[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-08-07 21:48:30
Message-ID: 1218145710.158211.21103.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 843789 by ppenz:

Backport of 843787: use the global setting for the "Show Delete" command

 M  +4 -2      dolphincontextmenu.cpp  
 M  +3 -2      dolphinpart.cpp  
 M  +7 -5      generalsettingspage.cpp  
 M  +4 -2      treeviewcontextmenu.cpp  


--- branches/KDE/4.1/kdebase/apps/dolphin/src/dolphincontextmenu.cpp #843788:843789
@@ -296,8 +296,10 @@
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'
-    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-    bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", \
KConfig::IncludeGlobals); +    KConfigGroup configGroup(globalConfig, "KDE");
+    bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
+
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");
--- branches/KDE/4.1/kdebase/apps/dolphin/src/dolphinpart.cpp #843788:843789
@@ -373,8 +373,9 @@
                 addDel = true;
             }
             else {
-                KConfigGroup configGroup( KGlobal::config(), "KDE" );
-                if ( configGroup.readEntry( "ShowDeleteCommand", false) )
+                KSharedConfig::Ptr globalConfig = \
KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); +                \
KConfigGroup configGroup(globalConfig, "KDE"); +                if ( \
configGroup.readEntry("ShowDeleteCommand", false) )  addDel = true;
             }
         }
--- branches/KDE/4.1/kdebase/apps/dolphin/src/generalsettingspage.cpp #843788:843789
@@ -106,9 +106,10 @@
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     confirmationGroup.sync();
 
-    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-    kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
-    kdeConfig.sync();
+    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", \
KConfig::NoGlobals); +    KConfigGroup configGroup(globalConfig, "KDE");
+    configGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
+    configGroup.sync();
 
     settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
     settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked());
@@ -132,8 +133,9 @@
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", \
                false));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", true));
 
-    const KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-    m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", \
false)); +    KSharedConfig::Ptr globalConfig = \
KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); +    KConfigGroup \
configGroup(globalConfig, "KDE"); +    \
m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false));  
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());
--- branches/KDE/4.1/kdebase/apps/dolphin/src/treeviewcontextmenu.cpp #843788:843789
@@ -82,8 +82,10 @@
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
-        KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-        bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", \
KConfig::IncludeGlobals); +        KConfigGroup configGroup(globalConfig, "KDE");
+        bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
+
         const KUrl& url = m_fileInfo.url();
         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),


[prev in list] [next in list] [prev in thread] [next in thread]