mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
* share Context Menu page settings from dolphin with konqueror
* Make KonqPopupMenu aware of the CopyTo/MoveTo settings from konqueror and dolphin svn path=/trunk/KDE/kdebase/apps/; revision=955015
This commit is contained in:
parent
b842968e4a
commit
f2d889b349
|
@ -203,6 +203,7 @@ set(kcm_dolphingeneral_PART_SRCS
|
||||||
kcm/kcmdolphingeneral.cpp
|
kcm/kcmdolphingeneral.cpp
|
||||||
settings/behaviorsettingspage.cpp
|
settings/behaviorsettingspage.cpp
|
||||||
settings/previewssettingspage.cpp
|
settings/previewssettingspage.cpp
|
||||||
|
settings/contextmenusettingspage.cpp
|
||||||
settings/settingspagebase.cpp)
|
settings/settingspagebase.cpp)
|
||||||
|
|
||||||
kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
|
kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "settings/behaviorsettingspage.h"
|
#include "settings/behaviorsettingspage.h"
|
||||||
#include "settings/previewssettingspage.h"
|
#include "settings/previewssettingspage.h"
|
||||||
|
#include "settings/contextmenusettingspage.h"
|
||||||
|
|
||||||
#include <ktabwidget.h>
|
#include <ktabwidget.h>
|
||||||
#include <kdialog.h>
|
#include <kdialog.h>
|
||||||
|
@ -60,8 +61,14 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
|
||||||
tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
|
tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
|
||||||
connect(previewsPage, SIGNAL(changed()), this, SLOT(changed()));
|
connect(previewsPage, SIGNAL(changed()), this, SLOT(changed()));
|
||||||
|
|
||||||
|
// initialize 'Context Menu' tab
|
||||||
|
ContextMenuSettingsPage *contextMenuPage = new ContextMenuSettingsPage(tabWidget);
|
||||||
|
tabWidget->addTab(contextMenuPage, i18nc("@title:tab Context Menu settings", "Context Menu"));
|
||||||
|
connect(contextMenuPage, SIGNAL(changed()), this, SLOT(changed()));
|
||||||
|
|
||||||
m_pages.append(behaviorPage);
|
m_pages.append(behaviorPage);
|
||||||
m_pages.append(previewsPage);
|
m_pages.append(previewsPage);
|
||||||
|
m_pages.append(contextMenuPage);
|
||||||
|
|
||||||
topLayout->addWidget(tabWidget, 0, 0);
|
topLayout->addWidget(tabWidget, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue