4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Use icons from theme on Linux

Browse source
This commit is contained in:
Clayton Groeneveld 2019-03-11 10:52:01 -05:00
commit 2080051b9f
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
UI/window-basic-main.cpp
View file

@ -4977,7 +4977,8 @@ inline void OBSBasic::OnActivate()
UpdateProcessPriority();
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
QIcon(":/res/images/tray_active.png")));
}
}
@ -4990,7 +4991,8 @@ inline void OBSBasic::OnDeactivate()
ClearProcessPriority();
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/obs.png"));
trayIcon->setIcon(QIcon::fromTheme("obs-tray",
QIcon(":/res/images/obs.png")));
}
}
@ -6639,8 +6641,8 @@ void OBSBasic::ToggleShowHide()
void OBSBasic::SystemTrayInit()
{
trayIcon.reset(new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
this));
trayIcon.reset(new QSystemTrayIcon(QIcon::fromTheme("obs-tray",
QIcon(":/res/images/obs.png")), this));
trayIcon->setToolTip("OBS Studio");
showHide = new QAction(QTStr("Basic.SystemTray.Show"),