From 1dd5d9f96d53fe0c295e9eec559a588266a2e164 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Tue, 10 Nov 2026 20:24:06 +0100 Subject: [PATCH] Add yes/no and ok/cancel input types to variable action --- data/locale/ar-SA.ini | 2 +- data/locale/en-US.ini | 7 +- lib/macro/macro-action-variable-input.cpp | 84 ++++++++++++++++++++--- lib/macro/macro-action-variable-input.hpp | 6 ++ lib/utils/non-modal-dialog.cpp | 12 ++++ lib/utils/value-input.hpp | 2 + 6 files changed, 102 insertions(+), 11 deletions(-) diff --git a/data/locale/ar-SA.ini b/data/locale/ar-SA.ini index 6645979b..c3225346 100644 --- a/data/locale/ar-SA.ini +++ b/data/locale/ar-SA.ini @@ -1467,7 +1467,7 @@ AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}في{{variables}}إ AdvSceneSwitcher.action.variable.layout.substringIndex="بداية الجزء:{{subStringStart}}حجم الجزء:{{subStringSize}}{{subStringRegex}}" AdvSceneSwitcher.action.variable.layout.substringRegex="إسناد قيمة التطابق رقم{{regexMatchIdx}}باستخدام التعبير النمطي:{{subStringRegex}}" AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}" -AdvSceneSwitcher.action.variable.layout.userInput.type="نوع الإدخال:{{inputType}}" +AdvSceneSwitcher.action.variable.layout.userInput.type="نوع الإدخال:{{inputType}}{{inputTypeHelp}}" AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}استخدام مطالبة مخصصة{{inputPrompt}}" AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}تعبئة بنص مؤقت{{inputPlaceholder}}" AdvSceneSwitcher.action.variable.layout.randomNumber="ولّد رقمًا عشوائيًا في النطاق من{{randomNumberStart}}إلى{{randomNumberEnd}}" diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 672f44d3..a5447b52 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -1467,8 +1467,11 @@ AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}of{{variables}}to l AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}{{subStringRegex}}" AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:{{subStringRegex}}" AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}" -AdvSceneSwitcher.action.variable.layout.userInput.type="Input type:{{inputType}}" +AdvSceneSwitcher.action.variable.layout.userInput.type="Input type:{{inputType}}{{inputTypeHelp}}" AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Use custom prompt{{inputPrompt}}" +AdvSceneSwitcher.action.variable.layout.userInput.choicePrompt="Question:{{choicePrompt}}" +AdvSceneSwitcher.action.variable.userInput.yesNo.help="The variable will be set to \"yes\" or \"no\" depending on the button pressed.\nClosing the dialog sets it to \"no\"." +AdvSceneSwitcher.action.variable.userInput.okCancel.help="The variable will be set to \"ok\" or \"cancel\" depending on the button pressed.\nClosing the dialog sets it to \"cancel\"." AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Fill with placeholder{{inputPlaceholder}}" AdvSceneSwitcher.action.variable.layout.randomNumber="Generate random number in range from{{randomNumberStart}}to{{randomNumberEnd}}" AdvSceneSwitcher.action.projector="Projector" @@ -2752,6 +2755,8 @@ AdvSceneSwitcher.valueInputType.source="Source" AdvSceneSwitcher.valueInputType.string="Plain text" AdvSceneSwitcher.valueInputType.variable="Variable" AdvSceneSwitcher.valueInputType.selection="Selection from list" +AdvSceneSwitcher.valueInputType.yesNo="Yes / No" +AdvSceneSwitcher.valueInputType.okCancel="OK / Cancel" AdvSceneSwitcher.enterURL="--enter URL--" AdvSceneSwitcher.selectHotkey="--select hotkey--" AdvSceneSwitcher.selectDisplay="--select display--" diff --git a/lib/macro/macro-action-variable-input.cpp b/lib/macro/macro-action-variable-input.cpp index fd1e83af..41792b68 100644 --- a/lib/macro/macro-action-variable-input.cpp +++ b/lib/macro/macro-action-variable-input.cpp @@ -1,4 +1,5 @@ #include "macro-action-variable-input.hpp" +#include "help-icon.hpp" #include "layout-helpers.hpp" #include "macro.hpp" #include "non-modal-dialog.hpp" @@ -37,10 +38,33 @@ struct AskForInputParams { std::atomic_bool resultReady = {false}; }; +static bool isChoiceInputType(ValueInputType type) +{ + return type == ValueInputType::YesNo || + type == ValueInputType::OkCancel; +} + +static std::string getChoiceValue(ValueInputType type, bool accepted) +{ + if (type == ValueInputType::YesNo) { + return accepted ? "yes" : "no"; + } + return accepted ? "ok" : "cancel"; +} + static void askForInput(void *param) { auto parameters = *static_cast *>(param); + if (isChoiceInputType(parameters->type)) { + auto dialog = new NonModalMessageDialog( + parameters->prompt, parameters->type, "", {}); + const bool accepted = dialog->ShowMessage() == QMessageBox::Yes; + parameters->result = getChoiceValue(parameters->type, accepted); + parameters->resultReady = true; + return; + } + NonModalMessageDialog *dialog = nullptr; if (parameters->type == ValueInputType::String) { dialog = new NonModalMessageDialog( @@ -103,13 +127,15 @@ bool VariableActionInput::AskForUserInput(MacroActionVariable &action, for (const auto &option : _inputOptions) { options << QString::fromStdString(option); } + const bool useCustomPrompt = _useCustomPrompt || + isChoiceInputType(_inputType); auto params = std::make_shared( - _useCustomPrompt + useCustomPrompt ? QString::fromStdString(_inputPrompt) : QString(obs_module_text( "AdvSceneSwitcher.action.variable.askForValuePromptDefault")) .arg(QString::fromStdString(var.Name())), - _useCustomPrompt && _useInputPlaceholder + useCustomPrompt && _useInputPlaceholder ? QString::fromStdString(_inputPlaceholder) : "", _inputType, options); @@ -154,23 +180,36 @@ VariableActionInputEdit::VariableActionInputEdit( _promptLayout(new QHBoxLayout()), _useCustomPrompt(new QCheckBox(this)), _inputPrompt(new VariableLineEdit(this)), + _choicePromptLayout(new QHBoxLayout()), + _choicePrompt(new VariableLineEdit(this)), _placeholderLayout(new QHBoxLayout()), _useInputPlaceholder(new QCheckBox(this)), _inputPlaceholder(new VariableLineEdit(this)), _inputTypeLayout(new QHBoxLayout()), _inputType(new QComboBox(this)), + _inputTypeHelp(new HelpIcon("", this)), _inputOptions(new StringListEdit(this)), _envVariable(new VariableLineEdit(this)) { _inputPrompt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + _choicePrompt->setSizePolicy(QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred); _inputOptions->SetMaxStringSize(99999999); PopulateValueInputTypeSelection(_inputType); + _inputType->addItem( + obs_module_text("AdvSceneSwitcher.valueInputType.yesNo"), + static_cast(ValueInputType::YesNo)); + _inputType->addItem( + obs_module_text("AdvSceneSwitcher.valueInputType.okCancel"), + static_cast(ValueInputType::OkCancel)); QWidget::connect(_useCustomPrompt, SIGNAL(stateChanged(int)), this, SLOT(UseCustomPromptChanged(int))); QWidget::connect(_inputPrompt, SIGNAL(editingFinished()), this, SLOT(InputPromptChanged())); + QWidget::connect(_choicePrompt, SIGNAL(editingFinished()), this, + SLOT(ChoicePromptChanged())); QWidget::connect(_useInputPlaceholder, SIGNAL(stateChanged(int)), this, SLOT(UseInputPlaceholderChanged(int))); QWidget::connect(_inputPlaceholder, SIGNAL(editingFinished()), this, @@ -186,9 +225,11 @@ VariableActionInputEdit::VariableActionInputEdit( const std::unordered_map widgetPlaceholders = { {"{{useCustomPrompt}}", _useCustomPrompt}, {"{{inputPrompt}}", _inputPrompt}, + {"{{choicePrompt}}", _choicePrompt}, {"{{useInputPlaceholder}}", _useInputPlaceholder}, {"{{inputPlaceholder}}", _inputPlaceholder}, {"{{inputType}}", _inputType}, + {"{{inputTypeHelp}}", _inputTypeHelp}, }; PlaceWidgets( obs_module_text( @@ -198,6 +239,10 @@ VariableActionInputEdit::VariableActionInputEdit( obs_module_text( "AdvSceneSwitcher.action.variable.layout.userInput.customPrompt"), _promptLayout, widgetPlaceholders); + PlaceWidgets( + obs_module_text( + "AdvSceneSwitcher.action.variable.layout.userInput.choicePrompt"), + _choicePromptLayout, widgetPlaceholders, false); PlaceWidgets( obs_module_text( "AdvSceneSwitcher.action.variable.layout.userInput.placeholder"), @@ -208,6 +253,7 @@ VariableActionInputEdit::VariableActionInputEdit( layout->addLayout(_inputTypeLayout); layout->addWidget(_inputOptions); layout->addLayout(_promptLayout); + layout->addLayout(_choicePromptLayout); layout->addLayout(_placeholderLayout); setLayout(layout); } @@ -233,6 +279,7 @@ void VariableActionInputEdit::UpdateEntryData() _useCustomPrompt->setChecked(_data->_useCustomPrompt); _inputPrompt->setText(_data->_inputPrompt); + _choicePrompt->setText(_data->_inputPrompt); _useInputPlaceholder->setChecked(_data->_useInputPlaceholder); _inputPlaceholder->setText(_data->_inputPlaceholder); _inputType->setCurrentIndex( @@ -250,21 +297,32 @@ void VariableActionInputEdit::SetWidgetVisibility( } const bool isUserInput = action == Action::USER_INPUT; + const bool isChoice = isUserInput && + isChoiceInputType(_data->_inputType); SetLayoutVisible(_inputTypeLayout, isUserInput); + _inputTypeHelp->setVisible(isChoice); + _inputTypeHelp->setToolTip( + _data->_inputType == ValueInputType::YesNo + ? obs_module_text( + "AdvSceneSwitcher.action.variable.userInput.yesNo.help") + : obs_module_text( + "AdvSceneSwitcher.action.variable.userInput.okCancel.help")); _inputOptions->setVisible( isUserInput && _data->_inputType == ValueInputType::Selection); - SetLayoutVisible(_promptLayout, isUserInput); - _inputPrompt->setVisible(isUserInput && _data->_useCustomPrompt); + SetLayoutVisible(_promptLayout, isUserInput && !isChoice); + _inputPrompt->setVisible(isUserInput && !isChoice && + _data->_useCustomPrompt); + SetLayoutVisible(_choicePromptLayout, isChoice); if (_data->_useCustomPrompt) { RemoveStretchIfPresent(_promptLayout); } else { AddStretchIfNecessary(_promptLayout); } - SetLayoutVisible(_placeholderLayout, - isUserInput && _data->_useCustomPrompt); - _useInputPlaceholder->setVisible(isUserInput && - _data->_useCustomPrompt); - _inputPlaceholder->setVisible(isUserInput && _data->_useCustomPrompt && + const bool showPlaceholder = isUserInput && !isChoice && + _data->_useCustomPrompt; + SetLayoutVisible(_placeholderLayout, showPlaceholder); + _useInputPlaceholder->setVisible(showPlaceholder); + _inputPlaceholder->setVisible(showPlaceholder && _data->_useInputPlaceholder); if (_data->_useInputPlaceholder) { RemoveStretchIfPresent(_placeholderLayout); @@ -286,6 +344,14 @@ void VariableActionInputEdit::InputPromptChanged() { GUARD_LOADING_AND_LOCK(); _data->_inputPrompt = _inputPrompt->text().toStdString(); + _choicePrompt->setText(_data->_inputPrompt); +} + +void VariableActionInputEdit::ChoicePromptChanged() +{ + GUARD_LOADING_AND_LOCK(); + _data->_inputPrompt = _choicePrompt->text().toStdString(); + _inputPrompt->setText(_data->_inputPrompt); } void VariableActionInputEdit::UseInputPlaceholderChanged(int value) diff --git a/lib/macro/macro-action-variable-input.hpp b/lib/macro/macro-action-variable-input.hpp index ea8cdbd5..b70893ce 100644 --- a/lib/macro/macro-action-variable-input.hpp +++ b/lib/macro/macro-action-variable-input.hpp @@ -6,6 +6,8 @@ namespace advss { +class HelpIcon; + class VariableActionInput : public VariableActionGroup { public: std::unique_ptr Copy() const override; @@ -48,6 +50,7 @@ public: private slots: void UseCustomPromptChanged(int); void InputPromptChanged(); + void ChoicePromptChanged(); void UseInputPlaceholderChanged(int); void InputPlaceholderChanged(); void InputTypeChanged(int); @@ -60,11 +63,14 @@ private: QHBoxLayout *_promptLayout; QCheckBox *_useCustomPrompt; VariableLineEdit *_inputPrompt; + QHBoxLayout *_choicePromptLayout; + VariableLineEdit *_choicePrompt; QHBoxLayout *_placeholderLayout; QCheckBox *_useInputPlaceholder; VariableLineEdit *_inputPlaceholder; QHBoxLayout *_inputTypeLayout; QComboBox *_inputType; + HelpIcon *_inputTypeHelp; StringListEdit *_inputOptions; VariableLineEdit *_envVariable; }; diff --git a/lib/utils/non-modal-dialog.cpp b/lib/utils/non-modal-dialog.cpp index af96d1e1..2ece5ad6 100644 --- a/lib/utils/non-modal-dialog.cpp +++ b/lib/utils/non-modal-dialog.cpp @@ -29,6 +29,18 @@ NonModalMessageDialog::NonModalMessageDialog(const QString &message, const QStringList &options) : NonModalMessageDialog(message, Type::INPUT) { + if (inputType == ValueInputType::YesNo || + inputType == ValueInputType::OkCancel) { + layout()->removeWidget(_inputEdit); + delete _inputEdit; + _inputEdit = nullptr; + if (inputType == ValueInputType::YesNo) { + findChild()->setStandardButtons( + QDialogButtonBox::Yes | QDialogButtonBox::No); + } + return; + } + _valueInput = new ValueInputWidget(inputType, defaultValue, options, this); layout()->replaceWidget(_inputEdit, _valueInput); diff --git a/lib/utils/value-input.hpp b/lib/utils/value-input.hpp index 5bd56325..e37f03a7 100644 --- a/lib/utils/value-input.hpp +++ b/lib/utils/value-input.hpp @@ -18,6 +18,8 @@ enum class ValueInputType { String, Variable, Selection, + YesNo, + OkCancel, }; void PopulateValueInputTypeSelection(QComboBox *list);