oxygen icon naming fixes from Luca Gugelmann

svn path=/trunk/KDE/kdebase/libkonq/; revision=640669

diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index 3fb031edc9523b23567f2e12d0202181b0fd318a..aaef9b3d90b1688a7468964f29de433275b301c8 100644 (file)
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -110,12 +110,12 @@ void BookmarksSidebarPage::slotContextMenuRequested(Q3ListBoxItem* item,
 
     Q3PopupMenu* popup = new Q3PopupMenu();
     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/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

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index cdb1b713bbfd99ee437c33a59ca61aebf72b24e9..8708af3efef2f60f83a2c2080c57105485223d5b 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -54,7 +54,7 @@ FilterBar::FilterBar(QWidget* parent) :
 
     m_close = new QToolButton(this);
     m_close->setAutoRaise(true);
-    m_close->setIcon(QIcon(SmallIcon("fileclose")));
+    m_close->setIcon(QIcon(SmallIcon("window-close")));
     hLayout->addWidget(m_close);
     hLayout->addSpacing(gap);
 

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index ab43d47530cdba2b84b01ae95574ec7eb41fd719..8aabb2f839b61b05211ee64b79e22f027fb2c3ad 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -35,7 +35,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     setButtons(Ok|Cancel);
     setDefaultButton(Ok);
 
-    setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "apply"));
+    setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "dialog-apply"));
 
     QWidget *page = new QWidget(this);
     setMainWidget(page);

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 11bbea36db113633b78a4bf6312f6f85358b931e..6b528d802b50cc04b2c168fe0865c2e9952a6bfb 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -93,7 +93,7 @@ void StatusBarMessageLabel::setMessage(const QString& text,
             break;
 
         case DolphinStatusBar::Information:
-            iconName = "info";
+            iconName = "document-properties";
             m_closeButton->hide();
             break;
 

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index f6578a511ae4882665e460b80fd275a371ed56b8..ecb27db15416f670c1f3814a86e6c48ebd364a48 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -81,7 +81,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons"));
-    m_viewMode->addItem(SmallIcon("view_text"), i18n("Details"));
+    m_viewMode->addItem(SmallIcon("fileview-text"), i18n("Details"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
 

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 5bdd1753e6a973b9850ce96a1cb238a74d921d4f..d4c7f5bae330df1c5120d0c26428cbc26242954a 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -53,7 +53,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, SmallIcon("fileview-text"), i18n("Details"));
 
     topLayout->addWidget(tabWidget, 0, 0 );
 }