mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
Icon renaming (code changes - KDE/):
consolidate the fileview-* icons to view-* svn path=/trunk/KDE/kdebase/apps/; revision=755384
This commit is contained in:
parent
eb709ca046
commit
05c8b55c73
4 changed files with 13 additions and 13 deletions
|
@ -1151,7 +1151,7 @@ void DolphinMainWindow::setupActions()
|
||||||
|
|
||||||
KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
|
KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
|
||||||
showPreview->setText(i18nc("@action:intoolbar", "Preview"));
|
showPreview->setText(i18nc("@action:intoolbar", "Preview"));
|
||||||
showPreview->setIcon(KIcon("fileview-preview"));
|
showPreview->setIcon(KIcon("view-preview"));
|
||||||
connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
|
connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
|
||||||
|
|
||||||
KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
|
KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
|
||||||
|
@ -1457,14 +1457,14 @@ void DolphinMainWindow::updateSplitAction()
|
||||||
if (m_viewContainer[SecondaryView] != 0) {
|
if (m_viewContainer[SecondaryView] != 0) {
|
||||||
if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
|
if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
|
||||||
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
|
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
|
||||||
splitAction->setIcon(KIcon("fileview-close-right"));
|
splitAction->setIcon(KIcon("view-right-close"));
|
||||||
} else {
|
} else {
|
||||||
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
|
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
|
||||||
splitAction->setIcon(KIcon("fileview-close-left"));
|
splitAction->setIcon(KIcon("view-left-close"));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
|
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
|
||||||
splitAction->setIcon(KIcon("fileview-split"));
|
splitAction->setIcon(KIcon("view-right-new"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -998,7 +998,7 @@ KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
|
||||||
KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
|
KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
|
||||||
iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
|
iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
|
||||||
iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
|
iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
|
||||||
iconsView->setIcon(KIcon("fileview-icon"));
|
iconsView->setIcon(KIcon("view-list-icons"));
|
||||||
iconsView->setData(QVariant::fromValue(IconsView));
|
iconsView->setData(QVariant::fromValue(IconsView));
|
||||||
return iconsView;
|
return iconsView;
|
||||||
}
|
}
|
||||||
|
@ -1008,7 +1008,7 @@ KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollectio
|
||||||
KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
|
KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
|
||||||
detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
|
detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
|
||||||
detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
|
detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
|
||||||
detailsView->setIcon(KIcon("fileview-detailed"));
|
detailsView->setIcon(KIcon("view-list-details"));
|
||||||
detailsView->setData(QVariant::fromValue(DetailsView));
|
detailsView->setData(QVariant::fromValue(DetailsView));
|
||||||
return detailsView;
|
return detailsView;
|
||||||
}
|
}
|
||||||
|
@ -1018,7 +1018,7 @@ KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollectio
|
||||||
KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
|
KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
|
||||||
columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
|
columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
|
||||||
columnView->setShortcut(Qt::CTRL | Qt::Key_3);
|
columnView->setShortcut(Qt::CTRL | Qt::Key_3);
|
||||||
columnView->setIcon(KIcon("fileview-column"));
|
columnView->setIcon(KIcon("view-file-columns"));
|
||||||
columnView->setData(QVariant::fromValue(ColumnView));
|
columnView->setData(QVariant::fromValue(ColumnView));
|
||||||
return columnView;
|
return columnView;
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,9 +91,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
|
||||||
|
|
||||||
QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
|
QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
|
||||||
m_viewMode = new QComboBox(propsBox);
|
m_viewMode = new QComboBox(propsBox);
|
||||||
m_viewMode->addItem(KIcon("fileview-icon"), i18nc("@item:inlistbox", "Icons"));
|
m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"));
|
||||||
m_viewMode->addItem(KIcon("fileview-detailed"), i18nc("@item:inlistbox", "Details"));
|
m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details"));
|
||||||
m_viewMode->addItem(KIcon("fileview-column"), i18nc("@item:inlistbox", "Column"));
|
m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column"));
|
||||||
|
|
||||||
QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);
|
QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);
|
||||||
QWidget* sortingBox = new QWidget(propsBox);
|
QWidget* sortingBox = new QWidget(propsBox);
|
||||||
|
|
|
@ -54,15 +54,15 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
|
||||||
|
|
||||||
// initialize 'Icons' tab
|
// initialize 'Icons' tab
|
||||||
m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
|
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
|
// initialize 'Details' tab
|
||||||
m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
|
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
|
// initialize 'Column' tab
|
||||||
m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
|
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);
|
topLayout->addWidget(tabWidget, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue