Use SVG icons in YACReader's toolbar (windows/linux) and in shortcuts dialog

YACReader/main_window_viewer.cpp

@@ -36,40 +36,48 @@
 #include <QDate>
 #include <QMenuBar>
 
-/* TODO remove, no longer used
+// TODO there are no SVG assets in macos yet
+// we need two sets of icons, one for the toolbar and one for the context menu because of this bug (QTBUG-96553): https://bugreports.qt.io/browse/QTBUG-96553
+
+QString addExtensionToIconPath(const QString &path)
+{
 #ifdef Q_OS_MAC
-class MacToolBarSeparator : public QWidget
-{
-public:
-        MacToolBarSeparator(QWidget * parent =0)
-                :QWidget(parent)
-        {
-                setFixedWidth(2);
+    return path + ".png";
+#else
+    return path + ".svg";
+#endif
 }
 
-        void paintEvent(QPaintEvent *event)
+QString addExtensionToIconPathInToolbar(const QString &path)
 {
-                Q_UNUSED(event);
-                QPainter painter(this);
-
-                QLinearGradient lG(0,0,0,height());
-
-                lG.setColorAt(0,QColor(128,128,128,0));
-                lG.setColorAt(0.5,QColor(128,128,128,255));
-                lG.setColorAt(1,QColor(128,128,128,0));
-
-                painter.fillRect(0,0,1,height(),lG);
-
-                QLinearGradient lG2(1,0,1,height());
-
-                lG2.setColorAt(0,QColor(220,220,220,0));
-                lG2.setColorAt(0.5,QColor(220,220,220,255));
-                lG2.setColorAt(1,QColor(220,220,220,0));
-
-                painter.fillRect(1,0,1,height(),lG2);
+#ifdef Q_OS_MAC
+    return path + ".png";
+#else
+    return path + "_18x18.svg";
+#endif
+}
+
+QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
+{
+
+#ifdef Q_OS_MAC
+    return action;
+#else
+    auto a = new QAction(icon, action->text());
+
+    a->setEnabled(action->isEnabled());
+    a->setCheckable(action->isCheckable());
+
+    a->setChecked(action->isChecked());
+
+    QObject::connect(a, &QAction::triggered, action, &QAction::triggered);
+    QObject::connect(action, &QAction::enabledChanged, a, &QAction::setEnabled);
+    QObject::connect(a, &QAction::toggled, action, &QAction::setChecked);
+    QObject::connect(action, &QAction::toggled, a, &QAction::setChecked);
+
+    return a;
+#endif
 }
-};
-#endif*/
 
 MainWindowViewer::MainWindowViewer()
     : QMainWindow(), fullscreen(false), toolbars(true), currentDirectory("."), currentDirectoryImgDest("."), isClient(false)
@@ -217,7 +225,7 @@ void MainWindowViewer::setupUI()
 void MainWindowViewer::createActions()
 {
     openAction = new QAction(tr("&Open"), this);
-    openAction->setIcon(QIcon(":/images/viewer_toolbar/open.png"));
+    openAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/open")));
     openAction->setToolTip(tr("Open a comic"));
     openAction->setData(OPEN_ACTION_Y);
     openAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_ACTION_Y));
@@ -244,7 +252,7 @@ void MainWindowViewer::createActions()
 #endif
 
     openFolderAction = new QAction(tr("Open Folder"), this);
-    openFolderAction->setIcon(QIcon(":/images/viewer_toolbar/openFolder.png"));
+    openFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openFolder")));
     openFolderAction->setToolTip(tr("Open image folder"));
     openFolderAction->setData(OPEN_FOLDER_ACTION_Y);
     openFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_FOLDER_ACTION_Y));
@@ -268,28 +276,28 @@ void MainWindowViewer::createActions()
     connect(clearRecentFilesAction, &QAction::triggered, this, &MainWindowViewer::clearRecentFiles);
 
     saveImageAction = new QAction(tr("Save"), this);
-    saveImageAction->setIcon(QIcon(":/images/viewer_toolbar/save.png"));
+    saveImageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/save")));
     saveImageAction->setToolTip(tr("Save current page"));
     saveImageAction->setData(SAVE_IMAGE_ACTION_Y);
     saveImageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SAVE_IMAGE_ACTION_Y));
     connect(saveImageAction, &QAction::triggered, this, &MainWindowViewer::saveImage);
 
     openComicOnTheLeftAction = new QAction(tr("Previous Comic"), this);
