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

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/apps/plasma/applets/folderview
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2008-08-08 13:27:38
Message-ID: 1218202058.608842.27686.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 844041 by alexmerry:

Backport fix: respect the ShowDeleteCommand option, as set in Dolphin/Konqueror.

CCBUG: 163701



 M  +6 -0      folderview.cpp  


--- branches/KDE/4.1/kdebase/apps/plasma/applets/folderview/folderview.cpp #844040:844041
@@ -830,6 +830,7 @@
             SLOT(moveToTrash(Qt::MouseButtons, Qt::KeyboardModifiers)));
 
     KAction *del = new KAction(i18n("&Delete"), this);
+    del->setIcon(KIcon("edit-delete"));
     del->setShortcut(Qt::SHIFT + Qt::Key_Delete);
     connect(del, SIGNAL(triggered()), SLOT(deleteSelectedIcons()));
 
@@ -1038,9 +1039,14 @@
 
     QList<QAction*> editActions;
     editActions.append(m_actionCollection.action("rename"));
+    KConfigGroup configGroup(KGlobal::config(), "KDE");
+    bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
     if (!hasRemoteFiles) {
         editActions.append(m_actionCollection.action("trash"));
     } else {
+        showDeleteCommand = true;
+    }
+    if (showDeleteCommand) {
         editActions.append(m_actionCollection.action("del"));
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]