diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index e43b7f81..68665f47 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -64,7 +64,7 @@
../images/importingIcon.png
../images/importLibrary.png
../images/importTopCoversDecoration.png
- ../images/main_toolbar/divider.png
+ ../images/main_toolbar/divider.svg
../images/menus_icons/editIcon.png
../images/menus_icons/editIcon@2x.png
../images/menus_icons/exportComicsInfoIcon.png
diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc
index 8828bf78..e9fa80f2 100644
--- a/YACReaderLibrary/images_win.qrc
+++ b/YACReaderLibrary/images_win.qrc
@@ -1,28 +1,24 @@
- ../images/main_toolbar/back.png
+ ../images/main_toolbar/back.svg
../images/main_toolbar/back_disabled.png
- ../images/main_toolbar/forward.png
+ ../images/main_toolbar/forward.svg
../images/main_toolbar/forward_disabled.png
- ../images/main_toolbar/settings.png
- ../images/main_toolbar/server.png
- ../images/main_toolbar/help.png
- ../images/main_toolbar/fullscreen.png
+ ../images/main_toolbar/settings.svg
+ ../images/main_toolbar/server.svg
+ ../images/main_toolbar/help.svg
+ ../images/main_toolbar/fullscreen.svg
+ ../images/main_toolbar/flow.svg
+ ../images/main_toolbar/grid.svg
+ ../images/main_toolbar/info.svg
../images/sidebar/libraryIcon.png
../images/sidebar/setRoot.png
../images/sidebar/expand.png
../images/sidebar/colapse.png
../images/sidebar/newLibraryIcon.png
../images/sidebar/openLibraryIcon.png
- ../images/main_toolbar/flow.png
- ../images/main_toolbar/grid.png
- ../images/main_toolbar/info.png
- ../images/empty_folder.png
- ../images/empty_search.png
../images/sidebar/addNew_sidebar.png
../images/sidebar/delete_sidebar.png
- ../images/iconSearchNew.png
- ../images/clearSearchNew.png
../images/sidebar/addLabelIcon.png
../images/sidebar/renameListIcon.png
../images/lists/default_0.png
@@ -40,8 +36,12 @@
../images/lists/label_white.png
../images/lists/label_yellow.png
../images/lists/list.png
+ ../images/empty_folder.png
+ ../images/empty_search.png
+ ../images/iconSearchNew.png
+ ../images/clearSearchNew.png
../images/empty_reading_list.png
- ../images/viewer_toolbar/close.png
+ ../images/viewer_toolbar/close.svg
icon.ico
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 637e449c..e7066781 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/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?
diff --git a/YACReaderLibrary/yacreader_content_views_manager.cpp b/YACReaderLibrary/yacreader_content_views_manager.cpp
index 64dadbb6..f61c23f1 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.cpp
+++ b/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);
diff --git a/YACReaderLibrary/yacreader_main_toolbar.cpp b/YACReaderLibrary/yacreader_main_toolbar.cpp
index 3f774eae..3d78a980 100644
--- a/YACReaderLibrary/yacreader_main_toolbar.cpp
+++ b/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);
diff --git a/images/main_toolbar/back.png b/images/main_toolbar/back.png
deleted file mode 100644
index 2677d99e..00000000
Binary files a/images/main_toolbar/back.png and /dev/null differ
diff --git a/images/main_toolbar/back.svg b/images/main_toolbar/back.svg
new file mode 100644
index 00000000..08a5777f
--- /dev/null
+++ b/images/main_toolbar/back.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/divider.png b/images/main_toolbar/divider.png
deleted file mode 100644
index ed245eeb..00000000
Binary files a/images/main_toolbar/divider.png and /dev/null differ
diff --git a/images/main_toolbar/divider.svg b/images/main_toolbar/divider.svg
new file mode 100644
index 00000000..6822367e
--- /dev/null
+++ b/images/main_toolbar/divider.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/flow.png b/images/main_toolbar/flow.png
deleted file mode 100644
index eec316ee..00000000
Binary files a/images/main_toolbar/flow.png and /dev/null differ
diff --git a/images/main_toolbar/flow.svg b/images/main_toolbar/flow.svg
new file mode 100644
index 00000000..afde5c5b
--- /dev/null
+++ b/images/main_toolbar/flow.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/forward.png b/images/main_toolbar/forward.png
deleted file mode 100644
index b6473ae8..00000000
Binary files a/images/main_toolbar/forward.png and /dev/null differ
diff --git a/images/main_toolbar/forward.svg b/images/main_toolbar/forward.svg
new file mode 100644
index 00000000..50a5f21a
--- /dev/null
+++ b/images/main_toolbar/forward.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/fullscreen.png b/images/main_toolbar/fullscreen.png
deleted file mode 100644
index 4235184f..00000000
Binary files a/images/main_toolbar/fullscreen.png and /dev/null differ
diff --git a/images/main_toolbar/fullscreen.svg b/images/main_toolbar/fullscreen.svg
new file mode 100644
index 00000000..f0bf9e9c
--- /dev/null
+++ b/images/main_toolbar/fullscreen.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/grid.png b/images/main_toolbar/grid.png
deleted file mode 100644
index 6bcf639d..00000000
Binary files a/images/main_toolbar/grid.png and /dev/null differ
diff --git a/images/main_toolbar/grid.svg b/images/main_toolbar/grid.svg
new file mode 100644
index 00000000..6c6d534d
--- /dev/null
+++ b/images/main_toolbar/grid.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/help.png b/images/main_toolbar/help.png
deleted file mode 100644
index b3ab9914..00000000
Binary files a/images/main_toolbar/help.png and /dev/null differ
diff --git a/images/main_toolbar/help.svg b/images/main_toolbar/help.svg
new file mode 100644
index 00000000..f0d09053
--- /dev/null
+++ b/images/main_toolbar/help.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/info.png b/images/main_toolbar/info.png
deleted file mode 100644
index 09d12542..00000000
Binary files a/images/main_toolbar/info.png and /dev/null differ
diff --git a/images/main_toolbar/info.svg b/images/main_toolbar/info.svg
new file mode 100644
index 00000000..4b7510e0
--- /dev/null
+++ b/images/main_toolbar/info.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/server.png b/images/main_toolbar/server.png
deleted file mode 100644
index 98b66e5a..00000000
Binary files a/images/main_toolbar/server.png and /dev/null differ
diff --git a/images/main_toolbar/server.svg b/images/main_toolbar/server.svg
new file mode 100644
index 00000000..0bd8cfeb
--- /dev/null
+++ b/images/main_toolbar/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/main_toolbar/settings.png b/images/main_toolbar/settings.png
deleted file mode 100644
index 02e7df24..00000000
Binary files a/images/main_toolbar/settings.png and /dev/null differ
diff --git a/images/main_toolbar/settings.svg b/images/main_toolbar/settings.svg
new file mode 100644
index 00000000..4f01a4d0
--- /dev/null
+++ b/images/main_toolbar/settings.svg
@@ -0,0 +1 @@
+
\ No newline at end of file