-    openComicOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/openPrevious.png"));
+    openComicOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openPrevious")));
     openComicOnTheLeftAction->setToolTip(tr("Open previous comic"));
     openComicOnTheLeftAction->setData(OPEN_PREVIOUS_COMIC_ACTION_Y);
     openComicOnTheLeftAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_PREVIOUS_COMIC_ACTION_Y));
     connect(openComicOnTheLeftAction, &QAction::triggered, this, &MainWindowViewer::openLeftComic);
 
     openComicOnTheRightAction = new QAction(tr("Next Comic"), this);
-    openComicOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/openNext.png"));
+    openComicOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openNext")));
     openComicOnTheRightAction->setToolTip(tr("Open next comic"));
     openComicOnTheRightAction->setData(OPEN_NEXT_COMIC_ACTION_Y);
     openComicOnTheRightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_NEXT_COMIC_ACTION_Y));
     connect(openComicOnTheRightAction, &QAction::triggered, this, &MainWindowViewer::openRightComic);
 
     goToPageOnTheLeftAction = new QAction(tr("&Previous"), this);
-    goToPageOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/previous.png"));
+    goToPageOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/previous")));
     goToPageOnTheLeftAction->setShortcutContext(Qt::WidgetShortcut);
     goToPageOnTheLeftAction->setToolTip(tr("Go to previous page"));
     goToPageOnTheLeftAction->setData(PREV_ACTION_Y);
@@ -297,7 +305,7 @@ void MainWindowViewer::createActions()
     connect(goToPageOnTheLeftAction, &QAction::triggered, viewer, &Viewer::left);
 
     goToPageOnTheRightAction = new QAction(tr("&Next"), this);
-    goToPageOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/next.png"));
+    goToPageOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/next")));
     goToPageOnTheRightAction->setShortcutContext(Qt::WidgetShortcut);
     goToPageOnTheRightAction->setToolTip(tr("Go to next page"));
     goToPageOnTheRightAction->setData(NEXT_ACTION_Y);
@@ -305,27 +313,27 @@ void MainWindowViewer::createActions()
     connect(goToPageOnTheRightAction, &QAction::triggered, viewer, &Viewer::right);
 
     adjustHeightAction = new QAction(tr("Fit Height"), this);
-    adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png"));
+    adjustHeightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toHeight")));
     // adjustWidth->setCheckable(true);
     adjustHeightAction->setToolTip(tr("Fit image to height"));
-    // adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
+    // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
     adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y);
     adjustHeightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_HEIGHT_ACTION_Y));
     adjustHeightAction->setCheckable(true);
     connect(adjustHeightAction, &QAction::triggered, this, &MainWindowViewer::fitToHeight);
 
     adjustWidthAction = new QAction(tr("Fit Width"), this);
-    adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png"));
+    adjustWidthAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toWidth")));
     // adjustWidth->setCheckable(true);
     adjustWidthAction->setToolTip(tr("Fit image to width"));
-    // adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
+    // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
     adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y);
     adjustWidthAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_WIDTH_ACTION_Y));
     adjustWidthAction->setCheckable(true);
     connect(adjustWidthAction, &QAction::triggered, this, &MainWindowViewer::fitToWidth);
 
     adjustToFullSizeAction = new QAction(tr("Show full size"), this);
-    adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
+    adjustToFullSizeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/full")));
     adjustToFullSizeAction->setCheckable(false);
     adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
     adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y));
@@ -333,7 +341,7 @@ void MainWindowViewer::createActions()
     connect(adjustToFullSizeAction, &QAction::triggered, this, &MainWindowViewer::adjustToFullSizeSwitch);
 
     fitToPageAction = new QAction(tr("Fit to page"), this);
-    fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/fitToPage.png"));
+    fitToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/fitToPage")));
     fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
     fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y));
     fitToPageAction->setCheckable(true);
@@ -369,7 +377,7 @@ void MainWindowViewer::createActions()
     connect(resetZoomAction, &QAction::triggered, this, &MainWindowViewer::resetZoomLevel);
 
     showZoomSliderlAction = new QAction(tr("Show zoom slider"), this);
-    showZoomSliderlAction->setIcon(QIcon(":/images/viewer_toolbar/zoom.png"));
+    showZoomSliderlAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/zoom")));
 
     increasePageZoomAction = new QAction(tr("Zoom+"), this);
     increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y);
