From 0b37c7c6849a6f36c337efdff6801708fc39b175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20A=CC=81ngel=20San=20Marti=CC=81n=20Rodri=CC=81guez?= Date: Thu, 20 Oct 2022 19:14:13 +0200 Subject: [PATCH] Use the new svg icons in macos too --- YACReader/YACReader.pro | 6 +-- YACReader/main_window_viewer.cpp | 25 +++--------- YACReader/yacreader_images.qrc | 54 ++++++++++++++++++++++++++ YACReader/yacreader_images_osx.qrc | 61 ------------------------------ YACReader/yacreader_images_win.qrc | 58 ---------------------------- 5 files changed, 61 insertions(+), 143 deletions(-) delete mode 100644 YACReader/yacreader_images_osx.qrc delete mode 100644 YACReader/yacreader_images_win.qrc diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 7c4d5a0e..855de657 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -171,11 +171,7 @@ include(../compressed_archive/libarchive/libarchive-wrapper.pri) include(../shortcuts_management/shortcuts_management.pri) RESOURCES += yacreader_images.qrc \ - yacreader_files.qrc - -win32:RESOURCES += yacreader_images_win.qrc -unix:!macx:RESOURCES += yacreader_images_win.qrc -macx:RESOURCES += yacreader_images_osx.qrc + yacreader_files.qrc include(../third_party/QsLog/QsLog.pri) diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 96526fe5..329aafb9 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -41,28 +41,17 @@ QString addExtensionToIconPath(const QString &path) { -#ifdef Q_OS_MAC - return path + ".png"; -#else + return path + ".svg"; -#endif } QString addExtensionToIconPathInToolbar(const QString &path) { -#ifdef Q_OS_MAC - return path + ".png"; -#else return path + "_18x18.svg"; -#endif } -QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action) +QAction *actionWithCustomIcon(const QIcon &icon, QAction *action) { - -#ifdef Q_OS_MAC - return action; -#else auto a = new QAction(icon, action->text()); a->setEnabled(action->isEnabled()); @@ -76,7 +65,6 @@ QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action) QObject::connect(action, &QAction::toggled, a, &QAction::setChecked); return a; -#endif } MainWindowViewer::MainWindowViewer() @@ -522,16 +510,15 @@ void MainWindowViewer::createToolBars() comicToolBar = addToolBar(tr("&File")); #endif -#ifdef Q_OS_MAC - // comicToolBar->setIconSize(QSize(16,16)); -#else comicToolBar->setIconSize(QSize(18, 18)); + +#ifndef Q_OS_MAC comicToolBar->setStyleSheet("QToolBar{border:none;}"); #endif #ifdef Q_OS_MAC - comicToolBar->addAction(openAction); - comicToolBar->addAction(openFolderAction); + comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction)); + comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction)); #else auto recentmenu = new QMenu(tr("Open recent")); recentmenu->addActions(recentFilesActionList); diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index 96434918..ac14706b 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -33,5 +33,59 @@ ../images/shortcuts_group_visualization.svg ../images/custom_dialog/custom_close_button.svg ../images/whats_new/whatsnew_header.svg + ../images/viewer_toolbar/bookmark.svg + ../images/viewer_toolbar/close.svg + ../images/viewer_toolbar/doublePage.svg + ../images/viewer_toolbar/doubleMangaPage.svg + ../images/viewer_toolbar/fitToPage.svg + ../images/viewer_toolbar/flow.svg + ../images/viewer_toolbar/full.svg + ../images/viewer_toolbar/goto.svg + ../images/viewer_toolbar/help.svg + ../images/viewer_toolbar/info.svg + ../images/viewer_toolbar/magnifyingGlass.svg + ../images/viewer_toolbar/next.svg + ../images/viewer_toolbar/open.svg + ../images/viewer_toolbar/openFolder.svg + ../images/viewer_toolbar/openNext.svg + ../images/viewer_toolbar/openPrevious.svg + ../images/viewer_toolbar/options.svg + ../images/viewer_toolbar/previous.svg + ../images/viewer_toolbar/rotateL.svg + ../images/viewer_toolbar/rotateR.svg + ../images/viewer_toolbar/save.svg + ../images/viewer_toolbar/shortcuts.svg + ../images/viewer_toolbar/showBookmarks.svg + ../images/viewer_toolbar/toHeight.svg + ../images/viewer_toolbar/toWidth.svg + ../images/viewer_toolbar/translator.svg + ../images/viewer_toolbar/zoom.svg + ../images/viewer_toolbar/bookmark_18x18.svg + ../images/viewer_toolbar/close_18x18.svg + ../images/viewer_toolbar/doublePage_18x18.svg + ../images/viewer_toolbar/doubleMangaPage_18x18.svg + ../images/viewer_toolbar/fitToPage_18x18.svg + ../images/viewer_toolbar/flow_18x18.svg + ../images/viewer_toolbar/full_18x18.svg + ../images/viewer_toolbar/goto_18x18.svg + ../images/viewer_toolbar/help_18x18.svg + ../images/viewer_toolbar/info_18x18.svg + ../images/viewer_toolbar/magnifyingGlass_18x18.svg + ../images/viewer_toolbar/next_18x18.svg + ../images/viewer_toolbar/open_18x18.svg + ../images/viewer_toolbar/openFolder_18x18.svg + ../images/viewer_toolbar/openNext_18x18.svg + ../images/viewer_toolbar/openPrevious_18x18.svg + ../images/viewer_toolbar/options_18x18.svg + ../images/viewer_toolbar/previous_18x18.svg + ../images/viewer_toolbar/rotateL_18x18.svg + ../images/viewer_toolbar/rotateR_18x18.svg + ../images/viewer_toolbar/save_18x18.svg + ../images/viewer_toolbar/shortcuts_18x18.svg + ../images/viewer_toolbar/showBookmarks_18x18.svg + ../images/viewer_toolbar/toHeight_18x18.svg + ../images/viewer_toolbar/toWidth_18x18.svg + ../images/viewer_toolbar/translator_18x18.svg + ../images/viewer_toolbar/zoom_18x18.svg diff --git a/YACReader/yacreader_images_osx.qrc b/YACReader/yacreader_images_osx.qrc deleted file mode 100644 index 64c97517..00000000 --- a/YACReader/yacreader_images_osx.qrc +++ /dev/null @@ -1,61 +0,0 @@ - - -../images/viewer_toolbar/bookmark_osx.png -../images/viewer_toolbar/bookmark_osx@2x.png -../images/viewer_toolbar/close_osx.png -../images/viewer_toolbar/close_osx@2x.png -../images/viewer_toolbar/doubleMangaPage_osx.png -../images/viewer_toolbar/doubleMangaPage_osx@2x.png -../images/viewer_toolbar/doublePage_osx.png -../images/viewer_toolbar/doublePage_osx@2x.png -../images/viewer_toolbar/fitToPage_osx.png -../images/viewer_toolbar/fitToPage_osx@2x.png -../images/viewer_toolbar/flow_osx.png -../images/viewer_toolbar/flow_osx@2x.png -../images/viewer_toolbar/full_osx.png -../images/viewer_toolbar/full_osx@2x.png -../images/viewer_toolbar/goto_osx.png -../images/viewer_toolbar/goto_osx@2x.png -../images/viewer_toolbar/help_osx.png -../images/viewer_toolbar/help_osx@2x.png -../images/viewer_toolbar/info_osx.png -../images/viewer_toolbar/info_osx@2x.png -../images/viewer_toolbar/magnifyingGlass_osx.png -../images/viewer_toolbar/magnifyingGlass_osx@2x.png -../images/viewer_toolbar/next_osx.png -../images/viewer_toolbar/next_osx@2x.png -../images/viewer_toolbar/open_osx.png -../images/viewer_toolbar/open_osx@2x.png -../images/viewer_toolbar/openFolder_osx.png -../images/viewer_toolbar/openFolder_osx@2x.png -../images/viewer_toolbar/openNext_osx.png -../images/viewer_toolbar/openNext_osx@2x.png -../images/viewer_toolbar/openPrevious_osx.png -../images/viewer_toolbar/openPrevious_osx@2x.png -../images/viewer_toolbar/options_osx.png -../images/viewer_toolbar/options_osx@2x.png -../images/viewer_toolbar/previous_osx.png -../images/viewer_toolbar/previous_osx@2x.png -../images/viewer_toolbar/rotateL_osx.png -../images/viewer_toolbar/rotateL_osx@2x.png -../images/viewer_toolbar/rotateR_osx.png -../images/viewer_toolbar/rotateR_osx@2x.png -../images/viewer_toolbar/save_osx.png -../images/viewer_toolbar/save_osx@2x.png -../images/viewer_toolbar/shortcuts_osx.png -../images/viewer_toolbar/shortcuts_osx@2x.png -../images/viewer_toolbar/showBookmarks_osx.png -../images/viewer_toolbar/showBookmarks_osx@2x.png -../images/viewer_toolbar/toHeight_osx.png -../images/viewer_toolbar/toHeight_osx@2x.png -../images/viewer_toolbar/toWidth_osx.png -../images/viewer_toolbar/toWidth_osx@2x.png -../images/viewer_toolbar/toWidthSlider_osx.png -../images/viewer_toolbar/toWidthSlider_osx@2x.png -../images/viewer_toolbar/translator_osx.png -../images/viewer_toolbar/translator_osx@2x.png -../images/viewer_toolbar/zoom_osx.png -../images/viewer_toolbar/zoom_osx@2x.png - - - diff --git a/YACReader/yacreader_images_win.qrc b/YACReader/yacreader_images_win.qrc deleted file mode 100644 index 7915c821..00000000 --- a/YACReader/yacreader_images_win.qrc +++ /dev/null @@ -1,58 +0,0 @@ - - - ../images/viewer_toolbar/bookmark.svg - ../images/viewer_toolbar/close.svg - ../images/viewer_toolbar/doublePage.svg - ../images/viewer_toolbar/doubleMangaPage.svg - ../images/viewer_toolbar/fitToPage.svg - ../images/viewer_toolbar/flow.svg - ../images/viewer_toolbar/full.svg - ../images/viewer_toolbar/goto.svg - ../images/viewer_toolbar/help.svg - ../images/viewer_toolbar/info.svg - ../images/viewer_toolbar/magnifyingGlass.svg - ../images/viewer_toolbar/next.svg - ../images/viewer_toolbar/open.svg - ../images/viewer_toolbar/openFolder.svg - ../images/viewer_toolbar/openNext.svg - ../images/viewer_toolbar/openPrevious.svg - ../images/viewer_toolbar/options.svg - ../images/viewer_toolbar/previous.svg - ../images/viewer_toolbar/rotateL.svg - ../images/viewer_toolbar/rotateR.svg - ../images/viewer_toolbar/save.svg - ../images/viewer_toolbar/shortcuts.svg - ../images/viewer_toolbar/showBookmarks.svg - ../images/viewer_toolbar/toHeight.svg - ../images/viewer_toolbar/toWidth.svg - ../images/viewer_toolbar/translator.svg - ../images/viewer_toolbar/zoom.svg - ../images/viewer_toolbar/bookmark_18x18.svg - ../images/viewer_toolbar/close_18x18.svg - ../images/viewer_toolbar/doublePage_18x18.svg - ../images/viewer_toolbar/doubleMangaPage_18x18.svg - ../images/viewer_toolbar/fitToPage_18x18.svg - ../images/viewer_toolbar/flow_18x18.svg - ../images/viewer_toolbar/full_18x18.svg - ../images/viewer_toolbar/goto_18x18.svg - ../images/viewer_toolbar/help_18x18.svg - ../images/viewer_toolbar/info_18x18.svg - ../images/viewer_toolbar/magnifyingGlass_18x18.svg - ../images/viewer_toolbar/next_18x18.svg - ../images/viewer_toolbar/open_18x18.svg - ../images/viewer_toolbar/openFolder_18x18.svg - ../images/viewer_toolbar/openNext_18x18.svg - ../images/viewer_toolbar/openPrevious_18x18.svg - ../images/viewer_toolbar/options_18x18.svg - ../images/viewer_toolbar/previous_18x18.svg - ../images/viewer_toolbar/rotateL_18x18.svg - ../images/viewer_toolbar/rotateR_18x18.svg - ../images/viewer_toolbar/save_18x18.svg - ../images/viewer_toolbar/shortcuts_18x18.svg - ../images/viewer_toolbar/showBookmarks_18x18.svg - ../images/viewer_toolbar/toHeight_18x18.svg - ../images/viewer_toolbar/toWidth_18x18.svg - ../images/viewer_toolbar/translator_18x18.svg - ../images/viewer_toolbar/zoom_18x18.svg - -