Branch: master

b4202489 2014-10-13 15:43:42 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M src/bookmarkssidebarpage.cpp
M src/dolphin.cpp
M src/dolphincontextmenu.cpp
M src/filterbar.cpp
diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index e70e8af..94a37eb 100644
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -102,12 +102,12 @@
 
     TQPopupMenu* popup = new TQPopupMenu();
     if (item == 0) {
-        popup->insertItem(SmallIcon("filenew"), i18n("Add Bookmark..."), addID);
+        popup->insertItem(SmallIcon("document-new"), i18n("Add Bookmark..."), addID);
     }
     else {
-        popup->insertItem(SmallIcon("filenew"), i18n("Insert Bookmark..."), insertID);
+        popup->insertItem(SmallIcon("document-new"), i18n("Insert Bookmark..."), insertID);
         popup->insertItem(SmallIcon("edit"), i18n("Edit..."), editID);
-        popup->insertItem(SmallIcon("editdelete"), i18n("Delete"), deleteID);
+        popup->insertItem(SmallIcon("edit-delete"), i18n("Delete"), deleteID);
     }
 
     KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 8d3874e..de44df9 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -126,7 +126,7 @@
         TDEPopupMenu popup(this);
 
         popup.insertItem(SmallIcon("goto"), i18n("&Move Here") + "\t" + KKey::modFlagLabel(KKey::SHIFT), 0);
-        popup.insertItem(SmallIcon("editcopy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel(KKey::CTRL), 1);
+        popup.insertItem(SmallIcon("edit-copy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel(KKey::CTRL), 1);
         popup.insertItem(i18n("&Link Here") + "\t" + KKey::modFlagLabel((KKey::ModFlag)(KKey::CTRL|KKey::SHIFT)), 2);
         popup.insertSeparator();
         popup.insertItem(SmallIcon("process-stop"), i18n("Cancel"), 3);
@@ -549,7 +549,7 @@
     const bool del = KMessageBox::warningContinueCancel(this,
                                                         text,
                                                         TQString(),
-                                                        KGuiItem(i18n("Delete"), SmallIcon("editdelete"))
+                                                        KGuiItem(i18n("Delete"), SmallIcon("edit-delete"))
                                                        ) == KMessageBox::Continue;
     if (del) {
         TDEIO::Job* job = TDEIO::del(list);
@@ -1193,7 +1193,7 @@
     TDEAction* deleteAction = new TDEAction(i18n("Delete"), "Shift+Delete",
                                         TQT_TQOBJECT(this), TQT_SLOT(deleteItems()),
                                         actionCollection(), "delete");
-    deleteAction->setIcon("editdelete");
+    deleteAction->setIcon("edit-delete");
 
     new TDEAction(i18n("Propert&ies"), "Alt+Return",
                      TQT_TQOBJECT(this), TQT_SLOT(properties()),
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 1b9dbbf..345773a 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -126,7 +126,7 @@
     }
     else
     {
-        popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu);
+        popup->insertItem(SmallIcon("document-new"), i18n("Create New"), createNewMenu);
     }
     popup->insertSeparator();
 
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index a0c0639..1db8835 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -49,7 +49,7 @@
     layout->addWidget(m_filterInput);
 
     m_close = new KPushButton(this);
-    m_close->setIconSet(SmallIcon("fileclose"));
+    m_close->setIconSet(SmallIcon("window-close"));
     m_close->setFlat(true);
     layout->addWidget(m_close);
     layout->addSpacing(gap);