diff --git a/app/fileopscontextmanageritem.cpp b/app/fileopscontextmanageritem.cpp --- a/app/fileopscontextmanageritem.cpp +++ b/app/fileopscontextmanageritem.cpp @@ -138,12 +138,12 @@ mCopyToAction = file->addAction("file_copy_to", this, SLOT(copyTo())); mCopyToAction->setText(i18nc("Verb", "Copy To...")); - mCopyToAction->setIcon(QIcon::fromTheme("edit-copy")); + mCopyToAction->setIcon(QIcon::fromTheme("edit-copy-symbolic")); actionCollection->setDefaultShortcut(mCopyToAction, Qt::Key_F7); mMoveToAction = file->addAction("file_move_to", this, SLOT(moveTo())); mMoveToAction->setText(i18nc("Verb", "Move To...")); - mMoveToAction->setIcon(QIcon::fromTheme("go-jump")); + mMoveToAction->setIcon(QIcon::fromTheme("go-jump-symbolic")); actionCollection->setDefaultShortcut(mMoveToAction, Qt::Key_F8); mLinkToAction = file->addAction("file_link_to", this, SLOT(linkTo())); @@ -165,15 +165,15 @@ mRestoreAction = file->addAction("file_restore", this, SLOT(restore())); mRestoreAction->setText(i18n("Restore")); - mRestoreAction->setIcon(QIcon::fromTheme("edit-undo")); + mRestoreAction->setIcon(QIcon::fromTheme("edit-undo-symbolic")); mShowPropertiesAction = file->addAction("file_show_properties", this, SLOT(showProperties())); mShowPropertiesAction->setText(i18n("Properties")); - mShowPropertiesAction->setIcon(QIcon::fromTheme("document-properties")); + mShowPropertiesAction->setIcon(QIcon::fromTheme("document-properties-symbolic")); mCreateFolderAction = file->addAction("file_create_folder", this, SLOT(createFolder())); mCreateFolderAction->setText(i18n("Create Folder...")); - mCreateFolderAction->setIcon(QIcon::fromTheme("folder-new")); + mCreateFolderAction->setIcon(QIcon::fromTheme("folder-new-symbolic")); mOpenWithAction = file->addAction("file_open_with"); mOpenWithAction->setText(i18n("Open With")); diff --git a/app/imageopscontextmanageritem.cpp b/app/imageopscontextmanageritem.cpp --- a/app/imageopscontextmanageritem.cpp +++ b/app/imageopscontextmanageritem.cpp @@ -83,31 +83,31 @@ mRotateLeftAction = edit->addAction("rotate_left", q, SLOT(rotateLeft())); mRotateLeftAction->setText(i18n("Rotate Left")); mRotateLeftAction->setToolTip(i18nc("@info:tooltip", "Rotate image to the left")); - mRotateLeftAction->setIcon(QIcon::fromTheme("object-rotate-left")); + mRotateLeftAction->setIcon(QIcon::fromTheme("image-rotate-left-symbolic")); actionCollection->setDefaultShortcut(mRotateLeftAction, Qt::CTRL + Qt::Key_L); mRotateRightAction = edit->addAction("rotate_right", q, SLOT(rotateRight())); mRotateRightAction->setText(i18n("Rotate Right")); mRotateRightAction->setToolTip(i18nc("@info:tooltip", "Rotate image to the right")); - mRotateRightAction->setIcon(QIcon::fromTheme("object-rotate-right")); + mRotateRightAction->setIcon(QIcon::fromTheme("image-rotate-right-symbolic")); actionCollection->setDefaultShortcut(mRotateRightAction, Qt::CTRL + Qt::Key_R); mMirrorAction = edit->addAction("mirror", q, SLOT(mirror())); mMirrorAction->setText(i18n("Mirror")); - mMirrorAction->setIcon(QIcon::fromTheme("object-flip-horizontal")); + mMirrorAction->setIcon(QIcon::fromTheme("image-flip-horizontal-symbolic")); mFlipAction = edit->addAction("flip", q, SLOT(flip())); mFlipAction->setText(i18n("Flip")); - mFlipAction->setIcon(QIcon::fromTheme("object-flip-vertical")); + mFlipAction->setIcon(QIcon::fromTheme("image-flip-vertical-symbolic")); mResizeAction = edit->addAction("resize", q, SLOT(resizeImage())); mResizeAction->setText(i18n("Resize")); - mResizeAction->setIcon(QIcon::fromTheme("transform-scale")); + mResizeAction->setIcon(QIcon::fromTheme("image-resize-symbolic")); actionCollection->setDefaultShortcut(mResizeAction, Qt::SHIFT + Qt::Key_R); mCropAction = edit->addAction("crop", q, SLOT(crop())); mCropAction->setText(i18n("Crop")); - mCropAction->setIcon(QIcon::fromTheme("transform-crop-and-resize")); + mCropAction->setIcon(QIcon::fromTheme("image-crop-symbolic")); actionCollection->setDefaultShortcut(mCropAction, Qt::SHIFT + Qt::Key_C); mRedEyeReductionAction = edit->addAction("red_eye_reduction", q, SLOT(startRedEyeReduction())); diff --git a/app/kipiexportaction.cpp b/app/kipiexportaction.cpp --- a/app/kipiexportaction.cpp +++ b/app/kipiexportaction.cpp @@ -67,7 +67,7 @@ }; KIPIExportAction::KIPIExportAction(QObject* parent) -: KToolBarPopupAction(QIcon::fromTheme("document-share"), i18nc("@action", "Share"), parent) +: KToolBarPopupAction(QIcon::fromTheme("emblem-shared-symbolic"), i18nc("@action", "Share"), parent) , d(new KIPIExportActionPrivate) { d->q = this; diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -368,7 +368,7 @@ QAction * action = file->addAction("reload", q, SLOT(reload())); action->setText(i18nc("@action reload the currently viewed image", "Reload")); - action->setIcon(QIcon::fromTheme("view-refresh")); + action->setIcon(QIcon::fromTheme("view-refresh-symbolic")); actionCollection->setDefaultShortcuts(action, KStandardShortcut::reload()); mBrowseAction = view->addAction("browse"); @@ -382,7 +382,7 @@ mViewAction = view->addAction("view"); mViewAction->setText(i18nc("@action:intoolbar Switch to image view", "View")); mViewAction->setToolTip(i18nc("@info:tooltip", "View selected images")); - mViewAction->setIcon(QIcon::fromTheme("view-preview")); + mViewAction->setIcon(QIcon::fromTheme("fileview-preview")); mViewAction->setCheckable(true); mViewModeActionGroup = new QActionGroup(q); @@ -401,34 +401,36 @@ mFullScreenAction, SLOT(trigger())); QAction * leaveFullScreenAction = view->addAction("leave_fullscreen", q, SLOT(leaveFullScreen())); - leaveFullScreenAction->setIcon(QIcon::fromTheme("view-restore")); + leaveFullScreenAction->setIcon(QIcon::fromTheme("view-restore-symbolic")); leaveFullScreenAction->setPriority(QAction::LowPriority); leaveFullScreenAction->setText(i18nc("@action", "Leave Fullscreen Mode")); mGoToPreviousAction = view->addAction("go_previous", q, SLOT(goToPrevious())); mGoToPreviousAction->setPriority(QAction::LowPriority); - mGoToPreviousAction->setIcon(QIcon::fromTheme("media-skip-backward")); + mGoToPreviousAction->setIcon(QIcon::fromTheme("go-previous-symbolic")); mGoToPreviousAction->setText(i18nc("@action Go to previous image", "Previous")); mGoToPreviousAction->setToolTip(i18nc("@info:tooltip", "Go to previous image")); actionCollection->setDefaultShortcut(mGoToPreviousAction, Qt::Key_Backspace); installDisabledActionShortcutMonitor(mGoToPreviousAction, SLOT(showFirstDocumentReached())); mGoToNextAction = view->addAction("go_next", q, SLOT(goToNext())); mGoToNextAction->setPriority(QAction::LowPriority); - mGoToNextAction->setIcon(QIcon::fromTheme("media-skip-forward")); + mGoToNextAction->setIcon(QIcon::fromTheme("go-next-symbolic")); mGoToNextAction->setText(i18nc("@action Go to next image", "Next")); mGoToNextAction->setToolTip(i18nc("@info:tooltip", "Go to next image")); actionCollection->setDefaultShortcut(mGoToNextAction, Qt::Key_Space); installDisabledActionShortcutMonitor(mGoToNextAction, SLOT(showLastDocumentReached())); mGoToFirstAction = view->addAction("go_first", q, SLOT(goToFirst())); mGoToFirstAction->setPriority(QAction::LowPriority); + mGoToFirstAction->setIcon(QIcon::fromTheme("go-first-symbolic")); mGoToFirstAction->setText(i18nc("@action Go to first image", "First")); mGoToFirstAction->setToolTip(i18nc("@info:tooltip", "Go to first image")); actionCollection->setDefaultShortcut(mGoToFirstAction, Qt::Key_Home); mGoToLastAction = view->addAction("go_last", q, SLOT(goToLast())); mGoToLastAction->setPriority(QAction::LowPriority); + mGoToLastAction->setIcon(QIcon::fromTheme("go-last-symbolic")); mGoToLastAction->setText(i18nc("@action Go to last image", "Last")); mGoToLastAction->setToolTip(i18nc("@info:tooltip", "Go to last image")); actionCollection->setDefaultShortcut(mGoToLastAction, Qt::Key_End); @@ -439,7 +441,7 @@ action = view->addAction("go_start_page", q, SLOT(showStartMainPage())); action->setPriority(QAction::LowPriority); - action->setIcon(QIcon::fromTheme("go-home")); + action->setIcon(QIcon::fromTheme("go-home-symbolic")); action->setText(i18nc("@action", "Start Page")); action->setToolTip(i18nc("@info:tooltip", "Open the start page")); @@ -492,15 +494,15 @@ action = undoGroup->createRedoAction(actionCollection); action->setObjectName(KStandardAction::name(KStandardAction::Redo)); - action->setIcon(QIcon::fromTheme("edit-redo")); + action->setIcon(QIcon::fromTheme("edit-redo-symbolic")); action->setIconText(i18n("Redo")); actionCollection->setDefaultShortcuts(action, KStandardShortcut::redo()); edit->addAction(action->objectName(), action); action = undoGroup->createUndoAction(actionCollection); action->setObjectName(KStandardAction::name(KStandardAction::Undo)); - action->setIcon(QIcon::fromTheme("edit-undo")); + action->setIcon(QIcon::fromTheme("edit-undo-symbolic")); action->setIconText(i18n("Undo")); actionCollection->setDefaultShortcuts(action, KStandardShortcut::undo()); edit->addAction(action->objectName(), action); @@ -1377,10 +1379,10 @@ { if (d->mSlideShow->isRunning()) { d->mToggleSlideShowAction->setText(i18n("Stop Slideshow")); - d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-pause")); + d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-pause-symbolic")); } else { d->mToggleSlideShowAction->setText(i18n("Start Slideshow")); - d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-start")); + d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-start-symbolic")); } } @@ -1393,8 +1395,8 @@ return true; } - KGuiItem yes(i18n("Save All Changes"), "document-save-all"); - KGuiItem no(i18n("Discard Changes")); + KGuiItem yes(i18n("Save All Changes"), "document-save-symbolic"); + KGuiItem no(i18n("Discard Changes"), "user-trash-symbolic"); QString msg = i18np("One image has been modified.", "%1 images have been modified.", list.size()) + '\n' + i18n("If you quit now, your changes will be lost."); diff --git a/lib/thumbnailview/previewitemdelegate.cpp b/lib/thumbnailview/previewitemdelegate.cpp --- a/lib/thumbnailview/previewitemdelegate.cpp +++ b/lib/thumbnailview/previewitemdelegate.cpp @@ -613,19 +613,19 @@ d->mContextBar->hide(); d->mToggleSelectionButton = new QToolButton; - d->mToggleSelectionButton->setIcon(QIcon::fromTheme("list-add")); + d->mToggleSelectionButton->setIcon(QIcon::fromTheme("list-add-symbolic")); connect(d->mToggleSelectionButton, &QToolButton::clicked, this, &PreviewItemDelegate::slotToggleSelectionClicked); d->mFullScreenButton = new QToolButton; - d->mFullScreenButton->setIcon(QIcon::fromTheme("view-fullscreen")); + d->mFullScreenButton->setIcon(QIcon::fromTheme("view-fullscreen-symbolic")); connect(d->mFullScreenButton, &QToolButton::clicked, this, &PreviewItemDelegate::slotFullScreenClicked); d->mRotateLeftButton = new QToolButton; - d->mRotateLeftButton->setIcon(QIcon::fromTheme("object-rotate-left")); + d->mRotateLeftButton->setIcon(QIcon::fromTheme("object-rotate-left-symbolic")); connect(d->mRotateLeftButton, &QToolButton::clicked, this, &PreviewItemDelegate::slotRotateLeftClicked); d->mRotateRightButton = new QToolButton; - d->mRotateRightButton->setIcon(QIcon::fromTheme("object-rotate-right")); + d->mRotateRightButton->setIcon(QIcon::fromTheme("object-rotate-right-symbolic")); connect(d->mRotateRightButton, &QToolButton::clicked, this, &PreviewItemDelegate::slotRotateRightClicked); QHBoxLayout* layout = new QHBoxLayout(d->mContextBar); @@ -638,7 +638,7 @@ // Save button d->mSaveButton = new QToolButton(d->mView->viewport()); - d->mSaveButton->setIcon(QIcon::fromTheme("document-save")); + d->mSaveButton->setIcon(QIcon::fromTheme("document-save-symbolic")); d->mSaveButton->hide(); connect(d->mSaveButton, &QToolButton::clicked, this, &PreviewItemDelegate::slotSaveClicked); }