mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -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 39 additions and 29 deletions
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/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>

28
YACReaderLibrary/images_win.qrc
View File

@ -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>

20
YACReaderLibrary/library_window.cpp
View File

@ -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?

6
YACReaderLibrary/yacreader_content_views_manager.cpp
View File

@ -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);

2
YACReaderLibrary/yacreader_main_toolbar.cpp
View File

@ -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);

BIN
images/main_toolbar/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 225 B

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15,14.81c0,.5-.36,.72-.81,.49L.81,8.42c-.44-.23-.44-.6,0-.83L14.19,.7c.44-.23,.81,0,.81,.49V14.81Z"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1 34"><defs><style>.cls-1{fill:none;stroke:url(#linear-gradient);stroke-miterlimit:10;}</style><linearGradient id="linear-gradient" x1=".5" y1="0" x2=".5" y2="34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d1d1d1" stop-opacity="0"/><stop offset="0" stop-color="#d0d0d0" stop-opacity=".01"/><stop offset=".1" stop-color="#c9cacc" stop-opacity=".31"/><stop offset=".2" stop-color="#c3c5c9" stop-opacity=".56"/><stop offset=".29" stop-color="#bec2c7" stop-opacity=".75"/><stop offset=".37" stop-color="#babfc5" stop-opacity=".89"/><stop offset=".44" stop-color="#b8bdc4" stop-opacity=".97"/><stop offset=".5" stop-color="#b8bdc4"/><stop offset=".56" stop-color="#b8bdc4" stop-opacity=".97"/><stop offset=".63" stop-color="#babfc5" stop-opacity=".89"/><stop offset=".71" stop-color="#bec2c7" stop-opacity=".75"/><stop offset=".8" stop-color="#c3c5c9" stop-opacity=".56"/><stop offset=".9" stop-color="#c9cacc" stop-opacity=".31"/><stop offset="1" stop-color="#d0d0d0" stop-opacity=".01"/><stop offset="1" stop-color="#d1d1d1" stop-opacity="0"/></linearGradient></defs><line class="cls-1" x1=".5" x2=".5" y2="34"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" x="6" y="2" width="12" height="20" rx="1" ry="1"/><rect class="cls-1" width="1" height="24"/><rect class="cls-1" x="3" y="2" width="1" height="20"/><rect class="cls-1" x="20" y="2" width="1" height="20"/><rect class="cls-1" x="23" width="1" height="24"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M0,14.81c0,.5,.36,.72,.81,.49l13.38-6.89c.44-.23,.44-.6,0-.83L.81,.7C.36,.47,0,.69,0,1.19V14.81Z"/></svg>
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

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

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#404040}</style></defs><path d="M22 0h-9l3 3-5 5 5 5 5-5 3 3V2c0-1.1-.9-2-2-2Z" class="cls-1"/><path d="M22 22h-9v-9c0-1.1-.9-2-2-2H2V2h9V0H2C.9 0 0 .9 0 2v20c0 1.1.9 2 2 2h20c1.1 0 2-.9 2-2v-9h-2v9Z" class="cls-1"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="9" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="18" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" y="14" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="9" y="14" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="18" y="14" width="6" height="10" rx="1" ry="1"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 25"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M3.34,16.35l-.04-.91c-.1-1.79,.49-3.61,2.07-5.5,1.12-1.33,2.03-2.45,2.03-3.64s-.81-2.03-2.56-2.1c-1.15,0-2.56,.42-3.47,1.05L.19,1.44C1.45,.7,3.55,0,6.04,0c4.62,0,6.72,2.56,6.72,5.46,0,2.66-1.64,4.41-2.98,5.88-1.29,1.43-1.82,2.8-1.79,4.38v.63H3.34Zm-.91,4.83c0-1.86,1.29-3.19,3.12-3.19s3.12,1.33,3.15,3.19c0,1.82-1.26,3.19-3.15,3.19s-3.12-1.37-3.12-3.19Z"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="9" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" x="18" width="6" height="10" rx="1" ry="1"/><rect class="cls-1" y="14" width="24" height="1"/><rect class="cls-1" y="17" width="24" height="1"/><rect class="cls-1" y="20" width="24" height="1"/><rect class="cls-1" y="23" width="16" height="1"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 24"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M14,0H3C1.35,0,0,1.35,0,3V21c0,1.65,1.35,3,3,3H14c1.65,0,3-1.35,3-3V3c0-1.65-1.35-3-3-3Zm-3,12h2v2h-2v-2Zm4,9H2v-1H15v1Zm0-2H2v-1H15v1Zm0-2H2v-1H15v1Z"/></svg>
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

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M23,14c.55,0,1-.45,1-1v-2c0-.55-.45-1-1-1h-.2c-.55,0-1.13-.43-1.3-.96l-.69-1.68c-.26-.48-.15-1.2,.23-1.59l.15-.15c.39-.39,.39-1.03,0-1.41l-1.41-1.41c-.39-.39-1.03-.39-1.41,0l-.15,.15c-.39,.39-1.1,.49-1.59,.23l-1.68-.69c-.53-.16-.96-.75-.96-1.3v-.2c0-.55-.45-1-1-1h-2c-.55,0-1,.45-1,1v.2c0,.55-.43,1.13-.96,1.3l-1.68,.69c-.48,.26-1.2,.15-1.59-.23l-.15-.15c-.39-.39-1.03-.39-1.41,0l-1.41,1.41c-.39,.39-.39,1.03,0,1.41l.15,.15c.39,.39,.49,1.1,.23,1.59l-.69,1.68c-.16,.53-.75,.96-1.3,.96h-.2C.45,10,0,10.45,0,11v2C0,13.55,.45,14,1,14h.2c.55,0,1.13,.43,1.3,.96l.69,1.68c.26,.48,.15,1.2-.23,1.59l-.15,.15c-.39,.39-.39,1.03,0,1.41l1.41,1.41c.39,.39,1.03,.39,1.41,0l.15-.15c.39-.39,1.1-.49,1.59-.23l1.68,.69c.53,.16,.96,.75,.96,1.3v.2c0,.55,.45,1,1,1h2c.55,0,1-.45,1-1v-.2c0-.55,.43-1.13,.96-1.3l1.68-.69c.48-.26,1.2-.15,1.59,.23l.15,.15c.39,.39,1.03,.39,1.41,0l1.41-1.41c.39-.39,.39-1.03,0-1.41l-.15-.15c-.39-.39-.49-1.1-.23-1.59l.69-1.68c.16-.53,.75-.96,1.3-.96h.2Zm-11,2.4c-2.43,0-4.4-1.97-4.4-4.4s1.97-4.4,4.4-4.4,4.4,1.97,4.4,4.4-1.97,4.4-4.4,4.4Z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB