From e7f031641fc54690338f91bcc0c2bf902fa0b55a Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Mon, 24 May 2021 15:16:31 +0200 Subject: [PATCH] Add warning for macro action source --- data/locale/en-US.ini | 1 + src/headers/macro-action-source.hpp | 2 ++ src/macro-action-source.cpp | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index d0184577..cd17b4ef 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -171,6 +171,7 @@ AdvSceneSwitcher.action.source="Source" AdvSceneSwitcher.action.source.type.enable="Enable" AdvSceneSwitcher.action.source.type.disable="Disable" AdvSceneSwitcher.action.source.entry="{{actions}} {{sources}}" +AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI" AdvSceneSwitcher.action.media="Media" AdvSceneSwitcher.action.media.type.play="Play" AdvSceneSwitcher.action.media.type.pause="Pause" diff --git a/src/headers/macro-action-source.hpp b/src/headers/macro-action-source.hpp index db52358d..0e9f5c02 100644 --- a/src/headers/macro-action-source.hpp +++ b/src/headers/macro-action-source.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include #include "macro-action-edit.hpp" enum class SourceAction { @@ -50,6 +51,7 @@ private slots: protected: QComboBox *_sources; QComboBox *_actions; + QLabel *_warning; std::shared_ptr _entryData; private: diff --git a/src/macro-action-source.cpp b/src/macro-action-source.cpp index 8da1d692..09e27f8c 100644 --- a/src/macro-action-source.cpp +++ b/src/macro-action-source.cpp @@ -73,6 +73,8 @@ MacroActionSourceEdit::MacroActionSourceEdit( { _sources = new QComboBox(); _actions = new QComboBox(); + _warning = new QLabel( + obs_module_text("AdvSceneSwitcher.action.source.warning")); populateActionSelection(_actions); populateSourceSelection(_sources); @@ -82,13 +84,16 @@ MacroActionSourceEdit::MacroActionSourceEdit( QWidget::connect(_sources, SIGNAL(currentTextChanged(const QString &)), this, SLOT(SourceChanged(const QString &))); - QHBoxLayout *mainLayout = new QHBoxLayout; + QVBoxLayout *mainLayout = new QVBoxLayout; + QHBoxLayout *entryLayout = new QHBoxLayout; std::unordered_map widgetPlaceholders = { {"{{sources}}", _sources}, {"{{actions}}", _actions}, }; placeWidgets(obs_module_text("AdvSceneSwitcher.action.source.entry"), - mainLayout, widgetPlaceholders); + entryLayout, widgetPlaceholders); + mainLayout->addLayout(entryLayout); + mainLayout->addWidget(_warning); setLayout(mainLayout); _entryData = entryData;