From ebb093b8a3498a3998904bd030dbb2aafe5d9671 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 11 Jul 2020 06:12:51 -0700 Subject: [PATCH] Revert "UI: Match Windows taskbar state to tray icon" This reverts commit d442fda3fc1155947fb311d0a2fbb46213df4a16. --- UI/CMakeLists.txt | 5 --- UI/forms/images/active.png | Bin 3404 -> 0 bytes UI/forms/images/paused.png | Bin 2969 -> 0 bytes UI/forms/obs.qrc | 2 -- UI/window-basic-main.cpp | 56 ++++--------------------------- UI/window-basic-main.hpp | 9 ----- cmake/Modules/CopyMSVCBins.cmake | 2 -- 7 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 UI/forms/images/active.png delete mode 100644 UI/forms/images/paused.png diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index a06c600e3..bf1fc8e6d 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -57,9 +57,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_AUTOMOC TRUE) find_package(Qt5Svg ${FIND_MODE}) -if(WIN32) - find_package(Qt5WinExtras ${FIND_MODE}) -endif() find_package(Qt5Xml ${FIND_MODE}) find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat) @@ -388,8 +385,6 @@ if(WIN32) set_target_properties(obs PROPERTIES OUTPUT_NAME "obs${_output_suffix}") - target_link_libraries(obs - Qt5::WinExtras) endif() target_link_libraries(obs diff --git a/UI/forms/images/active.png b/UI/forms/images/active.png deleted file mode 100644 index c3fd4669eb125557605e4c0b82b430c6bb2db39d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3404 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 diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc index e37f05577..040e9af58 100644 --- a/UI/forms/obs.qrc +++ b/UI/forms/obs.qrc @@ -12,8 +12,6 @@ images/obs.png images/obs_paused.png images/tray_active.png - images/paused.png - images/active.png images/expand.svg images/unlocked.svg images/locked.svg diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 0fead5c0e..bb1231664 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1837,11 +1837,6 @@ void OBSBasic::OBSInit() SystemTray(true); #endif -#ifdef _WIN32 - taskBtn->setWindow(windowHandle()); - taskProg->setRange(0, 1); -#endif - bool has_last_version = config_has_user_value(App()->GlobalConfig(), "General", "LastVersion"); bool first_run = @@ -5392,13 +5387,6 @@ inline void OBSBasic::OnActivate() App()->IncrementSleepInhibition(); UpdateProcessPriority(); -#ifdef _WIN32 - taskProg->show(); - taskProg->resume(); - taskProg->setValue(1); - taskBtn->setOverlayIcon(QIcon::fromTheme( - "obs-active", QIcon(":/res/images/active.png"))); -#endif if (trayIcon) trayIcon->setIcon(QIcon::fromTheme( "obs-tray-active", @@ -5420,34 +5408,12 @@ inline void OBSBasic::OnDeactivate() if (trayIcon) trayIcon->setIcon(QIcon::fromTheme( "obs-tray", QIcon(":/res/images/obs.png"))); -#ifdef _WIN32 - taskProg->hide(); - taskBtn->clearOverlayIcon(); -#endif - } else { - if (os_atomic_load_bool(&recording_paused)) { -#ifdef _WIN32 - taskProg->show(); - taskProg->pause(); - taskBtn->setOverlayIcon(QIcon::fromTheme( - "obs-paused", - QIcon(":/res/images/paused.png"))); -#endif - if (trayIcon) - trayIcon->setIcon( - QIcon(":/res/images/obs_paused.png")); - } else { -#ifdef _WIN32 - taskProg->show(); - taskProg->resume(); - taskBtn->setOverlayIcon(QIcon::fromTheme( - "obs-active", - QIcon(":/res/images/active.png"))); -#endif - if (trayIcon) - trayIcon->setIcon( - QIcon(":/res/images/tray_active.png")); - } + } else if (trayIcon) { + if (os_atomic_load_bool(&recording_paused)) + trayIcon->setIcon(QIcon(":/res/images/obs_paused.png")); + else + trayIcon->setIcon( + QIcon(":/res/images/tray_active.png")); } } @@ -7915,11 +7881,6 @@ void OBSBasic::PauseRecording() ui->statusbar->RecordingPaused(); -#ifdef _WIN32 - taskProg->pause(); - taskBtn->setOverlayIcon(QIcon::fromTheme( - "obs-paused", QIcon(":/res/images/paused.png"))); -#endif if (trayIcon) trayIcon->setIcon(QIcon(":/res/images/obs_paused.png")); @@ -7949,11 +7910,6 @@ void OBSBasic::UnpauseRecording() ui->statusbar->RecordingUnpaused(); -#ifdef _WIN32 - taskProg->resume(); - taskBtn->setOverlayIcon(QIcon::fromTheme( - "obs-active", QIcon(":/res/images/active.png"))); -#endif if (trayIcon) trayIcon->setIcon( QIcon(":/res/images/tray_active.png")); diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index d2cc692a9..587a3a20a 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -21,10 +21,6 @@ #include #include #include -#ifdef _WIN32 -#include -#include -#endif #include #include #include @@ -282,11 +278,6 @@ private: QPointer perSceneTransitionMenu; QPointer shortcutFilter; -#ifdef _WIN32 - QWinTaskbarButton *taskBtn = new QWinTaskbarButton(this); - QWinTaskbarProgress *taskProg = taskBtn->progress(); -#endif - QPointer programWidget; QPointer programLayout; QPointer programLabel; diff --git a/cmake/Modules/CopyMSVCBins.cmake b/cmake/Modules/CopyMSVCBins.cmake index e0b6ca835..504d7b1ca 100644 --- a/cmake/Modules/CopyMSVCBins.cmake +++ b/cmake/Modules/CopyMSVCBins.cmake @@ -158,7 +158,6 @@ file(GLOB QT_DEBUG_BIN_FILES "${Qt5Core_DIR}/../../../bin/Qt5Guid.dll" "${Qt5Core_DIR}/../../../bin/Qt5Widgetsd.dll" "${Qt5Core_DIR}/../../../bin/Qt5Svgd.dll" - "${Qt5Core_DIR}/../../../bin/Qt5WinExtrasd.dll" "${Qt5Core_DIR}/../../../bin/Qt5Xmld.dll" "${Qt5Core_DIR}/../../../bin/libGLESv2d.dll" "${Qt5Core_DIR}/../../../bin/libEGLd.dll") @@ -177,7 +176,6 @@ file(GLOB QT_BIN_FILES "${Qt5Core_DIR}/../../../bin/Qt5Gui.dll" "${Qt5Core_DIR}/../../../bin/Qt5Widgets.dll" "${Qt5Core_DIR}/../../../bin/Qt5Svg.dll" - "${Qt5Core_DIR}/../../../bin/Qt5WinExtras.dll" "${Qt5Core_DIR}/../../../bin/Qt5Xml.dll" "${Qt5Core_DIR}/../../../bin/libGLESv2.dll" "${Qt5Core_DIR}/../../../bin/libEGL.dll")