Fixed icon-names so that they match to the new Oxygen naming scheme (erase all Dolphi...

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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 346ee64013fc9bd327c1350609f11aaccceb3849..14760658128d3477ab2361eb7b95e6086a28e502 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -97,7 +97,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addMenu(viewModeMenu);
     popup->addSeparator();
 
     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..."));
     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)) {
     // 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
     }
 
     // Insert 'Open With...' sub menu

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 102e544049ef0e1445dae36ab426ee7bee5d8d06..dc46a942984bf539eec0c3be440331d570af488d 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -919,11 +919,11 @@ void DolphinMainWindow::init()
     assert(manager != 0);\r
     KBookmarkGroup root = manager->root();\r
     if (root.first().isNull()) {\r
     assert(manager != 0);\r
     KBookmarkGroup root = manager->root();\r
     if (root.first().isNull()) {\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-workgroup");\r
-        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red");\r
-        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash-full");\r
+        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder-home");\r
+        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "hdd-mount");\r
+        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-local");\r
+        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder-red");\r
+        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash");\r

     }\r
 \r
     setupActions();\r
     }\r
 \r
     setupActions();\r


@@ -1063,7 +1063,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");\r
     iconsView->setText(i18n("Icons"));\r
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);\r
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");\r
     iconsView->setText(i18n("Icons"));\r
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);\r

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

     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));\r
 \r
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");\r
     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));\r
 \r
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");\r


@@ -1113,7 +1113,8 @@ void DolphinMainWindow::setupActions()
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));\r
 \r
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");\r
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));\r
 \r
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");\r

-    showPreview->setText(i18n("Show Preview"));\r
+    showPreview->setText(i18n("Preview"));\r
+    showPreview->setIcon(KIcon("thumbnail-show"));\r

     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));\r
 \r
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");\r
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));\r
 \r
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");\r


@@ -1122,9 +1123,9 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));\r
 \r
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");\r
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));\r
 \r
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");\r

-    split->setText(i18n("Split View"));\r
+    split->setText(i18n("Split"));\r

     split->setShortcut(Qt::Key_F10);\r
     split->setShortcut(Qt::Key_F10);\r

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

     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));\r
 \r
     QAction* reload = actionCollection()->addAction("reload");\r
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));\r
 \r
     QAction* reload = actionCollection()->addAction("reload");\r

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index cf66af3b267e800781bad13c6a85e756ee90ea6a..55472caafbab3c627b7b40a450bffb3ad01f0a5c 100644 (file)
--- 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"));
 
     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"));
 
     m_bookmarksSettingsPage = new BookmarksSettingsPage(mainWindow, this);
     KPageWidgetItem* bookmarksSettingsFrame = addPage(m_bookmarksSettingsPage, i18n("Bookmarks"));

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index d20cdcf1d4411d14a62472acb429c2205ea339dd..5f822bf6488a39a996174f7b615dbd26f819ef25 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -105,6 +105,7 @@
   <Action name="icons" />
   <Action name="details" />
   <Separator name="separator_0" />
   <Action name="icons" />
   <Action name="details" />
   <Separator name="separator_0" />

+  <Action name="show_preview" />

   <Action name="split_view" />
  </ToolBar>
  <ActionProperties>
   <Action name="split_view" />
  </ToolBar>
  <ActionProperties>

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 52e22992264d330b7022a13c7643c7dcf6b9fc9d..72a3a9c491548b23cde42094e38f9a45c522e006 100644 (file)
--- 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 = 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()),
     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 d4c7f5bae330df1c5120d0c26428cbc26242954a..6c14e702051cb66495ba84cfc220fac06148a5b6 100644 (file)
--- 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);
 
     // 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);
 
     // 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);
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);