From 5c38996d417f0e27347ceaa4f1d61b05bcb82641 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Wed, 14 Oct 2020 20:17:51 +0200 Subject: [PATCH] add add pulse for media/exec/audio and move inactive pluse to general --- src/general.cpp | 2 ++ src/headers/advanced-scene-switcher.hpp | 1 - src/switch-audio.cpp | 6 +++--- src/switch-executable.cpp | 7 +++++++ src/switch-media.cpp | 7 +++++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/general.cpp b/src/general.cpp index 91875fb2..f2d1c646 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -5,6 +5,8 @@ #include "headers/advanced-scene-switcher.hpp" +QMetaObject::Connection inactivePluse; + void SceneSwitcher::on_close_clicked() { done(0); diff --git a/src/headers/advanced-scene-switcher.hpp b/src/headers/advanced-scene-switcher.hpp index 39a7d26d..a6080e4a 100644 --- a/src/headers/advanced-scene-switcher.hpp +++ b/src/headers/advanced-scene-switcher.hpp @@ -25,7 +25,6 @@ class SceneSwitcher : public QDialog { public: std::unique_ptr ui; bool loading = true; - QMetaObject::Connection inactivePluse; SceneSwitcher(QWidget *parent); diff --git a/src/switch-audio.cpp b/src/switch-audio.cpp index 895373d9..8a68eda0 100644 --- a/src/switch-audio.cpp +++ b/src/switch-audio.cpp @@ -7,11 +7,11 @@ #include #include -QMetaObject::Connection test; +static QMetaObject::Connection addPulse; void SceneSwitcher::on_audioAdd_clicked() { - ui->audioAdd->disconnect(test); + ui->audioAdd->disconnect(addPulse); std::lock_guard lock(switcher->m); switcher->audioSwitches.emplace_back(); @@ -192,7 +192,7 @@ void SceneSwitcher::setupAudioTab() } if (switcher->audioSwitches.size() == 0) - test = PulseWidget(ui->audioAdd, QColor(Qt::green)); + addPulse = PulseWidget(ui->audioAdd, QColor(Qt::green)); } void AudioSwitch::setVolumeLevel(void *data, diff --git a/src/switch-executable.cpp b/src/switch-executable.cpp index 37f72257..e80314b1 100644 --- a/src/switch-executable.cpp +++ b/src/switch-executable.cpp @@ -1,7 +1,11 @@ #include "headers/advanced-scene-switcher.hpp" +static QMetaObject::Connection addPulse; + void SceneSwitcher::on_executableAdd_clicked() { + ui->executableAdd->disconnect(addPulse); + std::lock_guard lock(switcher->m); switcher->executableSwitches.emplace_back(); @@ -193,6 +197,9 @@ void SceneSwitcher::setupExecutableTab() item->setSizeHint(sw->minimumSizeHint()); ui->executables->setItemWidget(item, sw); } + + if (switcher->executableSwitches.size() == 0) + addPulse = PulseWidget(ui->executableAdd, QColor(Qt::green)); } ExecutableSwitchWidget::ExecutableSwitchWidget(ExecutableSwitch *s) diff --git a/src/switch-media.cpp b/src/switch-media.cpp index 82c6b9af..2035bc6a 100644 --- a/src/switch-media.cpp +++ b/src/switch-media.cpp @@ -1,7 +1,11 @@ #include "headers/advanced-scene-switcher.hpp" +static QMetaObject::Connection addPulse; + void SceneSwitcher::on_mediaAdd_clicked() { + ui->mediaAdd->disconnect(addPulse); + std::lock_guard lock(switcher->m); switcher->mediaSwitches.emplace_back(); @@ -191,6 +195,9 @@ void SceneSwitcher::setupMediaTab() item->setSizeHint(sw->minimumSizeHint()); ui->mediaSwitches->setItemWidget(item, sw); } + + if (switcher->mediaSwitches.size() == 0) + addPulse = PulseWidget(ui->mediaAdd, QColor(Qt::green)); } bool MediaSwitch::initialized()