[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps
From: Alessandro Diaferia <alediaferia () gmail ! com>
Date: 2009-04-16 18:55:19
Message-ID: 1239908119.653915.20071.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 955015 by adiaferia:
* share Context Menu page settings from dolphin with konqueror
* Make KonqPopupMenu aware of the CopyTo/MoveTo settings from konqueror and dolphin
M +1 -0 dolphin/src/CMakeLists.txt
M +7 -0 dolphin/src/kcm/kcmdolphingeneral.cpp
M +6 -1 lib/konq/konq_popupmenu.cpp
--- trunk/KDE/kdebase/apps/dolphin/src/CMakeLists.txt #955014:955015
@@ -203,6 +203,7 @@
kcm/kcmdolphingeneral.cpp
settings/behaviorsettingspage.cpp
settings/previewssettingspage.cpp
+ settings/contextmenusettingspage.cpp
settings/settingspagebase.cpp)
kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
--- trunk/KDE/kdebase/apps/dolphin/src/kcm/kcmdolphingeneral.cpp #955014:955015
@@ -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 @@
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);
}
--- trunk/KDE/kdebase/apps/lib/konq/konq_popupmenu.cpp #955014:955015
@@ -410,8 +410,13 @@
q->addSeparator();
+ // Use the Dolphin setting for showing the "Copy To" and "Move To" actions
+ KSharedConfig::Ptr dolphin = KSharedConfig::openConfig("dolphinrc");
+
// CopyTo/MoveTo menus
- if (m_itemFlags & KParts::BrowserExtension::ShowUrlOperations) {
+ if (m_itemFlags & KParts::BrowserExtension::ShowUrlOperations &&
+ KConfigGroup(dolphin, "General").readEntry("ShowCopyMoveMenu", false)) {
+
m_copyToMenu.setItems(lstItems);
m_copyToMenu.setReadOnly(sMoving == false);
m_copyToMenu.addActionsTo(q);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic