Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-05 16:16:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option to run "else" actions using the "Run macros" button

Browse Source 
If there are else actions to run holding control and clicking the "Run
macros" button will allow you to test them.
This commit is contained in:
WarmUpTill
2023-09-13 10:39:44 +02:00
committed by WarmUpTill
parent 0c8135078d
commit d6e4ee0203
7 changed files with 121 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/macro-core/macro-tab.cpp
View File

@@ -451,21 +451,6 @@ void AdvSceneSwitcher::on_macroName_editingFinished()
RenameMacro(macro, newName);
}
void AdvSceneSwitcher::on_runMacro_clicked()
{
auto macro = GetSelectedMacro();
if (!macro) {
return;
}
bool ret = macro->PerformActions(true, true, true);
if (!ret) {
QString err =
obs_module_text("AdvSceneSwitcher.macroTab.runFail");
DisplayMessage(err.arg(QString::fromStdString(macro->Name())));
}
}
void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value)
{
auto macro = GetSelectedMacro();
@@ -792,6 +777,7 @@ void AdvSceneSwitcher::SetupMacroTab()
SLOT(MacroSelectionAboutToChange()));
connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
SLOT(MacroSelectionChanged()));
ui->runMacro->SetMacroTree(ui->macros);
ui->conditionsList->SetHelpMsg(
obs_module_text("AdvSceneSwitcher.macroTab.editConditionHelp"));