add add pulse for media/exec/audio and move inactive pluse to general

This commit is contained in:
WarmUpTill
2020-10-14 20:17:51 +02:00
parent 4d76206452
commit 5c38996d41
5 changed files with 19 additions and 4 deletions

View File

@@ -5,6 +5,8 @@
#include "headers/advanced-scene-switcher.hpp"
QMetaObject::Connection inactivePluse;
void SceneSwitcher::on_close_clicked()
{
done(0);

View File

@@ -25,7 +25,6 @@ class SceneSwitcher : public QDialog {
public:
std::unique_ptr<Ui_SceneSwitcher> ui;
bool loading = true;
QMetaObject::Connection inactivePluse;
SceneSwitcher(QWidget *parent);

View File

@@ -7,11 +7,11 @@
#include <QPropertyAnimation>
#include <QGraphicsColorizeEffect>
QMetaObject::Connection test;
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_audioAdd_clicked()
{
ui->audioAdd->disconnect(test);
ui->audioAdd->disconnect(addPulse);
std::lock_guard<std::mutex> 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,

View File

@@ -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<std::mutex> 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)

View File

@@ -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<std::mutex> 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()