Use svg icons in the default main toolbar

YACReaderLibrary/images.qrc

@@ -61,7 +61,6 @@
         <file>../images/importingIcon.png</file>
         <file>../images/importLibrary.png</file>
         <file>../images/importTopCoversDecoration.png</file>
-        <file>../images/main_toolbar/divider.png</file>
         <file>../images/menus_icons/editIcon.png</file>
         <file>../images/menus_icons/editIcon@2x.png</file>
         <file>../images/menus_icons/exportComicsInfoIcon.png</file>
@@ -110,5 +109,16 @@
         <file>../images/sidebar/libraryOptions.png</file>
         <file>../images/sidebar/libraryOptions@2x.png</file>
         <file>../images/updatingIcon.png</file>
+
+        <!-- main toolbar - default theme -->
+        <file>../images/main_toolbar/back.svg</file>
+        <file>../images/main_toolbar/forward.svg</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/divider.svg</file>
+        <file>../images/main_toolbar/iconSearch.svg</file>
+        <file>../images/main_toolbar/clearSearch.svg</file>
     </qresource>
 </RCC>

YACReaderLibrary/images_win.qrc

@@ -1,28 +1,15 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/main_toolbar/back.png</file>
-        <file>../images/main_toolbar/back_disabled.png</file>
-        <file>../images/main_toolbar/forward.png</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/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>

YACReaderLibrary/yacreader_comics_views_manager.cpp

@@ -189,7 +189,7 @@ void YACReaderComicsViewsManager::_toggleComicsView()
     switch (comicsViewStatus) {
     case Flow: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(":/images/main_toolbar/info.svg", QSize(), QIcon::Normal);
         libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
 
@@ -205,7 +205,7 @@ void YACReaderComicsViewsManager::_toggleComicsView()
 
     case Grid: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(":/images/main_toolbar/flow.svg", QSize(), QIcon::Normal);
         libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
 
@@ -220,7 +220,7 @@ void YACReaderComicsViewsManager::_toggleComicsView()
 
     case Info: {
         QIcon icoViewsButton;
-        icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(":/images/main_toolbar/grid.svg", QSize(), QIcon::Normal);
         libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
         libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
 

YACReaderLibrary/yacreader_library_toolbar.cpp

@@ -11,8 +11,8 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
 {
     backAction = new QAction(mainWindow);
     QIcon icoBackButton;
-    icoBackButton.addFile(":/images/main_toolbar/back.png",QSize(), QIcon::Normal);
-    //icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
+    icoBackButton.addFile(":/images/main_toolbar/back.svg",QSize(), QIcon::Normal);
+    //icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.svg"), QIcon::Disabled);
     backAction->setData(BACK_ACTION_YL);
     backAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(BACK_ACTION_YL));
     backAction->setIcon(icoBackButton);
@@ -20,8 +20,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
 
     forwardAction = new QAction(mainWindow);
     QIcon icoFordwardButton;
-    icoFordwardButton.addFile(":/images/main_toolbar/forward.png", QSize(), QIcon::Normal);
-    //icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
+    icoFordwardButton.addFile(":/images/main_toolbar/forward.svg", QSize(), QIcon::Normal);
     forwardAction->setData(FORWARD_ACTION_YL);
     forwardAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FORWARD_ACTION_YL));
     forwardAction->setIcon(icoFordwardButton);
@@ -32,7 +31,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
     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(":/images/main_toolbar/settings.svg", QSize(), QIcon::Normal);
     optionsAction->setIcon(icoSettingsButton);
 
     serverConfigAction = new QAction(mainWindow);
@@ -40,7 +39,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
     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(":/images/main_toolbar/server.svg", QSize(), QIcon::Normal);
     serverConfigAction->setIcon(icoServerButton);
 
     toggleComicsViewAction = new QAction(tr("Change between comics views"),mainWindow);
@@ -48,11 +47,11 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
     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(":/images/main_toolbar/grid.svg", QSize(), QIcon::Normal);
     else if(settings->value(COMICS_VIEW_STATUS) == Grid)
-        icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(":/images/main_toolbar/info.svg", QSize(), QIcon::Normal);
     else
-        icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
+        icoViewsButton.addFile(":/images/main_toolbar/flow.svg", QSize(), QIcon::Normal);
 
     toggleComicsViewAction->setData(TOGGLE_COMICS_VIEW_ACTION_YL);
     toggleComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_COMICS_VIEW_ACTION_YL));
@@ -63,7 +62,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
     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(":/images/main_toolbar/help.svg",QSize(), QIcon::Normal);
     helpAboutAction->setIcon(icoHelpButton);
 
     if (!useNativeFullScreen) {
@@ -72,7 +71,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
         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.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.svg"), QIcon::Normal);
         toggleFullScreenAction->setIcon(icoFullscreenButton);
     }
 

YACReaderLibrary/yacreader_main_toolbar.cpp

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

custom_widgets/yacreader_search_line_edit.cpp

@@ -14,14 +14,17 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
     clearButton = new QToolButton(this);
     searchLabel = new QLabel(this);
 
-    QPixmap pixmap(":/images/clearSearch.png");
-    QPixmap pixmapIcon(":/images/iconSearch.png");
+    QPixmap clearSearchPixmap(":/images/main_toolbar/clearSearch.svg");
+    QPixmap inconSearchPixmap(":/images/main_toolbar/iconSearch.svg");
+
+    clearSearchPixmap.setDevicePixelRatio(devicePixelRatio());
+    inconSearchPixmap.setDevicePixelRatio(devicePixelRatio());
 
     searchLabel->setStyleSheet("QLabel { border: none; padding: 0px; }");
-    searchLabel->setPixmap(pixmapIcon);
+    searchLabel->setPixmap(inconSearchPixmap);
 
-    clearButton->setIcon(QIcon(pixmap));
-    clearButton->setIconSize(pixmap.size());
+    clearButton->setIcon(QIcon(clearSearchPixmap));
+    clearButton->setIconSize(clearSearchPixmap.size());
     clearButton->setCursor(Qt::ArrowCursor);
     clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
     clearButton->hide();