* 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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ab2c5a28e5e5453ac662b4202780e19fb423b0f..b705909e9df9af470c5124a801d53eb0f47f1811 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -203,6 +203,7 @@ set(kcm_dolphingeneral_PART_SRCS
     kcm/kcmdolphingeneral.cpp
     settings/behaviorsettingspage.cpp
     settings/previewssettingspage.cpp
+    settings/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)
 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS

diff --git a/src/kcm/kcmdolphingeneral.cpp b/src/kcm/kcmdolphingeneral.cpp
index 5f8b9630412c2df8eba9e2b5585f9a61b8c7506f..4c0de517ccff879d70d5f94fa09c71261f17c855 100644 (file)
--- a/src/kcm/kcmdolphingeneral.cpp
+++ b/src/kcm/kcmdolphingeneral.cpp
@@ -21,6 +21,7 @@
 
 #include "settings/behaviorsettingspage.h"
 #include "settings/previewssettingspage.h"
+#include "settings/contextmenusettingspage.h"
 
 #include <ktabwidget.h>
 #include <kdialog.h>
@@ -60,8 +61,14 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
     tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
     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(previewsPage);
+    m_pages.append(contextMenuPage);
 
     topLayout->addWidget(tabWidget, 0, 0);
 }