@@ -382,20 +390,20 @@ void MainWindowViewer::createActions()
     connect(decreasePageZoomAction, &QAction::triggered, this, &MainWindowViewer::decreasePageZoomLevel);
 
     leftRotationAction = new QAction(tr("Rotate image to the left"), this);
-    leftRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateL.png"));
+    leftRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateL")));
     leftRotationAction->setData(LEFT_ROTATION_ACTION_Y);
     leftRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(LEFT_ROTATION_ACTION_Y));
     connect(leftRotationAction, &QAction::triggered, viewer, &Viewer::rotateLeft);
 
     rightRotationAction = new QAction(tr("Rotate image to the right"), this);
-    rightRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateR.png"));
+    rightRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateR")));
     rightRotationAction->setData(RIGHT_ROTATION_ACTION_Y);
     rightRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RIGHT_ROTATION_ACTION_Y));
     connect(rightRotationAction, &QAction::triggered, viewer, &Viewer::rotateRight);
 
     doublePageAction = new QAction(tr("Double page mode"), this);
     doublePageAction->setToolTip(tr("Switch to double page mode"));
-    doublePageAction->setIcon(QIcon(":/images/viewer_toolbar/doublePage.png"));
+    doublePageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doublePage")));
     doublePageAction->setCheckable(true);
     doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage());
     doublePageAction->setData(DOUBLE_PAGE_ACTION_Y);
@@ -405,7 +413,7 @@ void MainWindowViewer::createActions()
     // inversed pictures mode
     doubleMangaPageAction = new QAction(tr("Double page manga mode"), this);
     doubleMangaPageAction->setToolTip(tr("Reverse reading order in double page mode"));
-    doubleMangaPageAction->setIcon(QIcon(":/images/viewer_toolbar/doubleMangaPage.png"));
+    doubleMangaPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doubleMangaPage")));
     doubleMangaPageAction->setCheckable(true);
     doubleMangaPageAction->setChecked(Configuration::getConfiguration().getDoubleMangaPage());
     doubleMangaPageAction->setData(DOUBLE_MANGA_PAGE_ACTION_Y);
@@ -414,7 +422,7 @@ void MainWindowViewer::createActions()
     connect(doubleMangaPageAction, &QAction::triggered, this, &MainWindowViewer::doubleMangaPageSwitch);
 
     goToPageAction = new QAction(tr("Go To"), this);
-    goToPageAction->setIcon(QIcon(":/images/viewer_toolbar/goto.png"));
+    goToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/goto")));
     goToPageAction->setToolTip(tr("Go to page ..."));
     goToPageAction->setData(GO_TO_PAGE_ACTION_Y);
     goToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_PAGE_ACTION_Y));
@@ -424,20 +432,20 @@ void MainWindowViewer::createActions()
     optionsAction->setToolTip(tr("YACReader options"));
     optionsAction->setData(OPTIONS_ACTION_Y);
     optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_Y));
-    optionsAction->setIcon(QIcon(":/images/viewer_toolbar/options.png"));
+    optionsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/options")));
 
     connect(optionsAction, &QAction::triggered, optionsDialog, &OptionsDialog::show);
 
     helpAboutAction = new QAction(tr("Help"), this);
     helpAboutAction->setToolTip(tr("Help, About YACReader"));
-    helpAboutAction->setIcon(QIcon(":/images/viewer_toolbar/help.png"));
+    helpAboutAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/help")));
     helpAboutAction->setData(HELP_ABOUT_ACTION_Y);
     helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_Y));
     connect(helpAboutAction, &QAction::triggered, had, &QWidget::show);
 
     showMagnifyingGlassAction = new QAction(tr("Magnifying glass"), this);
     showMagnifyingGlassAction->setToolTip(tr("Switch Magnifying glass"));
-    showMagnifyingGlassAction->setIcon(QIcon(":/images/viewer_toolbar/magnifyingGlass.png"));
+    showMagnifyingGlassAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/magnifyingGlass")));
     showMagnifyingGlassAction->setCheckable(true);
     showMagnifyingGlassAction->setData(SHOW_MAGNIFYING_GLASS_ACTION_Y);
     showMagnifyingGlassAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_MAGNIFYING_GLASS_ACTION_Y));
