From 05c8b55c7344d9c3a8b844fcc09787095852f34c Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Tue, 1 Jan 2008 12:25:48 +0000 Subject: [PATCH] Icon renaming (code changes - KDE/): consolidate the fileview-* icons to view-* svn path=/trunk/KDE/kdebase/apps/; revision=755384 --- src/dolphinmainwindow.cpp | 8 ++++---- src/dolphinview.cpp | 6 +++--- src/viewpropertiesdialog.cpp | 6 +++--- src/viewsettingspage.cpp | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 6eb45ac0d1..02e99c4720 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1151,7 +1151,7 @@ void DolphinMainWindow::setupActions() KToggleAction* showPreview = actionCollection()->add("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("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 297ab99342..7418997d94 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -998,7 +998,7 @@ KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection) KToggleAction* iconsView = actionCollection->add("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("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("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 fc670e3eb1..faf17d48b1 100644 --- 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 3903094b90..5f5117dae9 100644 --- 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); }