opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
parent e67cae3710 2080051b9f
commit 55c1b5bd7b
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/obs-app.cpp
+2
View File
@@ -1045,6 +1045,8 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
profilerNameStore(store)
{
sleepInhibitor = os_inhibit_sleep_create("OBS Video/audio");
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
}
OBSApp::~OBSApp()
UI/window-basic-main.cpp
+6 -4
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"),
UI/window-basic-stats.cpp
+2 -1
View File
@@ -139,7 +139,8 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closeable)
resize(800, 280);
setWindowTitle(QTStr("Basic.Stats"));
setWindowIcon(QIcon(":/res/images/obs.png"));
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
setWindowModality(Qt::NonModal);
setAttribute(Qt::WA_DeleteOnClose, true);
UI/window-projector.cpp
+2 -1
View File
@@ -30,7 +30,8 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
type = type_;
if (isWindow) {
setWindowIcon(QIcon(":/res/images/obs.png"));
setWindowIcon(QIcon::fromTheme("obs",
QIcon(":/res/images/obs.png")));
UpdateProjectorTitle(projectorTitle);
windowedProjectors.push_back(this);