@@ -445,7 +453,7 @@ void MainWindowViewer::createActions()
 
     setBookmarkAction = new QAction(tr("Set bookmark"), this);
     setBookmarkAction->setToolTip(tr("Set a bookmark on the current page"));
-    setBookmarkAction->setIcon(QIcon(":/images/viewer_toolbar/bookmark.png"));
+    setBookmarkAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/bookmark")));
     setBookmarkAction->setCheckable(true);
     setBookmarkAction->setData(SET_BOOKMARK_ACTION_Y);
     setBookmarkAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_BOOKMARK_ACTION_Y));
@@ -455,39 +463,38 @@ void MainWindowViewer::createActions()
 
     showBookmarksAction = new QAction(tr("Show bookmarks"), this);
     showBookmarksAction->setToolTip(tr("Show the bookmarks of the current comic"));
-    showBookmarksAction->setIcon(QIcon(":/images/viewer_toolbar/showBookmarks.png"));
+    showBookmarksAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/showBookmarks")));
     showBookmarksAction->setData(SHOW_BOOKMARKS_ACTION_Y);
     showBookmarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_BOOKMARKS_ACTION_Y));
     connect(showBookmarksAction, &QAction::triggered, viewer->getBookmarksDialog(), &QWidget::show);
 
     showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this);
-    showShorcutsAction->setIcon(QIcon(":/images/viewer_toolbar/shortcuts.png"));
+    showShorcutsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/shortcuts")));
     showShorcutsAction->setData(SHOW_SHORCUTS_ACTION_Y);
     showShorcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_SHORCUTS_ACTION_Y));
-    // connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
     connect(showShorcutsAction, &QAction::triggered, editShortcutsDialog, &QWidget::show);
 
     showInfoAction = new QAction(tr("Show Info"), this);
-    showInfoAction->setIcon(QIcon(":/images/viewer_toolbar/info.png"));
+    showInfoAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/info")));
     showInfoAction->setData(SHOW_INFO_ACTION_Y);
     showInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_INFO_ACTION_Y));
     connect(showInfoAction, &QAction::triggered, viewer, &Viewer::informationSwitch);
 
     closeAction = new QAction(tr("Close"), this);
-    closeAction->setIcon(QIcon(":/images/viewer_toolbar/close.png"));
+    closeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/close")));
     closeAction->setData(CLOSE_ACTION_Y);
     closeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CLOSE_ACTION_Y));
     connect(closeAction, &QAction::triggered, this, &QWidget::close);
 
     showDictionaryAction = new QAction(tr("Show Dictionary"), this);
-    showDictionaryAction->setIcon(QIcon(":/images/viewer_toolbar/translator.png"));
+    showDictionaryAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/translator")));
     // showDictionaryAction->setCheckable(true);
     showDictionaryAction->setData(SHOW_DICTIONARY_ACTION_Y);
     showDictionaryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_DICTIONARY_ACTION_Y));
     connect(showDictionaryAction, &QAction::triggered, viewer, &Viewer::translatorSwitch);
 
     showFlowAction = new QAction(tr("Show go to flow"), this);
-    showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png"));
+    showFlowAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/flow")));
     showFlowAction->setData(SHOW_FLOW_ACTION_Y);
     showFlowAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_FLOW_ACTION_Y));
     connect(showFlowAction, &QAction::triggered, viewer, &Viewer::goToFlowSwitch);
@@ -533,61 +540,72 @@ void MainWindowViewer::createToolBars()
     refreshRecentFilesActionList();
 
     auto tb = new QToolButton();
-    tb->addAction(openAction);
-    tb->addAction(openLatestComicAction);
-    tb->addAction(openFolderAction);
+    auto open = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction);
+    tb->addAction(open);
+    tb->addAction(actionWithCustomIcon(QIcon(), openLatestComicAction));
+    tb->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
     tb->addAction(recentmenu->menuAction());
     tb->setPopupMode(QToolButton::MenuButtonPopup);
-    tb->setDefaultAction(openAction);
+    tb->setDefaultAction(open);
 
     comicToolBar->addWidget(tb);
 #endif
 
