oxygen icon naming fixes from Luca Gugelmann

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a2fe72d6e229f4ec6baf6291902362a03a6737e4..102e544049ef0e1445dae36ab426ee7bee5d8d06 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -154,12 +154,12 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 \r
         QString seq = QKeySequence(Qt::ShiftModifier).toString();\r
         seq.chop(1); // chop superfluous '+'\r
-        QAction* moveAction = popup.addAction(KIcon("goto"),\r
+        QAction* moveAction = popup.addAction(KIcon("goto-page"),\r
                                               i18n("&Move Here") + '\t' + seq);\r
 \r
         seq = QKeySequence(Qt::ControlModifier).toString();\r
         seq.chop(1);\r
-        QAction* copyAction = popup.addAction(KIcon("editcopy"),\r
+        QAction* copyAction = popup.addAction(KIcon("edit-copy"),\r
                                               i18n("&Copy Here") + '\t' + seq);\r
 \r
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();\r
@@ -168,7 +168,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                               i18n("&Link Here") + '\t' + seq);\r
 \r
         popup.addSeparator();\r
-        popup.addAction(KIcon("stop"), i18n("Cancel"));\r
+        popup.addAction(KIcon("process-stop"), i18n("Cancel"));\r
 \r
         QAction* activatedAction = popup.exec(QCursor::pos());\r
         if (activatedAction == moveAction) {\r
@@ -438,7 +438,7 @@ void DolphinMainWindow::deleteItems()
     const bool del = KMessageBox::warningContinueCancel(this,\r
                                                         text,\r
                                                         QString(),\r
-                                                        KGuiItem(i18n("Delete"), KIcon("editdelete"))\r
+                                                        KGuiItem(i18n("Delete"), KIcon("edit-delete"))\r
                                                        ) == KMessageBox::Continue;\r
     if (del) {\r
         KIO::Job* job = KIO::del(list);\r
@@ -919,11 +919,11 @@ void DolphinMainWindow::init()
     assert(manager != 0);\r
     KBookmarkGroup root = manager->root();\r
     if (root.first().isNull()) {\r
-        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder_home");\r
+        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "user-home");\r
         root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "blockdevice");\r
-        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network_local");\r
+        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-workgroup");\r
         root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red");\r
-        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "trashcan_full");\r
+        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash-full");\r
     }\r
 \r
     setupActions();\r
@@ -998,12 +998,12 @@ void DolphinMainWindow::setupActions()
     m_newMenu = new DolphinNewMenu(this);\r
     KMenu* menu = m_newMenu->menu();\r
     menu->setTitle(i18n("Create New..."));\r
-    menu->setIcon(SmallIcon("filenew"));\r
+    menu->setIcon(SmallIcon("document-new"));\r
     connect(menu, SIGNAL(aboutToShow()),\r
             this, SLOT(updateNewMenu()));\r
 \r
     QAction* newWindow = actionCollection()->addAction("new_window");\r
-    newWindow->setIcon(KIcon("window_new"));\r
+    newWindow->setIcon(KIcon("window-new"));\r
     newWindow->setText(i18n("New &Window"));\r
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);\r
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));\r
@@ -1015,14 +1015,14 @@ void DolphinMainWindow::setupActions()
 \r
     QAction* moveToTrash = actionCollection()->addAction("move_to_trash");\r
     moveToTrash->setText(i18n("Move to Trash"));\r
-    moveToTrash->setIcon(KIcon("edittrash"));\r
+    moveToTrash->setIcon(KIcon("edit-trash"));\r
     moveToTrash->setShortcut(QKeySequence::Delete);\r
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));\r
 \r
     QAction* deleteAction = actionCollection()->addAction("delete");\r
     deleteAction->setText(i18n("Delete"));\r
     deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);\r
-    deleteAction->setIcon(KIcon("editdelete"));\r
+    deleteAction->setIcon(KIcon("edit-delete"));\r
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));\r
 \r
     QAction* properties = actionCollection()->addAction("properties");\r
@@ -1069,7 +1069,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");\r
     detailsView->setText(i18n("Details"));\r
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);\r
-    detailsView->setIcon(KIcon("view_text"));\r
+    detailsView->setIcon(KIcon("fileview-text"));\r
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));\r
 \r
     QActionGroup* viewModeGroup = new QActionGroup(this);\r
@@ -1130,12 +1130,12 @@ void DolphinMainWindow::setupActions()
     QAction* reload = actionCollection()->addAction("reload");\r
     reload->setText(i18n("Reload"));\r
     reload->setShortcut(Qt::Key_F5);\r
-    reload->setIcon(KIcon("reload"));\r
+    reload->setIcon(KIcon("view-refresh"));\r
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));\r
 \r
     QAction* stop = actionCollection()->addAction("stop");\r
     stop->setText(i18n("Stop"));\r
-    stop->setIcon(KIcon("stop"));\r
+    stop->setIcon(KIcon("process-stop"));\r
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));\r
 \r
     // TODO: the URL navigator must emit a signal if the editable state has been\r
@@ -1171,7 +1171,7 @@ void DolphinMainWindow::setupActions()
     QAction* findFile = actionCollection()->addAction("find_file");\r
     findFile->setText(i18n("Find File..."));\r
     findFile->setShortcut(Qt::Key_F);\r
-    findFile->setIcon(KIcon("filefind"));\r
+    findFile->setIcon(KIcon("file-find"));\r
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));\r
 \r
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");\r