Fixed icon-names so that they match to the new Oxygen naming scheme (erase all Dolphin config files to see the effect). Although Oxygen is not finished yet, it looks very beautiful already, kudos to the Oxygen team :-)

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

6 files changed, 17 insertions, 15 deletions

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 346ee6401..147606581 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -97,7 +97,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addMenu(viewModeMenu);
     popup->addSeparator();
 
-    QAction* bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
+    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder"));
     popup->addSeparator();
 
     QAction* propertiesAction = popup->addAction(i18n("Properties..."));
@@ -174,7 +174,7 @@ void DolphinContextMenu::openItemContextMenu()
     // urls contains only one item, i.e. no multiple selection made
     QAction* bookmarkAction = 0;
     if (m_fileInfo->isDir() && (urls.count() == 1)) {
-        bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
+        bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder"));
     }
 
     // Insert 'Open With...' sub menu
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 102e54404..dc46a9429 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -919,11 +919,11 @@ void DolphinMainWindow::init()
     assert(manager != 0);

     KBookmarkGroup root = manager->root();

     if (root.first().isNull()) {

-        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "user-home");

-        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "blockdevice");

-        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-workgroup");

-        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red");

-        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash-full");

+        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder-home");

+        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "hdd-mount");

+        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-local");

+        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder-red");

+        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash");

     }

 

     setupActions();

@@ -1063,7 +1063,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");

     iconsView->setText(i18n("Icons"));

     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);

-    iconsView->setIcon(KIcon("view_icon"));

+    iconsView->setIcon(KIcon("view-icon"));

     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));

 

     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");

@@ -1113,7 +1113,8 @@ void DolphinMainWindow::setupActions()
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));

 

     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");

-    showPreview->setText(i18n("Show Preview"));

+    showPreview->setText(i18n("Preview"));

+    showPreview->setIcon(KIcon("thumbnail-show"));

     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));

 

     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");

@@ -1122,9 +1123,9 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));

 

     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");

-    split->setText(i18n("Split View"));

+    split->setText(i18n("Split"));

     split->setShortcut(Qt::Key_F10);

-    split->setIcon(KIcon("view_left_right"));

+    split->setIcon(KIcon("view-left-right"));

     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));

 

     QAction* reload = actionCollection()->addAction("reload");

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index cf66af3b2..55472caaf 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -44,7 +44,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
     KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
-    viewSettingsFrame->setIcon(KIcon("view_choose"));
+    viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     m_bookmarksSettingsPage = new BookmarksSettingsPage(mainWindow, this);
     KPageWidgetItem* bookmarksSettingsFrame = addPage(m_bookmarksSettingsPage, i18n("Bookmarks"));
diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index d20cdcf1d..5f822bf64 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -105,6 +105,7 @@
   <Action name="icons" />
   <Action name="details" />
   <Separator name="separator_0" />
+  <Action name="show_preview" />
   <Action name="split_view" />
  </ToolBar>
  <ActionProperties>
diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 52e229922..72a3a9c49 100644
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -91,7 +91,7 @@ UrlNavigator::UrlNavigator(const KUrl& url,
     m_toggleButton = new QToolButton();
     m_toggleButton->setCheckable(true);
     m_toggleButton->setAutoRaise(true);
-    m_toggleButton->setIcon(KIcon("locationbar_erase")); // TODO: is just a placeholder icon
+    m_toggleButton->setIcon(KIcon("editinput")); // TODO: is just a placeholder icon (?)
     m_toggleButton->setFocusPolicy(Qt::NoFocus);
     m_toggleButton->setMinimumHeight(minimumHeight());
     connect(m_toggleButton, SIGNAL(clicked()),
diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index d4c7f5bae..6c14e7020 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -45,11 +45,11 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'General' tab
     m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_generalPage, SmallIcon("view_choose"), i18n("General"));
+    tabWidget->addTab(m_generalPage, SmallIcon("view-choose"), i18n("General"));
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, SmallIcon("view-icon"), i18n("Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);