mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace more icons with svg

Browse Source
This commit is contained in:
Luis Ángel San Martín 2022-10-22 11:40:49 +02:00
parent 8f1c63fcf0
commit 75c08885be
25 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/images.qrc
View File

@ -64,7 +64,7 @@
<file>../images/importingIcon.png</file> <file>../images/importingIcon.png</file>
<file>../images/importLibrary.png</file> <file>../images/importLibrary.png</file>
<file>../images/importTopCoversDecoration.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.png</file>
<file>../images/menus_icons/editIcon@2x.png</file> <file>../images/menus_icons/editIcon@2x.png</file>
<file>../images/menus_icons/exportComicsInfoIcon.png</file> <file>../images/menus_icons/exportComicsInfoIcon.png</file>

28
YACReaderLibrary/images_win.qrc
View File

@ -1,28 +1,24 @@
<RCC> <RCC>
<qresource prefix="/"> <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/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/forward_disabled.png</file>
<file>../images/main_toolbar/settings.png</file> <file>../images/main_toolbar/settings.svg</file>
<file>../images/main_toolbar/server.png</file> <file>../images/main_toolbar/server.svg</file>
<file>../images/main_toolbar/help.png</file> <file>../images/main_toolbar/help.svg</file>
<file>../images/main_toolbar/fullscreen.png</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/libraryIcon.png</file>
<file>../images/sidebar/setRoot.png</file> <file>../images/sidebar/setRoot.png</file>
<file>../images/sidebar/expand.png</file> <file>../images/sidebar/expand.png</file>
<file>../images/sidebar/colapse.png</file> <file>../images/sidebar/colapse.png</file>
<file>../images/sidebar/newLibraryIcon.png</file> <file>../images/sidebar/newLibraryIcon.png</file>
<file>../images/sidebar/openLibraryIcon.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/addNew_sidebar.png</file>
<file>../images/sidebar/delete_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/addLabelIcon.png</file>
<file>../images/sidebar/renameListIcon.png</file> <file>../images/sidebar/renameListIcon.png</file>
<file>../images/lists/default_0.png</file> <file>../images/lists/default_0.png</file>
@ -40,8 +36,12 @@
<file>../images/lists/label_white.png</file> <file>../images/lists/label_white.png</file>
<file>../images/lists/label_yellow.png</file> <file>../images/lists/label_yellow.png</file>
<file>../images/lists/list.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/empty_reading_list.png</file>
<file>../images/viewer_toolbar/close.png</file> <file>../images/viewer_toolbar/close.svg</file>
<file>icon.ico</file> <file>icon.ico</file>
</qresource> </qresource>
</RCC> </RCC>

20
YACReaderLibrary/library_window.cpp
View File

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

6
YACReaderLibrary/yacreader_content_views_manager.cpp
View File

@ -210,7 +210,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
switch (comicsViewStatus) { switch (comicsViewStatus) {
case Flow: { case Flow: {
QIcon icoViewsButton; 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); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@ -227,7 +227,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
case Grid: { case Grid: {
QIcon icoViewsButton; 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); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@ -243,7 +243,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
case Info: { case Info: {
QIcon icoViewsButton; 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); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);

2
YACReaderLibrary/yacreader_main_toolbar.cpp
View File

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

BIN
images/main_toolbar/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 225 B

BIN
images/main_toolbar/back.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

BIN
images/main_toolbar/divider.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 207 B

BIN
images/main_toolbar/divider.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
images/main_toolbar/flow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 184 B

BIN
images/main_toolbar/flow.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 440 B

BIN
images/main_toolbar/forward.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 234 B

BIN
images/main_toolbar/forward.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 288 B

BIN
images/main_toolbar/fullscreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 259 B

BIN
images/main_toolbar/fullscreen.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
images/main_toolbar/grid.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 179 B

BIN
images/main_toolbar/grid.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 555 B

BIN
images/main_toolbar/help.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 384 B

BIN
images/main_toolbar/help.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 545 B

BIN
images/main_toolbar/info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 197 B

BIN
images/main_toolbar/info.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 550 B

BIN
images/main_toolbar/server.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 196 B

BIN
images/main_toolbar/server.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 342 B

BIN
images/main_toolbar/settings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

BIN
images/main_toolbar/settings.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB