jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2093 from Programatic/pause_icon 

UI: Implement system tray icon for when the recording is paused
master
Jim 2019-11-17 19:31:27 -08:00 committed by GitHub
parent 374b8d2229 ac75ec1247
commit 769e5f3f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
UI/forms/images/obs_paused.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

1
UI/forms/obs.qrc
View File

@ -9,6 +9,7 @@
<file>images/down.svg</file>
<file>images/up.svg</file>
<file>images/obs.png</file>
<file>images/obs_paused.png</file>
<file>images/tray_active.png</file>
<file>images/expand.svg</file>
<file>images/unlocked.svg</file>

9
UI/window-basic-main.cpp
View File

@ -7471,6 +7471,10 @@ void OBSBasic::PauseRecording()
pause->blockSignals(true);
pause->setChecked(true);
pause->blockSignals(false);
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/obs_paused.png"));
os_atomic_set_bool(&recording_paused, true);
if (api)
@ -7494,6 +7498,11 @@ void OBSBasic::UnpauseRecording()
pause->blockSignals(true);
pause->setChecked(false);
pause->blockSignals(false);
if (trayIcon)
trayIcon->setIcon(
QIcon(":/res/images/tray_active.png"));
os_atomic_set_bool(&recording_paused, false);
if (api)