icon renamings:

- emptytrash -> trash-empty
- edit-trash -> user-trash

svn path=/trunk/KDE/kdebase/apps/; revision=728161

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 4b58809bd9277b0ec2896a15629bbf128dd8312c..4a852c9b7c8b4306eefbd5c3aefbfa63c5c3d653 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -101,7 +101,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), popup);
     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 74869e9674a26e86c7c1d6b03408934d604dabd1..7e55ccef0766c1f302b49abd6e2b848c784160b5 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1096,7 +1096,7 @@ void DolphinMainWindow::setupActions()
 
     QAction* moveToTrash = actionCollection()->addAction("move_to_trash");
     moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
-    moveToTrash->setIcon(KIcon("edit-trash"));
+    moveToTrash->setIcon(KIcon("user-trash"));
     moveToTrash->setShortcut(QKeySequence::Delete);
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index d095ee13d00d1397ea1f19eccfe9acb9ca22b6f9..73d228c2c48a92ae28cfcc4e8fe95a3b177a1dd5 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -79,7 +79,7 @@ void TreeViewContextMenu::open()
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo.url();
     if (url.isLocalFile()) {
-        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"),
+        QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
                                                  i18nc("@action:inmenu", "Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);