From 3759f51a1315f7517aa4e8a80c582ea602e18c08 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Thu, 8 Mar 2007 19:32:19 +0000 Subject: [PATCH] oxygen icon naming fixes from Luca Gugelmann svn path=/trunk/KDE/kdebase/libkonq/; revision=640669 --- src/bookmarkssidebarpage.cpp | 6 +++--- src/dolphinmainwindow.cpp | 30 +++++++++++++++--------------- src/filterbar.cpp | 2 +- src/renamedialog.cpp | 2 +- src/statusbarmessagelabel.cpp | 2 +- src/viewpropertiesdialog.cpp | 2 +- src/viewsettingspage.cpp | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index 3fb031edc..aaef9b3d9 100644 --- a/src/bookmarkssidebarpage.cpp +++ b/src/bookmarkssidebarpage.cpp @@ -110,12 +110,12 @@ void BookmarksSidebarPage::slotContextMenuRequested(Q3ListBoxItem* item, Q3PopupMenu* popup = new Q3PopupMenu(); if (item == 0) { - popup->insertItem(SmallIcon("filenew"), i18n("Add Bookmark..."), addID); + popup->insertItem(SmallIcon("document-new"), i18n("Add Bookmark..."), addID); } else { - popup->insertItem(SmallIcon("filenew"), i18n("Insert Bookmark..."), insertID); + popup->insertItem(SmallIcon("document-new"), i18n("Insert Bookmark..."), insertID); popup->insertItem(SmallIcon("edit"), i18n("Edit..."), editID); - popup->insertItem(SmallIcon("editdelete"), i18n("Delete"), deleteID); + popup->insertItem(SmallIcon("edit-delete"), i18n("Delete"), deleteID); } KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a2fe72d6e..102e54404 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -154,12 +154,12 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, QString seq = QKeySequence(Qt::ShiftModifier).toString(); seq.chop(1); // chop superfluous '+' - QAction* moveAction = popup.addAction(KIcon("goto"), + QAction* moveAction = popup.addAction(KIcon("goto-page"), i18n("&Move Here") + '\t' + seq); seq = QKeySequence(Qt::ControlModifier).toString(); seq.chop(1); - QAction* copyAction = popup.addAction(KIcon("editcopy"), + QAction* copyAction = popup.addAction(KIcon("edit-copy"), i18n("&Copy Here") + '\t' + seq); seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); @@ -168,7 +168,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, i18n("&Link Here") + '\t' + seq); popup.addSeparator(); - popup.addAction(KIcon("stop"), i18n("Cancel")); + popup.addAction(KIcon("process-stop"), i18n("Cancel")); QAction* activatedAction = popup.exec(QCursor::pos()); if (activatedAction == moveAction) { @@ -438,7 +438,7 @@ void DolphinMainWindow::deleteItems() const bool del = KMessageBox::warningContinueCancel(this, text, QString(), - KGuiItem(i18n("Delete"), KIcon("editdelete")) + KGuiItem(i18n("Delete"), KIcon("edit-delete")) ) == KMessageBox::Continue; if (del) { KIO::Job* job = KIO::del(list); @@ -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(), "folder_home"); + 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_local"); + root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-workgroup"); root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red"); - root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "trashcan_full"); + root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash-full"); } setupActions(); @@ -998,12 +998,12 @@ void DolphinMainWindow::setupActions() m_newMenu = new DolphinNewMenu(this); KMenu* menu = m_newMenu->menu(); menu->setTitle(i18n("Create New...")); - menu->setIcon(SmallIcon("filenew")); + menu->setIcon(SmallIcon("document-new")); connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); QAction* newWindow = actionCollection()->addAction("new_window"); - newWindow->setIcon(KIcon("window_new")); + newWindow->setIcon(KIcon("window-new")); newWindow->setText(i18n("New &Window")); newWindow->setShortcut(Qt::CTRL | Qt::Key_N); connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); @@ -1015,14 +1015,14 @@ void DolphinMainWindow::setupActions() QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); moveToTrash->setText(i18n("Move to Trash")); - moveToTrash->setIcon(KIcon("edittrash")); + moveToTrash->setIcon(KIcon("edit-trash")); moveToTrash->setShortcut(QKeySequence::Delete); connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); QAction* deleteAction = actionCollection()->addAction("delete"); deleteAction->setText(i18n("Delete")); deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); - deleteAction->setIcon(KIcon("editdelete")); + deleteAction->setIcon(KIcon("edit-delete")); connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); QAction* properties = actionCollection()->addAction("properties"); @@ -1069,7 +1069,7 @@ void DolphinMainWindow::setupActions() KToggleAction* detailsView = actionCollection()->add("details"); detailsView->setText(i18n("Details")); detailsView->setShortcut(Qt::CTRL | Qt::Key_2); - detailsView->setIcon(KIcon("view_text")); + detailsView->setIcon(KIcon("fileview-text")); connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView())); QActionGroup* viewModeGroup = new QActionGroup(this); @@ -1130,12 +1130,12 @@ void DolphinMainWindow::setupActions() QAction* reload = actionCollection()->addAction("reload"); reload->setText(i18n("Reload")); reload->setShortcut(Qt::Key_F5); - reload->setIcon(KIcon("reload")); + reload->setIcon(KIcon("view-refresh")); connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); QAction* stop = actionCollection()->addAction("stop"); stop->setText(i18n("Stop")); - stop->setIcon(KIcon("stop")); + stop->setIcon(KIcon("process-stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); // TODO: the URL navigator must emit a signal if the editable state has been @@ -1171,7 +1171,7 @@ void DolphinMainWindow::setupActions() QAction* findFile = actionCollection()->addAction("find_file"); findFile->setText(i18n("Find File...")); findFile->setShortcut(Qt::Key_F); - findFile->setIcon(KIcon("filefind")); + findFile->setIcon(KIcon("file-find")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); diff --git a/src/filterbar.cpp b/src/filterbar.cpp index cdb1b713b..8708af3ef 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -54,7 +54,7 @@ FilterBar::FilterBar(QWidget* parent) : m_close = new QToolButton(this); m_close->setAutoRaise(true); - m_close->setIcon(QIcon(SmallIcon("fileclose"))); + m_close->setIcon(QIcon(SmallIcon("window-close"))); hLayout->addWidget(m_close); hLayout->addSpacing(gap); diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index ab43d4753..8aabb2f83 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -35,7 +35,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) : setButtons(Ok|Cancel); setDefaultButton(Ok); - setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "apply")); + setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "dialog-apply")); QWidget *page = new QWidget(this); setMainWidget(page); diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 11bbea36d..6b528d802 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -93,7 +93,7 @@ void StatusBarMessageLabel::setMessage(const QString& text, break; case DolphinStatusBar::Information: - iconName = "info"; + iconName = "document-properties"; m_closeButton->hide(); break; diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index f6578a511..ecb27db15 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -81,7 +81,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox); m_viewMode = new QComboBox(propsBox); m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons")); - m_viewMode->addItem(SmallIcon("view_text"), i18n("Details")); + m_viewMode->addItem(SmallIcon("fileview-text"), i18n("Details")); const int index = static_cast(m_viewProps->viewMode()); m_viewMode->setCurrentIndex(index); diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp index 5bdd1753e..d4c7f5bae 100644 --- a/src/viewsettingspage.cpp +++ b/src/viewsettingspage.cpp @@ -53,7 +53,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow, // initialize 'Details' tab m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget); - tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details")); + tabWidget->addTab(m_detailsPage, SmallIcon("fileview-text"), i18n("Details")); topLayout->addWidget(tabWidget, 0, 0 ); } -- 2.47.3