iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove USE_SYSTEM_MENU_ICON cmake option

Browse Source
This commit is contained in:
Craig Drummond
2017-04-08 19:32:40 +01:00
parent 4f7357c5bd
commit 3e06d37633
8 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
widgets/icons.cpp
View File

@@ -52,11 +52,7 @@ Icons::Icons()
singleIcon=MonoIcon::icon(FontAwesome::ex_one, stdColor);
consumeIcon=MonoIcon::icon(":consume.svg", stdColor);
#ifdef USE_SYSTEM_MENU_ICON
menuIcon=Icon("applications-system");
#else
menuIcon=MonoIcon::icon(FontAwesome::bars, stdColor);
#endif
QString iconFile=QString(CANTATA_SYS_ICONS_DIR+"stream.png");
if (QFile::exists(iconFile)) {
@@ -164,16 +160,11 @@ void Icons::initToolbarIcons(QColor toolbarText)
toolbarStopIcon=MonoIcon::icon(QLatin1String(":media-stop"), toolbarText);
toolbarNextIcon=MonoIcon::icon(QLatin1String(rtl ? ":media-prev" : ":media-next"), toolbarText);
infoIcon=MonoIcon::icon(QLatin1String(":sidebar-info"), toolbarText);
#ifdef USE_SYSTEM_MENU_ICON
toolbarMenuIcon=MonoIcon::icon(QLatin1String(":menu-icon"), toolbarText);
menuIcon=MonoIcon::icon(QLatin1String(":menu-icon"), stdColor);
#else
if (toolbarText==stdColor) {
toolbarMenuIcon=menuIcon;
} else {
toolbarMenuIcon=MonoIcon::icon(FontAwesome::bars, toolbarText);
}
#endif
}
const Icon &Icons::albumIcon(int size, bool mono) const