Replace more icons with svg

YACReaderLibrary/images.qrc

@@ -64,7 +64,7 @@
         <file>../images/importingIcon.png</file>
         <file>../images/importLibrary.png</file>
         <file>../images/importTopCoversDecoration.png</file>
-        <file>../images/main_toolbar/divider.png</file>
+        <file>../images/main_toolbar/divider.svg</file>
         <file>../images/menus_icons/editIcon.png</file>
         <file>../images/menus_icons/editIcon@2x.png</file>
         <file>../images/menus_icons/exportComicsInfoIcon.png</file>

YACReaderLibrary/images_win.qrc

@@ -1,28 +1,24 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/main_toolbar/back.png</file>
+        <file>../images/main_toolbar/back.svg</file>
         <file>../images/main_toolbar/back_disabled.png</file>
-        <file>../images/main_toolbar/forward.png</file>
+        <file>../images/main_toolbar/forward.svg</file>
         <file>../images/main_toolbar/forward_disabled.png</file>
-        <file>../images/main_toolbar/settings.png</file>
-        <file>../images/main_toolbar/server.png</file>
-        <file>../images/main_toolbar/help.png</file>
-        <file>../images/main_toolbar/fullscreen.png</file>
+        <file>../images/main_toolbar/settings.svg</file>
+        <file>../images/main_toolbar/server.svg</file>
+        <file>../images/main_toolbar/help.svg</file>
+        <file>../images/main_toolbar/fullscreen.svg</file>
+        <file>../images/main_toolbar/flow.svg</file>
+        <file>../images/main_toolbar/grid.svg</file>
+        <file>../images/main_toolbar/info.svg</file>
         <file>../images/sidebar/libraryIcon.png</file>
         <file>../images/sidebar/setRoot.png</file>
         <file>../images/sidebar/expand.png</file>
         <file>../images/sidebar/colapse.png</file>
         <file>../images/sidebar/newLibraryIcon.png</file>
         <file>../images/sidebar/openLibraryIcon.png</file>
-        <file>../images/main_toolbar/flow.png</file>
-        <file>../images/main_toolbar/grid.png</file>
-        <file>../images/main_toolbar/info.png</file>
-        <file>../images/empty_folder.png</file>
-        <file>../images/empty_search.png</file>
         <file>../images/sidebar/addNew_sidebar.png</file>
         <file>../images/sidebar/delete_sidebar.png</file>
-        <file alias="images/iconSearch.png">../images/iconSearchNew.png</file>
-        <file alias="images/clearSearch.png">../images/clearSearchNew.png</file>
         <file>../images/sidebar/addLabelIcon.png</file>
         <file>../images/sidebar/renameListIcon.png</file>
         <file>../images/lists/default_0.png</file>
@@ -40,8 +36,12 @@
         <file>../images/lists/label_white.png</file>
         <file>../images/lists/label_yellow.png</file>
         <file>../images/lists/list.png</file>
+        <file>../images/empty_folder.png</file>
+        <file>../images/empty_search.png</file>
+        <file alias="images/iconSearch.png">../images/iconSearchNew.png</file>
+        <file alias="images/clearSearch.png">../images/clearSearchNew.png</file>
         <file>../images/empty_reading_list.png</file>
-        <file>../images/viewer_toolbar/close.png</file>
+        <file>../images/viewer_toolbar/close.svg</file>
         <file>icon.ico</file>
     </qresource>
 </RCC>

YACReaderLibrary/library_window.cpp

@@ -464,7 +464,7 @@ void LibraryWindow::createActions()
 {
     backAction = new QAction(this);
     QIcon icoBackButton;
-    icoBackButton.addFile(":/images/main_toolbar/back.png", QSize(), QIcon::Normal);
+    icoBackButton.addFile(addExtensionToIconPath(":/images/main_toolbar/back"), QSize(), QIcon::Normal);
     // icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
     backAction->setData(BACK_ACTION_YL);
     backAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(BACK_ACTION_YL));
@@ -473,7 +473,7 @@ void LibraryWindow::createActions()
 
     forwardAction = new QAction(this);
     QIcon icoFordwardButton;
-    icoFordwardButton.addFile(":/images/main_toolbar/forward.png", QSize(), QIcon::Normal);
+    icoFordwardButton.addFile(addExtensionToIconPath(":/images/main_toolbar/forward"), QSize(), QIcon::Normal);
     // icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
     forwardAction->setData(FORWARD_ACTION_YL);
     forwardAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FORWARD_ACTION_YL));
@@ -595,7 +595,7 @@ void LibraryWindow::createActions()
     toggleFullScreenAction->setData(TOGGLE_FULL_SCREEN_ACTION_YL);
     toggleFullScreenAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_FULL_SCREEN_ACTION_YL));
     QIcon icoFullscreenButton;
-    icoFullscreenButton.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.png"), QIcon::Normal);
+    icoFullscreenButton.addFile(addExtensionToIconPath(":/images/main_toolbar/fullscreen"), QSize(), QIcon::Normal);
     toggleFullScreenAction->setIcon(icoFullscreenButton);
 #endif
     helpAboutAction = new QAction(this);
@@ -603,7 +603,7 @@ void LibraryWindow::createActions()
     helpAboutAction->setData(HELP_ABOUT_ACTION_YL);
     helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_YL));
     QIcon icoHelpButton;
-    icoHelpButton.addFile(":/images/main_toolbar/help.png", QSize(), QIcon::Normal);
+    icoHelpButton.addFile(addExtensionToIconPath(":/images/main_toolbar/help"), QSize(), QIcon::Normal);
     helpAboutAction->setIcon(icoHelpButton);
 
     addFolderAction = new QAction(tr("Add new folder"), this);
@@ -641,7 +641,7 @@ void LibraryWindow::createActions()
     optionsAction->setData(OPTIONS_ACTION_YL);
     optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_YL));
     QIcon icoSettingsButton;
-    icoSettingsButton.addFile(":/images/main_toolbar/settings.png", QSize(), QIcon::Normal);
+    icoSettingsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/settings"), QSize(), QIcon::Normal);
     optionsAction->setIcon(icoSettingsButton);
 
     serverConfigAction = new QAction(this);
@@ -649,7 +649,7 @@ void LibraryWindow::createActions()
     serverConfigAction->setData(SERVER_CONFIG_ACTION_YL);
     serverConfigAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SERVER_CONFIG_ACTION_YL));
     QIcon icoServerButton;
-    icoServerButton.addFile(":/images/main_toolbar/server.png", QSize(), QIcon::Normal);
+    icoServerButton.addFile(addExtensionToIconPath(":/images/main_toolbar/server"), QSize(), QIcon::Normal);
     serverConfigAction->setIcon(icoServerButton);
 
     toggleComicsViewAction = new QAction(tr("Change between comics views"), this);
@@ -657,11 +657,11 @@ void LibraryWindow::createActions()
     QIcon icoViewsButton;
 
     if (!settings->contains(COMICS_VIEW_STATUS) || settings->value(COMICS_VIEW_STATUS) == Flow)
-        icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/grid"), QSize(), QIcon::Normal);
     else if (settings->value(COMICS_VIEW_STATUS) == Grid)
-        icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/info"), QSize(), QIcon::Normal);
     else
-        icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/flow"), QSize(), QIcon::Normal);
 
     toggleComicsViewAction->setData(TOGGLE_COMICS_VIEW_ACTION_YL);
     toggleComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_COMICS_VIEW_ACTION_YL));
@@ -775,7 +775,7 @@ void LibraryWindow::createActions()
     addAction(showEditShortcutsAction);
 
     quitAction = new QAction(tr("&Quit"), this);
-    quitAction->setIcon(QIcon(":/images/viewer_toolbar/close.png"));
+    quitAction->setIcon(QIcon(":/images/viewer_toolbar/close.svg"));
     quitAction->setData(QUIT_ACTION_YL);
     quitAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(QUIT_ACTION_YL));
     // TODO: is `quitAction->setMenuRole(QAction::QuitRole);` useful on macOS?

YACReaderLibrary/yacreader_content_views_manager.cpp

@@ -210,7 +210,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
     switch (comicsViewStatus) {
     case Flow: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/info"), QSize(), QIcon::Normal);
         libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
 #ifdef Q_OS_MAC
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@@ -227,7 +227,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
 
     case Grid: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/flow"), QSize(), QIcon::Normal);
         libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
 #ifdef Q_OS_MAC
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@@ -243,7 +243,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
 
     case Info: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/grid"), QSize(), QIcon::Normal);
         libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
 #ifdef Q_OS_MAC
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);

YACReaderLibrary/yacreader_main_toolbar.cpp

@@ -116,7 +116,7 @@ void YACReaderMainToolBar::resizeEvent(QResizeEvent *event)
 
 void YACReaderMainToolBar::addDivider()
 {
-    QPixmap img(":/images/main_toolbar/divider.png");
+    QPixmap img(":/images/main_toolbar/divider.svg");
     QLabel *divider = new QLabel();
     divider->setPixmap(img);