Merge pull request #2093 from Programatic/pause_icon

UI: Implement system tray icon for when the recording is paused
This commit is contained in:
Jim authored and GitHub committed 2019-11-17 19:31:27 -08:00
commit 769e5f3f78
3 files changed
+10

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

+1
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
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)