From ac75ec12476c1766bd8029e911cbde59a03f09fb Mon Sep 17 00:00:00 2001 From: Ford Smith Date: Wed, 2 Oct 2019 19:44:47 -0400 Subject: [PATCH] UI: Add system tray icon to indicate when paused --- UI/forms/images/obs_paused.png | Bin 0 -> 10319 bytes UI/forms/obs.qrc | 1 + UI/window-basic-main.cpp | 9 +++++++++ 3 files changed, 10 insertions(+) create mode 100644 UI/forms/images/obs_paused.png diff --git a/UI/forms/images/obs_paused.png b/UI/forms/images/obs_paused.png new file mode 100644 index 0000000000000000000000000000000000000000..b428db6f4543f4b7d8b3204c358aa87f2c3d3968 GIT binary patch literal 10319 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 xximages/down.svg images/up.svg images/obs.png + images/obs_paused.png images/tray_active.png images/expand.svg images/unlocked.svg diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 5abb2e96a..6419fd6c2 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -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)