mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-14 11:04:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the new svg icons in macos too

Browse Source
This commit is contained in:
Luis Ángel San Martín Rodríguez
2022-10-20 19:14:13 +02:00
parent 4c66b8ecad
commit 0b37c7c684
5 changed files with 61 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
YACReader/main_window_viewer.cpp
View File

@ -41,28 +41,17 @@
QString addExtensionToIconPath(const QString &path)
{
#ifdef Q_OS_MAC
return path + ".png";
#else
return path + ".svg";
#endif
}
QString addExtensionToIconPathInToolbar(const QString &path)
{
#ifdef Q_OS_MAC
return path + ".png";
#else
return path + "_18x18.svg";
#endif
}
QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
QAction *actionWithCustomIcon(const QIcon &icon, QAction *action)
{
#ifdef Q_OS_MAC
return action;
#else
auto a = new QAction(icon, action->text());
a->setEnabled(action->isEnabled());
@ -76,7 +65,6 @@ QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
QObject::connect(action, &QAction::toggled, a, &QAction::setChecked);
return a;
#endif
}
MainWindowViewer::MainWindowViewer()
@ -522,16 +510,15 @@ void MainWindowViewer::createToolBars()
comicToolBar = addToolBar(tr("&File"));
#endif
#ifdef Q_OS_MAC
// comicToolBar->setIconSize(QSize(16,16));
#else
comicToolBar->setIconSize(QSize(18, 18));
#ifndef Q_OS_MAC
comicToolBar->setStyleSheet("QToolBar{border:none;}");
#endif
#ifdef Q_OS_MAC
comicToolBar->addAction(openAction);
comicToolBar->addAction(openFolderAction);
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction));
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
#else
auto recentmenu = new QMenu(tr("Open recent"));
recentmenu->addActions(recentFilesActionList);