-    comicToolBar->addAction(saveImageAction);
-    comicToolBar->addAction(openComicOnTheLeftAction);
-    comicToolBar->addAction(openComicOnTheRightAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/save")), saveImageAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openPrevious")), openComicOnTheLeftAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openNext")), openComicOnTheRightAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(goToPageOnTheLeftAction);
-    comicToolBar->addAction(goToPageOnTheRightAction);
-    comicToolBar->addAction(goToPageAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/previous")), goToPageOnTheLeftAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/next")), goToPageOnTheRightAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/goto")), goToPageAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(adjustWidthAction);
-    comicToolBar->addAction(adjustHeightAction);
+    auto adjustToWidthTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toWidth")), adjustWidthAction);
+    comicToolBar->addAction(adjustToWidthTBAction);
+    auto adjustToHeightTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toHeight")), adjustHeightAction);
+    comicToolBar->addAction(adjustToHeightTBAction);
+    auto adjustToFullSizeTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/full")), adjustToFullSizeAction);
     comicToolBar->addAction(adjustToFullSizeAction);
-    comicToolBar->addAction(fitToPageAction);
+    auto fitToPageTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/fitToPage")), fitToPageAction);
+    comicToolBar->addAction(fitToPageTBAction);
+
+    auto fitModes = new QActionGroup(this);
+    fitModes->addAction(adjustToWidthTBAction);
+    fitModes->addAction(adjustToHeightTBAction);
+    fitModes->addAction(adjustToFullSizeTBAction);
+    fitModes->addAction(fitToPageTBAction);
 
     zoomSliderAction = new YACReaderSlider(this);
     zoomSliderAction->hide();
 
-    comicToolBar->addAction(showZoomSliderlAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/zoom")), showZoomSliderlAction));
 
     connect(showZoomSliderlAction, &QAction::triggered, this, &MainWindowViewer::toggleFitToWidthSlider);
     connect(zoomSliderAction, &YACReaderSlider::zoomRatioChanged, viewer, &Viewer::updateZoomRatio);
     connect(viewer, &Viewer::zoomUpdated, zoomSliderAction, &YACReaderSlider::updateZoomRatio);
 
-    comicToolBar->addAction(leftRotationAction);
-    comicToolBar->addAction(rightRotationAction);
-    comicToolBar->addAction(doublePageAction);
-    comicToolBar->addAction(doubleMangaPageAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateL")), leftRotationAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateR")), rightRotationAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doublePage")), doublePageAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doubleMangaPage")), doubleMangaPageAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(showMagnifyingGlassAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/magnifyingGlass")), showMagnifyingGlassAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(setBookmarkAction);
-    comicToolBar->addAction(showBookmarksAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/bookmark")), setBookmarkAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/showBookmarks")), showBookmarksAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(showDictionaryAction);
-    comicToolBar->addAction(showFlowAction);
-    comicToolBar->addAction(showInfoAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/translator")), showDictionaryAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/flow")), showFlowAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/info")), showInfoAction));
 
 #ifdef Q_OS_MAC
     comicToolBar->addStretch();
@@ -595,10 +613,9 @@ void MainWindowViewer::createToolBars()
     comicToolBar->addWidget(new YACReaderToolBarStretch());
 #endif
 
-    comicToolBar->addAction(showShorcutsAction);
-    comicToolBar->addAction(optionsAction);
-    comicToolBar->addAction(helpAboutAction);
-    // comicToolBar->addAction(closeAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/shortcuts")), showShorcutsAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/options")), optionsAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/help")), helpAboutAction));
 
 #ifndef Q_OS_MAC
     comicToolBar->setMovable(false);
@@ -1156,7 +1173,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     QList<QAction *> allActions;
     QList<QAction *> tmpList;
 
-    editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.png"),
+    editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.svg"),
                                          tmpList = { openAction,
                                                      openLatestComicAction,
                                                      openFolderAction,
@@ -1172,7 +1189,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     auto *const toggleToolbarsAction = addActionWithShortcut(tr("Hide/show toolbar"), TOGGLE_TOOL_BARS_ACTION_Y);
     connect(toggleToolbarsAction, &QAction::triggered, this, &MainWindowViewer::toggleToolBars);
 
-    editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.png"),
+    editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.svg"),
                                          tmpList = QList<QAction *>()
                                                  << optionsAction
                                                  << helpAboutAction
@@ -1206,7 +1223,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     mglassActions = { sizeUpMglassAction, sizeDownMglassAction,
                       zoomInMglassAction, zoomOutMglassAction };
 
-    editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.png"),
+    editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.svg"),
                                          tmpList = QList<QAction *>()
                                                  << showMagnifyingGlassAction
                                                  << mglassActions);
@@ -1217,7 +1234,7 @@ void MainWindowViewer::setUpShortcutsManagement()
                                                                 CHANGE_FIT_ACTION_Y);
     connect(toggleFitToScreenAction, &QAction::triggered, this, &MainWindowViewer::toggleWidthHeight);
 
-    editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.png"),
+    editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.svg"),
                                          tmpList = QList<QAction *>()
                                                  << adjustHeightAction
                                                  << adjustWidthAction
@@ -1287,7 +1304,7 @@ void MainWindowViewer::setUpShortcutsManagement()
                            goToFirstPageAction,
                            goToLastPageAction };
 
-    editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.png"),
+    editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.svg"),
                                          tmpList = QList<QAction *>()
                                                  << goToPageOnTheRightAction
                                                  << goToPageOnTheLeftAction

YACReader/yacreader_images.qrc

@@ -21,16 +21,16 @@
     <file>../images/dropDownArrow.png</file>
     <file>../images/translatorSearch.png</file>
     <file>../images/speaker.png</file>
-    <file>../images/clear_shortcut.png</file>
-    <file>../images/accept_shortcut.png</file>
-    <file>../images/shortcuts_group_comics.png</file>
-    <file>../images/shortcuts_group_folders.png</file>
-    <file>../images/shortcuts_group_general.png</file>
-    <file>../images/shortcuts_group_libraries.png</file>
-    <file>../images/shortcuts_group_mglass.png</file>
-    <file>../images/shortcuts_group_page.png</file>
-    <file>../images/shortcuts_group_reading.png</file>
-    <file>../images/shortcuts_group_visualization.png</file>
+    <file>../images/clear_shortcut.svg</file>
+    <file>../images/accept_shortcut.svg</file>
+    <file>../images/shortcuts_group_comics.svg</file>
+    <file>../images/shortcuts_group_folders.svg</file>
+    <file>../images/shortcuts_group_general.svg</file>
+    <file>../images/shortcuts_group_libraries.svg</file>
+    <file>../images/shortcuts_group_mglass.svg</file>
+    <file>../images/shortcuts_group_page.svg</file>
+    <file>../images/shortcuts_group_reading.svg</file>
+    <file>../images/shortcuts_group_visualization.svg</file>
     <file>../images/custom_dialog/custom_close_button.svg</file>
     <file>../images/whats_new/whatsnew_header.svg</file>
   </qresource>

YACReader/yacreader_images_win.qrc

@@ -1,31 +1,58 @@
 <RCC>
   <qresource prefix="/" >
