Fwd: KDE/kdebase/apps/plasma/applets/folderview

[Alex Merry]

Sorry, meant to CCMAIL in the commit itself.

Should I backport this to 4.1?

Alex


----------  Forwarded Message  ----------

Subject: KDE/kdebase/apps/plasma/applets/folderview
Date: Wednesday 06 August 2008
From: Alex Merry <kde at randomguy3.me.uk>
To: kde-commits at kde.org

SVN commit 843259 by alexmerry:

Honour Dolphin's "Show delete command" option in folderview.

BUG: 163701



 M  +9 -0      folderview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp 
#843258:843259
@@ -1057,6 +1057,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()));
 
@@ -1279,9 +1280,17 @@
 
     QList<QAction*> editActions;
     editActions.append(m_actionCollection.action("rename"));
+
+    KSharedConfig::Ptr dolphinConfig =
+        KSharedConfig::openConfig("dolphinrc", KConfig::IncludeGlobals);
+    const KConfigGroup dolphinKdeConfig(dolphinConfig, "KDE");
+    bool showDeleteCommand = dolphinKdeConfig.readEntry("ShowDeleteCommand", 
false);
     if (!hasRemoteFiles) {
         editActions.append(m_actionCollection.action("trash"));
     } else {
+        showDeleteCommand = true;
+    }
+    if (showDeleteCommand) {
         editActions.append(m_actionCollection.action("del"));
     }
 

-------------------------------------------------------
-- 
Proud KDE hacker: http://www.kde.org
Get KDE 4.1 - out now!
Arch Linux: perfect for geeks like me - http://www.archlinux.org
OpenSUSE: just works - http://www.opensuse.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/plasma-devel/attachments/20080806/2cb13ba8/attachment.pgp