Icon renaming (code changes - KDE/):

consolidate the fileview-* icons to view-*

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 6eb45ac0d1558389586d68800162f86ed656ece5..02e99c4720d8426ce1e913ebfdcb954abe9666f7 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1151,7 +1151,7 @@ void DolphinMainWindow::setupActions()
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
-    showPreview->setIcon(KIcon("fileview-preview"));
+    showPreview->setIcon(KIcon("view-preview"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
@@ -1457,14 +1457,14 @@ void DolphinMainWindow::updateSplitAction()
     if (m_viewContainer[SecondaryView] != 0) {
         if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
-            splitAction->setIcon(KIcon("fileview-close-right"));
+            splitAction->setIcon(KIcon("view-right-close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
-            splitAction->setIcon(KIcon("fileview-close-left"));
+            splitAction->setIcon(KIcon("view-left-close"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
-        splitAction->setIcon(KIcon("fileview-split"));
+        splitAction->setIcon(KIcon("view-right-new"));
     }
 }
 

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 297ab9934267c9464f6217a004f89010ce74134a..7418997d94dc16fcbc025c736eda5dd9920c38b3 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -998,7 +998,7 @@ KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
     KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(KIcon("fileview-icon"));
+    iconsView->setIcon(KIcon("view-list-icons"));
     iconsView->setData(QVariant::fromValue(IconsView));
     return iconsView;
 }
@@ -1008,7 +1008,7 @@ KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollectio
     KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
-    detailsView->setIcon(KIcon("fileview-detailed"));
+    detailsView->setIcon(KIcon("view-list-details"));
     detailsView->setData(QVariant::fromValue(DetailsView));
     return detailsView;
 }
@@ -1018,7 +1018,7 @@ KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollectio
     KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
     columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
-    columnView->setIcon(KIcon("fileview-column"));
+    columnView->setIcon(KIcon("view-file-columns"));
     columnView->setData(QVariant::fromValue(ColumnView));
     return columnView;
 }

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index fc670e3eb17b00383f1d91df86acdf2f03c30693..faf17d48b1e3551f58ce87776f7712f82534f652 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -91,9 +91,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
-    m_viewMode->addItem(KIcon("fileview-icon"), i18nc("@item:inlistbox", "Icons"));
-    m_viewMode->addItem(KIcon("fileview-detailed"), i18nc("@item:inlistbox", "Details"));
-    m_viewMode->addItem(KIcon("fileview-column"), i18nc("@item:inlistbox", "Column"));
+    m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"));
+    m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details"));
+    m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column"));
 
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);
     QWidget* sortingBox = new QWidget(propsBox);

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 3903094b906650fec09933d108a2c7a336503580..5f5117dae939365fa835f959e909415b52260ac0 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -54,15 +54,15 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_iconsPage, KIcon("fileview-icon"), i18nc("@title:tab", "Icons"));
+    tabWidget->addTab(m_iconsPage, KIcon("view-list-icons"), i18nc("@title:tab", "Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18nc("@title:tab", "Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("view-list-details"), i18nc("@title:tab", "Details"));
 
     // initialize 'Column' tab
     m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_columnPage, KIcon("fileview-column"), i18nc("@title:tab", "Column"));
+    tabWidget->addTab(m_columnPage, KIcon("view-file-columns"), i18nc("@title:tab", "Column"));
 
     topLayout->addWidget(tabWidget, 0, 0);
 }