-    <file>../images/viewer_toolbar/bookmark.png</file>
-    <file>../images/viewer_toolbar/close.png</file>
-    <file>../images/viewer_toolbar/doublePage.png</file>
-    <file>../images/viewer_toolbar/doubleMangaPage.png</file>
-    <file>../images/viewer_toolbar/fitToPage.png</file>
-    <file>../images/viewer_toolbar/flow.png</file>
-    <file>../images/viewer_toolbar/full.png</file>
-    <file>../images/viewer_toolbar/goto.png</file>
-    <file>../images/viewer_toolbar/help.png</file>
-    <file>../images/viewer_toolbar/info.png</file>
-    <file>../images/viewer_toolbar/magnifyingGlass.png</file>
-    <file>../images/viewer_toolbar/next.png</file>
-    <file>../images/viewer_toolbar/open.png</file>
-    <file>../images/viewer_toolbar/openFolder.png</file>
-    <file>../images/viewer_toolbar/openNext.png</file>
-    <file>../images/viewer_toolbar/openPrevious.png</file>
-    <file>../images/viewer_toolbar/options.png</file>
-    <file>../images/viewer_toolbar/previous.png</file>
-    <file>../images/viewer_toolbar/rotateL.png</file>
-    <file>../images/viewer_toolbar/rotateR.png</file>
-    <file>../images/viewer_toolbar/save.png</file>
-    <file>../images/viewer_toolbar/shortcuts.png</file>
-    <file>../images/viewer_toolbar/showBookmarks.png</file>
-    <file>../images/viewer_toolbar/toHeight.png</file>
-    <file>../images/viewer_toolbar/toWidth.png</file>
-    <file>../images/viewer_toolbar/translator.png</file>
-    <file>../images/viewer_toolbar/zoom.png</file>
+    <file>../images/viewer_toolbar/bookmark.svg</file>
+    <file>../images/viewer_toolbar/close.svg</file>
+    <file>../images/viewer_toolbar/doublePage.svg</file>
+    <file>../images/viewer_toolbar/doubleMangaPage.svg</file>
+    <file>../images/viewer_toolbar/fitToPage.svg</file>
+    <file>../images/viewer_toolbar/flow.svg</file>
+    <file>../images/viewer_toolbar/full.svg</file>
+    <file>../images/viewer_toolbar/goto.svg</file>
+    <file>../images/viewer_toolbar/help.svg</file>
+    <file>../images/viewer_toolbar/info.svg</file>
+    <file>../images/viewer_toolbar/magnifyingGlass.svg</file>
+    <file>../images/viewer_toolbar/next.svg</file>
+    <file>../images/viewer_toolbar/open.svg</file>
+    <file>../images/viewer_toolbar/openFolder.svg</file>
+    <file>../images/viewer_toolbar/openNext.svg</file>
+    <file>../images/viewer_toolbar/openPrevious.svg</file>
+    <file>../images/viewer_toolbar/options.svg</file>
+    <file>../images/viewer_toolbar/previous.svg</file>
+    <file>../images/viewer_toolbar/rotateL.svg</file>
+    <file>../images/viewer_toolbar/rotateR.svg</file>
+    <file>../images/viewer_toolbar/save.svg</file>
+    <file>../images/viewer_toolbar/shortcuts.svg</file>
+    <file>../images/viewer_toolbar/showBookmarks.svg</file>
+    <file>../images/viewer_toolbar/toHeight.svg</file>
+    <file>../images/viewer_toolbar/toWidth.svg</file>
+    <file>../images/viewer_toolbar/translator.svg</file>
+    <file>../images/viewer_toolbar/zoom.svg</file>
+    <file>../images/viewer_toolbar/bookmark_18x18.svg</file>
+    <file>../images/viewer_toolbar/close_18x18.svg</file>
+    <file>../images/viewer_toolbar/doublePage_18x18.svg</file>
+    <file>../images/viewer_toolbar/doubleMangaPage_18x18.svg</file>
+    <file>../images/viewer_toolbar/fitToPage_18x18.svg</file>
+    <file>../images/viewer_toolbar/flow_18x18.svg</file>
+    <file>../images/viewer_toolbar/full_18x18.svg</file>
+    <file>../images/viewer_toolbar/goto_18x18.svg</file>
+    <file>../images/viewer_toolbar/help_18x18.svg</file>
+    <file>../images/viewer_toolbar/info_18x18.svg</file>
+    <file>../images/viewer_toolbar/magnifyingGlass_18x18.svg</file>
+    <file>../images/viewer_toolbar/next_18x18.svg</file>
+    <file>../images/viewer_toolbar/open_18x18.svg</file>
+    <file>../images/viewer_toolbar/openFolder_18x18.svg</file>
+    <file>../images/viewer_toolbar/openNext_18x18.svg</file>
+    <file>../images/viewer_toolbar/openPrevious_18x18.svg</file>
+    <file>../images/viewer_toolbar/options_18x18.svg</file>
+    <file>../images/viewer_toolbar/previous_18x18.svg</file>
+    <file>../images/viewer_toolbar/rotateL_18x18.svg</file>
+    <file>../images/viewer_toolbar/rotateR_18x18.svg</file>
+    <file>../images/viewer_toolbar/save_18x18.svg</file>
+    <file>../images/viewer_toolbar/shortcuts_18x18.svg</file>
+    <file>../images/viewer_toolbar/showBookmarks_18x18.svg</file>
+    <file>../images/viewer_toolbar/toHeight_18x18.svg</file>
+    <file>../images/viewer_toolbar/toWidth_18x18.svg</file>
+    <file>../images/viewer_toolbar/translator_18x18.svg</file>
+    <file>../images/viewer_toolbar/zoom_18x18.svg</file>
   </qresource>
 </RCC>

YACReaderLibrary/images.qrc

@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/accept_shortcut.png</file>
-        <file>../images/clear_shortcut.png</file>
+        <file>../images/accept_shortcut.svg</file>
+        <file>../images/clear_shortcut.svg</file>
         <file>../images/comic_vine/downArrow.png</file>
         <file>../images/comic_vine/nextPage.png</file>
         <file>../images/comic_vine/previousPage.png</file>
