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

Merge pull request #1736 from cg2121/icons-from-theme

Browse source 
UI: Use icons from theme on Linux
This commit is contained in:
Colin Edwards 2019-03-19 19:25:42 -05:00 • committed by GitHub
commit 55c1b5bd7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -4975,7 +4975,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")));
}
}
@ -4988,7 +4989,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")));
}
}
@ -6637,8 +6639,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"),