@@ -92,14 +92,14 @@
         <file>../images/readRibbon.png</file>
         <file>../images/searching_icon.png</file>
         <file>../images/serverConfigBackground.png</file>
-        <file>../images/shortcuts_group_comics.png</file>
-        <file>../images/shortcuts_group_folders.png</file>
-        <file>../images/shortcuts_group_general.png</file>
-        <file>../images/shortcuts_group_libraries.png</file>
-        <file>../images/shortcuts_group_mglass.png</file>
-        <file>../images/shortcuts_group_page.png</file>
-        <file>../images/shortcuts_group_reading.png</file>
-        <file>../images/shortcuts_group_visualization.png</file>
+        <file>../images/shortcuts_group_comics.svg</file>
+        <file>../images/shortcuts_group_folders.svg</file>
+        <file>../images/shortcuts_group_general.svg</file>
+        <file>../images/shortcuts_group_libraries.svg</file>
+        <file>../images/shortcuts_group_mglass.svg</file>
+        <file>../images/shortcuts_group_page.svg</file>
+        <file>../images/shortcuts_group_reading.svg</file>
+        <file>../images/shortcuts_group_visualization.svg</file>
         <file>../images/shownCovers.png</file>
         <file>../images/sidebar/branch-closed.png</file>
         <file>../images/sidebar/branch-open.png</file>

YACReaderLibrary/library_window.cpp

@@ -361,7 +361,7 @@ void LibraryWindow::setUpShortcutsManagement()
     QList<QAction *> allActions;
     QList<QAction *> tmpList;
 
-    editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.png"),
+    editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.svg"),
                                          tmpList = QList<QAction *>()
                                                  << openComicAction
                                                  << saveCoversToAction
@@ -379,7 +379,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.png"),
+    editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.svg"),
                                          tmpList = QList<QAction *>()
                                                  << addFolderAction
                                                  << deleteFolderAction
@@ -396,7 +396,7 @@ void LibraryWindow::setUpShortcutsManagement()
                                                  << updateCurrentFolderAction);
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.png"), // TODO change icon
+    editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon
                                          tmpList = QList<QAction *>()
                                                  << addReadingListAction
                                                  << deleteReadingListAction
@@ -404,7 +404,7 @@ void LibraryWindow::setUpShortcutsManagement()
                                                  << renameListAction);
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.png"),
+    editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.svg"),
                                          tmpList = QList<QAction *>()
                                                  << backAction
                                                  << forwardAction
@@ -418,7 +418,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.png"),
+    editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.svg"),
                                          tmpList = QList<QAction *>()
                                                  << createLibraryAction
                                                  << openLibraryAction
@@ -433,7 +433,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.png"),
+    editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.svg"),
                                          tmpList = QList<QAction *>()
                                                  << showHideMarksAction
 #ifndef Q_OS_MAC

shortcuts_management/edit_shortcut_item_delegate.cpp

@@ -59,20 +59,17 @@ KeySequenceLineEdit::KeySequenceLineEdit(QWidget *parent)
     // keys[0] = keys[1] = keys[2] = keys[3] = 0;
     setAlignment(Qt::AlignRight);
 
-    QPixmap clearPixmap(":/images/clear_shortcut.png");
-    QPixmap acceptPixmap(":/images/accept_shortcut.png");
-
     clearButton = new QToolButton(this);
     acceptButton = new QToolButton(this);
     QString buttonsStyle = "QToolButton { border: none; padding: 0px; }";
 
-    clearButton->setIcon(QIcon(clearPixmap));
-    clearButton->setIconSize(clearPixmap.size());
+    clearButton->setIcon(QIcon(":/images/clear_shortcut.svg"));
+    clearButton->setIconSize(QSize(15, 15));
     clearButton->setCursor(Qt::ArrowCursor);
     clearButton->setStyleSheet(buttonsStyle);
 
-    acceptButton->setIcon(QIcon(acceptPixmap));
-    acceptButton->setIconSize(acceptPixmap.size());
+    acceptButton->setIcon(QIcon(":/images/accept_shortcut.svg"));
+    acceptButton->setIconSize(QSize(15, 15));
     acceptButton->setCursor(Qt::ArrowCursor);
     acceptButton->setStyleSheet(buttonsStyle);