Rework libproc2 API version check

The previous version was not behaving as expected for flatpak builds

CMakeLists.txt

@@ -166,6 +166,7 @@ target_sources(
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
           lib/macro/macro-tree.hpp
+          lib/macro/macro-websocket-trigger.cpp
           lib/macro/macro.cpp
           lib/macro/macro.hpp)
 
@@ -184,6 +185,8 @@ target_sources(
           lib/utils/canvas-helpers.hpp
           lib/utils/condition-logic.cpp
           lib/utils/condition-logic.hpp
+          lib/utils/crash-handler.cpp
+          lib/utils/crash-handler.hpp
           lib/utils/curl-helper.cpp
           lib/utils/curl-helper.hpp
           lib/utils/cursor-shape-changer.cpp
@@ -201,6 +204,8 @@ target_sources(
           lib/utils/file-selection.hpp
           lib/utils/filter-combo-box.cpp
           lib/utils/filter-combo-box.hpp
+          lib/utils/first-run-wizard.cpp
+          lib/utils/first-run-wizard.hpp
           lib/utils/help-icon.hpp
           lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
@@ -451,14 +456,29 @@ else()
   endif()
   if(PROCPS2_INCLUDE_DIR)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(libproc2 IMPORTED_TARGET libproc2<4.0.5 QUIET)
-    if(libproc2_FOUND)
-      target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_USE_INFO)
-    endif()
     pkg_check_modules(libproc2 REQUIRED IMPORTED_TARGET libproc2)
     set(PROC_INCLUDE_DIR "${PROCPS2_INCLUDE_DIR}")
     target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_AVAILABLE)
     set(PROCESS_CONDITION_SUPPORTED 1)
+
+    # Check if PIDS_VAL takes 4 arguments (old API, pre-4.0.5) or 3 (new API)
+    include(CheckCSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES "${PROCPS2_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_LIBRARIES proc2)
+    check_c_source_compiles(
+      "
+      #include <libproc2/pids.h>
+      int main(void) {
+        struct pids_stack *s = 0;
+        struct pids_info *i = 0;
+        (void)PIDS_VAL(0, str, s, i);
+        return 0;
+      }
+    "
+      PROCPS2_PIDS_VAL_TAKES_INFO)
+    if(PROCPS2_PIDS_VAL_TAKES_INFO)
+      target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_USE_INFO)
+    endif()
   endif()
   if(NOT DEFINED PROCESS_CONDITION_SUPPORTED)
     message(

cmake/common/get_git_revision_description.cmake

@@ -64,7 +64,7 @@ function(_git_find_closest_git_dir _start_dir _git_dir_var)
   while(NOT EXISTS "${git_dir}")
     # .git dir not found, search parent directories
     set(git_previous_parent "${cur_dir}")
-    get_filename_component(cur_dir ${cur_dir} DIRECTORY)
+    get_filename_component(cur_dir "${cur_dir}" DIRECTORY)
     if(cur_dir STREQUAL git_previous_parent)
       # We have reached the root directory, we are not in git
       set(${_git_dir_var}

data/locale/de-DE.ini

@@ -76,7 +76,6 @@ AdvSceneSwitcher.macroTab.name="Name:"
 AdvSceneSwitcher.macroTab.run="Makro ausführen"
 AdvSceneSwitcher.macroTab.runFail="Ausführen von \"%1\" fehlgeschlagen!\nEntweder ist eine der Aktionen fehlgeschlagen oder das Makro wird bereits ausgeführt.\nSoll die aktuelle Ausführung gestoppt werden?"
 AdvSceneSwitcher.macroTab.runInParallel="Parallel zu anderen Makros ausführen"
-AdvSceneSwitcher.macroTab.onChange="Nur bei Änderung ausführen"
 AdvSceneSwitcher.macroTab.defaultname="Makro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Gruppe %1"
 AdvSceneSwitcher.macroTab.removeGroupPopup.text="Sicher, dass \"%1\" und alle zugehörigen Elemente gelöscht werden?"
@@ -291,14 +290,14 @@ AdvSceneSwitcher.condition.replay.state.started="Replay Buffer gestartet"
 AdvSceneSwitcher.condition.replay.state.saved="Replay Buffer gespeichert"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Datum"
-AdvSceneSwitcher.condition.date.anyDay="Beliebiger Tag"
-AdvSceneSwitcher.condition.date.monday="Montag"
-AdvSceneSwitcher.condition.date.tuesday="Dienstag"
-AdvSceneSwitcher.condition.date.wednesday="Mittwoch"
-AdvSceneSwitcher.condition.date.thursday="Donnerstag"
-AdvSceneSwitcher.condition.date.friday="Freitag"
-AdvSceneSwitcher.condition.date.saturday="Samstag"
-AdvSceneSwitcher.condition.date.sunday="Sonntag"
+AdvSceneSwitcher.day.any="Beliebiger Tag"
+AdvSceneSwitcher.day.monday="Montag"
+AdvSceneSwitcher.day.tuesday="Dienstag"
+AdvSceneSwitcher.day.wednesday="Mittwoch"
+AdvSceneSwitcher.day.thursday="Donnerstag"
+AdvSceneSwitcher.day.friday="Freitag"
+AdvSceneSwitcher.day.saturday="Samstag"
+AdvSceneSwitcher.day.sunday="Sonntag"
 AdvSceneSwitcher.condition.date.state.at="Am"
 AdvSceneSwitcher.condition.date.state.after="Nach"
 AdvSceneSwitcher.condition.date.state.before="Vor"
@@ -309,12 +308,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="Wenn diese Option nicht aktiviert is
 AdvSceneSwitcher.condition.date.ignoreTime="Wenn diese Option nicht aktiviert ist, wird die Zeitkomponente ignoriert"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Erweiterte Einstellungen anzeigen"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Einfache Einstellungen anzeigen"
-AdvSceneSwitcher.condition.date.entry.simple="Am {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
-AdvSceneSwitcher.condition.date.entry.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Nächster Treffer bei: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
+AdvSceneSwitcher.condition.date.layout.simple.day="Am{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
+AdvSceneSwitcher.condition.date.layout.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Nächster Treffer bei: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
 AdvSceneSwitcher.condition.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Transformation erhalten"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="entspricht Transformation"
@@ -429,7 +429,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Verstecken"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Umschalten"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Quelle"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Beliebig"
-AdvSceneSwitcher.action.sceneVisibility.entry="Auf{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Auf{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Aktivieren"
 AdvSceneSwitcher.action.filter.type.disable="Deaktivieren"
@@ -834,8 +834,6 @@ AdvSceneSwitcher.status.inactive="Inaktiv"
 AdvSceneSwitcher.running="Plugin läuft"
 AdvSceneSwitcher.stopped="Plugin gestoppt"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Dies scheint das erste Mal zu sein, dass der Erweiterte Szenenwechsler gestartet wurde.<br>Bitte schaue ins <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> für eine Liste von Anleitungen und Beispielen.<br>Nicht zögern und Fragen im <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">Thread</span></a> des Plugins im OBS-Forum stellen!!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Die Entwicklung für dieses Tab wurde gestoppt!\nBitte stattdessen zur Verwendung des Makros-Tab übergehen.\nDieser Hinweis kann im Allgemein-Tab deaktiviert werden."
 
 AdvSceneSwitcher.unit.milliseconds="Millisekunden"

data/locale/en-US.ini

@@ -160,6 +160,8 @@ AdvSceneSwitcher.macroTab.title="Macro"
 AdvSceneSwitcher.macroTab.macros="Macros"
 AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
+AdvSceneSwitcher.macroTab.macroLastExecutedTooltip="Was last executed %1 seconds ago."
+AdvSceneSwitcher.macroTab.macroNotYetExecutedTooltip="Was not yet executed."
 AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define macro conditions.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new condition."
 AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
 AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
@@ -175,7 +177,12 @@ AdvSceneSwitcher.macroTab.run.tooltip="Run all macro actions regardless of condi
 AdvSceneSwitcher.macroTab.runElse="Run macro (else)"
 AdvSceneSwitcher.macroTab.runFail="Running \"%1\" failed!\nEither one of the actions failed or the macro is running already.\nDo you want to stop it?"
 AdvSceneSwitcher.macroTab.runInParallel="Run macro in parallel to other macros"
-AdvSceneSwitcher.macroTab.onChange="Perform actions only on condition change"
+AdvSceneSwitcher.macroTab.actionTriggerMode.label="Perform actions:"
+AdvSceneSwitcher.macroTab.actionTriggerMode.tooltip="Controls when the actions of this macro are performed.\n\n\"Always\" - actions are performed every time the conditions are met.\n\"Macro result changed\" - actions are only performed when the macro transitions between matching and not matching.\n\"Any condition changed\" - actions are only performed when any individual condition changes its result.\n\"Any condition triggered\" - actions are only performed when any individual condition changes from false to true."
+AdvSceneSwitcher.macroTab.actionTriggerMode.always="always"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onOverallChange="only when result changes"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionChange="only when any condition changes"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionTriggered="only when any condition becomes true"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Group %1"
 AdvSceneSwitcher.macroTab.macroNameExists="The name \"%1\" is already used by a macro."
@@ -587,14 +594,6 @@ AdvSceneSwitcher.condition.replay.state.started="Replay buffer started"
 AdvSceneSwitcher.condition.replay.state.saved="Replay buffer saved"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.condition.date.anyDay="Any day"
-AdvSceneSwitcher.condition.date.monday="Monday"
-AdvSceneSwitcher.condition.date.tuesday="Tuesday"
-AdvSceneSwitcher.condition.date.wednesday="Wednesday"
-AdvSceneSwitcher.condition.date.thursday="Thursday"
-AdvSceneSwitcher.condition.date.friday="Friday"
-AdvSceneSwitcher.condition.date.saturday="Saturday"
-AdvSceneSwitcher.condition.date.sunday="Sunday"
 AdvSceneSwitcher.condition.date.state.at="At"
 AdvSceneSwitcher.condition.date.state.after="After"
 AdvSceneSwitcher.condition.date.state.before="Before"
@@ -605,12 +604,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="If unchecked the date component will
 AdvSceneSwitcher.condition.date.ignoreTime="If unchecked the time component will be ignored"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Show advanced settings"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Show simple settings"
-AdvSceneSwitcher.condition.date.entry.simple="On{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Repeat every{{duration}}on date match"
-AdvSceneSwitcher.condition.date.entry.pattern="Current date \"{{currentDate}}\" matches pattern{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Next match at: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}On repeat update selected date to repeat date"
+AdvSceneSwitcher.condition.date.layout.simple.day="On{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Repeat every{{duration}}on date match"
+AdvSceneSwitcher.condition.date.layout.pattern="Current date \"{{currentDate}}\" matches pattern{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Next match at: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}On repeat update selected date to repeat date"
 AdvSceneSwitcher.condition.sceneTransform="Scene item transform"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="Get current value"
@@ -916,7 +916,9 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Hide"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Toggle"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
-AdvSceneSwitcher.action.sceneVisibility.entry="On{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="On{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout.transition="{{updateTransition}}Set transition to{{transitions}}"
+AdvSceneSwitcher.action.sceneVisibility.layout.duration="{{updateDuration}}Set transition duration to{{duration}}seconds"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Enable"
 AdvSceneSwitcher.action.filter.type.disable="Disable"
@@ -1192,6 +1194,8 @@ AdvSceneSwitcher.action.variable.type.swapValues="Swap variable values"
 AdvSceneSwitcher.action.variable.type.trim="Trim whitespace"
 AdvSceneSwitcher.action.variable.type.changeCase="Change case"
 AdvSceneSwitcher.action.variable.type.randomNumber="Generate random number"
+AdvSceneSwitcher.action.variable.type.randomListValue="Select random value"
+AdvSceneSwitcher.action.variable.type.allowRepeat="Allow repeat values"
 AdvSceneSwitcher.action.variable.case.type.lowerCase="lowercase"
 AdvSceneSwitcher.action.variable.case.type.upperCase="UPPERCASE"
 AdvSceneSwitcher.action.variable.case.type.capitalized="Capitalized"
@@ -1214,8 +1218,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="Current value:"
 AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}{{caseType}}{{jsonQuery}}{{jsonQueryHelp}}{{jsonIndex}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}of{{variables}}to length{{stringLength}}by adding{{paddingCharSelection}}to the{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}of{{variables}}to length{{stringLength}}by removing characters from the{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:"
+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.customPrompt="{{useCustomPrompt}}Use custom prompt{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Fill with placeholder{{inputPlaceholder}}"
@@ -1390,6 +1394,8 @@ AdvSceneSwitcher.hotkey.macro.segment.remove="Remove selected macro segment"
 AdvSceneSwitcher.askBackup="Detected a new version of the Advanced Scene Switcher.\nShould a backup of the old settings be created?"
 AdvSceneSwitcher.askForMacro="Select macro{{macroSelection}}"
 
+AdvSceneSwitcher.crashDetected="OBS did not shut down cleanly (for example, due to a crash or freeze).\n\nThe Advanced Scene Switcher plugin would normally start automatically.\nWould you like to keep it stopped for now?"
+
 AdvSceneSwitcher.close="Close"
 AdvSceneSwitcher.browse="Browse"
 
@@ -2149,6 +2155,8 @@ AdvSceneSwitcher.tempVar.window.window="Window title"
 AdvSceneSwitcher.tempVar.window.window.description="The window title of the matching window."
 AdvSceneSwitcher.tempVar.window.windowClass="Window class"
 AdvSceneSwitcher.tempVar.window.windowClass.description="The window class of the matching window."
+AdvSceneSwitcher.tempVar.window.windowText="Window text"
+AdvSceneSwitcher.tempVar.window.windowText.description="Text contained within the window (won't work on all window types)."
 
 AdvSceneSwitcher.tempVar.timer.seconds="Seconds"
 AdvSceneSwitcher.tempVar.timer.minutes="Minutes"
@@ -2193,6 +2201,8 @@ AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording durati
 AdvSceneSwitcher.tempVar.recording.lastSavePath="Last save path"
 AdvSceneSwitcher.tempVar.recording.lastSavePath.description="The file path of the last saved recording."
 
+AdvSceneSwitcher.tempVar.video.similarity="Similarity Rating"
+AdvSceneSwitcher.tempVar.video.similarity.description="Values range from 0 to 1, where 0 means dissimilar and 1 means highly similar."
 AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
 AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."
 AdvSceneSwitcher.tempVar.video.objectCount="Object count"
@@ -2433,8 +2443,6 @@ AdvSceneSwitcher.status.inactive="Inactive"
 AdvSceneSwitcher.running="Plugin running"
 AdvSceneSwitcher.stopped="Plugin stopped"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>This seems to be the first time the Advanced Scene Switcher was started.<br>Please have a look at the <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> for a list of guides and examples.<br>Do not hesitate to ask questions in the plugin's <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">thread</span></a> on the OBS forums!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Development for this tab stopped!\nPlease consider transitioning to using Macros instead.\nThis hint can be disabled on the General tab."
 
 AdvSceneSwitcher.unit.milliseconds="milliseconds"
@@ -2464,6 +2472,47 @@ AdvSceneSwitcher.clearBufferOnMatch="Clear message buffer when matching message
 AdvSceneSwitcher.script.settings="Settings"
 AdvSceneSwitcher.script.timeout="Script timeout:{{timeout}}"
 
+AdvSceneSwitcher.day.monday="Monday"
+AdvSceneSwitcher.day.tuesday="Tuesday"
+AdvSceneSwitcher.day.wednesday="Wednesday"
+AdvSceneSwitcher.day.thursday="Thursday"
+AdvSceneSwitcher.day.friday="Friday"
+AdvSceneSwitcher.day.saturday="Saturday"
+AdvSceneSwitcher.day.sunday="Sunday"
+AdvSceneSwitcher.day.none="No day"
+AdvSceneSwitcher.day.any="Any day"
+
+# First run wizard
+FirstRunWizard.windowTitle="Advanced Scene Switcher - Setup Wizard"
+
+FirstRunWizard.welcome.title="Welcome to Advanced Scene Switcher"
+FirstRunWizard.welcome.subtitle="Let's create your first automation in a few easy steps."
+FirstRunWizard.welcome.body="<p>Advanced Scene Switcher lets you build <b>Macros</b> - rules of the form:</p><blockquote><i>When [condition] -> perform [action]</i></blockquote><p>This wizard creates a macro that <b>switches to a chosen OBS scene whenever a specific window comes into focus</b>.</p><p>You can skip at any time. Re-open this wizard later from the <b>General</b> tab inside the Advanced Scene Switcher dialog.</p>"
+
+FirstRunWizard.scene.title="Choose a Target Scene"
+FirstRunWizard.scene.subtitle="Which OBS scene should become active when your chosen window comes into focus?"
+FirstRunWizard.scene.label="Switch to scene:"
+
+FirstRunWizard.window.title="Choose a Trigger Window"
+FirstRunWizard.window.subtitle="Enter the title of the window that should trigger the scene switch. Partial matches are fine - \"Firefox\" will match any Firefox window."
+FirstRunWizard.window.label="Window title contains:"
+FirstRunWizard.window.placeholder="e.g. \"Firefox\", \"Visual Studio Code\""
+FirstRunWizard.window.autoDetect="Auto-detect focused window"
+FirstRunWizard.window.autoDetectTooltip="Click, then switch to the target window. The title will be captured automatically after 3 seconds."
+FirstRunWizard.window.autoDetectCountdown="Detecting in %1 s - focus your window now..."
+FirstRunWizard.window.hint="<small>Tip: a short partial title is more robust than the full title, which often changes when you switch tabs.</small>"
+
+FirstRunWizard.review.title="Review Your Macro"
+FirstRunWizard.review.subtitle="Click Back to make changes, or Finish to create the macro."
+FirstRunWizard.review.summary="<b>Macro name:</b> Window -> %1<br><br><b>Condition:</b> Focused window title contains <i>\"%2\"</i> (case-insensitive)<br><br><b>Action:</b> Switch to scene <i>\"%1\"</i>"
+FirstRunWizard.review.errorTitle="Macro Creation Failed"
+FirstRunWizard.review.errorBody="The macro could not be created automatically.\n\nYou can create it manually on the Macros tab:\n  Condition: Window -> contains \"%1\"\n  Action:    Switch scene -> \"%2\""
+
+FirstRunWizard.done.title="You're all set!"
+FirstRunWizard.done.subtitle="Your first macro has been created and is now active."
+FirstRunWizard.done.body="<p>You can view and edit it on the <b>Macros</b> tab of the Advanced Scene Switcher dialog.</p><p>To learn more:</p><ul><li><a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\">Plugin wiki</a></li><li><a href=\"https://obsproject.com/forum/resources/automatic-scene-switching.395/\">OBS forum thread</a></li></ul>"
+
+FirstRunWizard.openButton="Open Setup Wizard..."
 # This secion is copied from the OBS locale files
 
 # OBS commonly shared locale

data/locale/es-ES.ini

@@ -72,7 +72,6 @@ AdvSceneSwitcher.macroTab.add="Agregar nueva macro"
 AdvSceneSwitcher.macroTab.name="Nombre:"
 AdvSceneSwitcher.macroTab.run="Ejecutar macro"
 AdvSceneSwitcher.macroTab.runInParallel="Ejecutar macro en paralelo a otras macros"
-AdvSceneSwitcher.macroTab.onChange="Realizar acciones solo en el cambio de condición"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.copy="Crear copia"
 AdvSceneSwitcher.macroTab.expandAll="Expandir todo"
@@ -241,14 +240,14 @@ AdvSceneSwitcher.condition.replay.state.started="Búfer de reproducción iniciad
 AdvSceneSwitcher.condition.replay.state.saved="Búfer de reproducción guardado"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Fecha"
-AdvSceneSwitcher.condition.date.anyDay="Cualquier día"
-AdvSceneSwitcher.condition.date.monday="Lunes"
-AdvSceneSwitcher.condition.date.tuesday="Martes"
-AdvSceneSwitcher.condition.date.wednesday="Miércoles"
-AdvSceneSwitcher.condition.date.thursday="Jueves"
-AdvSceneSwitcher.condition.date.friday="Viernes"
-AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.condition.date.sunday="Domingo"
+AdvSceneSwitcher.day.any="Cualquier día"
+AdvSceneSwitcher.day.monday="Lunes"
+AdvSceneSwitcher.day.tuesday="Martes"
+AdvSceneSwitcher.day.wednesday="Miércoles"
+AdvSceneSwitcher.day.thursday="Jueves"
+AdvSceneSwitcher.day.friday="Viernes"
+AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.day.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="A las"
 AdvSceneSwitcher.condition.date.state.after="Después"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -258,11 +257,12 @@ AdvSceneSwitcher.condition.date.ignoreDate="Si no se marca, se ignorará el comp
 AdvSceneSwitcher.condition.date.ignoreTime="Si no se marca, se ignorará el componente de tiempo"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Mostrar configuración avanzada"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Mostrar configuración simple"
-AdvSceneSwitcher.condition.date.entry.simple="El {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} Repetir cada {{duration}} en la coincidencia de fechas"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima coincidencia en: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
+AdvSceneSwitcher.condition.date.layout.simple.day="El{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} Repetir cada {{duration}} en la coincidencia de fechas"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Próxima coincidencia en: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
 AdvSceneSwitcher.condition.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtener transformación"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="coincide con la transformación"
@@ -350,7 +350,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.show="Mostrar"
 AdvSceneSwitcher.action.sceneVisibility.type.hide="Ocultar"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Fuente"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Cualquiera"
-AdvSceneSwitcher.action.sceneVisibility.entry="En{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="En{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Deshabilitar"
@@ -680,8 +680,6 @@ AdvSceneSwitcher.status.inactive="Inactivo"
 AdvSceneSwitcher.running="Iniciar complemento"
 AdvSceneSwitcher.stopped="Complemento de detención"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Esta parece ser la primera vez que se inicia el conmutador de escena avanzado.<br>Por favor, eche un vistazo a <a href=\"https:/ /github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> para obtener una lista de guías y ejemplos.<br>No dude en hacer preguntas en el complemento <a href=\"https://obsproject.com /forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">hilo</span></a> en los foros de OBS!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="¡Se detuvo el desarrollo de esta pestaña!\nConsidere cambiar a macros en su lugar.\nEsta sugerencia se puede desactivar en la pestaña General".
 
 AdvSceneSwitcher.unit.milliseconds="milisegundos"

data/locale/fr-FR.ini

@@ -78,7 +78,6 @@ AdvSceneSwitcher.macroTab.add="Ajouter une nouvelle macro"
 AdvSceneSwitcher.macroTab.name="Nom :"
 AdvSceneSwitcher.macroTab.run="Exécuter la macro"
 AdvSceneSwitcher.macroTab.runInParallel="Exécuter la macro en parallèle avec d'autres macros"
-AdvSceneSwitcher.macroTab.onChange="Exécuter des actions uniquement en cas de changement de condition"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Groupe %1"
 AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text="Êtes-vous sûr de vouloir supprimer \"%1\" ?"
@@ -356,14 +355,14 @@ AdvSceneSwitcher.condition.replay.state.stopped="Tampon de répétition arrêté
 AdvSceneSwitcher.condition.replay.state.started="Tampon de répétition démarré"
 AdvSceneSwitcher.condition.replay.state.saved="Tampon de répétition enregistré"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.condition.date.anyDay="N'importe quel jour"
-AdvSceneSwitcher.condition.date.monday="Lundi"
-AdvSceneSwitcher.condition.date.tuesday="Mardi"
-AdvSceneSwitcher.condition.date.wednesday="Mercredi"
-AdvSceneSwitcher.condition.date.thursday="Jeudi"
-AdvSceneSwitcher.condition.date.friday="Vendredi"
-AdvSceneSwitcher.condition.date.saturday="Samedi"
-AdvSceneSwitcher.condition.date.sunday="Dimanche"
+AdvSceneSwitcher.day.any="N'importe quel jour"
+AdvSceneSwitcher.day.monday="Lundi"
+AdvSceneSwitcher.day.tuesday="Mardi"
+AdvSceneSwitcher.day.wednesday="Mercredi"
+AdvSceneSwitcher.day.thursday="Jeudi"
+AdvSceneSwitcher.day.friday="Vendredi"
+AdvSceneSwitcher.day.saturday="Samedi"
+AdvSceneSwitcher.day.sunday="Dimanche"
 AdvSceneSwitcher.condition.date.state.at="À"
 AdvSceneSwitcher.condition.date.state.after="Après"
 AdvSceneSwitcher.condition.date.state.before="Avant"
@@ -374,11 +373,12 @@ AdvSceneSwitcher.condition.date.ignoreDate="Si non cochée, la composante date s
 AdvSceneSwitcher.condition.date.ignoreTime="Si non cochée, la composante heure sera ignorée"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Afficher les paramètres avancés"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Afficher les paramètres simples"
-AdvSceneSwitcher.condition.date.entry.simple="Le{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Répéter toutes les{{duration}}lorsque la date correspond"
-AdvSceneSwitcher.condition.date.entry.pattern="La date actuelle \"{{currentDate}}\" correspond au motif{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Prochaine correspondance à : %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
+AdvSceneSwitcher.condition.date.layout.simple.day="Le{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Répéter toutes les{{duration}}lorsque la date correspond"
+AdvSceneSwitcher.condition.date.layout.pattern="La date actuelle \"{{currentDate}}\" correspond au motif{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Prochaine correspondance à : %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
 AdvSceneSwitcher.condition.sceneTransform="Transformation de l'élément de la scène"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtenir la transformation"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="correspond à la transformation"
@@ -510,7 +510,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Masquer"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Basculer"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="N'importe"
-AdvSceneSwitcher.action.sceneVisibility.entry="Sur{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Sur{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtre"
 AdvSceneSwitcher.action.filter.type.enable="Activer"
 AdvSceneSwitcher.action.filter.type.disable="Désactiver"
@@ -701,8 +701,8 @@ AdvSceneSwitcher.action.variable.invalidSelection="Sélection invalide !"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="La récupération de valeurs de variables à partir d'actions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="La récupération de valeurs de variables à partir de conditions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valeur actuelle :"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Utiliser un message personnalisé{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Remplir avec un indicateur de position{{inputPlaceholder}}"
 AdvSceneSwitcher.action.projector="Projecteur"
@@ -1122,8 +1122,6 @@ AdvSceneSwitcher.status.inactive="Inactif"
 AdvSceneSwitcher.running="Plugin en cours d'exécution"
 AdvSceneSwitcher.stopped="Plugin arrêté"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Il semble que ce soit la première fois que l'Advanced Scene Switcher est démarré.<br>Veuillez consulter le <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> pour obtenir une liste de guides et d'exemples.<br>N'hésitez pas à poser des questions dans le <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">fil de discussion</span></a> du plugin sur les forums OBS !</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Le développement de cet onglet est terminé !\nVeuillez envisager de passer à l'utilisation des Macros à la place.\nCette astuce peut être désactivée dans l'onglet Général."
 
 AdvSceneSwitcher.unit.milliseconds="millisecondes"

data/locale/ja-JP.ini

@@ -164,7 +164,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="条件に関係なくすべてのマク
 AdvSceneSwitcher.macroTab.runElse="マクロ実行（else）"
 AdvSceneSwitcher.macroTab.runFail="\"%1\" の実行に失敗しました!\nいずれかのアクションが失敗したか、マクロがすでに実行されています。\n停止しますか？"
 AdvSceneSwitcher.macroTab.runInParallel="他のマクロと並行してマクロを実行する"
-AdvSceneSwitcher.macroTab.onChange="条件変更時のみアクションを実行"
 AdvSceneSwitcher.macroTab.defaultname="マクロ %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="グループ %1"
 AdvSceneSwitcher.macroTab.macroNameExists="名前 \"%1\" は既にマクロで使用されています。"
@@ -555,14 +554,14 @@ AdvSceneSwitcher.condition.replay.state.started="リプレイバッファを開
 AdvSceneSwitcher.condition.replay.state.saved="リプレイバッファを保存"
 ; AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="日付条件"
-AdvSceneSwitcher.condition.date.anyDay="いつでも"
-AdvSceneSwitcher.condition.date.monday="月曜日"
-AdvSceneSwitcher.condition.date.tuesday="火曜日"
-AdvSceneSwitcher.condition.date.wednesday="水曜日"
-AdvSceneSwitcher.condition.date.thursday="木曜日"
-AdvSceneSwitcher.condition.date.friday="金曜日"
-AdvSceneSwitcher.condition.date.saturday="土曜日"
-AdvSceneSwitcher.condition.date.sunday="日曜日"
+AdvSceneSwitcher.day.any="いつでも"
+AdvSceneSwitcher.day.monday="月曜日"
+AdvSceneSwitcher.day.tuesday="火曜日"
+AdvSceneSwitcher.day.wednesday="水曜日"
+AdvSceneSwitcher.day.thursday="木曜日"
+AdvSceneSwitcher.day.friday="金曜日"
+AdvSceneSwitcher.day.saturday="土曜日"
+AdvSceneSwitcher.day.sunday="日曜日"
 ; AdvSceneSwitcher.condition.date.state.at="At"
 AdvSceneSwitcher.condition.date.state.after="アフター"
 AdvSceneSwitcher.condition.date.state.before="前"
@@ -573,12 +572,9 @@ AdvSceneSwitcher.condition.date.ignoreDate="チェックを外すと日付部分
 AdvSceneSwitcher.condition.date.ignoreTime="チェックを外すと時間要素は無視されます"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="詳細設定を表示"
 AdvSceneSwitcher.condition.date.showSimpleSettings="簡単設定を表示"
-; AdvSceneSwitcher.condition.date.entry.simple="On{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-; AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}日付の一致ごとに{{duration}}繰り返します"
-AdvSceneSwitcher.condition.date.entry.pattern="現在の日付「{{currentDate}}」はパターン{{pattern}}と一致します"
-; AdvSceneSwitcher.condition.date.entry.nextMatchDate="Next match at: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}繰り返しの場合、選択した日付を繰り返しの日付に更新します"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}日付の一致ごとに{{duration}}繰り返します"
+AdvSceneSwitcher.condition.date.layout.pattern="現在の日付「{{currentDate}}」はパターン{{pattern}}と一致します"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}繰り返しの場合、選択した日付を繰り返しの日付に更新します"
 ; AdvSceneSwitcher.condition.sceneTransform="Scene item transform"
 ; AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="現在の値を取得"
@@ -870,7 +866,6 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="非表示"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="切り替え"
 ; AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 ; AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
-; AdvSceneSwitcher.action.sceneVisibility.entry="On{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="フィルタ"
 AdvSceneSwitcher.action.filter.type.enable="有効にする"
 AdvSceneSwitcher.action.filter.type.disable="無効化"
@@ -1149,8 +1144,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="現在値："
 ; AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{paddingCharSelection}}を{{direction}}に追加します。"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{direction}}から文字を削除します。"
-AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:"
+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.customPrompt="{{useCustomPrompt}}カスタム プロンプトを使用する{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}プレースホルダーを入力{{inputPlaceholder}}"
@@ -2256,8 +2251,6 @@ AdvSceneSwitcher.status.inactive="停止中"
 AdvSceneSwitcher.running="プラグイン実行中"
 AdvSceneSwitcher.stopped="プラグイン停止しました"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>高機能シーンスイッチャーが初めて起動したようです。<br>ガイドと使用例については <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> をご覧ください。<br>質問は <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">OBSフォーラムのプラグインのスレッド</span></a> で遠慮なくどうぞ！</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="このタブの開発は停止しました！\n代わりにマクロの使用に移行することを検討してください。\nこのヒントは [全般] タブで無効にすることができます。"
 
 AdvSceneSwitcher.unit.milliseconds="ミリ秒"

data/locale/pt-BR.ini

@@ -147,7 +147,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="Execute todas as ações da macro indepen
 AdvSceneSwitcher.macroTab.runElse="Executar macro (alternativa)"
 AdvSceneSwitcher.macroTab.runFail="Falha ao executar \"%1\"!\nUma das ações falhou ou a macro já está em execução.\nDeseja interrompê-la?"
 AdvSceneSwitcher.macroTab.runInParallel="Executar macro em paralelo com outras macros"
-AdvSceneSwitcher.macroTab.onChange="Executar ações apenas quando houver mudança na condição"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Grupo %1"
 AdvSceneSwitcher.macroTab.macroNameExists="O nome \"%1\" já está em uso por uma macro."
@@ -502,14 +501,14 @@ AdvSceneSwitcher.condition.replay.state.started="Buffer de replay iniciado"
 AdvSceneSwitcher.condition.replay.state.saved="Buffer de replay salvo"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Data"
-AdvSceneSwitcher.condition.date.anyDay="Qualquer dia"
-AdvSceneSwitcher.condition.date.monday="Segunda-feira"
-AdvSceneSwitcher.condition.date.tuesday="Terça-feira"
-AdvSceneSwitcher.condition.date.wednesday="Quarta-feira"
-AdvSceneSwitcher.condition.date.thursday="Quinta-feira"
-AdvSceneSwitcher.condition.date.friday="Sexta-feira"
-AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.condition.date.sunday="Domingo"
+AdvSceneSwitcher.day.any="Qualquer dia"
+AdvSceneSwitcher.day.monday="Segunda-feira"
+AdvSceneSwitcher.day.tuesday="Terça-feira"
+AdvSceneSwitcher.day.wednesday="Quarta-feira"
+AdvSceneSwitcher.day.thursday="Quinta-feira"
+AdvSceneSwitcher.day.friday="Sexta-feira"
+AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.day.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="Às"
 AdvSceneSwitcher.condition.date.state.after="Após"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -520,12 +519,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="Se desmarcado, o componente de data
 AdvSceneSwitcher.condition.date.ignoreTime="Se desmarcado, o componente de tempo será ignorado"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Mostrar configurações avançadas"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Mostrar configurações simples"
-AdvSceneSwitcher.condition.date.entry.simple="Em{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Repetir a cada{{duration}}em correspondência de data"
-AdvSceneSwitcher.condition.date.entry.pattern="Data atual \"{{currentDate}}\" corresponde ao padrão{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima correspondência em: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}Ao repetir, atualize a data selecionada para a data de repetição"
+AdvSceneSwitcher.condition.date.layout.simple.day="Em{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Repetir a cada{{duration}}em correspondência de data"
+AdvSceneSwitcher.condition.date.layout.pattern="Data atual \"{{currentDate}}\" corresponde ao padrão{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Próxima correspondência em: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}Ao repetir, atualize a data selecionada para a data de repetição"
 AdvSceneSwitcher.condition.sceneTransform="Transformação do item de cena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obter transformação"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="Obter valor atual"
@@ -781,7 +781,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Ocultar"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Alternar"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Fonte"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Qualquer"
-AdvSceneSwitcher.action.sceneVisibility.entry="Em{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Em{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Desabilitar"
@@ -1030,8 +1030,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Obter valores de va
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valor atual:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}de{{variables}}para comprimento{{stringLength}}adicionando{{paddingCharSelection}}ao{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}de{{variables}}para comprimento{{stringLength}}removendo caracteres da{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Usar prompt personalizado{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Preencher com placeholder{{inputPlaceholder}}"
@@ -1871,8 +1871,6 @@ AdvSceneSwitcher.status.inactive="Inativo"
 AdvSceneSwitcher.running="Plugin em execução"
 AdvSceneSwitcher.stopped="Plugin parado"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Parece que esta é a primeira vez que o Advanced Scene Switcher está sendo iniciado.<br>Por favor, consulte o <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> para uma lista de guias e exemplos.<br>Não hesite em fazer perguntas no <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">tópico</span></a> do plugin nos fóruns do OBS!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Desenvolvimento para esta aba interrompido!\nPor favor, considere a transição para o uso de Macros em vez disso.\nEsta dica pode ser desativada na aba Geral."
 
 AdvSceneSwitcher.unit.milliseconds="milissegundos"

data/locale/tr-TR.ini

@@ -72,7 +72,6 @@ AdvSceneSwitcher.macroTab.add="Yeni Makro ekle"
 AdvSceneSwitcher.macroTab.name="İsim:"
 AdvSceneSwitcher.macroTab.run="Makro Çalıştırma"
 AdvSceneSwitcher.macroTab.runInParallel="Makroyu diğer makrolara paralel olarak çalıştırın"
-AdvSceneSwitcher.macroTab.onChange="Eylemleri yalnızca koşul değişikliğinde gerçekleştirin"
 AdvSceneSwitcher.macroTab.defaultname="Makro %1"
 AdvSceneSwitcher.macroTab.copy="Kopya oluştur"
 AdvSceneSwitcher.macroTab.expandAll="Hepsini Genişlet"
@@ -281,7 +280,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.show="Göster"
 AdvSceneSwitcher.action.sceneVisibility.type.hide="Gizle"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Kayıt"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Herhangi"
-AdvSceneSwitcher.action.sceneVisibility.entry="Açık{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Açık{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtrele"
 AdvSceneSwitcher.action.filter.type.enable="Etkin"
 AdvSceneSwitcher.action.filter.type.disable="Etkisiz"
@@ -587,8 +586,6 @@ AdvSceneSwitcher.status.inactive="İnaktif"
 AdvSceneSwitcher.running="Eklenti çalışıyor"
 AdvSceneSwitcher.stopped="Eklenti durdu"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Gelişmiş Sahne Değiştirici ilk kez başlatılıyor gibi görünüyor.<br>Lütfen <a href=\"https://github.com/ adresine bir göz atın. WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> için kılavuzlar ve örnekler listesi.<br>Yapmayın. eklentinin <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:# sayfasında soru sormaktan çekinmeyin OBS forumlarında 268bd2;\">konu</span></a>!</p></body></html>"
-
 AdvSceneSwitcher.unit.milliseconds="millisaniye"
 AdvSceneSwitcher.unit.seconds="saniye"
 AdvSceneSwitcher.unit.minutes="dakika"

data/locale/zh-CN.ini

@@ -151,7 +151,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="无论条件如何，都运行所有宏
 AdvSceneSwitcher.macroTab.runElse="运行宏（不满足条件）"
 AdvSceneSwitcher.macroTab.runFail="运行 \"%1\" 失败!\n要么其中一个操作失败，要么宏已在运行中.\n你想停止它吗?"
 AdvSceneSwitcher.macroTab.runInParallel="与其他宏并行运行宏"
-AdvSceneSwitcher.macroTab.onChange="仅在条件结果发生变化时执行操作(条件结果不变时只执行一次操作)"
 AdvSceneSwitcher.macroTab.defaultname="宏 %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="分组 %1"
 AdvSceneSwitcher.macroTab.macroNameExists="名称 \"%1\" 已被宏使用."
@@ -530,14 +529,14 @@ AdvSceneSwitcher.condition.replay.state.started="回放缓存已启动"
 AdvSceneSwitcher.condition.replay.state.saved="已保存回放缓存"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="日期"
-AdvSceneSwitcher.condition.date.anyDay="每一天"
-AdvSceneSwitcher.condition.date.monday="周一"
-AdvSceneSwitcher.condition.date.tuesday="周二"
-AdvSceneSwitcher.condition.date.wednesday="周三"
-AdvSceneSwitcher.condition.date.thursday="周四"
-AdvSceneSwitcher.condition.date.friday="周五"
-AdvSceneSwitcher.condition.date.saturday="周六"
-AdvSceneSwitcher.condition.date.sunday="周日"
+AdvSceneSwitcher.day.any="每一天"
+AdvSceneSwitcher.day.monday="周一"
+AdvSceneSwitcher.day.tuesday="周二"
+AdvSceneSwitcher.day.wednesday="周三"
+AdvSceneSwitcher.day.thursday="周四"
+AdvSceneSwitcher.day.friday="周五"
+AdvSceneSwitcher.day.saturday="周六"
+AdvSceneSwitcher.day.sunday="周日"
 AdvSceneSwitcher.condition.date.state.at="现在"
 AdvSceneSwitcher.condition.date.state.after="之后"
 AdvSceneSwitcher.condition.date.state.before="之前"
@@ -548,12 +547,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="如果未选中，日期组件将被
 AdvSceneSwitcher.condition.date.ignoreTime="如果未选中，时间组件将被忽略"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="显示高级设置"
 AdvSceneSwitcher.condition.date.showSimpleSettings="显示简单设置"
-AdvSceneSwitcher.condition.date.entry.simple="{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} 每 {{duration}} 重复一次时间/日期匹配"
-AdvSceneSwitcher.condition.date.entry.pattern="当前日期 \"{{currentDate}}\" 与 {{pattern}} 模式匹配 , 例子:2025 03 18 24 00 00 = .... .. .. .. .. .. ，难崩，我测试了一段时间才明白"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="下一次匹配 在: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} 在重复时将选定日期更新为重复日期"
+AdvSceneSwitcher.condition.date.layout.simple.day="{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} 每 {{duration}} 重复一次时间/日期匹配"
+AdvSceneSwitcher.condition.date.layout.pattern="当前日期 \"{{currentDate}}\" 与 {{pattern}} 模式匹配 , 例子:2025 03 18 24 00 00 = .... .. .. .. .. .. ，难崩，我测试了一段时间才明白"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="下一次匹配 在: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} 在重复时将选定日期更新为重复日期"
 AdvSceneSwitcher.condition.sceneTransform="场景项目变换"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="获取变换"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="获取当前值"
@@ -840,7 +840,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="隐藏"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="切换可见性"
 AdvSceneSwitcher.action.sceneVisibility.type.source="源"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="任何"
-AdvSceneSwitcher.action.sceneVisibility.entry="{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="滤镜"
 AdvSceneSwitcher.action.filter.type.enable="开启"
 AdvSceneSwitcher.action.filter.type.disable="关闭"
@@ -1100,8 +1100,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="不支持从 %1 条
 AdvSceneSwitcher.action.variable.currentSegmentValue="当前值:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}于{{variables}}的{{direction}}起，内容为{{paddingCharSelection}}将其变量值长度增加至{{stringLength}}."
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}于{{variables}}的{{direction}}起，将变量长度缩减至{{stringLength}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="截取字符串开始位置:{{subStringStart}} 截取字符串长度:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="使用正则表达式为 {{regexMatchIdx}} 匹配的值:"
+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.customPrompt="{{useCustomPrompt}}使用自定义提示{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}用占位符填充{{inputPlaceholder}}"
@@ -2115,8 +2115,6 @@ AdvSceneSwitcher.status.inactive="已停止"
 AdvSceneSwitcher.running="插件正在运行"
 AdvSceneSwitcher.stopped="插件已停止"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>这似乎是您第一次启动高级场景切换器.<br>请看一下 <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> 查看指南和示例列表.<br>如果有问题，在在OBS论坛插件帖子内提问 <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">thread</span></a></p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="此选项卡的开发已停止！请考虑转换为使用宏来代替。\n可以在“常规”选项卡上禁用此提示."
 
 AdvSceneSwitcher.unit.milliseconds="毫秒"

forms/advanced-scene-switcher.ui

@@ -68,7 +68,7 @@
             <x>0</x>
             <y>0</y>
             <width>962</width>
-            <height>1160</height>
+            <height>1190</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -565,6 +565,13 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="openSetupWizard">
+             <property name="text">
+              <string>FirstRunWizard.openButton</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -786,25 +793,19 @@
               </widget>
              </item>
              <item>
-              <widget class="QCheckBox" name="runMacroOnChange">
-               <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
+              <widget class="QLabel" name="label_18">
                <property name="text">
-                <string/>
+                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.label</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_18">
+              <widget class="QComboBox" name="actionTriggerMode">
                <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
-               <property name="text">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
-               <property name="wordWrap">
-                <bool>true</bool>
+                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.tooltip</string>
                </property>
               </widget>
              </item>
@@ -4118,7 +4119,7 @@
   <tabstop>macroName</tabstop>
   <tabstop>runMacro</tabstop>
   <tabstop>runMacroInParallel</tabstop>
-  <tabstop>runMacroOnChange</tabstop>
+  <tabstop>actionTriggerMode</tabstop>
   <tabstop>macroSettings</tabstop>
   <tabstop>macroEdit</tabstop>
   <tabstop>sceneGroups</tabstop>

lib/advanced-scene-switcher.cpp

@@ -1,5 +1,6 @@
 #include "advanced-scene-switcher.hpp"
 #include "backup.hpp"
+#include "crash-handler.hpp"
 #include "log-helper.hpp"
 #include "macro-helpers.hpp"
 #include "obs-module-helper.hpp"
@@ -191,25 +192,21 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
 
 		switcher->m.lock();
 		if (switcher->VersionChanged(data, g_GIT_SHA1)) {
-			auto json = obs_data_get_json(data);
-			static QString jsonQString = json ? json : "";
-			std::thread t([]() {
-				obs_queue_task(
-					OBS_TASK_UI,
-					[](void *) {
-						AskForBackup(jsonQString);
-					},
-					nullptr, false);
-			});
-			t.detach();
+			AskForBackup(data);
 		}
 
 		switcher->LoadSettings(data);
 		switcher->m.unlock();
 
-		if (!switcher->stop) {
-			switcher->Start();
+		if (switcher->stop) {
+			return;
 		}
+
+		if (ShouldSkipPluginStartOnUncleanShutdown()) {
+			return;
+		}
+
+		switcher->Start();
 	}
 }
 

lib/advanced-scene-switcher.hpp

@@ -70,6 +70,7 @@ public slots:
 	void on_priorityUp_clicked();
 	void on_priorityDown_clicked();
 	void on_threadPriority_currentTextChanged(const QString &text);
+	void on_openSetupWizard_clicked();
 
 	/* --- End of legacy tab section --- */
 
@@ -107,7 +108,7 @@ public slots:
 	void on_macroDown_clicked() const;
 	void on_macroName_editingFinished();
 	void on_runMacroInParallel_stateChanged(int value) const;
-	void on_runMacroOnChange_stateChanged(int value) const;
+	void on_actionTriggerMode_currentIndexChanged(int index) const;
 	void MacroSelectionChanged();
 	void ShowMacroContextMenu(const QPoint &);
 	void CopyMacro();

lib/general.cpp

@@ -1,19 +1,18 @@
 #include "advanced-scene-switcher.hpp"
 #include "file-selection.hpp"
 #include "filter-combo-box.hpp"
+#include "first-run-wizard.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
 #include "macro-search.hpp"
 #include "macro-settings.hpp"
 #include "path-helpers.hpp"
-#include "selection-helpers.hpp"
 #include "source-helpers.hpp"
 #include "splitter-helpers.hpp"
 #include "status-control.hpp"
 #include "switcher-data.hpp"
 #include "tab-helpers.hpp"
 #include "ui-helpers.hpp"
-#include "utility.hpp"
 #include "variable.hpp"
 #include "version.h"
 
@@ -361,14 +360,46 @@ void AdvSceneSwitcher::RestoreWindowGeo()
 	}
 }
 
+static void renameMacroIfNecessary(const std::shared_ptr<Macro> &macro)
+{
+	if (!GetMacroByName(macro->Name().c_str())) {
+		return;
+	}
+
+	auto name = macro->Name();
+	int i = 2;
+	while (GetMacroByName((name + " " + std::to_string(i)).c_str())) {
+		i++;
+	}
+
+	macro->SetName(name + " " + std::to_string(i));
+}
+
 void AdvSceneSwitcher::CheckFirstTimeSetup()
 {
-	if (switcher->firstBoot && !switcher->disableHints) {
-		switcher->firstBoot = false;
-		DisplayMessage(
-			obs_module_text("AdvSceneSwitcher.firstBootMessage"));
-		switcher->Start();
+	if (!IsFirstRun() || !GetTopLevelMacros().empty()) {
+		return;
 	}
+
+	auto macro = FirstRunWizard::ShowWizard(this);
+	if (macro) {
+		renameMacroIfNecessary(macro);
+		QTimer::singleShot(0, this,
+				   [this, macro]() { ui->macros->Add(macro); });
+	}
+	switcher->Start();
+}
+
+void AdvSceneSwitcher::on_openSetupWizard_clicked()
+{
+	auto macro = FirstRunWizard::ShowWizard(this);
+	if (!macro) {
+		return;
+	}
+
+	renameMacroIfNecessary(macro);
+	ui->macros->Add(macro);
+	ui->tabWidget->setCurrentWidget(ui->macroTab);
 }
 
 void AdvSceneSwitcher::on_tabWidget_currentChanged(int)

lib/macro/macro-action-variable.cpp

@@ -219,6 +219,43 @@ void MacroActionVariable::GenerateRandomNumber(Variable *var)
 	}
 }
 
+void MacroActionVariable::PickRandomValue(Variable *var)
+{
+	static std::random_device rd;
+	static std::mt19937 gen(rd());
+	static const uint8_t maxIter = 255;
+
+	if (_randomValues.isEmpty()) {
+		return;
+	}
+
+	if (_randomValues.size() == 1) {
+		const auto &value = _randomValues.at(0);
+		var->SetValue(value);
+		_lastRandomValue = value;
+	}
+
+	std::uniform_int_distribution<int> dis(0, _randomValues.size() - 1);
+	StringVariable value = _randomValues.at(dis(gen));
+
+	uint8_t iter = 0;
+	for (; !_allowRepeatValues && iter < maxIter &&
+	       _lastRandomValue.has_value() &&
+	       std::string(value) == _lastRandomValue.value();
+	     iter++) {
+		value = _randomValues.at(dis(gen));
+	}
+
+	if (iter == maxIter) {
+		blog(LOG_INFO,
+		     "giving up picking non-repeat random value after %d tries",
+		     maxIter);
+	}
+
+	var->SetValue(value);
+	_lastRandomValue = value;
+}
+
 struct AskForInputParams {
 	AskForInputParams(const QString &prompt_, const QString &placeholder_)
 		: prompt(prompt_),
@@ -458,6 +495,9 @@ bool MacroActionVariable::PerformAction()
 	case Action::RANDOM_NUMBER:
 		GenerateRandomNumber(var.get());
 		return true;
+	case Action::RANDOM_LIST_VALUE:
+		PickRandomValue(var.get());
+		return true;
 	}
 
 	return true;
@@ -498,6 +538,8 @@ bool MacroActionVariable::Save(obs_data_t *obj) const
 	_randomNumberStart.Save(obj, "randomNumberStart");
 	_randomNumberEnd.Save(obj, "randomNumberEnd");
 	obs_data_set_bool(obj, "generateInteger", _generateInteger);
+	_randomValues.Save(obj, "randomValues", "value");
+	obs_data_set_bool(obj, "allowRepeatValues", _allowRepeatValues);
 	_jsonQuery.Save(obj, "jsonQuery");
 	_jsonIndex.Save(obj, "jsonIndex");
 
@@ -556,6 +598,8 @@ bool MacroActionVariable::Load(obs_data_t *obj)
 	_randomNumberStart.Load(obj, "randomNumberStart");
 	_randomNumberEnd.Load(obj, "randomNumberEnd");
 	_generateInteger = obs_data_get_bool(obj, "generateInteger");
+	_randomValues.Load(obj, "randomValues", "value");
+	_allowRepeatValues = obs_data_get_bool(obj, "allowRepeatValues");
 	_jsonQuery.Load(obj, "jsonQuery");
 	_jsonIndex.Load(obj, "jsonIndex");
 
@@ -724,6 +768,8 @@ static inline void populateActionSelection(QComboBox *list)
 			 "AdvSceneSwitcher.action.variable.type.roundToInt"},
 			{MacroActionVariable::Action::RANDOM_NUMBER,
 			 "AdvSceneSwitcher.action.variable.type.randomNumber"},
+			{MacroActionVariable::Action::RANDOM_LIST_VALUE,
+			 "AdvSceneSwitcher.action.variable.type.randomListValue"},
 			{true, ""}, // Separator
 
 			{MacroActionVariable::Action::USER_INPUT,
@@ -801,11 +847,10 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _segmentValueStatus(new QLabel()),
 	  _segmentValue(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _substringLayout(new QVBoxLayout()),
-	  _subStringIndexEntryLayout(new QHBoxLayout()),
-	  _subStringRegexEntryLayout(new QHBoxLayout()),
+	  _subStringControlsLayout(new QHBoxLayout()),
 	  _subStringStart(new VariableSpinBox(this)),
 	  _subStringSize(new VariableSpinBox(this)),
-	  _substringRegex(new RegexConfigWidget(parent)),
+	  _subStringRegex(new RegexConfigWidget(parent)),
 	  _regexPattern(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _regexMatchIdx(new VariableSpinBox(this)),
 	  _findReplaceLayout(new QHBoxLayout()),
@@ -837,7 +882,13 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		  obs_module_text(
 			  "AdvSceneSwitcher.action.variable.generateInteger"),
 		  this)),
-	  _randomLayout(new QVBoxLayout()),
+	  _randomNumberLayout(new QVBoxLayout()),
+	  _randomValues(new StringListEdit(this)),
+	  _allowRepeatValues(new QCheckBox(
+		  obs_module_text(
+			  "AdvSceneSwitcher.action.variable.type.allowRepeat"),
+		  this)),
+	  _randomValueLayout(new QVBoxLayout()),
 	  _jsonQuery(new VariableLineEdit(this)),
 	  _jsonQueryHelp(new HelpIcon(
 		  obs_module_text(
@@ -873,6 +924,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_randomNumberStart->setMaximum(9999999999);
 	_randomNumberEnd->setMinimum(-9999999999);
 	_randomNumberEnd->setMaximum(9999999999);
+	_randomValues->SetMaxStringSize(99999999);
 	_jsonIndex->setMaximum(999);
 
 	QWidget::connect(_variables, SIGNAL(SelectionChanged(const QString &)),
@@ -901,7 +953,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		_subStringSize,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(SubStringSizeChanged(const NumberVariable<int> &)));
-	QWidget::connect(_substringRegex,
+	QWidget::connect(_subStringRegex,
 			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
 			 SLOT(SubStringRegexChanged(const RegexConfig &)));
 	QWidget::connect(_regexPattern, SIGNAL(textChanged()), this,
@@ -961,6 +1013,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		SLOT(RandomNumberEndChanged(const NumberVariable<double> &)));
 	QWidget::connect(_generateInteger, SIGNAL(stateChanged(int)), this,
 			 SLOT(GenerateIntegerChanged(int)));
+	QWidget::connect(_randomValues,
+			 SIGNAL(StringListChanged(const StringList &)), this,
+			 SLOT(RandomValueListChanged(const StringList &)));
+	QWidget::connect(_allowRepeatValues, SIGNAL(stateChanged(int)), this,
+			 SLOT(AllowRepeatValuesChanged(int)));
 	QWidget::connect(_jsonQuery, SIGNAL(editingFinished()), this,
 			 SLOT(JsonQueryChanged()));
 	QWidget::connect(
@@ -975,9 +1032,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{strValue}}", _strValue},
 		{"{{numValue}}", _numValue},
 		{"{{segmentIndex}}", _segmentIdx},
-		{"{{subStringStart}}", _subStringStart},
-		{"{{subStringSize}}", _subStringSize},
-		{"{{regexMatchIdx}}", _regexMatchIdx},
 		{"{{findRegex}}", _findRegex},
 		{"{{findStr}}", _findStr},
 		{"{{replaceStr}}", _replaceStr},
@@ -1009,12 +1063,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	PlaceWidgets(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.substringIndex"),
-		_subStringIndexEntryLayout, widgetPlaceholders);
-
-	PlaceWidgets(
-		obs_module_text(
-			"AdvSceneSwitcher.action.variable.layout.substringRegex"),
-		_subStringRegexEntryLayout, widgetPlaceholders);
+		_subStringControlsLayout, widgetPlaceholders);
 
 	PlaceWidgets(
 		obs_module_text(
@@ -1035,15 +1084,17 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.randomNumber"),
 		randomLayout, widgetPlaceholders);
-	_randomLayout->addLayout(randomLayout);
-	_randomLayout->addWidget(_generateInteger);
+	_randomNumberLayout->addLayout(randomLayout);
+	_randomNumberLayout->addWidget(_generateInteger);
+
+	_randomValueLayout->addWidget(_randomValues);
+	_randomValueLayout->addWidget(_allowRepeatValues);
 
 	auto regexConfigLayout = new QHBoxLayout;
-	regexConfigLayout->addWidget(_substringRegex);
+	regexConfigLayout->addWidget(_subStringRegex);
 	regexConfigLayout->addStretch();
 
-	_substringLayout->addLayout(_subStringIndexEntryLayout);
-	_substringLayout->addLayout(_subStringRegexEntryLayout);
+	_substringLayout->addLayout(_subStringControlsLayout);
 	_substringLayout->addWidget(_regexPattern);
 	_substringLayout->addLayout(regexConfigLayout);
 
@@ -1056,7 +1107,8 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	layout->addWidget(_mathExpressionResult);
 	layout->addLayout(_promptLayout);
 	layout->addLayout(_placeholderLayout);
-	layout->addLayout(_randomLayout);
+	layout->addLayout(_randomNumberLayout);
+	layout->addLayout(_randomValueLayout);
 	setLayout(layout);
 
 	_entryData = entryData;
@@ -1090,7 +1142,7 @@ void MacroActionVariableEdit::UpdateEntryData()
 			: MacroSegmentSelection::Type::ACTION);
 	_subStringStart->SetValue(_entryData->_subStringStart);
 	_subStringSize->SetValue(_entryData->_subStringSize);
-	_substringRegex->SetRegexConfig(_entryData->_subStringRegex);
+	_subStringRegex->SetRegexConfig(_entryData->_subStringRegex);
 	_findRegex->SetRegexConfig(_entryData->_findRegex);
 	_regexPattern->setPlainText(
 		QString::fromStdString(_entryData->_regexPattern));
@@ -1115,6 +1167,8 @@ void MacroActionVariableEdit::UpdateEntryData()
 	_randomNumberStart->SetValue(_entryData->_randomNumberStart);
 	_randomNumberEnd->SetValue(_entryData->_randomNumberEnd);
 	_generateInteger->setChecked(_entryData->_generateInteger);
+	_allowRepeatValues->setChecked(_entryData->_allowRepeatValues);
+	_randomValues->SetStringList(_entryData->_randomValues);
 	_jsonQuery->setText(_entryData->_jsonQuery);
 	_jsonIndex->SetValue(_entryData->_jsonIndex);
 
@@ -1457,6 +1511,18 @@ void MacroActionVariableEdit::GenerateIntegerChanged(int value)
 	_entryData->_generateInteger = value;
 }
 
+void MacroActionVariableEdit::RandomValueListChanged(const StringList &values)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_randomValues = values;
+}
+
+void MacroActionVariableEdit::AllowRepeatValuesChanged(int value)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_allowRepeatValues = value;
+}
+
 void MacroActionVariableEdit::JsonQueryChanged()
 {
 	GUARD_LOADING_AND_LOCK();
@@ -1495,8 +1561,20 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		{"{{jsonQuery}}", _jsonQuery},
 		{"{{jsonQueryHelp}}", _jsonQueryHelp},
 		{"{{jsonIndex}}", _jsonIndex},
+		{"{{subStringRegex}}", _subStringRegex},
+		{"{{subStringStart}}", _subStringStart},
+		{"{{subStringSize}}", _subStringSize},
+		{"{{regexMatchIdx}}", _regexMatchIdx},
 	};
 
+	for (const auto &[_, widget] : widgetPlaceholders) {
+		_entryLayout->removeWidget(widget);
+		_subStringControlsLayout->removeWidget(widget);
+	}
+
+	ClearLayout(_entryLayout);
+	ClearLayout(_subStringControlsLayout);
+
 	const char *layoutString = "";
 	if (_entryData->_action == MacroActionVariable::Action::PAD) {
 		layoutString = obs_module_text(
@@ -1510,11 +1588,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			"AdvSceneSwitcher.action.variable.layout.other");
 	}
 
-	for (const auto &[_, widget] : widgetPlaceholders) {
-		_entryLayout->removeWidget(widget);
-	}
-
-	ClearLayout(_entryLayout);
 	PlaceWidgets(layoutString, _entryLayout, widgetPlaceholders);
 
 	if (_entryData->_action == MacroActionVariable::Action::SET_VALUE ||
@@ -1561,15 +1634,25 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			MacroActionVariable::Action::SET_ACTION_VALUE ||
 		_entryData->_action ==
 			MacroActionVariable::Action::SET_CONDITION_VALUE);
+
+	bool showRegex = _entryData->_subStringRegex.Enabled();
+	layoutString =
+		showRegex
+			? "AdvSceneSwitcher.action.variable.layout.substringRegex"
+			: "AdvSceneSwitcher.action.variable.layout.substringIndex";
+	PlaceWidgets(obs_module_text(layoutString), _subStringControlsLayout,
+		     widgetPlaceholders);
+	_subStringStart->setVisible(!showRegex);
+	_subStringSize->setVisible(!showRegex);
+	_regexMatchIdx->setVisible(showRegex);
+
 	SetLayoutVisible(_substringLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::SUBSTRING);
-	if (_entryData->_action == MacroActionVariable::Action::SUBSTRING) {
-		bool showRegex = _entryData->_subStringRegex.Enabled();
-		SetLayoutVisible(_subStringIndexEntryLayout, !showRegex);
-		SetLayoutVisible(_subStringRegexEntryLayout, showRegex);
-		_regexPattern->setVisible(showRegex);
-	}
+	_regexPattern->setVisible(
+		showRegex &&
+		_entryData->_action == MacroActionVariable::Action::SUBSTRING);
+
 	SetLayoutVisible(_findReplaceLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::FIND_AND_REPLACE);
@@ -1634,9 +1717,13 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 					  MacroActionVariable::Action::PAD);
 	_caseType->setVisible(_entryData->_action ==
 			      MacroActionVariable::Action::CHANGE_CASE);
-	SetLayoutVisible(_randomLayout,
+	SetLayoutVisible(_randomNumberLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::RANDOM_NUMBER);
+	SetLayoutVisible(
+		_randomValueLayout,
+		_entryData->_action ==
+			MacroActionVariable::Action::RANDOM_LIST_VALUE);
 	_jsonQuery->setVisible(_entryData->_action ==
 			       MacroActionVariable::Action::QUERY_JSON);
 	_jsonQueryHelp->setVisible(_entryData->_action ==

lib/macro/macro-action-variable.hpp

@@ -6,6 +6,7 @@
 #include "resizing-text-edit.hpp"
 #include "scene-selection.hpp"
 #include "single-char-selection.hpp"
+#include "string-list.hpp"
 #include "variable-line-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "variable-spinbox.hpp"
@@ -56,6 +57,7 @@ public:
 		QUERY_JSON,
 		ARRAY_JSON,
 		COPY_VAR,
+		RANDOM_LIST_VALUE,
 	};
 
 	Action _action = Action::SET_VALUE;
@@ -107,6 +109,10 @@ public:
 	DoubleVariable _randomNumberEnd = 100;
 	bool _generateInteger = true;
 
+	StringList _randomValues = {"value1", "value2", "value3"};
+	bool _allowRepeatValues = true;
+	std::optional<std::string> _lastRandomValue;
+
 	StringVariable _jsonQuery = "$.some.nested.value";
 	IntVariable _jsonIndex = 0;
 
@@ -119,6 +125,7 @@ private:
 	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
 	void GenerateRandomNumber(Variable *);
+	void PickRandomValue(Variable *);
 
 	std::weak_ptr<MacroSegment> _macroSegment;
 	int _segmentIdxLoadValue = -1;
@@ -175,6 +182,8 @@ private slots:
 	void RandomNumberStartChanged(const NumberVariable<double> &);
 	void RandomNumberEndChanged(const NumberVariable<double> &);
 	void GenerateIntegerChanged(int);
+	void RandomValueListChanged(const StringList &);
+	void AllowRepeatValuesChanged(int);
 	void JsonQueryChanged();
 	void JsonIndexChanged(const NumberVariable<int> &);
 
@@ -194,11 +203,10 @@ private:
 	QLabel *_segmentValueStatus;
 	ResizingPlainTextEdit *_segmentValue;
 	QVBoxLayout *_substringLayout;
-	QHBoxLayout *_subStringIndexEntryLayout;
-	QHBoxLayout *_subStringRegexEntryLayout;
+	QHBoxLayout *_subStringControlsLayout;
 	VariableSpinBox *_subStringStart;
 	VariableSpinBox *_subStringSize;
-	RegexConfigWidget *_substringRegex;
+	RegexConfigWidget *_subStringRegex;
 	ResizingPlainTextEdit *_regexPattern;
 	VariableSpinBox *_regexMatchIdx;
 	QHBoxLayout *_findReplaceLayout;
@@ -225,7 +233,10 @@ private:
 	VariableDoubleSpinBox *_randomNumberStart;
 	VariableDoubleSpinBox *_randomNumberEnd;
 	QCheckBox *_generateInteger;
-	QVBoxLayout *_randomLayout;
+	QVBoxLayout *_randomNumberLayout;
+	StringListEdit *_randomValues;
+	QCheckBox *_allowRepeatValues;
+	QVBoxLayout *_randomValueLayout;
 	VariableLineEdit *_jsonQuery;
 	QLabel *_jsonQueryHelp;
 	VariableSpinBox *_jsonIndex;

lib/macro/macro-condition.cpp

@@ -7,6 +7,17 @@ MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
 {
 }
 
+bool MacroCondition::EvaluateCondition()
+{
+	bool newValue = CheckCondition();
+	_changed = _previousValue.has_value() && (*_previousValue != newValue);
+	const bool negate = _logic.IsNegationType(GetLogicType());
+	_risingEdge = _changed &&
+		      ((!negate && newValue) || (negate && !newValue));
+	_previousValue = newValue;
+	return newValue;
+}
+
 bool MacroCondition::Save(obs_data_t *obj) const
 {
 	MacroSegment::Save(obj);

lib/macro/macro-condition.hpp

@@ -4,13 +4,19 @@
 #include "duration-modifier.hpp"
 #include "macro-ref.hpp"
 
+#include <optional>
+
 namespace advss {
 
 class EXPORT MacroCondition : public MacroSegment {
 public:
 	MacroCondition(Macro *m, bool supportsVariableValue = false);
 	virtual ~MacroCondition() = default;
-	virtual bool CheckCondition() = 0;
+
+	bool EvaluateCondition();
+	bool HasChanged() const { return _changed; }
+	bool IsRisingEdge() const { return _risingEdge; }
+
 	virtual bool Save(obs_data_t *obj) const = 0;
 	virtual bool Load(obs_data_t *obj) = 0;
 
@@ -28,9 +34,15 @@ public:
 
 	static std::string_view GetDefaultID();
 
+protected:
+	virtual bool CheckCondition() = 0;
+
 private:
 	Logic _logic = Logic(Logic::Type::ROOT_NONE);
 	DurationModifier _durationModifier;
+	std::optional<bool> _previousValue;
+	bool _changed = false;
+	bool _risingEdge = false;
 };
 
 class EXPORT MacroRefCondition : virtual public MacroCondition {

lib/macro/macro-edit.hpp

@@ -8,9 +8,6 @@ namespace advss {
 class Macro;
 class MacroSegment;
 
-/*******************************************************************************
- * Advanced Scene Switcher window
- *******************************************************************************/
 class MacroEdit : public QWidget {
 	Q_OBJECT
 

lib/macro/macro-helpers.cpp

@@ -242,6 +242,11 @@ bool RunMacroActions(Macro *macro)
 	return macro && macro->PerformActions(true);
 }
 
+bool RunMacroElseActions(Macro *macro)
+{
+	return macro && macro->PerformActions(false);
+}
+
 void ResetMacroConditionTimers(Macro *macro)
 {
 	if (!macro) {

lib/macro/macro-helpers.hpp

@@ -8,7 +8,6 @@
 #include <condition_variable>
 #include <deque>
 #include <optional>
-#include <string_view>
 #include <thread>
 
 struct obs_data;
@@ -69,6 +68,7 @@ EXPORT void AddMacroHelperThread(Macro *, std::thread &&);
 EXPORT bool CheckMacros();
 
 EXPORT bool RunMacroActions(Macro *);
+bool RunMacroElseActions(Macro *);
 EXPORT bool RunMacros();
 void StopAllMacros();
 

lib/macro/macro-selection.cpp

@@ -51,6 +51,7 @@ void MacroSelection::HideSelectedMacro()
 		return;
 	}
 
+#ifndef UNIT_TEST
 	const auto m = ssWindow->ui->macros->GetCurrentMacro();
 	if (!m) {
 		return;
@@ -61,6 +62,7 @@ void MacroSelection::HideSelectedMacro()
 	}
 
 	qobject_cast<QListView *>(view())->setRowHidden(idx, true);
+#endif // !UNIT_TEST
 }
 
 void MacroSelection::HideGroups()

lib/macro/macro-tab.cpp

@@ -25,6 +25,8 @@ namespace advss {
 
 static QObject *addPulse = nullptr;
 static QTimer onChangeHighlightTimer;
+static std::chrono::high_resolution_clock::time_point
+	lastOnChangeHighlightCheckTime{};
 
 static void disableAddButtonHighlight()
 {
@@ -472,14 +474,17 @@ void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value) const
 	macro->SetRunInParallel(value);
 }
 
-void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value) const
+void AdvSceneSwitcher::on_actionTriggerMode_currentIndexChanged(int index) const
 {
 	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
+
 	auto lock = LockContext();
-	macro->SetMatchOnChange(value);
+	const auto mode = static_cast<Macro::ActionTriggerMode>(
+		ui->actionTriggerMode->itemData(index).toInt());
+	macro->SetActionTriggerMode(mode);
 }
 
 void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) const
@@ -487,7 +492,7 @@ void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) const
 	ui->macroName->setDisabled(disable);
 	ui->runMacro->setDisabled(disable);
 	ui->runMacroInParallel->setDisabled(disable);
-	ui->runMacroOnChange->setDisabled(disable);
+	ui->actionTriggerMode->setDisabled(disable);
 	ui->macroEdit->SetControlsDisabled(disable);
 }
 
@@ -517,10 +522,12 @@ void AdvSceneSwitcher::MacroSelectionChanged()
 	{
 		const QSignalBlocker b1(ui->macroName);
 		const QSignalBlocker b2(ui->runMacroInParallel);
-		const QSignalBlocker b3(ui->runMacroOnChange);
+		const QSignalBlocker b3(ui->actionTriggerMode);
 		ui->macroName->setText(macro->Name().c_str());
 		ui->runMacroInParallel->setChecked(macro->RunInParallel());
-		ui->runMacroOnChange->setChecked(macro->MatchOnChange());
+		ui->actionTriggerMode->setCurrentIndex(
+			ui->actionTriggerMode->findData(static_cast<int>(
+				macro->GetActionTriggerMode())));
 	}
 
 	macro->ResetUIHelpers();
@@ -550,10 +557,14 @@ void AdvSceneSwitcher::HighlightOnChange() const
 		return;
 	}
 
-	if (macro->OnChangePreventedActionsRecently()) {
-		HighlightWidget(ui->runMacroOnChange, Qt::yellow,
+	if (macro->ActionTriggerModePreventedActionsSince(
+		    lastOnChangeHighlightCheckTime)) {
+		HighlightWidget(ui->actionTriggerMode, Qt::yellow,
 				Qt::transparent, true);
 	}
+
+	lastOnChangeHighlightCheckTime =
+		std::chrono::high_resolution_clock::now();
 }
 
 void AdvSceneSwitcher::on_macroSettings_clicked()
@@ -652,6 +663,8 @@ void AdvSceneSwitcher::SetupMacroTab()
 	ui->macroPriorityWarning->setVisible(
 		switcher->functionNamesByPriority[0] != macro_func);
 
+	lastOnChangeHighlightCheckTime =
+		std::chrono::high_resolution_clock::now();
 	onChangeHighlightTimer.setInterval(1500);
 	connect(&onChangeHighlightTimer, SIGNAL(timeout()), this,
 		SLOT(HighlightOnChange()));
@@ -674,6 +687,24 @@ void AdvSceneSwitcher::SetupMacroTab()
 				ui->macroSearchRegex,
 				ui->macroSearchShowSettings,
 				[this]() { ui->macros->RefreshFilter(); });
+
+	static const std::vector<
+		std::pair<Macro::ActionTriggerMode, const char *>>
+		actionTriggerModes = {
+			{Macro::ActionTriggerMode::ALWAYS,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.always"},
+			{Macro::ActionTriggerMode::MACRO_RESULT_CHANGED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onOverallChange"},
+			{Macro::ActionTriggerMode::ANY_CONDITION_CHANGED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionChange"},
+			{Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionTriggered"},
+		};
+
+	for (const auto &[mode, name] : actionTriggerModes) {
+		ui->actionTriggerMode->addItem(obs_module_text(name),
+					       static_cast<int>(mode));
+	}
 }
 
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)

lib/macro/macro-tree.cpp

@@ -5,18 +5,17 @@
 #include "path-helpers.hpp"
 #include "sync-helpers.hpp"
 #include "ui-helpers.hpp"
-#include "utility.hpp"
 
 #include <obs.h>
 #include <string>
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpacerItem>
-#include <QPushButton>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QStylePainter>
+#include <QToolTip>
 
 Q_DECLARE_METATYPE(std::shared_ptr<advss::Macro>);
 
@@ -62,12 +61,11 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,
 
 	_boxLayout = new QHBoxLayout();
 	_boxLayout->setContentsMargins(0, 0, 0, 0);
-	_boxLayout->addWidget(_running);
 	if (isGroup) {
 		_boxLayout->addWidget(_iconLabel);
 		_boxLayout->addSpacing(2);
-		_running->hide();
 	}
+	_boxLayout->addWidget(_running);
 	_boxLayout->addWidget(_label);
 #ifdef __APPLE__
 	/* Hack: Fixes a bug where scrollbars would be above the lock icon */
@@ -77,29 +75,138 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,
 	Update(true);
 	setLayout(_boxLayout);
 
-	auto setRunning = [this](bool val) {
-		_macro->SetPaused(!val);
-	};
-	connect(_running, &QAbstractButton::clicked, setRunning);
+	connect(_running, SIGNAL(clicked(bool)), this,
+		SLOT(RunningClicked(bool)));
 	connect(MacroSignalManager::Instance(), SIGNAL(HighlightChanged(bool)),
 		this, SLOT(EnableHighlight(bool)));
 	connect(MacroSignalManager::Instance(),
 		SIGNAL(Rename(const QString &, const QString &)), this,
 		SLOT(MacroRenamed(const QString &, const QString &)));
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(HighlightIfExecuted()));
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdatePaused()));
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdateRunning()));
+
+	UpdateRunning();
 	_timer.start(1500);
 }
 
+bool MacroTreeItem::event(QEvent *event)
+{
+	if (event->type() != QEvent::ToolTip) {
+		return QFrame::event(event);
+	}
+
+	if (_macro->IsGroup()) {
+		return true;
+	}
+
+	QString text;
+	if (!_macro->WasExecutedSince({})) {
+		text = obs_module_text(
+			"AdvSceneSwitcher.macroTab.macroNotYetExecutedTooltip");
+	} else {
+		const QString formatStr = obs_module_text(
+			"AdvSceneSwitcher.macroTab.macroLastExecutedTooltip");
+		const auto secondsSinceLastRun =
+			std::chrono::duration_cast<std::chrono::seconds>(
+				std::chrono::high_resolution_clock::now() -
+				_macro->GetLastExecutionTime());
+		text = formatStr.arg(secondsSinceLastRun.count());
+	}
+
+	auto helpEvent = static_cast<QHelpEvent *>(event);
+	QToolTip::showText(helpEvent->globalPos(), text, this);
+	return true;
+}
+
 void MacroTreeItem::EnableHighlight(bool enable)
 {
 	_highlight = enable;
 }
 
-void MacroTreeItem::UpdatePaused()
+void MacroTreeItem::RunningClicked(bool running)
+{
+	const auto updateWidget = [this](Macro *macro) {
+		if (!macro) {
+			return;
+		}
+
+		const auto &macros = GetTopLevelMacros();
+
+		bool found = false;
+		int idx = 0;
+		for (const auto &m : macros) {
+			if (m.get() == macro) {
+				found = true;
+				break;
+			}
+			idx++;
+		}
+
+		if (!found) {
+			return;
+		}
+
+		const auto widget = _tree->GetItemWidget(idx);
+		if (widget) {
+			widget->UpdateRunning();
+		}
+	};
+
+	if (!_macro->IsGroup()) {
+		_macro->SetPaused(!running);
+		if (!_macro->IsSubitem()) {
+			return;
+		}
+
+		const auto group = _macro->Parent();
+		updateWidget(group.get());
+		return;
+	}
+
+	const auto macros = GetGroupMacroEntries(_macro.get());
+	for (const auto &macro : macros) {
+		macro->SetPaused(!running);
+	}
+
+	// Update backend values before updating UI to prevent flickering in
+	// running state of the group
+	for (const auto &macro : macros) {
+		updateWidget(macro.get());
+	}
+	UpdateRunning();
+}
+
+void MacroTreeItem::UpdateRunning()
 {
 	const QSignalBlocker blocker(_running);
-	_running->setChecked(!_macro->Paused());
+
+	if (!_macro->IsGroup()) {
+		_running->setChecked(!_macro->Paused());
+		return;
+	}
+
+	const auto macros = GetGroupMacroEntries(_macro.get());
+	bool allRunning = true;
+	bool allPaused = true;
+	for (const auto &macro : macros) {
+		if (macro->Paused()) {
+			allRunning = false;
+		} else {
+			allPaused = false;
+		}
+	}
+
+	if (allRunning) {
+		_running->setCheckState(Qt::Checked);
+		return;
+	}
+
+	if (allPaused) {
+		_running->setCheckState(Qt::Unchecked);
+		return;
+	}
+
+	_running->setCheckState(Qt::PartiallyChecked);
 }
 
 void MacroTreeItem::HighlightIfExecuted()
@@ -108,10 +215,20 @@ void MacroTreeItem::HighlightIfExecuted()
 		return;
 	}
 
+	bool wasHighlighted = false;
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    _macro->WasExecutedSince(_lastHighlightCheckTime)) {
 		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		wasHighlighted = true;
 	}
+
+	if (!wasHighlighted &&
+	    _lastHighlightCheckTime.time_since_epoch().count() != 0 &&
+	    _macro->ActionTriggerModePreventedActionsSince(
+		    _lastHighlightCheckTime)) {
+		HighlightWidget(this, Qt::yellow, QColor(0, 0, 0, 0), true);
+	}
+
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }
 
@@ -188,7 +305,7 @@ void MacroTreeItem::Update(bool force)
 		_expand->blockSignals(true);
 		_expand->setChecked(_macro->IsCollapsed());
 		_expand->blockSignals(false);
-		connect(_expand, &QPushButton::toggled, this,
+		connect(_expand, &QCheckBox::toggled, this,
 			&MacroTreeItem::ExpandClicked);
 	} else {
 		_spacer = new QSpacerItem(3, 1);
@@ -214,7 +331,6 @@ void MacroTreeModel::Reset(std::deque<std::shared_ptr<Macro>> &newItems)
 	_macros = newItems;
 	endResetModel();
 
-	UpdateGroupState(false);
 	_mt->ResetWidgets();
 }
 
@@ -459,9 +575,6 @@ void MacroTreeModel::Remove(std::shared_ptr<Macro> item)
 
 	_mt->selectionModel()->clear();
 
-	if (isGroup) {
-		UpdateGroupState(true);
-	}
 	assert(IsInValidState());
 }
 
@@ -550,7 +663,6 @@ MacroTreeModel::MacroTreeModel(MacroTree *st_,
 	  _mt(st_),
 	  _macros(macros)
 {
-	UpdateGroupState(false);
 }
 
 int MacroTreeModel::rowCount(const QModelIndex &parent) const
@@ -704,7 +816,6 @@ void MacroTreeModel::GroupSelectedItems(QModelIndexList &indices)
 		offset++;
 	}
 
-	_hasGroups = true;
 	_mt->selectionModel()->clear();
 
 	Reset(_macros);
@@ -762,24 +873,6 @@ void MacroTreeModel::CollapseGroup(std::shared_ptr<Macro> item)
 	assert(IsInValidState());
 }
 
-void MacroTreeModel::UpdateGroupState(bool update)
-{
-	bool nowHasGroups = false;
-	for (auto &item : _macros) {
-		if (item->IsGroup()) {
-			nowHasGroups = true;
-			break;
-		}
-	}
-
-	if (nowHasGroups != _hasGroups) {
-		_hasGroups = nowHasGroups;
-		if (update) {
-			_mt->UpdateWidgets(true);
-		}
-	}
-}
-
 void MacroTree::Reset(std::deque<std::shared_ptr<Macro>> &macros,
 		      bool highlight)
 {
@@ -842,7 +935,6 @@ MacroTree::MacroTree(QWidget *parent_) : QListView(parent_)
 void MacroTree::ResetWidgets()
 {
 	MacroTreeModel *mtm = GetModel();
-	mtm->UpdateGroupState(false);
 	int modelIdx = 0;
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		QModelIndex index = mtm->createIndex(modelIdx, 0, nullptr);

lib/macro/macro-tree.hpp

@@ -34,10 +34,14 @@ public:
 	explicit MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macro,
 			       bool highlight);
 
+protected:
+	bool event(QEvent *) override;
+
 private slots:
 	void ExpandClicked(bool checked);
 	void EnableHighlight(bool enable);
-	void UpdatePaused();
+	void RunningClicked(bool);
+	void UpdateRunning();
 	void HighlightIfExecuted();
 	void MacroRenamed(const QString &, const QString &);
 
@@ -106,7 +110,6 @@ private:
 	void UngroupSelectedGroups(QModelIndexList &indices);
 	void ExpandGroup(std::shared_ptr<Macro> item);
 	void CollapseGroup(std::shared_ptr<Macro> item);
-	void UpdateGroupState(bool update);
 	int GetItemMacroIndex(const std::shared_ptr<Macro> &item) const;
 	int GetItemModelIndex(const std::shared_ptr<Macro> &item) const;
 	bool IsLastItem(std::shared_ptr<Macro> item) const;
@@ -114,7 +117,6 @@ private:
 
 	MacroTree *_mt;
 	std::deque<std::shared_ptr<Macro>> &_macros;
-	bool _hasGroups = false;
 
 	friend class MacroTree;
 	friend class MacroTreeItem;

lib/macro/macro-websocket-trigger.cpp

@@ -0,0 +1,111 @@
+#include "websocket-api.hpp"
+#include "log-helper.hpp"
+#include "plugin-state-helpers.hpp"
+#include "variable.hpp"
+#include "macro-helpers.hpp"
+
+#include <obs.hpp>
+
+namespace advss {
+
+static bool setup();
+static bool setupDone = setup();
+static void receiveRunMacroMessage(obs_data_t *data, obs_data_t *);
+static void receiveSetVariablesMessage(obs_data_t *data, obs_data_t *);
+
+static const char *runMacroMessage = "AdvancedSceneSwitcherRunMacro";
+static const char *setVariablesMessage = "AdvancedSceneSwitcherSetVariables";
+
+static bool setup()
+{
+	AddPluginInitStep([]() {
+		RegisterWebsocketRequest(runMacroMessage,
+					 receiveRunMacroMessage);
+		RegisterWebsocketRequest(setVariablesMessage,
+					 receiveSetVariablesMessage);
+	});
+	return true;
+}
+
+static void setVariables(obs_data_t *data)
+{
+	OBSDataArrayAutoRelease variables =
+		obs_data_get_array(data, "variables");
+	size_t count = obs_data_array_count(variables);
+	for (size_t i = 0; i < count; i++) {
+		OBSDataAutoRelease item = obs_data_array_item(variables, i);
+		if (!obs_data_has_user_value(item, "name")) {
+			blog(LOG_INFO,
+			     "ignoring invalid variable entry in \"%s\" websocket message (missing \"name\")",
+			     runMacroMessage);
+			continue;
+		}
+
+		if (!obs_data_has_user_value(item, "value")) {
+			blog(LOG_INFO,
+			     "ignoring invalid variable entry in \"%s\" websocket message (missing \"value\")",
+			     runMacroMessage);
+			continue;
+		}
+
+		auto varName = obs_data_get_string(item, "name");
+		auto value = obs_data_get_string(item, "value");
+
+		auto weakVar = GetWeakVariableByName(varName);
+		auto var = weakVar.lock();
+		if (!var) {
+			blog(LOG_INFO,
+			     "ignoring invalid variable name \"%s\" in \"%s\" websocket message",
+			     varName, runMacroMessage);
+			continue;
+		}
+
+		var->SetValue(value);
+	}
+}
+
+static void receiveRunMacroMessage(obs_data_t *data, obs_data_t *)
+{
+	if (!obs_data_has_user_value(data, "name")) {
+		blog(LOG_INFO,
+		     "ignoring invalid \"%s\" websocket message (missing \"name\")",
+		     runMacroMessage);
+		return;
+	}
+
+	auto name = obs_data_get_string(data, "name");
+	const auto weakMacro =
+		GetWeakMacroByName(obs_data_get_string(data, "name"));
+	const auto macro = weakMacro.lock();
+	if (!macro) {
+		blog(LOG_INFO,
+		     "ignoring invalid \"%s\" websocket message (macro \"%s\") not found",
+		     runMacroMessage, name);
+		return;
+	}
+
+	if (obs_data_has_user_value(data, "variables")) {
+		setVariables(data);
+	}
+
+	const bool runElse = obs_data_get_bool(data, "runElseActions");
+	if (runElse) {
+		RunMacroElseActions(macro.get());
+	} else {
+		RunMacroActions(macro.get());
+	}
+}
+
+static void receiveSetVariablesMessage(obs_data_t *data, obs_data_t *)
+{
+	if (!obs_data_has_user_value(data, "variables")) {
+		blog(LOG_INFO,
+		     "ignoring invalid \"%s\" websocket message (missing \"variables\")",
+		     setVariablesMessage);
+		return;
+	}
+
+	setVariables(data);
+}
+
+} // namespace advss

lib/macro/macro.cpp

@@ -111,7 +111,7 @@ static bool checkCondition(const std::shared_ptr<MacroCondition> &condition)
 	const auto startTime = std::chrono::high_resolution_clock::now();
 	bool conditionMatched = false;
 	condition->WithLock([&condition, &conditionMatched]() {
-		conditionMatched = condition->CheckCondition();
+		conditionMatched = condition->EvaluateCondition();
 	});
 	const auto endTime = std::chrono::high_resolution_clock::now();
 	const auto timeSpent = endTime - startTime;
@@ -241,9 +241,37 @@ bool Macro::CheckConditions(bool ignorePause)
 
 	vblog(LOG_INFO, "Macro %s returned %d", _name.c_str(), _matched);
 
-	_conditionSateChanged = _lastMatched != _matched;
-	if (!_conditionSateChanged && _performActionsOnChange) {
-		_onPreventedActionExecution = true;
+	_actionModeMatch = false;
+	switch (_actionTriggerMode) {
+	case Macro::ActionTriggerMode::ALWAYS:
+		_actionModeMatch = true;
+		break;
+	case Macro::ActionTriggerMode::MACRO_RESULT_CHANGED:
+		_actionModeMatch = _lastMatched != _matched;
+		break;
+	case Macro::ActionTriggerMode::ANY_CONDITION_CHANGED:
+		for (const auto &condition : _conditions) {
+			if (condition->HasChanged()) {
+				_actionModeMatch = true;
+			}
+		}
+		break;
+	case Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED:
+		for (const auto &condition : _conditions) {
+			if (condition->IsRisingEdge()) {
+				_actionModeMatch = true;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	const bool hasActionsToExecute = _matched ? (_actions.size() > 0)
+						  : (_elseActions.size() > 0);
+	if (!_actionModeMatch && hasActionsToExecute) {
+		_lastActionRunModePreventTime =
+			std::chrono::high_resolution_clock::now();
 	}
 
 	_lastMatched = _matched;
@@ -302,6 +330,16 @@ bool Macro::WasExecutedSince(const TimePoint &time) const
 	return _lastExecutionTime > time;
 }
 
+bool Macro::ActionTriggerModePreventedActionsSince(const TimePoint &time) const
+{
+	return _lastActionRunModePreventTime > time;
+}
+
+Macro::TimePoint Macro::GetLastExecutionTime() const
+{
+	return _lastExecutionTime;
+}
+
 bool Macro::ConditionsShouldBeChecked() const
 {
 	if (!_useCustomConditionCheckInterval) {
@@ -328,10 +366,9 @@ bool Macro::ShouldRunActions() const
 
 	const bool hasActionsToExecute =
 		!_paused && (_matched || _elseActions.size() > 0) &&
-		(!_performActionsOnChange || _conditionSateChanged);
+		_actionModeMatch;
 
-	if (VerboseLoggingEnabled() && _performActionsOnChange &&
-	    !_conditionSateChanged) {
+	if (VerboseLoggingEnabled() && !_actionModeMatch) {
 		if (_matched && _actions.size() > 0) {
 			blog(LOG_INFO, "skip actions for Macro %s (on change)",
 			     _name.c_str());
@@ -362,10 +399,24 @@ void Macro::ResetTimers()
 	_lastExecutionTime = {};
 }
 
+void Macro::SetActionTriggerMode(ActionTriggerMode mode)
+{
+	_actionTriggerMode = mode;
+}
+
+Macro::ActionTriggerMode Macro::GetActionTriggerMode() const
+{
+	return _actionTriggerMode;
+}
+
 bool Macro::RunActionsHelper(
 	const std::deque<std::shared_ptr<MacroAction>> &actionsToRun,
 	bool ignorePause)
 {
+	if (_paused && !ignorePause) {
+		return true;
+	}
+
 	// Create copy of action list as elements might be removed, inserted, or
 	// reordered while actions are currently being executed.
 	auto actions = actionsToRun;
@@ -415,11 +466,6 @@ bool Macro::WasPausedSince(const TimePoint &time) const
 	return _lastUnpauseTime > time;
 }
 
-void Macro::SetMatchOnChange(bool onChange)
-{
-	_performActionsOnChange = onChange;
-}
-
 void Macro::SetStopActionsIfNotDone(bool stopActionsIfNotDone)
 {
 	_stopActionsIfNotDone = stopActionsIfNotDone;
@@ -740,7 +786,8 @@ bool Macro::Save(obs_data_t *obj, bool saveForCopy) const
 	obs_data_set_bool(obj, "pause", _paused);
 	obs_data_set_bool(obj, "parallel", _runInParallel);
 	obs_data_set_bool(obj, "checkConditionsInParallel", _checkInParallel);
-	obs_data_set_bool(obj, "onChange", _performActionsOnChange);
+	obs_data_set_int(obj, "actionTriggerMode",
+			 static_cast<int>(_actionTriggerMode));
 	obs_data_set_bool(obj, "skipExecOnStart", _skipExecOnStart);
 	obs_data_set_bool(obj, "stopActionsIfNotDone", _stopActionsIfNotDone);
 	obs_data_set_bool(obj, "useShortCircuitEvaluation",
@@ -826,7 +873,15 @@ bool Macro::Load(obs_data_t *obj)
 	}
 	_runInParallel = obs_data_get_bool(obj, "parallel");
 	_checkInParallel = obs_data_get_bool(obj, "checkConditionsInParallel");
-	_performActionsOnChange = obs_data_get_bool(obj, "onChange");
+	if (obs_data_has_user_value(obj, "onChange")) {
+		const bool onChange = obs_data_get_bool(obj, "onChange");
+		_actionTriggerMode =
+			onChange ? ActionTriggerMode::MACRO_RESULT_CHANGED
+				 : ActionTriggerMode::ALWAYS;
+	} else {
+		_actionTriggerMode = static_cast<ActionTriggerMode>(
+			obs_data_get_int(obj, "actionTriggerMode"));
+	}
 	_skipExecOnStart = obs_data_get_bool(obj, "skipExecOnStart");
 	_stopActionsIfNotDone = obs_data_get_bool(obj, "stopActionsIfNotDone");
 	_useShortCircuitEvaluation =
@@ -986,18 +1041,8 @@ bool Macro::HasValidSplitterPositions() const
 	       !_elseActionSplitterPosition.empty();
 }
 
-bool Macro::OnChangePreventedActionsRecently()
-{
-	if (_onPreventedActionExecution) {
-		_onPreventedActionExecution = false;
-		return _matched ? _actions.size() > 0 : _elseActions.size() > 0;
-	}
-	return false;
-}
-
 void Macro::ResetUIHelpers()
 {
-	_onPreventedActionExecution = false;
 	for (auto c : _conditions) {
 		c->GetHighlightAndReset();
 	}
@@ -1096,9 +1141,11 @@ void Macro::ClearHotkeys() const
 void setHotkeyDescriptionHelper(const char *formatModuleText,
 				const std::string name, const obs_hotkey_id id)
 {
+#ifndef UNIT_TEST
 	QString format{obs_module_text(formatModuleText)};
 	QString hotkeyDesc = format.arg(QString::fromStdString(name));
 	obs_hotkey_set_description(id, hotkeyDesc.toStdString().c_str());
+#endif // !UNIT_TEST
 }
 
 void Macro::SetHotkeysDesc() const

lib/macro/macro.hpp

@@ -26,6 +26,16 @@ class Macro {
 
 public:
 	enum class PauseStateSaveBehavior { PERSIST, PAUSE, UNPAUSE };
+	enum class ActionTriggerMode {
+		// Trigger always
+		ALWAYS,
+		// Trigger when macro match result flips
+		MACRO_RESULT_CHANGED,
+		// Trigger when any individual condition changes
+		ANY_CONDITION_CHANGED,
+		// Trigger when any individual condition evaluates to true
+		ANY_CONDITION_TRIGGERED,
+	};
 
 	Macro(const std::string &name = "");
 	Macro(const std::string &name, const GlobalMacroSettings &settings);
@@ -54,8 +64,8 @@ public:
 	bool GetStop() const { return _stop; }
 	void ResetTimers();
 
-	void SetMatchOnChange(bool onChange);
-	bool MatchOnChange() const { return _performActionsOnChange; }
+	void SetActionTriggerMode(ActionTriggerMode);
+	ActionTriggerMode GetActionTriggerMode() const;
 
 	void SetSkipExecOnStart(bool skip) { _skipExecOnStart = skip; }
 	bool SkipExecOnStart() const { return _skipExecOnStart; }
@@ -137,7 +147,8 @@ public:
 	const QList<int> &GetElseActionSplitterPosition() const;
 	bool HasValidSplitterPositions() const;
 	bool WasExecutedSince(const TimePoint &) const;
-	bool OnChangePreventedActionsRecently();
+	bool ActionTriggerModePreventedActionsSince(const TimePoint &) const;
+	TimePoint GetLastExecutionTime() const;
 	void ResetUIHelpers();
 
 	// Hotkeys
@@ -168,6 +179,7 @@ private:
 	TimePoint _lastCheckTime{};
 	TimePoint _lastUnpauseTime{};
 	TimePoint _lastExecutionTime{};
+	TimePoint _lastActionRunModePreventTime{};
 	std::vector<std::thread> _helperThreads;
 
 	std::deque<std::shared_ptr<MacroCondition>> _conditions;
@@ -182,14 +194,13 @@ private:
 	bool _useShortCircuitEvaluation = false;
 	bool _useCustomConditionCheckInterval = false;
 	Duration _customConditionCheckInterval = 0.3;
-	bool _conditionSateChanged = false;
+	bool _actionModeMatch = false;
 
 	bool _runInParallel = false;
 	bool _checkInParallel = false;
 	bool _matched = false;
 	std::future<void> _conditionCheckFuture;
 	bool _lastMatched = false;
-	bool _performActionsOnChange = true;
 	bool _skipExecOnStart = false;
 	bool _stopActionsIfNotDone = false;
 	bool _paused = false;
@@ -199,14 +210,14 @@ private:
 	obs_hotkey_id _unpauseHotkey = OBS_INVALID_HOTKEY_ID;
 	obs_hotkey_id _togglePauseHotkey = OBS_INVALID_HOTKEY_ID;
 
+	ActionTriggerMode _actionTriggerMode =
+		ActionTriggerMode::MACRO_RESULT_CHANGED;
+
 	PauseStateSaveBehavior _pauseSaveBehavior =
 		PauseStateSaveBehavior::PERSIST;
 
 	MacroInputVariables _inputVariables;
 
-	// UI helpers
-	bool _onPreventedActionExecution = false;
-
 	QList<int> _actionConditionSplitterPosition;
 	QList<int> _elseActionSplitterPosition;
 

lib/switcher-data.cpp

@@ -152,7 +152,7 @@ bool SwitcherData::VersionChanged(obs_data_t *obj, std::string currentVersion)
 	if (!obs_data_has_user_value(obj, "version")) {
 		return false;
 	}
-	switcher->firstBoot = false;
+
 	std::string previousVersion = obs_data_get_string(obj, "version");
 	return previousVersion != currentVersion;
 }

lib/switcher-data.hpp

@@ -94,7 +94,6 @@ public:
 	bool stop = false;
 	std::condition_variable cv;
 
-	bool firstBoot = true;
 	bool transitionActive = false;
 	bool sceneCollectionStop = false;
 	bool obsIsShuttingDown = false;

lib/utils/auto-update-tooltip-label.cpp

@@ -1,5 +1,7 @@
 #include "auto-update-tooltip-label.hpp"
 
+#include <QToolTip>
+
 namespace advss {
 
 AutoUpdateHelpIcon::AutoUpdateHelpIcon(
@@ -16,6 +18,7 @@ AutoUpdateHelpIcon::AutoUpdateHelpIcon(
 
 void AutoUpdateHelpIcon::enterEvent(QEnterEvent *event)
 {
+	UpdateTooltip();
 	_timer->start(_updateIntervalMs);
 	QLabel::enterEvent(event);
 }
@@ -28,7 +31,12 @@ void AutoUpdateHelpIcon::leaveEvent(QEvent *event)
 
 void AutoUpdateHelpIcon::UpdateTooltip()
 {
-	setToolTip(_callback());
+	if (!underMouse()) {
+		return;
+	}
+
+	const QString text = _callback();
+	QToolTip::showText(QCursor::pos(), text, this);
 }
 
 } // namespace advss

lib/utils/backup.cpp

@@ -8,13 +8,18 @@
 
 #include <obs-frontend-api.h>
 #include <obs-module.h>
-#include <QFileDialog>
-#include <QTextStream>
 #include <util/config-file.h>
 
+#include <QFileDialog>
+#include <QMainWindow>
+#include <QTextStream>
+#include <QTimer>
+
+#include <thread>
+
 namespace advss {
 
-void AskForBackup(const QString &json)
+static void showBackupDialogs(const QString &json)
 {
 	const bool backupWasConfirmed = DisplayMessage(
 		obs_module_text("AdvSceneSwitcher.askBackup"), true, false);
@@ -42,6 +47,27 @@ void AskForBackup(const QString &json)
 	out << json;
 }
 
+void AskForBackup(obs_data_t *settings)
+{
+	// This function is called while the plugin settings are being loaded.
+	// Blocking at this stage can cause issues such as OBS failing to start
+	// or crashing.
+	// Therefore, we ask the user whether they want to back up the settings
+	// asynchronously.
+
+	auto json = obs_data_get_json(settings);
+	static QString jsonQString = json ? json : "";
+
+	static const auto askForBackupWrapper = [](void *) {
+		showBackupDialogs(jsonQString);
+	};
+
+	AddFinishedLoadingStep([]() {
+		obs_queue_task(OBS_TASK_UI, askForBackupWrapper, nullptr,
+			       false);
+	});
+}
+
 void BackupSettingsOfCurrentVersion()
 {
 	auto sceneCollectionName = obs_frontend_get_current_scene_collection();

lib/utils/backup.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include <QString>
+#include <obs-data.h>
 
 namespace advss {
 
-void AskForBackup(const QString &json);
+void AskForBackup(obs_data_t *settings);
 void BackupSettingsOfCurrentVersion();
 
 } // namespace advss

lib/utils/crash-handler.cpp

@@ -0,0 +1,140 @@
+#include "crash-handler.hpp"
+#include "log-helper.hpp"
+#include "obs-module-helper.hpp"
+#include "plugin-state-helpers.hpp"
+#include "ui-helpers.hpp"
+
+#include <obs-frontend-api.h>
+#include <obs-module.h>
+
+#include <QDir>
+#include <QFile>
+#include <QMainWindow>
+#include <QTimer>
+
+#include <thread>
+
+namespace advss {
+
+static constexpr std::string_view sentinel = ".running";
+
+#ifndef NDEBUG
+static constexpr bool handleUncleanShutdown = false;
+#else
+static constexpr bool handleUncleanShutdown = true;
+#endif
+
+static bool wasCleanShutdown = false;
+
+static void setup();
+static bool setupDone = []() {
+	AddPluginInitStep(setup);
+	return true;
+}();
+
+static void handleShutdown(enum obs_frontend_event event, void *)
+{
+	if (event != OBS_FRONTEND_EVENT_EXIT) {
+		return;
+	}
+
+	char *sentinelFile = obs_module_config_path(sentinel.data());
+	if (!sentinelFile) {
+		return;
+	}
+
+	QFile file(sentinelFile);
+	if (!file.exists()) {
+		bfree(sentinelFile);
+		return;
+	}
+
+	if (!file.remove()) {
+		blog(LOG_WARNING, "failed to remove sentinel file");
+	}
+
+	bfree(sentinelFile);
+}
+
+static void setup()
+{
+	char *sentinelFile = obs_module_config_path(sentinel.data());
+	if (!sentinelFile) {
+		return;
+	}
+
+	QString dirPath = QFileInfo(sentinelFile).absolutePath();
+	QDir dir(dirPath);
+	if (!dir.exists()) {
+		if (!dir.mkpath(dirPath)) {
+			blog(LOG_WARNING,
+			     "failed to create directory for sentinel file");
+			bfree(sentinelFile);
+			return;
+		}
+	}
+
+	QFile file(sentinelFile);
+
+	wasCleanShutdown = file.exists();
+
+	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+		blog(LOG_WARNING, "failed to create sentinel file");
+		bfree(sentinelFile);
+		return;
+	}
+
+	file.write("running");
+	file.close();
+	bfree(sentinelFile);
+
+	obs_frontend_add_event_callback(handleShutdown, nullptr);
+	return;
+}
+
+static bool wasUncleanShutdown()
+{
+	static bool alreadyHandled = false;
+
+	if (!handleUncleanShutdown || !wasCleanShutdown || alreadyHandled) {
+		alreadyHandled = true;
+		return false;
+	}
+
+	alreadyHandled = true;
+	blog(LOG_WARNING, "unclean shutdown detected");
+	return true;
+}
+
+static void askForStartupSkip()
+{
+	bool skipStart = DisplayMessage(
+		obs_module_text("AdvSceneSwitcher.crashDetected"), true, false);
+	if (!skipStart) {
+		StartPlugin();
+	}
+}
+
+bool ShouldSkipPluginStartOnUncleanShutdown()
+{
+	if (!wasUncleanShutdown()) {
+		return false;
+	}
+
+	// This function is called while the plugin settings are being loaded.
+	// Blocking at this stage can cause issues such as OBS failing to start
+	// or crashing.
+	// Therefore, we ask the user whether they want to start the plugin
+	// asynchronously.
+	static const auto showDialogWrapper = [](void *) {
+		askForStartupSkip();
+	};
+
+	AddFinishedLoadingStep([]() {
+		obs_queue_task(OBS_TASK_UI, showDialogWrapper, nullptr, false);
+	});
+
+	return true;
+}
+
+} // namespace advss

lib/utils/crash-handler.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace advss {
+
+bool ShouldSkipPluginStartOnUncleanShutdown();
+
+} // namespace advss

lib/utils/export-symbol-helper.hpp

@@ -1,12 +1,5 @@
 #pragma once
 
-#ifdef UNIT_TEST
-
-#define EXPORT
-#define ADVSS_EXPORT
-
-#else
-
 #ifdef _MSC_VER
 #define EXPORT __declspec(dllexport)
 #else
@@ -19,5 +12,3 @@
 #else
 #define ADVSS_EXPORT Q_DECL_IMPORT
 #endif
-
-#endif // UNIT_TEST

lib/utils/first-run-wizard.cpp

@@ -0,0 +1,465 @@
+#include "first-run-wizard.hpp"
+
+#include "log-helper.hpp"
+#include "macro.hpp"
+#include "macro-action-factory.hpp"
+#include "macro-condition-factory.hpp"
+#include "macro-settings.hpp"
+#include "platform-funcs.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs-frontend-api.h>
+#include <obs-data.h>
+#include <util/config-file.h>
+
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QRegularExpression>
+#include <QVBoxLayout>
+
+namespace advss {
+
+static constexpr char kConditionIdWindow[] = "window";
+static constexpr char kActionIdSceneSwitch[] = "scene_switch";
+
+// ---------------------------------------------------------------------------
+// OBS global config helpers
+// ---------------------------------------------------------------------------
+static constexpr char kConfigSection[] = "AdvancedSceneSwitcher";
+static constexpr char kFirstRunKey[] = "firstRun";
+
+bool IsFirstRun()
+{
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(31, 0, 0)
+	config_t *cfg = obs_frontend_get_user_config();
+#else
+	config_t *cfg = obs_frontend_get_global_config();
+#endif
+	if (!config_has_user_value(cfg, kConfigSection, kFirstRunKey)) {
+		return true;
+	}
+	return config_get_bool(cfg, kConfigSection, kFirstRunKey);
+}
+
+static void WriteFirstRun(bool value)
+{
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(31, 0, 0)
+	config_t *cfg = obs_frontend_get_user_config();
+#else
+	config_t *cfg = obs_frontend_get_global_config();
+#endif
+	config_set_bool(cfg, kConfigSection, kFirstRunKey, value);
+	config_save_safe(cfg, "tmp", nullptr);
+}
+
+static QString DetectFocusedWindow()
+{
+	std::string title;
+	GetCurrentWindowTitle(title);
+	return QString::fromStdString(title);
+}
+
+// ===========================================================================
+// WelcomePage
+// ===========================================================================
+
+WelcomePage::WelcomePage(QWidget *parent) : QWizardPage(parent)
+{
+	setTitle(obs_module_text("FirstRunWizard.welcome.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.welcome.subtitle"));
+
+	auto body = new QLabel(obs_module_text("FirstRunWizard.welcome.body"),
+			       this);
+	body->setWordWrap(true);
+	body->setTextFormat(Qt::RichText);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addWidget(body);
+	layout->addStretch();
+}
+
+// ===========================================================================
+// SceneSelectionPage
+// ===========================================================================
+
+SceneSelectionPage::SceneSelectionPage(QWidget *parent) : QWizardPage(parent)
+{
+	setTitle(obs_module_text("FirstRunWizard.scene.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.scene.subtitle"));
+
+	auto label =
+		new QLabel(obs_module_text("FirstRunWizard.scene.label"), this);
+	_sceneCombo = new QComboBox(this);
+	_sceneCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+	// registerField with * suffix means the field is mandatory for Next
+	registerField("targetScene*", _sceneCombo, "currentText",
+		      SIGNAL(currentTextChanged(QString)));
+
+	connect(_sceneCombo, &QComboBox::currentTextChanged, this,
+		&QWizardPage::completeChanged);
+
+	auto row = new QHBoxLayout;
+	row->addWidget(label);
+	row->addWidget(_sceneCombo, 1);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addLayout(row);
+	layout->addStretch();
+}
+
+void SceneSelectionPage::initializePage()
+{
+	_sceneCombo->clear();
+	for (const QString &name : GetSceneNames())
+		_sceneCombo->addItem(name);
+}
+
+bool SceneSelectionPage::isComplete() const
+{
+	return _sceneCombo->count() > 0 &&
+	       !_sceneCombo->currentText().isEmpty();
+}
+
+// ===========================================================================
+// WindowConditionPage
+// ===========================================================================
+
+WindowConditionPage::WindowConditionPage(QWidget *parent)
+	: QWizardPage(parent),
+	  _detectTimer(new QTimer(this))
+{
+	setTitle(obs_module_text("FirstRunWizard.window.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.window.subtitle"));
+
+	auto label = new QLabel(obs_module_text("FirstRunWizard.window.label"),
+				this);
+	_windowEdit = new QLineEdit(this);
+	_windowEdit->setPlaceholderText(
+		obs_module_text("FirstRunWizard.window.placeholder"));
+
+	_autoDetect = new QPushButton(
+		obs_module_text("FirstRunWizard.window.autoDetect"), this);
+	_autoDetect->setToolTip(
+		obs_module_text("FirstRunWizard.window.autoDetectTooltip"));
+
+	registerField("windowTitle*", _windowEdit);
+
+	connect(_windowEdit, &QLineEdit::textChanged, this,
+		&QWizardPage::completeChanged);
+	connect(_autoDetect, &QPushButton::clicked, this,
+		&WindowConditionPage::onAutoDetectClicked);
+	connect(_detectTimer, &QTimer::timeout, this,
+		&WindowConditionPage::onCountdownTick);
+
+	auto row = new QHBoxLayout;
+	row->addWidget(label);
+	row->addWidget(_windowEdit, 1);
+
+	auto hint =
+		new QLabel(obs_module_text("FirstRunWizard.window.hint"), this);
+	hint->setTextFormat(Qt::RichText);
+	hint->setWordWrap(true);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addLayout(row);
+	layout->addWidget(_autoDetect, 0, Qt::AlignLeft);
+	layout->addWidget(hint);
+	layout->addStretch();
+}
+
+void WindowConditionPage::initializePage()
+{
+	if (_windowEdit->text().isEmpty()) {
+		QString detected = DetectFocusedWindow();
+		if (!detected.isEmpty()) {
+			_windowEdit->setText(detected);
+		}
+	}
+}
+
+bool WindowConditionPage::isComplete() const
+{
+	return !_windowEdit->text().trimmed().isEmpty();
+}
+
+void WindowConditionPage::onAutoDetectClicked()
+{
+	_countdown = 3;
+	_autoDetect->setEnabled(false);
+	_autoDetect->setText(
+		QString(obs_module_text(
+				"FirstRunWizard.window.autoDetectCountdown"))
+			.arg(_countdown));
+	_detectTimer->start(1000);
+}
+
+void WindowConditionPage::onCountdownTick()
+{
+	--_countdown;
+	if (_countdown > 0) {
+		_autoDetect->setText(
+			QString(obs_module_text(
+					"FirstRunWizard.window.autoDetectCountdown"))
+				.arg(_countdown));
+		return;
+	}
+
+	_detectTimer->stop();
+	QString title = DetectFocusedWindow();
+	if (!title.isEmpty()) {
+		_windowEdit->setText(title);
+	}
+
+	_autoDetect->setEnabled(true);
+	_autoDetect->setText(
+		obs_module_text("FirstRunWizard.window.autoDetect"));
+}
+
+// ===========================================================================
+// ReviewPage
+// ===========================================================================
+
+ReviewPage::ReviewPage(QWidget *parent, std::shared_ptr<Macro> &macro)
+	: QWizardPage(parent),
+	  _macro(macro)
+{
+	setTitle(obs_module_text("FirstRunWizard.review.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.review.subtitle"));
+
+	_summary = new QLabel(this);
+	_summary->setWordWrap(true);
+	_summary->setTextFormat(Qt::RichText);
+	_summary->setFrameShape(QFrame::StyledPanel);
+	_summary->setContentsMargins(12, 12, 12, 12);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addWidget(_summary);
+	layout->addStretch();
+}
+
+void ReviewPage::initializePage()
+{
+	const QString scene = field("targetScene").toString();
+	const QString window = field("windowTitle").toString();
+
+	_summary->setText(
+		QString(obs_module_text("FirstRunWizard.review.summary"))
+			.arg(scene.toHtmlEscaped(), window.toHtmlEscaped()));
+}
+
+static QString escapeForRegex(const QString &input)
+{
+	return QRegularExpression::escape(input);
+}
+
+bool ReviewPage::validatePage()
+{
+	const QString scene = field("targetScene").toString();
+	const QString window = escapeForRegex(field("windowTitle").toString());
+	const std::string name = ("Window -> " + scene).toStdString();
+
+	// Build condition data blob
+	// ---------------------------------------------------------------
+	// Condition blob — mirrors MacroConditionWindow::Save() output:
+	//
+	// {
+	//     "segmentSettings": { "enabled": true, "version": 1 },
+	//     "id": "window",
+	//     "checkTitle": true,
+	//     "window": "<user input>",
+	//     "windowRegexConfig": {
+	//         "enable": true,   // use regex-style partial matching
+	//         "partial": true,  // match anywhere in the title
+	//         "options": 3      // case-insensitive (QRegularExpression flags)
+	//     },
+	//     "focus": true,        // only trigger when window is focused
+	//     "version": 1
+	// }
+	// ---------------------------------------------------------------
+	OBSDataAutoRelease condSegment = obs_data_create();
+	obs_data_set_bool(condSegment, "enabled", true);
+	obs_data_set_int(condSegment, "version", 1);
+
+	OBSDataAutoRelease condRegex = obs_data_create();
+	obs_data_set_bool(condRegex, "enable", true);
+	obs_data_set_bool(condRegex, "partial", true);
+	obs_data_set_int(condRegex, "options", 3); // CaseInsensitiveOption
+
+	OBSDataAutoRelease condData = obs_data_create();
+	obs_data_set_obj(condData, "segmentSettings", condSegment);
+	obs_data_set_string(condData, "id", "window");
+	obs_data_set_bool(condData, "checkTitle", true);
+	obs_data_set_string(condData, "window", window.toUtf8().constData());
+	obs_data_set_obj(condData, "windowRegexConfig", condRegex);
+	obs_data_set_bool(condData, "focus", true);
+	obs_data_set_int(condData, "version", 1);
+
+	// Build action data blob
+	// ---------------------------------------------------------------
+	// Action blob — mirrors MacroActionSwitchScene::Save() output:
+	//
+	// {
+	//     "segmentSettings": { "enabled": true, "version": 1 },
+	//     "id": "scene_switch",
+	//     "action": 0,              // 0 = switch scene
+	//     "sceneSelection": {
+	//         "type": 0,            // 0 = scene by name
+	//         "name": "<scene>",
+	//         "canvasSelection": "Main"
+	//     },
+	//     "transitionType": 1,      // 1 = use scene's default transition
+	//     "blockUntilTransitionDone": false,
+	//     "sceneType": 0
+	// }
+	// ---------------------------------------------------------------
+	OBSDataAutoRelease actionSegment = obs_data_create();
+	obs_data_set_bool(actionSegment, "enabled", true);
+	obs_data_set_int(actionSegment, "version", 1);
+
+	OBSDataAutoRelease sceneSelection = obs_data_create();
+	obs_data_set_int(sceneSelection, "type", 0);
+	obs_data_set_string(sceneSelection, "name", scene.toUtf8().constData());
+	obs_data_set_string(sceneSelection, "canvasSelection", "Main");
+
+	OBSDataAutoRelease actionData = obs_data_create();
+	obs_data_set_obj(actionData, "segmentSettings", actionSegment);
+	obs_data_set_string(actionData, "id", "scene_switch");
+	obs_data_set_int(actionData, "action", 0);
+	obs_data_set_obj(actionData, "sceneSelection", sceneSelection);
+	obs_data_set_int(actionData, "transitionType", 1);
+	obs_data_set_bool(actionData, "blockUntilTransitionDone", false);
+	obs_data_set_int(actionData, "sceneType", 0);
+
+	if (!FirstRunWizard::CreateMacro(_macro, name, kConditionIdWindow,
+					 condData, kActionIdSceneSwitch,
+					 actionData)) {
+		QMessageBox::warning(
+			this,
+			obs_module_text("FirstRunWizard.review.errorTitle"),
+			QString(obs_module_text(
+					"FirstRunWizard.review.errorBody"))
+				.arg(window, scene));
+		_macro.reset();
+		// Still advance so the user is not stuck.
+	}
+	return true;
+}
+
+// ===========================================================================
+// DonePage
+// ===========================================================================
+
+DonePage::DonePage(QWidget *parent) : QWizardPage(parent)
+{
+	setTitle(obs_module_text("FirstRunWizard.done.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.done.subtitle"));
+
+	auto body =
+		new QLabel(obs_module_text("FirstRunWizard.done.body"), this);
+	body->setWordWrap(true);
+	body->setTextFormat(Qt::RichText);
+	body->setOpenExternalLinks(true);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addWidget(body);
+	layout->addStretch();
+}
+
+// ===========================================================================
+// FirstRunWizard
+// ===========================================================================
+
+FirstRunWizard::FirstRunWizard(QWidget *parent) : QWizard(parent)
+{
+	setWindowTitle(obs_module_text("FirstRunWizard.windowTitle"));
+	setWizardStyle(QWizard::ModernStyle);
+	setMinimumSize(540, 420);
+
+	setPage(PAGE_WELCOME, new WelcomePage(this));
+	setPage(PAGE_SCENE, new SceneSelectionPage(this));
+	setPage(PAGE_WINDOW, new WindowConditionPage(this));
+	setPage(PAGE_REVIEW, new ReviewPage(this, _macro));
+	setPage(PAGE_DONE, new DonePage(this));
+
+	setStartId(PAGE_WELCOME);
+	setOption(QWizard::NoBackButtonOnLastPage, true);
+	setOption(QWizard::NoCancelButtonOnLastPage, true);
+
+	// Mark done on both Accept (Finish) and Reject (Cancel / close)
+	connect(this, &QWizard::accepted, this,
+		&FirstRunWizard::markFirstRunComplete);
+	connect(this, &QWizard::rejected, this,
+		&FirstRunWizard::markFirstRunComplete);
+}
+
+void FirstRunWizard::markFirstRunComplete()
+{
+	WriteFirstRun(false);
+}
+
+// static
+std::shared_ptr<Macro> FirstRunWizard::ShowWizard(QWidget *parent)
+{
+	auto wizard = new FirstRunWizard(parent);
+	wizard->exec();
+	wizard->deleteLater();
+	return wizard->_macro;
+}
+
+// static
+bool FirstRunWizard::CreateMacro(std::shared_ptr<Macro> &macro,
+				 const std::string &macroName,
+				 const std::string &conditionId,
+				 obs_data_t *conditionData,
+				 const std::string &actionId,
+				 obs_data_t *actionData)
+{
+	// 1. Create and register the Macro
+	macro = std::make_shared<Macro>(macroName, GetGlobalMacroSettings());
+	if (!macro) {
+		blog(LOG_WARNING, "FirstRunWizard: Macro allocation failed");
+		return false;
+	}
+
+	// 2. Instantiate condition via factory, then hydrate via Load()
+	auto condition =
+		MacroConditionFactory::Create(conditionId, macro.get());
+	if (!condition) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: condition factory returned null "
+		     "for id '%s' — is the base plugin loaded?",
+		     conditionId.c_str());
+		return false;
+	}
+	if (!condition->Load(conditionData)) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: condition Load() failed for id '%s'",
+		     conditionId.c_str());
+		return false;
+	}
+	macro->Conditions().emplace_back(condition);
+
+	// 3. Instantiate action via factory, then hydrate via Load()
+	auto action = MacroActionFactory::Create(actionId, macro.get());
+	if (!action) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: action factory returned null "
+		     "for id '%s' — is the base plugin loaded?",
+		     actionId.c_str());
+		return false;
+	}
+	if (!action->Load(actionData)) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: action Load() failed for id '%s'",
+		     actionId.c_str());
+		return false;
+	}
+	macro->Actions().emplace_back(action);
+
+	blog(LOG_INFO, "FirstRunWizard: created macro '%s'", macroName.c_str());
+	return true;
+}
+
+} // namespace advss

lib/utils/first-run-wizard.hpp

@@ -0,0 +1,128 @@
+#pragma once
+
+#include <obs-data.h>
+
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTimer>
+#include <QWizard>
+#include <QWizardPage>
+
+#include <string>
+
+namespace advss {
+
+class Macro;
+
+bool IsFirstRun();
+
+// ---------------------------------------------------------------------------
+// Page IDs
+// ---------------------------------------------------------------------------
+enum WizardPageId {
+	PAGE_WELCOME = 0,
+	PAGE_SCENE,
+	PAGE_WINDOW,
+	PAGE_REVIEW,
+	PAGE_DONE,
+};
+
+// ---------------------------------------------------------------------------
+// WelcomePage
+// ---------------------------------------------------------------------------
+class WelcomePage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit WelcomePage(QWidget *parent = nullptr);
+	int nextId() const override { return PAGE_SCENE; }
+};
+
+// ---------------------------------------------------------------------------
+// SceneSelectionPage
+//   Registers wizard field "targetScene" (QString).
+// ---------------------------------------------------------------------------
+class SceneSelectionPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit SceneSelectionPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_WINDOW; }
+
+private:
+	QComboBox *_sceneCombo;
+};
+
+// ---------------------------------------------------------------------------
+// WindowConditionPage
+//   Registers wizard field "windowTitle" (QString).
+//   Auto-detect button samples the focused window after a countdown.
+// ---------------------------------------------------------------------------
+class WindowConditionPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit WindowConditionPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_REVIEW; }
+
+private slots:
+	void onAutoDetectClicked();
+	void onCountdownTick();
+
+private:
+	QLineEdit *_windowEdit;
+	QPushButton *_autoDetect;
+	QTimer *_detectTimer;
+	int _countdown = 3;
+};
+
+// ---------------------------------------------------------------------------
+// ReviewPage
+//   Displays a summary and calls FirstRunWizard::CreateMacro() on Finish.
+// ---------------------------------------------------------------------------
+class ReviewPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit ReviewPage(QWidget *parent, std::shared_ptr<Macro> &macro);
+	void initializePage() override;
+	bool validatePage() override;
+	int nextId() const override { return PAGE_DONE; }
+
+private:
+	QLabel *_summary;
+	std::shared_ptr<Macro> &_macro;
+};
+
+// ---------------------------------------------------------------------------
+// DonePage
+// ---------------------------------------------------------------------------
+class DonePage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit DonePage(QWidget *parent = nullptr);
+	int nextId() const override { return -1; }
+};
+
+// ---------------------------------------------------------------------------
+// FirstRunWizard
+// ---------------------------------------------------------------------------
+class FirstRunWizard : public QWizard {
+	Q_OBJECT
+public:
+	explicit FirstRunWizard(QWidget *parent = nullptr);
+	static std::shared_ptr<Macro> ShowWizard(QWidget *parent);
+	static bool
+	CreateMacro(std::shared_ptr<Macro> &macro, const std::string &macroName,
+		    const std::string &conditionId, obs_data_t *conditionData,
+		    const std::string &actionId, obs_data_t *actionData);
+
+private:
+	void markFirstRunComplete();
+
+	std::shared_ptr<Macro> _macro;
+};
+
+} // namespace advss

lib/utils/item-selection-helpers.cpp

@@ -4,9 +4,11 @@
 #include "ui-helpers.hpp"
 
 #include <algorithm>
+
 #include <QAction>
-#include <QMenu>
 #include <QLayout>
+#include <QMenu>
+#include <QTimer>
 
 Q_DECLARE_METATYPE(advss::Item *);
 
@@ -330,6 +332,13 @@ void ItemSettingsDialog::NameChanged(const QString &text)
 	SetNameWarning("");
 }
 
+void ItemSettingsDialog::showEvent(QShowEvent *)
+{
+	if (_showNameEmptyWarning && _name->text().isEmpty()) {
+		_name->setFocus(Qt::OtherFocusReason);
+	}
+}
+
 void ItemSettingsDialog::SetNameWarning(const QString warn)
 {
 	if (warn.isEmpty()) {

lib/utils/item-selection-helpers.hpp

@@ -52,6 +52,7 @@ private slots:
 	void NameChanged(const QString &);
 
 protected:
+	virtual void showEvent(QShowEvent *) override;
 	void SetNameWarning(const QString);
 
 	QLineEdit *_name;

lib/utils/log-helper.hpp

@@ -1,7 +1,5 @@
 #pragma once
-#ifndef UNIT_TEST
 #include <util/base.h>
-#endif
 
 namespace advss {
 
@@ -9,6 +7,7 @@ namespace advss {
 #define blog(level, msg, ...)
 #define vblog(level, msg, ...)
 #define ablog(level, msg, ...)
+#define mblog(level, msg, ...)
 #else
 
 // Print log with "[adv-ss] " prefix

lib/utils/non-modal-dialog.cpp

@@ -1,14 +1,12 @@
 #include "non-modal-dialog.hpp"
 #include "obs-module-helper.hpp"
 
-#include <atomic>
 #include <mutex>
 #include <obs-frontend-api.h>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QLayout>
 #include <QMainWindow>
-#include <QCoreApplication>
 
 namespace advss {
 

lib/utils/plugin-state-helpers.cpp

@@ -3,12 +3,42 @@
 #include "macro-signals.hpp"
 #include "switcher-data.hpp"
 
+#include "obs-frontend-api.h"
+
 namespace advss {
 
 static std::mutex initMutex;
 static std::mutex postLoadMutex;
+static std::mutex finishLoadMutex;
 static std::mutex mutex;
 
+static bool setup();
+static bool setupDonw = setup();
+bool loadingFinished = false;
+
+static std::vector<std::function<void()>> &getFinishLoadSteps();
+
+static bool setup()
+{
+	static auto handleEvent = [](enum obs_frontend_event event, void *) {
+		switch (event) {
+		case OBS_FRONTEND_EVENT_FINISHED_LOADING: {
+			std::lock_guard<std::mutex> lock(finishLoadMutex);
+			for (const auto &step : getFinishLoadSteps()) {
+				step();
+			}
+			getFinishLoadSteps().clear();
+			loadingFinished = true;
+			break;
+		}
+		default:
+			break;
+		};
+	};
+	obs_frontend_add_event_callback(handleEvent, nullptr);
+	return true;
+}
+
 static std::vector<std::function<void()>> &getPluginInitSteps()
 {
 	static std::vector<std::function<void()>> steps;
@@ -63,6 +93,12 @@ static std::vector<std::function<void()>> &getPostLoadSteps()
 	return steps;
 }
 
+static std::vector<std::function<void()>> &getFinishLoadSteps()
+{
+	static std::vector<std::function<void()>> steps;
+	return steps;
+}
+
 void SavePluginSettings(obs_data_t *obj)
 {
 	GetSwitcher()->SaveSettings(obj);
@@ -136,7 +172,7 @@ void AddPluginInitStep(std::function<void()> step)
 
 void AddPluginPostLoadStep(std::function<void()> step)
 {
-	std::lock_guard<std::mutex> lock(initMutex);
+	std::lock_guard<std::mutex> lock(mutex);
 	getPluginPostLoadSteps().emplace_back(step);
 }
 
@@ -178,6 +214,16 @@ void RunIntervalResetSteps()
 	}
 }
 
+void AddFinishedLoadingStep(std::function<void()> step)
+{
+	std::lock_guard<std::mutex> lock(finishLoadMutex);
+	if (loadingFinished) {
+		return;
+	}
+
+	getFinishLoadSteps().emplace_back(step);
+}
+
 void AddStartStep(std::function<void()> step)
 {
 	std::lock_guard<std::mutex> lock(mutex);

lib/utils/plugin-state-helpers.hpp

@@ -34,6 +34,9 @@ void RunStartSteps();
 void RunStopSteps();
 void RunIntervalResetSteps();
 
+// Steps are executed after OBS_FRONTEND_EVENT_FINISHED_LOADING is fired
+EXPORT void AddFinishedLoadingStep(std::function<void()>);
+
 enum class NoMatchBehavior { NO_SWITCH = 0, SWITCH = 1, RANDOM_SWITCH = 2 };
 EXPORT void SetPluginNoMatchBehavior(NoMatchBehavior);
 EXPORT NoMatchBehavior GetPluginNoMatchBehavior();

lib/utils/splitter-helpers.cpp

@@ -37,8 +37,8 @@ void CenterSplitterPosition(QSplitter *splitter)
 
 void SetSplitterPositionByFraction(QSplitter *splitter, double fraction)
 {
-	int value1 = (double)QWIDGETSIZE_MAX * fraction;
-	int value2 = (double)QWIDGETSIZE_MAX * (1.0 - fraction);
+	int value1 = (int)((double)QWIDGETSIZE_MAX * fraction);
+	int value2 = (int)((double)QWIDGETSIZE_MAX * (1.0 - fraction));
 	splitter->setSizes(QList<int>() << value1 << value2);
 }
 

lib/utils/string-list.cpp

@@ -58,6 +58,9 @@ StringListEdit::StringListEdit(
 	  _filterCallback(filter),
 	  _preprocessCallback(preprocess)
 {
+	if (_addString.isEmpty()) {
+		_addString = obs_module_text("AdvSceneSwitcher.windowTitle");
+	}
 }
 
 void StringListEdit::SetStringList(const StringList &list)

lib/utils/string-list.hpp

@@ -10,6 +10,8 @@ namespace advss {
 
 class StringList : public QList<StringVariable> {
 public:
+	using QList<StringVariable>::QList;
+
 	EXPORT bool Save(obs_data_t *obj, const char *name,
 			 const char *elementName = "string") const;
 	EXPORT bool Load(obs_data_t *obj, const char *name,

lib/utils/sync-helpers.cpp

@@ -2,8 +2,22 @@
 
 namespace advss {
 
+#ifdef UNIT_TEST
+std::mutex *GetSwitcherMutex()
+{
+	static std::mutex m;
+	return &m;
+}
+std::unique_lock<std::mutex> *GetSwitcherLoopLock()
+{
+	static std::mutex m;
+	static std::unique_lock<std::mutex> lock(m);
+	return &lock;
+}
+#else
 std::mutex *GetSwitcherMutex();
 std::unique_lock<std::mutex> *GetSwitcherLoopLock();
+#endif
 
 std::mutex *GetMutex()
 {

lib/utils/sync-helpers.hpp

@@ -2,7 +2,6 @@
 #include "export-symbol-helper.hpp"
 
 #include <functional>
-#include <memory>
 #include <mutex>
 
 namespace advss {

lib/variables/variable-spinbox.cpp

@@ -81,13 +81,13 @@ void GenericVariableSpinbox::DisableVariableSelection()
 
 void GenericVariableSpinbox::setMinimum(double value)
 {
-	_fixedValueInt->setMinimum(value);
+	_fixedValueInt->setMinimum((int)value);
 	_fixedValueDouble->setMinimum(value);
 }
 
 void GenericVariableSpinbox::setMaximum(double value)
 {
-	_fixedValueInt->setMaximum(value);
+	_fixedValueInt->setMaximum((int)value);
 	_fixedValueDouble->setMaximum(value);
 }
 

lib/win/advanced-scene-switcher-win.cpp

@@ -261,6 +261,14 @@ std::optional<std::string> GetTextInWindow(const std::string &window)
 		return {};
 	}
 
+	DWORD pid = 0;
+	DWORD thid = 0;
+	thid = GetWindowThreadProcessId(hwnd, &pid);
+	// Calling CoCreateInstance() on the OBS windows might cause a deadlock
+	if (GetCurrentProcessId() == pid) {
+		return {};
+	}
+
 	IUIAutomation *automation = nullptr;
 	auto hr = CoCreateInstance(__uuidof(CUIAutomation), nullptr,
 				   CLSCTX_INPROC_SERVER,

plugins/base/CMakeLists.txt

@@ -150,6 +150,8 @@ target_sources(
           utils/connection-manager.hpp
           utils/cursor-helpers.cpp
           utils/cursor-helpers.hpp
+          utils/day-of-week-selector.cpp
+          utils/day-of-week-selector.hpp
           utils/filter-selection.cpp
           utils/filter-selection.hpp
           utils/hotkey-helpers.cpp
@@ -166,6 +168,8 @@ target_sources(
           utils/scene-item-selection.hpp
           utils/scene-item-transform-helpers.cpp
           utils/scene-item-transform-helpers.hpp
+          utils/transition-helpers.cpp
+          utils/transition-helpers.hpp
           utils/source-properties-button.cpp
           utils/source-properties-button.hpp
           utils/source-settings-helpers.cpp

plugins/base/macro-action-file.cpp

@@ -144,7 +144,7 @@ void MacroActionFileEdit::UpdateEntryData()
 	}
 
 	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
-	_filePath->SetPath(QString::fromStdString(_entryData->_file));
+	_filePath->SetPath(_entryData->_file);
 	_text->setPlainText(_entryData->_text);
 
 	adjustSize();

plugins/base/macro-action-scene-switch.cpp

@@ -4,6 +4,7 @@
 #include "plugin-state-helpers.hpp"
 #include "scene-switch-helpers.hpp"
 #include "source-helpers.hpp"
+#include "transition-helpers.hpp"
 
 #include <obs-frontend-api.h>
 
@@ -68,14 +69,6 @@ static int getTransitionOverrideDuration(OBSWeakSource &scene)
 	return duration;
 }
 
-static bool isUsingFixedLengthTransition(const OBSWeakSource &transition)
-{
-	obs_source_t *source = obs_weak_source_get_source(transition);
-	bool ret = obs_transition_fixed(source);
-	obs_source_release(source);
-	return ret;
-}
-
 static OBSWeakSource getOverrideTransition(OBSWeakSource &scene)
 {
 	OBSWeakSource transition;
@@ -101,13 +94,13 @@ static int getExpectedTransitionDuration(OBSWeakSource &scene,
 		auto overrideTransition = getOverrideTransition(scene);
 		if (overrideTransition) {
 			transition = overrideTransition;
-			if (!isUsingFixedLengthTransition(transition)) {
+			if (!IsFixedLengthTransition(transition)) {
 				return getTransitionOverrideDuration(scene);
 			}
 		}
 	}
 
-	if (isUsingFixedLengthTransition(transition)) {
+	if (IsFixedLengthTransition(transition)) {
 		return -1; // no API is available to access the fixed duration
 	}
 	if (duration != 0) {
@@ -503,7 +496,7 @@ shouldShowDurationInTransitionLayout(MacroActionSwitchScene::SceneType type,
 		return true;
 	}
 
-	if (isUsingFixedLengthTransition(transition.GetTransition())) {
+	if (IsFixedLengthTransition(transition.GetTransition())) {
 		return false;
 	}
 

plugins/base/macro-action-scene-visibility.cpp

@@ -1,5 +1,9 @@
 #include "macro-action-scene-visibility.hpp"
 #include "layout-helpers.hpp"
+#include "plugin-state-helpers.hpp"
+#include "transition-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 
@@ -21,9 +25,168 @@ const static std::map<MacroActionSceneVisibility::Action, std::string>
 		 "AdvSceneSwitcher.action.sceneVisibility.type.toggle"},
 };
 
+namespace {
+
+struct TransitionRestoreContext;
+static std::unordered_map<obs_sceneitem_t *, TransitionRestoreContext *>
+	restoreContexts;
+static std::mutex restoreMutex;
+
+struct TransitionRestoreContext {
+public:
+	obs_sceneitem_t *item;
+	bool wasVisible;
+
+	OBSSource originalTransition = nullptr;
+	uint32_t originalDuration;
+
+	obs_source_t *transition = nullptr;
+	signal_handler_t *sh = nullptr;
+};
+
+} // namespace
+
+static void handleShutdown(enum obs_frontend_event event, void *private_data)
+{
+	if (event != OBS_FRONTEND_EVENT_EXIT) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(restoreMutex);
+	for (const auto &[_, ctx] : restoreContexts) {
+		obs_source_release(ctx->transition);
+	}
+	restoreContexts.clear();
+}
+
+static bool setup()
+{
+	obs_frontend_add_event_callback(handleShutdown, nullptr);
+	return true;
+}
+
+static bool setupDone = setup();
+
+static void handleSourceDestroyed(void *param, calldata_t *)
+{
+	if (OBSIsShuttingDown()) {
+		return;
+	}
+
+	auto ctx = static_cast<TransitionRestoreContext *>(param);
+	ctx->sh = nullptr;
+	ctx->originalTransition = nullptr;
+	delete ctx;
+}
+
+static void resetSceneItemTransition(void *param, calldata_t *)
+{
+	if (OBSIsShuttingDown()) {
+		return;
+	}
+
+	auto ctx = static_cast<TransitionRestoreContext *>(param);
+
+	if (!ctx) {
+		return;
+	}
+
+	SetSceneItemTransition(ctx->item, ctx->originalTransition,
+			       !ctx->wasVisible);
+
+	obs_sceneitem_set_transition_duration(ctx->item, !ctx->wasVisible,
+					      ctx->originalDuration);
+
+	signal_handler_disconnect(ctx->sh, "transition_stop",
+				  resetSceneItemTransition, ctx);
+	signal_handler_disconnect(ctx->sh, "destroy", handleSourceDestroyed,
+				  ctx);
+
+	{
+		std::lock_guard<std::mutex> lock(restoreMutex);
+		restoreContexts.erase(ctx->item);
+	}
+
+	obs_source_release(ctx->transition);
+	delete ctx;
+}
+
+static void attachRestoreContext(obs_sceneitem_t *item,
+				 obs_source_t *transition, bool itemWasVisible,
+				 OBSSource originalTransition,
+				 uint32_t originalDuration)
+{
+	signal_handler_t *sh = obs_source_get_signal_handler(transition);
+	if (!sh) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(restoreMutex);
+
+	auto ctx = new TransitionRestoreContext{
+		item,
+		itemWasVisible,
+		originalTransition,
+		originalDuration,
+		obs_source_get_ref(transition),
+		sh,
+	};
+
+	auto it = restoreContexts.find(item);
+	if (it != restoreContexts.end()) {
+		auto *oldCtx = it->second;
+
+		signal_handler_disconnect(oldCtx->sh, "transition_stop",
+					  resetSceneItemTransition, oldCtx);
+
+		signal_handler_disconnect(oldCtx->sh, "destroy",
+					  handleSourceDestroyed, oldCtx);
+
+		ctx->originalTransition = oldCtx->originalTransition;
+		ctx->originalDuration = oldCtx->originalDuration;
+
+		obs_source_release(oldCtx->transition);
+		delete oldCtx;
+
+		restoreContexts.erase(it);
+	}
+
+	restoreContexts[item] = ctx;
+
+	signal_handler_connect(sh, "transition_stop", resetSceneItemTransition,
+			       ctx);
+	signal_handler_connect(sh, "destroy", handleSourceDestroyed, ctx);
+}
+
 static void setSceneItemVisibility(obs_sceneitem_t *item,
+				   const bool setTransition,
+				   const OBSWeakSource &transitionWeak,
+				   const bool setDuration,
+				   const Duration &duration,
 				   MacroActionSceneVisibility::Action action)
 {
+	const OBSSourceAutoRelease transition = OBSGetStrongRef(transitionWeak);
+	const bool itemIsVisible = obs_sceneitem_visible(item);
+
+	const OBSSource currentTransition =
+		obs_sceneitem_get_transition(item, !itemIsVisible);
+	const uint32_t currentTransitionDuration =
+		obs_sceneitem_get_transition_duration(item, !itemIsVisible);
+
+	OBSSource privateTransitionSource = nullptr;
+	if (setTransition) {
+		privateTransitionSource = SetSceneItemTransition(
+			item, transition, !itemIsVisible);
+	} else {
+		privateTransitionSource =
+			obs_sceneitem_get_transition(item, !itemIsVisible);
+	}
+
+	if (setDuration) {
+		obs_sceneitem_set_transition_duration(item, !itemIsVisible,
+						      duration.Milliseconds());
+	}
+
 	switch (action) {
 	case MacroActionSceneVisibility::Action::SHOW:
 		obs_sceneitem_set_visible(item, true);
@@ -32,16 +195,43 @@ static void setSceneItemVisibility(obs_sceneitem_t *item,
 		obs_sceneitem_set_visible(item, false);
 		break;
 	case MacroActionSceneVisibility::Action::TOGGLE:
-		obs_sceneitem_set_visible(item, !obs_sceneitem_visible(item));
+		obs_sceneitem_set_visible(item, !itemIsVisible);
 		break;
 	}
+
+	if (!setTransition && !setDuration) {
+		return;
+	}
+
+	if (!privateTransitionSource) {
+		if (setTransition) {
+			SetSceneItemTransition(item, currentTransition,
+					       !itemIsVisible);
+		}
+		if (setDuration) {
+			obs_sceneitem_set_transition_duration(
+				item, !itemIsVisible,
+				currentTransitionDuration);
+		}
+		return;
+	}
+
+	auto sh = obs_source_get_signal_handler(privateTransitionSource);
+	if (!sh) {
+		return;
+	}
+
+	attachRestoreContext(item, privateTransitionSource, itemIsVisible,
+			     currentTransition, currentTransitionDuration);
 }
 
 bool MacroActionSceneVisibility::PerformAction()
 {
 	auto items = _source.GetSceneItems(_scene);
 	for (const auto &item : items) {
-		setSceneItemVisibility(item, _action);
+		setSceneItemVisibility(item, _updateTransition,
+				       _transition.GetTransition(),
+				       _updateDuration, _duration, _action);
 	}
 	return true;
 }
@@ -66,6 +256,10 @@ bool MacroActionSceneVisibility::Save(obs_data_t *obj) const
 	MacroAction::Save(obj);
 	_scene.Save(obj);
 	_source.Save(obj);
+	obs_data_set_bool(obj, "updateTransition", _updateTransition);
+	_transition.Save(obj);
+	obs_data_set_bool(obj, "updateDuration", _updateDuration);
+	_duration.Save(obj);
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	return true;
 }
@@ -82,6 +276,10 @@ bool MacroActionSceneVisibility::Load(obs_data_t *obj)
 	MacroAction::Load(obj);
 	_scene.Load(obj);
 	_source.Load(obj);
+	_updateTransition = obs_data_get_bool(obj, "updateTransition");
+	_transition.Load(obj);
+	_updateDuration = obs_data_get_bool(obj, "updateDuration");
+	_duration.Load(obj);
 	_action = static_cast<MacroActionSceneVisibility::Action>(
 		obs_data_get_int(obj, "action"));
 
@@ -141,10 +339,17 @@ MacroActionSceneVisibilityEdit::MacroActionSceneVisibilityEdit(
 			  SceneItemSelection::Type::ALL,
 		  },
 		  SceneItemSelectionWidget::NameClashMode::ALL)),
+	  _updateTransition(new QCheckBox(this)),
+	  _transitions(new TransitionSelectionWidget(this, false, false)),
+	  _updateDuration(new QCheckBox(this)),
+	  _duration(new DurationSelection(this, false)),
+	  _durationLayout(new QHBoxLayout),
 	  _actions(new QComboBox())
 {
 	populateActionSelection(_actions);
 
+	_duration->SpinBox()->setSpecialValueText("-");
+
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
 	QWidget::connect(_scenes, SIGNAL(SceneChanged(const SceneSelection &)),
@@ -154,18 +359,49 @@ MacroActionSceneVisibilityEdit::MacroActionSceneVisibilityEdit(
 	QWidget::connect(_sources,
 			 SIGNAL(SceneItemChanged(const SceneItemSelection &)),
 			 this, SLOT(SourceChanged(const SceneItemSelection &)));
+	QWidget::connect(_updateTransition, SIGNAL(stateChanged(int)), this,
+			 SLOT(UpdateTransitionChanged(int)));
+	QWidget::connect(_transitions,
+			 SIGNAL(TransitionChanged(const TransitionSelection &)),
+			 this,
+			 SLOT(TransitionChanged(const TransitionSelection &)));
+	QWidget::connect(_updateDuration, SIGNAL(stateChanged(int)), this,
+			 SLOT(UpdateDurationChanged(int)));
+	QWidget::connect(_duration, SIGNAL(DurationChanged(const Duration &)),
+			 this, SLOT(DurationChanged(const Duration &)));
 
-	auto layout = new QHBoxLayout;
+	auto sceneItemLayout = new QHBoxLayout;
 	PlaceWidgets(obs_module_text(
-			     "AdvSceneSwitcher.action.sceneVisibility.entry"),
-		     layout,
+			     "AdvSceneSwitcher.action.sceneVisibility.layout"),
+		     sceneItemLayout,
 		     {{"{{scenes}}", _scenes},
 		      {"{{sources}}", _sources},
 		      {"{{actions}}", _actions}});
+
+	auto transitionLayout = new QHBoxLayout;
+	PlaceWidgets(
+		obs_module_text(
+			"AdvSceneSwitcher.action.sceneVisibility.layout.transition"),
+		transitionLayout,
+		{{"{{updateTransition}}", _updateTransition},
+		 {"{{transitions}}", _transitions}});
+
+	PlaceWidgets(
+		obs_module_text(
+			"AdvSceneSwitcher.action.sceneVisibility.layout.duration"),
+		_durationLayout,
+		{{"{{updateDuration}}", _updateDuration},
+		 {"{{duration}}", _duration}});
+
+	auto layout = new QVBoxLayout;
+	layout->addLayout(sceneItemLayout);
+	layout->addLayout(transitionLayout);
+	layout->addLayout(_durationLayout);
 	setLayout(layout);
 
 	_entryData = entryData;
 	UpdateEntryData();
+	SetWidgetVisibility();
 	_loading = false;
 }
 
@@ -177,7 +413,11 @@ void MacroActionSceneVisibilityEdit::UpdateEntryData()
 
 	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
 	_scenes->SetScene(_entryData->_scene);
-	_sources->SetSceneItem((_entryData->_source));
+	_sources->SetSceneItem(_entryData->_source);
+	_updateTransition->setChecked(_entryData->_updateTransition);
+	_transitions->SetTransition(_entryData->_transition);
+	_updateDuration->setChecked(_entryData->_updateDuration);
+	_duration->SetDuration(_entryData->_duration);
 }
 
 void MacroActionSceneVisibilityEdit::SceneChanged(const SceneSelection &s)
@@ -197,6 +437,34 @@ void MacroActionSceneVisibilityEdit::SourceChanged(
 	updateGeometry();
 }
 
+void MacroActionSceneVisibilityEdit::UpdateTransitionChanged(int state)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_updateTransition = state;
+	SetWidgetVisibility();
+}
+
+void MacroActionSceneVisibilityEdit::TransitionChanged(
+	const TransitionSelection &t)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_transition = t;
+	SetWidgetVisibility();
+}
+
+void MacroActionSceneVisibilityEdit::UpdateDurationChanged(int state)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_updateDuration = state;
+	SetWidgetVisibility();
+}
+
+void MacroActionSceneVisibilityEdit::DurationChanged(const Duration &dur)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_duration = dur;
+}
+
 void MacroActionSceneVisibilityEdit::ActionChanged(int value)
 {
 	GUARD_LOADING_AND_LOCK();
@@ -204,4 +472,20 @@ void MacroActionSceneVisibilityEdit::ActionChanged(int value)
 		static_cast<MacroActionSceneVisibility::Action>(value);
 }
 
+void MacroActionSceneVisibilityEdit::SetWidgetVisibility()
+{
+	const bool hideDurationSelection =
+		_entryData->_updateTransition &&
+		IsFixedLengthTransition(
+			_entryData->_transition.GetTransition());
+
+	SetLayoutVisible(_durationLayout, !hideDurationSelection);
+
+	_transitions->setEnabled(_entryData->_updateTransition);
+	_duration->setEnabled(_entryData->_updateDuration);
+
+	adjustSize();
+	updateGeometry();
+}
+
 } // namespace advss

plugins/base/macro-action-scene-visibility.hpp

@@ -1,7 +1,9 @@
 #pragma once
+#include "duration-control.hpp"
 #include "macro-action-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
+#include "transition-selection.hpp"
 
 namespace advss {
 
@@ -20,6 +22,10 @@ public:
 
 	SceneSelection _scene;
 	SceneItemSelection _source;
+	bool _updateTransition = false;
+	TransitionSelection _transition;
+	bool _updateDuration = false;
+	Duration _duration;
 
 	enum class Action {
 		SHOW,
@@ -53,17 +59,27 @@ public:
 private slots:
 	void SceneChanged(const SceneSelection &);
 	void SourceChanged(const SceneItemSelection &);
+	void UpdateTransitionChanged(int);
+	void TransitionChanged(const TransitionSelection &);
+	void UpdateDurationChanged(int);
+	void DurationChanged(const Duration &seconds);
 	void ActionChanged(int value);
 signals:
 	void HeaderInfoChanged(const QString &);
 
-protected:
+private:
+	void SetWidgetVisibility();
+
 	SceneSelectionWidget *_scenes;
 	SceneItemSelectionWidget *_sources;
+	QCheckBox *_updateTransition;
+	TransitionSelectionWidget *_transitions;
+	QCheckBox *_updateDuration;
+	DurationSelection *_duration;
+	QHBoxLayout *_durationLayout;
 	QComboBox *_actions;
-	std::shared_ptr<MacroActionSceneVisibility> _entryData;
 
-private:
+	std::shared_ptr<MacroActionSceneVisibility> _entryData;
 	bool _loading = true;
 };
 

plugins/base/macro-action-transition.cpp

@@ -1,5 +1,6 @@
 #include "macro-action-transition.hpp"
 #include "layout-helpers.hpp"
+#include "transition-helpers.hpp"
 
 #include <obs-frontend-api.h>
 
@@ -75,26 +76,6 @@ static void obs_sceneitem_set_transition_duration(obs_sceneitem_t *item,
 }
 #endif
 
-static void setSceneItemTransition(const OBSSceneItem &item,
-				   const OBSSourceAutoRelease &transition,
-				   bool show)
-{
-	OBSDataAutoRelease settings = obs_source_get_settings(transition);
-	if (!transition || !settings) {
-		// Set transition to "None"
-		obs_sceneitem_set_transition(item, show, nullptr);
-		return;
-	}
-
-	// We cannot share the transition source between
-	// scene items without introducing strange graphical
-	// artifacts so we have to create new ones here
-	OBSSourceAutoRelease transitionSource = obs_source_create_private(
-		obs_source_get_id(transition), obs_source_get_name(transition),
-		settings);
-	obs_sceneitem_set_transition(item, show, transitionSource);
-}
-
 void MacroActionTransition::SetSourceTransition(bool show)
 {
 #if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(27, 0, 0)
@@ -103,7 +84,7 @@ void MacroActionTransition::SetSourceTransition(bool show)
 	const auto items = _source.GetSceneItems(_scene);
 	for (const auto &item : items) {
 		if (_setTransitionType) {
-			setSceneItemTransition(item, transition, show);
+			SetSceneItemTransition(item, transition, show);
 		}
 		if (_setDuration) {
 			obs_sceneitem_set_transition_duration(

plugins/base/macro-condition-date.cpp

@@ -38,32 +38,13 @@ const static std::map<MacroConditionDate::Condition, std::string>
 		 "AdvSceneSwitcher.condition.date.state.before"},
 };
 
-const static std::map<MacroConditionDate::Day, std::string> dayOfWeekNames = {
-	{MacroConditionDate::Day::ANY,
-	 "AdvSceneSwitcher.condition.date.anyDay"},
-	{MacroConditionDate::Day::MONDAY,
-	 "AdvSceneSwitcher.condition.date.monday"},
-	{MacroConditionDate::Day::TUESDAY,
-	 "AdvSceneSwitcher.condition.date.tuesday"},
-	{MacroConditionDate::Day::WEDNESDAY,
-	 "AdvSceneSwitcher.condition.date.wednesday"},
-	{MacroConditionDate::Day::THURSDAY,
-	 "AdvSceneSwitcher.condition.date.thursday"},
-	{MacroConditionDate::Day::FRIDAY,
-	 "AdvSceneSwitcher.condition.date.friday"},
-	{MacroConditionDate::Day::SATURDAY,
-	 "AdvSceneSwitcher.condition.date.saturday"},
-	{MacroConditionDate::Day::SUNDAY,
-	 "AdvSceneSwitcher.condition.date.sunday"},
-};
-
 bool MacroConditionDate::CheckDayOfWeek(int64_t msSinceLastCheck)
 {
 	QDateTime cur = QDateTime::currentDateTime();
 	SetVariables(cur);
 
-	if (_dayOfWeek != Day::ANY &&
-	    cur.date().dayOfWeek() != static_cast<int>(_dayOfWeek)) {
+	if (!_days.contains(static_cast<DayOfWeekSelector::Day>(
+		    cur.date().dayOfWeek()))) {
 		return false;
 	}
 	if (_ignoreTime) {
@@ -201,7 +182,7 @@ bool MacroConditionDate::CheckCondition()
 bool MacroConditionDate::Save(obs_data_t *obj) const
 {
 	MacroCondition::Save(obj);
-	obs_data_set_int(obj, "dayOfWeek", static_cast<int>(_dayOfWeek));
+	SaveSelectedDays(obj, _days);
 	obs_data_set_int(obj, "condition", static_cast<int>(_condition));
 	const auto &dateToSave = _updateOnRepeat ? _dateTime : _origDateTime;
 	const auto &dateToSave2 = _updateOnRepeat ? _dateTime2 : _origDateTime2;
@@ -216,13 +197,14 @@ bool MacroConditionDate::Save(obs_data_t *obj) const
 	_duration.Save(obj);
 	obs_data_set_bool(obj, "dayOfWeekCheck", _dayOfWeekCheck);
 	obs_data_set_string(obj, "pattern", _pattern.c_str());
+	obs_data_set_int(obj, "version", 1);
 	return true;
 }
 
 bool MacroConditionDate::Load(obs_data_t *obj)
 {
 	MacroCondition::Load(obj);
-	_dayOfWeek = static_cast<Day>(obs_data_get_int(obj, "dayOfWeek"));
+	_days = LoadSelectedDays(obj);
 	_condition = static_cast<MacroConditionDate::Condition>(
 		obs_data_get_int(obj, "condition"));
 	_dateTime = QDateTime::fromString(
@@ -245,17 +227,64 @@ bool MacroConditionDate::Load(obs_data_t *obj)
 	    _condition == MacroConditionDate::Condition::BETWEEN) {
 		_condition = MacroConditionDate::Condition::AT;
 	}
+
+	if (!obs_data_has_user_value(obj, "version")) {
+		enum class Day {
+			ANY = 0,
+			MONDAY,
+			TUESDAY,
+			WEDNESDAY,
+			THURSDAY,
+			FRIDAY,
+			SATURDAY,
+			SUNDAY,
+		};
+		auto oldDay =
+			static_cast<Day>(obs_data_get_int(obj, "dayOfWeek"));
+		switch (oldDay) {
+		case Day::ANY:
+			_days = {DayOfWeekSelector::Monday,
+				 DayOfWeekSelector::Tuesday,
+				 DayOfWeekSelector::Wednesday,
+				 DayOfWeekSelector::Thursday,
+				 DayOfWeekSelector::Friday,
+				 DayOfWeekSelector::Saturday,
+				 DayOfWeekSelector::Sunday};
+			break;
+		case Day::MONDAY:
+			_days = {DayOfWeekSelector::Monday};
+			break;
+		case Day::TUESDAY:
+			_days = {DayOfWeekSelector::Tuesday};
+			break;
+		case Day::WEDNESDAY:
+			_days = {DayOfWeekSelector::Wednesday};
+			break;
+		case Day::THURSDAY:
+			_days = {DayOfWeekSelector::Thursday};
+			break;
+		case Day::FRIDAY:
+			_days = {DayOfWeekSelector::Friday};
+			break;
+		case Day::SATURDAY:
+			_days = {DayOfWeekSelector::Saturday};
+			break;
+		case Day::SUNDAY:
+			_days = {DayOfWeekSelector::Sunday};
+			break;
+		default:
+			break;
+		}
+	}
+
 	return true;
 }
 
 std::string MacroConditionDate::GetShortDesc() const
 {
 	if (_dayOfWeekCheck) {
-		auto it = dayOfWeekNames.find(_dayOfWeek);
-		if (it == dayOfWeekNames.end()) {
-			return "";
-		}
-		std::string dayName = obs_module_text(it->second.c_str());
+		const auto dayName =
+			DayOfWeekSelector::ToString(_days).toStdString();
 		if (_ignoreTime) {
 			return dayName;
 		}
@@ -347,13 +376,6 @@ void MacroConditionDate::SetupTempVars()
 		   obs_module_text("AdvSceneSwitcher.tempVar.date.dayOfWeek"));
 }
 
-static inline void populateDaySelection(QComboBox *list)
-{
-	for (auto entry : dayOfWeekNames) {
-		list->addItem(obs_module_text(entry.second.c_str()));
-	}
-}
-
 static inline void populateConditionSelection(QComboBox *list)
 {
 	for (auto entry : dateConditionTypes) {
@@ -372,7 +394,7 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 	QWidget *parent, std::shared_ptr<MacroConditionDate> entryData)
 	: QWidget(parent),
 	  _weekCondition(new QComboBox()),
-	  _dayOfWeek(new QComboBox()),
+	  _days(new DayOfWeekSelector(this)),
 	  _ignoreWeekTime(new QCheckBox()),
 	  _weekTime(new QTimeEdit()),
 	  _condition(new QComboBox()),
@@ -392,7 +414,7 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 	  _currentDate(new QLabel()),
 	  _advancedSettingsTooggle(new QPushButton(obs_module_text(
 		  "AdvSceneSwitcher.condition.date.showAdvancedSettings"))),
-	  _simpleLayout(new QHBoxLayout()),
+	  _simpleLayout(new QVBoxLayout()),
 	  _advancedLayout(new QHBoxLayout()),
 	  _repeatLayout(new QVBoxLayout()),
 	  _repeatUpdateLayout(new QHBoxLayout()),
@@ -418,8 +440,8 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 
 	QWidget::connect(_weekCondition, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ConditionChanged(int)));
-	QWidget::connect(_dayOfWeek, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(DayOfWeekChanged(int)));
+	QWidget::connect(_days, &DayOfWeekSelector::SelectionChanged, this,
+			 &MacroConditionDateEdit::DaysChanged);
 	QWidget::connect(_ignoreWeekTime, SIGNAL(stateChanged(int)), this,
 			 SLOT(IgnoreTimeChanged(int)));
 	QWidget::connect(_weekTime, SIGNAL(timeChanged(const QTime &)), this,
@@ -449,13 +471,12 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 	QWidget::connect(_pattern, SIGNAL(editingFinished()), this,
 			 SLOT(PatternChanged()));
 
-	populateDaySelection(_dayOfWeek);
 	populateConditionSelection(_condition);
 	populateWeekConditionSelection(_weekCondition);
 
 	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{weekCondition}}", _weekCondition},
-		{"{{dayOfWeek}}", _dayOfWeek},
+		{"{{dayOfWeek}}", _days},
 		{"{{ignoreWeekTime}}", _ignoreWeekTime},
 		{"{{weekTime}}", _weekTime},
 		{"{{condition}}", _condition},
@@ -472,28 +493,39 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 		{"{{pattern}}", _pattern},
 		{"{{currentDate}}", _currentDate},
 	};
+
+	auto dayLayout = new QHBoxLayout;
 	PlaceWidgets(
-		obs_module_text("AdvSceneSwitcher.condition.date.entry.simple"),
-		_simpleLayout, widgetPlaceholders);
+		obs_module_text(
+			"AdvSceneSwitcher.condition.date.layout.simple.day"),
+		dayLayout, widgetPlaceholders);
+	auto timeLayout = new QHBoxLayout;
+	PlaceWidgets(
+		obs_module_text(
+			"AdvSceneSwitcher.condition.date.layout.simple.time"),
+		timeLayout, widgetPlaceholders);
+	_simpleLayout->addLayout(dayLayout);
+	_simpleLayout->addLayout(timeLayout);
+
 	PlaceWidgets(obs_module_text(
-			     "AdvSceneSwitcher.condition.date.entry.advanced"),
+			     "AdvSceneSwitcher.condition.date.layout.advanced"),
 		     _advancedLayout, widgetPlaceholders);
 	PlaceWidgets(
 		obs_module_text(
-			"AdvSceneSwitcher.condition.date.entry.updateOnRepeat"),
+			"AdvSceneSwitcher.condition.date.layout.updateOnRepeat"),
 		_repeatUpdateLayout, widgetPlaceholders);
 	auto repeatLayout = new QHBoxLayout;
-	PlaceWidgets(
-		obs_module_text("AdvSceneSwitcher.condition.date.entry.repeat"),
-		repeatLayout, widgetPlaceholders);
 	PlaceWidgets(obs_module_text(
-			     "AdvSceneSwitcher.condition.date.entry.pattern"),
+			     "AdvSceneSwitcher.condition.date.layout.repeat"),
+		     repeatLayout, widgetPlaceholders);
+	PlaceWidgets(obs_module_text(
+			     "AdvSceneSwitcher.condition.date.layout.pattern"),
 		     _patternLayout, widgetPlaceholders);
 	_repeatLayout->addLayout(repeatLayout);
 	_repeatLayout->addWidget(_nextMatchDate);
 	_repeatLayout->addLayout(_repeatUpdateLayout);
 
-	auto *mainLayout = new QVBoxLayout;
+	auto mainLayout = new QVBoxLayout;
 	mainLayout->addLayout(_simpleLayout);
 	mainLayout->addLayout(_advancedLayout);
 	mainLayout->addLayout(_patternLayout);
@@ -515,10 +547,11 @@ MacroConditionDateEdit::MacroConditionDateEdit(
 	_loading = false;
 }
 
-void MacroConditionDateEdit::DayOfWeekChanged(int day)
+void MacroConditionDateEdit::DaysChanged(
+	const QSet<DayOfWeekSelector::Day> &days)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_dayOfWeek = static_cast<MacroConditionDate::Day>(day);
+	_entryData->_days = days;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
 }
@@ -632,7 +665,7 @@ void MacroConditionDateEdit::ShowNextMatch()
 		return;
 	}
 	QString format(obs_module_text(
-		"AdvSceneSwitcher.condition.date.entry.nextMatchDate"));
+		"AdvSceneSwitcher.condition.date.layout.nextMatchDate"));
 	_nextMatchDate->setText(
 		format.arg(_entryData->GetNextMatchDateTime().toString()));
 }
@@ -658,8 +691,7 @@ void MacroConditionDateEdit::UpdateEntryData()
 	}
 	_weekCondition->setCurrentIndex(
 		static_cast<int>(_entryData->_condition));
-	_dayOfWeek->setCurrentIndex(
-		static_cast<int>(static_cast<int>(_entryData->_dayOfWeek)));
+	_days->SetSelectedDays(_entryData->_days);
 	_ignoreWeekTime->setChecked(!_entryData->_ignoreTime);
 	_weekTime->setTime(_entryData->GetDateTime1().time());
 	_condition->setCurrentIndex(static_cast<int>(_entryData->_condition));

plugins/base/macro-condition-date.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include "macro-condition-edit.hpp"
+#include "day-of-week-selector.hpp"
 #include "duration-control.hpp"
 
 #include <QCheckBox>
@@ -30,17 +31,6 @@ public:
 	QDateTime GetDateTime2() const;
 	QDateTime GetNextMatchDateTime() const;
 
-	enum class Day {
-		ANY = 0,
-		MONDAY,
-		TUESDAY,
-		WEDNESDAY,
-		THURSDAY,
-		FRIDAY,
-		SATURDAY,
-		SUNDAY,
-	};
-
 	enum class Condition {
 		AT,
 		AFTER,
@@ -49,7 +39,11 @@ public:
 		PATTERN,
 	};
 
-	Day _dayOfWeek = Day::ANY;
+	QSet<DayOfWeekSelector::Day> _days = {
+		DayOfWeekSelector::Day::Monday,
+		DayOfWeekSelector::Day::Tuesday,
+		DayOfWeekSelector::Day::Wednesday,
+	};
 	bool _ignoreDate = false;
 	bool _ignoreTime = false;
 	bool _repeat = false;
@@ -94,7 +88,7 @@ public:
 	}
 
 private slots:
-	void DayOfWeekChanged(int day);
+	void DaysChanged(const QSet<DayOfWeekSelector::Day> &);
 	void ConditionChanged(int cond);
 	void DateChanged(const QDate &date);
 	void TimeChanged(const QTime &time);
@@ -114,7 +108,7 @@ signals:
 
 protected:
 	QComboBox *_weekCondition;
-	QComboBox *_dayOfWeek;
+	DayOfWeekSelector *_days;
 	QCheckBox *_ignoreWeekTime;
 	QTimeEdit *_weekTime;
 
@@ -134,7 +128,7 @@ protected:
 	QLabel *_currentDate;
 
 	QPushButton *_advancedSettingsTooggle;
-	QHBoxLayout *_simpleLayout;
+	QVBoxLayout *_simpleLayout;
 	QHBoxLayout *_advancedLayout;
 	QVBoxLayout *_repeatLayout;
 	QHBoxLayout *_repeatUpdateLayout;

plugins/base/macro-condition-game-capture.cpp

@@ -55,17 +55,17 @@ void MacroConditionGameCapture::GetCalldataInfo(calldata_t *cd)
 	if (!calldata_get_string(cd, "title", &title)) {
 		blog(LOG_WARNING, "%s failed to get title", __func__);
 	}
-	_title = title;
+	_title = title ? title : "";
 	const char *className = "";
 	if (!calldata_get_string(cd, "class", &className)) {
 		blog(LOG_WARNING, "%s failed to get class", __func__);
 	}
-	_class = className;
+	_class = className ? className : "";
 	const char *executable = "";
 	if (!calldata_get_string(cd, "executable", &executable)) {
 		blog(LOG_WARNING, "%s failed to get executable", __func__);
 	}
-	_executable = executable;
+	_executable = executable ? executable : "";
 }
 
 void MacroConditionGameCapture::HookedSignalReceived(void *data, calldata_t *cd)

plugins/base/macro-condition-window.cpp

@@ -29,6 +29,22 @@ static bool windowContainsText(const std::string &window,
 	return text == matchText;
 }
 
+void MacroConditionWindow::SetCheckText(bool value)
+{
+#ifdef _WIN32
+	_checkText = value;
+#else
+	(void)value;
+	_checkText = false;
+#endif
+	SetupTempVars();
+}
+
+bool MacroConditionWindow::GetCheckText()
+{
+	return _checkText;
+}
+
 bool MacroConditionWindow::WindowMatchesRequirements(
 	const std::string &window) const
 {
@@ -94,12 +110,18 @@ void MacroConditionWindow::SetVariableValueBasedOnMatch(
 #ifdef _WIN32
 	SetTempVarValue("windowClass",
 			GetWindowClassByWindowTitle(matchWindow));
+	if (_checkText) {
+		const auto text = GetTextInWindow(matchWindow);
+		if (text) {
+			SetTempVarValue("windowText", *text);
+		}
+	}
 #endif
 	if (!IsReferencedInVars()) {
 		return;
 	}
 	if (_checkText) {
-		auto text = GetTextInWindow(matchWindow);
+		const auto text = GetTextInWindow(matchWindow);
 		SetVariableValue(text.value_or(""));
 	} else {
 		SetVariableValue(ForegroundWindowTitle());
@@ -186,6 +208,16 @@ void MacroConditionWindow::SetupTempVars()
 		obs_module_text("AdvSceneSwitcher.tempVar.window.windowClass"),
 		obs_module_text(
 			"AdvSceneSwitcher.tempVar.window.windowClass.description"));
+
+	if (!_checkText) {
+		return;
+	}
+
+	AddTempvar(
+		"windowText",
+		obs_module_text("AdvSceneSwitcher.tempVar.window.windowText"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.window.windowText.description"));
 #endif
 }
 
@@ -349,7 +381,7 @@ void MacroConditionWindowEdit::CheckTitleChanged(int state)
 void MacroConditionWindowEdit::CheckTextChanged(int state)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_checkText = state;
+	_entryData->SetCheckText(state);
 	SetWidgetVisibility();
 }
 
@@ -409,8 +441,8 @@ void MacroConditionWindowEdit::SetWidgetVisibility()
 			 _entryData->_focus || _entryData->_windowFocusChanged);
 	_windowSelection->setVisible(_entryData->_checkTitle);
 	_windowRegex->setVisible(_entryData->_checkTitle);
-	_textRegex->setVisible(_entryData->_checkText);
-	_text->setVisible(_entryData->_checkText);
+	_textRegex->setVisible(_entryData->GetCheckText());
+	_text->setVisible(_entryData->GetCheckText());
 	adjustSize();
 	updateGeometry();
 }
@@ -429,7 +461,7 @@ void MacroConditionWindowEdit::UpdateEntryData()
 	_maximized->setChecked(_entryData->_maximized);
 	_focused->setChecked(_entryData->_focus);
 	_windowFocusChanged->setChecked(_entryData->_windowFocusChanged);
-	_checkText->setChecked(_entryData->_checkText);
+	_checkText->setChecked(_entryData->GetCheckText());
 	_text->setPlainText(_entryData->_text);
 	_textRegex->SetRegexConfig(_entryData->_textRegex);
 	SetWidgetVisibility();

plugins/base/macro-condition-window.hpp

@@ -22,6 +22,9 @@ public:
 		return std::make_shared<MacroConditionWindow>(m);
 	}
 
+	void SetCheckText(bool value);
+	bool GetCheckText();
+
 	StringVariable _window;
 	RegexConfig _windowRegex;
 	bool _checkTitle = true;
@@ -30,8 +33,6 @@ public:
 	bool _focus = true;
 	bool _windowFocusChanged = false;
 
-	// For now only supported on Windows
-	bool _checkText = false;
 	StringVariable _text;
 	RegexConfig _textRegex = RegexConfig::PartialMatchRegexConfig();
 
@@ -42,6 +43,9 @@ private:
 	void SetVariableValueBasedOnMatch(const std::string &matchWindow);
 	void SetupTempVars();
 
+	// For now only supported on Windows
+	bool _checkText = false;
+
 	static bool _registered;
 	static const std::string id;
 };

plugins/base/utils/day-of-week-selector.cpp

@@ -0,0 +1,121 @@
+#include "day-of-week-selector.hpp"
+#include "obs-module-helper.hpp"
+
+#include <QPushButton>
+#include <QHBoxLayout>
+
+namespace advss {
+
+DayOfWeekSelector::DayOfWeekSelector(QWidget *parent) : QWidget(parent)
+{
+	auto layout = new QHBoxLayout(this);
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->setSpacing(4);
+
+	const QVector<QPair<Day, QString>> days = {
+		{Monday, obs_module_text("AdvSceneSwitcher.day.monday")},
+		{Tuesday, obs_module_text("AdvSceneSwitcher.day.tuesday")},
+		{Wednesday, obs_module_text("AdvSceneSwitcher.day.wednesday")},
+		{Thursday, obs_module_text("AdvSceneSwitcher.day.thursday")},
+		{Friday, obs_module_text("AdvSceneSwitcher.day.friday")},
+		{Saturday, obs_module_text("AdvSceneSwitcher.day.saturday")},
+		{Sunday, obs_module_text("AdvSceneSwitcher.day.sunday")}};
+
+	for (const auto &[day, name] : days) {
+		auto btn = new QPushButton(this);
+		btn->setText(name);
+		btn->setCheckable(true);
+
+		connect(btn, &QPushButton::toggled, this,
+			&DayOfWeekSelector::OnButtonToggled);
+
+		layout->addWidget(btn);
+		m_buttons.insert(day, btn);
+	}
+
+	setLayout(layout);
+}
+
+void DayOfWeekSelector::OnButtonToggled(bool)
+{
+	emit SelectionChanged(SelectedDays());
+}
+
+QSet<DayOfWeekSelector::Day> DayOfWeekSelector::SelectedDays() const
+{
+	QSet<Day> result;
+	for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it) {
+		if (it.value()->isChecked()) {
+			result.insert(it.key());
+		}
+	}
+	return result;
+}
+
+void DayOfWeekSelector::SetSelectedDays(const QSet<Day> &days)
+{
+	for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it) {
+		it.value()->setChecked(days.contains(it.key()));
+	}
+}
+
+QString DayOfWeekSelector::ToString(const QSet<Day> &days)
+{
+	const QVector<QPair<Day, QString>> dayNames = {
+		{Monday, obs_module_text("AdvSceneSwitcher.day.monday")},
+		{Tuesday, obs_module_text("AdvSceneSwitcher.day.tuesday")},
+		{Wednesday, obs_module_text("AdvSceneSwitcher.day.wednesday")},
+		{Thursday, obs_module_text("AdvSceneSwitcher.day.thursday")},
+		{Friday, obs_module_text("AdvSceneSwitcher.day.friday")},
+		{Saturday, obs_module_text("AdvSceneSwitcher.day.saturday")},
+		{Sunday, obs_module_text("AdvSceneSwitcher.day.sunday")}};
+
+	if (days.isEmpty()) {
+		return obs_module_text("AdvSceneSwitcher.day.none");
+	}
+
+	if (days.size() == 7) {
+		return obs_module_text("AdvSceneSwitcher.day.any");
+	}
+
+	QStringList parts;
+	for (const auto &[day, name] : dayNames) {
+		if (days.contains(day)) {
+			parts << name;
+		}
+	}
+
+	return parts.join(", ");
+}
+
+void SaveSelectedDays(obs_data_t *settings,
+		      const QSet<DayOfWeekSelector::Day> &days)
+{
+	uint64_t mask = 0;
+
+	for (DayOfWeekSelector::Day day : days) {
+		mask |= (1ULL << static_cast<int>(day));
+	}
+
+	obs_data_set_int(settings, "selectedDays",
+			 static_cast<long long>(mask));
+}
+
+QSet<DayOfWeekSelector::Day> LoadSelectedDays(obs_data_t *settings)
+{
+	QSet<DayOfWeekSelector::Day> result;
+
+	uint64_t mask = static_cast<uint64_t>(
+		obs_data_get_int(settings, "selectedDays"));
+
+	for (int i = DayOfWeekSelector::Monday; i <= DayOfWeekSelector::Sunday;
+	     ++i) {
+		if (mask & (1ULL << i)) {
+			result.insert(static_cast<DayOfWeekSelector::Day>(i));
+		}
+	}
+
+	return result;
+}
+
+} // namespace advss

plugins/base/utils/day-of-week-selector.hpp

@@ -0,0 +1,45 @@
+#pragma once
+#include <QWidget>
+#include <QSet>
+
+#include <obs-data.h>
+
+class QPushButton;
+
+namespace advss {
+
+class DayOfWeekSelector : public QWidget {
+	Q_OBJECT
+
+public:
+	enum Day {
+		Monday = 1,
+		Tuesday,
+		Wednesday,
+		Thursday,
+		Friday,
+		Saturday,
+		Sunday
+	};
+	Q_ENUM(Day)
+
+	explicit DayOfWeekSelector(QWidget *parent = nullptr);
+
+	QSet<Day> SelectedDays() const;
+	void SetSelectedDays(const QSet<Day> &days);
+	static QString ToString(const QSet<Day> &days);
+
+signals:
+	void SelectionChanged(const QSet<Day> &days);
+
+private:
+	void OnButtonToggled(bool checked);
+
+	QMap<Day, QPushButton *> m_buttons;
+};
+
+void SaveSelectedDays(obs_data_t *settings,
+		      const QSet<DayOfWeekSelector::Day> &days);
+QSet<DayOfWeekSelector::Day> LoadSelectedDays(obs_data_t *settings);
+
+} // namespace advss

plugins/base/utils/source-setting.cpp

@@ -335,6 +335,12 @@ void SetSourceSetting(obs_source_t *source, const SourceSetting &setting,
 	case OBS_DATA_OBJECT: {
 		OBSDataAutoRelease json =
 			obs_data_create_from_json(value.c_str());
+		if (!json) {
+			blog(LOG_WARNING,
+			     "not setting invalid data object settings value! (%s)",
+			     value.c_str());
+			break;
+		}
 		obs_data_set_obj(data, id.c_str(), json);
 		break;
 	}

plugins/base/utils/text-helpers.cpp

@@ -1,15 +1,12 @@
 #include "text-helpers.hpp"
 
-#include <regex>
+#include <QRegularExpression>
 
 namespace advss {
 
-QString EscapeForRegex(const QString &s)
+QString EscapeForRegex(const QString &input)
 {
-	static std::regex specialChars{R"([-[\]{}()*+?.,\^$|#\s])"};
-	std::string input = s.toStdString();
-	return QString::fromStdString(
-		std::regex_replace(input, specialChars, R"(\$&)"));
+	return QRegularExpression::escape(input);
 }
 
 } // namespace advss

plugins/base/utils/transition-helpers.cpp

@@ -0,0 +1,32 @@
+#include "transition-helpers.hpp"
+
+namespace advss {
+
+bool IsFixedLengthTransition(const OBSWeakSource &transition)
+{
+	OBSSourceAutoRelease source = obs_weak_source_get_source(transition);
+	return obs_transition_fixed(source);
+}
+
+obs_source_t *SetSceneItemTransition(const OBSSceneItem &item,
+				     const OBSSourceAutoRelease &transition,
+				     bool show)
+{
+	OBSDataAutoRelease settings = obs_source_get_settings(transition);
+	if (!transition || !settings) {
+		// Set transition to "None"
+		obs_sceneitem_set_transition(item, show, nullptr);
+		return nullptr;
+	}
+
+	// We cannot share the transition source between
+	// scene items without introducing strange graphical
+	// artifacts so we have to create new ones here
+	OBSSourceAutoRelease transitionSource = obs_source_create_private(
+		obs_source_get_id(transition), obs_source_get_name(transition),
+		settings);
+	obs_sceneitem_set_transition(item, show, transitionSource);
+	return transitionSource.Get();
+}
+
+} // namespace advss

plugins/base/utils/transition-helpers.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include <obs.hpp>
+
+namespace advss {
+
+bool IsFixedLengthTransition(const OBSWeakSource &transition);
+obs_source_t *SetSceneItemTransition(const OBSSceneItem &item,
+				     const OBSSourceAutoRelease &transition,
+				     bool show);
+
+} // namespace advss

plugins/http/macro-action-http.cpp

@@ -70,7 +70,7 @@ struct URLInfo {
 	std::string path;
 };
 
-static URLInfo getURLInfo(const std::string &input)
+static URLInfo getURLInfo(const std::string &input, bool keepParams)
 {
 	if (input.empty()) {
 		return {};
@@ -84,21 +84,35 @@ static URLInfo getURLInfo(const std::string &input)
 	const QUrl url(urlInput);
 	auto host =
 		url.scheme().toStdString() + "://" + url.host().toStdString();
-	int port = url.port();
+
+	const int port = url.port();
 	if (port != -1) {
 		host += ":" + std::to_string(port);
 	}
+
 	auto path = url.path().toStdString();
 	if (path.empty()) {
 		path = "/";
 	}
 
+	const auto query = url.query().toStdString();
+	if (!query.empty()) {
+		if (keepParams) {
+			path += "?" + query;
+		} else {
+			blog(LOG_WARNING,
+			     "ignoring query parameters \"%s\" in URL field. "
+			     "Using parameter field values instead.",
+			     query.c_str());
+		}
+	}
+
 	return {host, path};
 }
 
 bool MacroActionHttp::PerformAction()
 {
-	const auto [host, path] = getURLInfo(_url);
+	const auto [host, path] = getURLInfo(_url, !_setParams);
 
 	httplib::Client cli(host);
 	setTimeout(cli, _timeout);

plugins/stream-deck/macro-condition-stream-deck.cpp

@@ -93,7 +93,7 @@ bool MacroConditionStreamdeck::MessageMatches(const StreamDeckMessage &message)
 {
 	const bool keyStateMatches = !_pattern.checkKeyState ||
 				     ((message.keyDown && _pattern.keyDown) ||
-				      (!message.keyDown && !message.keyDown));
+				      (!message.keyDown && !_pattern.keyDown));
 	const bool positionMatches = !_pattern.checkPosition ||
 				     (message.row == _pattern.row &&
 				      message.column == _pattern.column);

plugins/twitch/event-sub.cpp

@@ -89,12 +89,24 @@ void EventSub::ConnectThread()
 
 void EventSub::WaitAndReconnect()
 {
+	if (_reconnecting) {
+		return;
+	}
+
+	_reconnecting = true;
+
 	auto thread = std::thread([this]() {
 		std::unique_lock<std::mutex> lock(_waitMtx);
 		blog(LOG_INFO,
 		     "Twitch EventSub trying to reconnect to in %d seconds.",
 		     reconnectDelay);
 		_cv.wait_for(lock, std::chrono::seconds(reconnectDelay));
+		_reconnecting = false;
+
+		if (_disconnect) {
+			return;
+		}
+
 		Connect();
 	});
 	thread.detach();
@@ -102,6 +114,10 @@ void EventSub::WaitAndReconnect()
 
 void EventSub::Connect()
 {
+	if (_reconnecting) {
+		return;
+	}
+
 	std::lock_guard<std::mutex> lock(_connectMtx);
 	if (_connected) {
 		vblog(LOG_INFO, "Twitch EventSub connect already in progress");
@@ -465,8 +481,8 @@ void EventSub::StartServerMigrationClient(const std::string &url)
 		const auto &data = msg->payload;
 
 		if (type == "session_welcome") {
-			vblog(LOG_INFO,
-			      "Twitch EventSub migration successful - switching to new connection");
+			blog(LOG_INFO,
+			     "Twitch EventSub migration successful - switching to new connection");
 			OBSDataAutoRelease session =
 				obs_data_get_obj(data, "session");
 			_migrationSessionID =
@@ -565,7 +581,7 @@ void EventSub::OnClose(connection_hdl hdl)
 	blog(LOG_INFO, "Twitch EventSub connection closed: %s / %s (%d)",
 	     msg.c_str(), reason.c_str(), code);
 
-	if (_migrating) {
+	if (!_migrating) {
 		ClearActiveSubscriptions();
 	}
 	_connected = false;

plugins/twitch/event-sub.hpp

@@ -110,6 +110,7 @@ private:
 	std::condition_variable _cv;
 	std::atomic_bool _connected{false};
 	std::atomic_bool _disconnect{false};
+	std::atomic_bool _reconnecting{false};
 
 	std::string _url;
 	std::string _sessionID;

plugins/twitch/twitch-tab.cpp

@@ -7,7 +7,11 @@
 #include "ui-helpers.hpp"
 
 #include <QDialogButtonBox>
+#include <QMainWindow>
 #include <QTabWidget>
+#include <QTimer>
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 
@@ -24,7 +28,7 @@ static bool setup()
 	AddSetupTabCallback("twitchConnectionTab",
 			    TwitchConnectionsTable::Create, setupTab);
 
-	static const auto showInvalidWarnings = []() {
+	static const auto showInvalidWarnings = [](void *) {
 		const auto invalidTokens = getInvalidTokens();
 		for (const auto &token : invalidTokens) {
 			QueueUITask(
@@ -38,8 +42,14 @@ static bool setup()
 		}
 	};
 
-	AddLoadStep([](obs_data_t *) {
-		AddPostLoadStep([]() { showInvalidWarnings(); });
+	// This function is called while the plugin settings are being loaded.
+	// Blocking at this stage can cause issues such as OBS failing to start
+	// or crashing.
+	// Therefore, we ask the user whether they want to update their Twitch
+	// connections asynchronously.
+	AddFinishedLoadingStep([]() {
+		obs_queue_task(OBS_TASK_UI, showInvalidWarnings, nullptr,
+			       false);
 	});
 
 	return true;

plugins/video/macro-condition-video.cpp

@@ -273,15 +273,18 @@ void MacroConditionVideo::SetCondition(VideoCondition condition)
 bool MacroConditionVideo::ScreenshotContainsPattern()
 {
 	cv::Mat result;
-	MatchPattern(_screenshotData.GetImage(), _patternImageData,
-		     _patternMatchParameters.threshold, result, nullptr,
-		     _patternMatchParameters.useAlphaAsMask,
-		     _patternMatchParameters.matchMode);
+	double bestMatchValue =
+		MatchPattern(_screenshotData.GetImage(), _patternImageData,
+			     _patternMatchParameters.threshold, result,
+			     _patternMatchParameters.useAlphaAsMask,
+			     _patternMatchParameters.matchMode);
 	if (result.total() == 0) {
+		SetTempVarValue("similarity", std::to_string(bestMatchValue));
 		SetTempVarValue("patternCount", "0");
 		return false;
 	}
 	const auto count = countNonZero(result);
+	SetTempVarValue("similarity", std::to_string(bestMatchValue));
 	SetTempVarValue("patternCount", std::to_string(count));
 	return count > 0;
 }
@@ -304,10 +307,12 @@ bool MacroConditionVideo::OutputChanged()
 
 	cv::Mat result;
 	_patternImageData = CreatePatternData(_matchImage);
-	MatchPattern(_screenshotData.GetImage(), _patternImageData,
-		     _patternMatchParameters.threshold, result, nullptr,
-		     _patternMatchParameters.useAlphaAsMask,
-		     _patternMatchParameters.matchMode);
+	double bestMatchValue =
+		MatchPattern(_screenshotData.GetImage(), _patternImageData,
+			     _patternMatchParameters.threshold, result,
+			     _patternMatchParameters.useAlphaAsMask,
+			     _patternMatchParameters.matchMode);
+	SetTempVarValue("similarity", std::to_string(bestMatchValue));
 	if (result.total() == 0) {
 		return false;
 	}
@@ -411,7 +416,25 @@ void MacroConditionVideo::SetupTempVars()
 {
 	MacroCondition::SetupTempVars();
 	switch (_condition) {
+	case VideoCondition::HAS_CHANGED:
+	case VideoCondition::HAS_NOT_CHANGED:
+		if (!_patternMatchParameters.useForChangedCheck) {
+			break;
+		}
+		AddTempvar(
+			"similarity",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.similarity"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.similarity.description"));
+		break;
 	case VideoCondition::PATTERN:
+		AddTempvar(
+			"similarity",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.similarity"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.similarity.description"));
 		AddTempvar(
 			"patternCount",
 			obs_module_text(
@@ -451,8 +474,6 @@ void MacroConditionVideo::SetupTempVars()
 		break;
 	case VideoCondition::MATCH:
 	case VideoCondition::DIFFER:
-	case VideoCondition::HAS_NOT_CHANGED:
-	case VideoCondition::HAS_CHANGED:
 	case VideoCondition::NO_IMAGE:
 	default:
 		break;
@@ -1477,6 +1498,7 @@ void MacroConditionVideoEdit::UsePatternForChangedCheckChanged(int value)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_patternMatchParameters.useForChangedCheck = value;
+	_entryData->SetupTempVars();
 	SetWidgetVisibility();
 }
 

plugins/video/macro-condition-video.hpp

@@ -50,6 +50,7 @@ public:
 
 	void SetCondition(VideoCondition);
 	VideoCondition GetCondition() const { return _condition; }
+	void SetupTempVars();
 
 	VideoInput _video;
 	std::string _file = obs_module_text("AdvSceneSwitcher.enterPath");
@@ -89,8 +90,6 @@ private:
 	bool Compare();
 	bool CheckShouldBeSkipped();
 
-	void SetupTempVars();
-
 	VideoCondition _condition = VideoCondition::MATCH;
 
 	bool _getNextScreenshot = true;

plugins/video/opencv-helpers.cpp

@@ -48,20 +48,18 @@ static void preprocessPatternMatchResult(cv::Mat &mat, bool invert)
 	}
 }
 
-void MatchPattern(QImage &img, const PatternImageData &patternData,
-		  double threshold, cv::Mat &result, double *pBestFitValue,
-		  bool useAlphaAsMask, cv::TemplateMatchModes matchMode)
+double MatchPattern(QImage &img, const PatternImageData &patternData,
+		    double threshold, cv::Mat &result, bool useAlphaAsMask,
+		    cv::TemplateMatchModes matchMode)
 {
+	double bestFitValue = std::numeric_limits<double>::signaling_NaN();
 	result = cv::Mat(0, 0, CV_32F);
-	if (pBestFitValue) {
-		*pBestFitValue = std::numeric_limits<double>::signaling_NaN();
-	}
 	if (img.isNull() || patternData.rgbaPattern.empty()) {
-		return;
+		return bestFitValue;
 	}
 	if (img.height() < patternData.rgbaPattern.rows ||
 	    img.width() < patternData.rgbaPattern.cols) {
-		return;
+		return bestFitValue;
 	}
 
 	auto input = QImageToMat(img);
@@ -94,20 +92,18 @@ void MatchPattern(QImage &img, const PatternImageData &patternData,
 	// -> Invert TM_SQDIFF_NORMED in the preprocess step
 	preprocessPatternMatchResult(result, matchMode == cv::TM_SQDIFF_NORMED);
 
-	if (pBestFitValue) {
-		cv::minMaxLoc(result, nullptr, pBestFitValue);
-	}
-
+	cv::minMaxLoc(result, nullptr, &bestFitValue);
 	cv::threshold(result, result, threshold, 0.0, cv::THRESH_TOZERO);
+	return bestFitValue;
 }
 
-void MatchPattern(QImage &img, QImage &pattern, double threshold,
-		  cv::Mat &result, double *pBestFitValue, bool useAlphaAsMask,
-		  cv::TemplateMatchModes matchColor)
+double MatchPattern(QImage &img, QImage &pattern, double threshold,
+		    cv::Mat &result, bool useAlphaAsMask,
+		    cv::TemplateMatchModes matchColor)
 {
 	auto data = CreatePatternData(pattern);
-	MatchPattern(img, data, threshold, result, pBestFitValue,
-		     useAlphaAsMask, matchColor);
+	return MatchPattern(img, data, threshold, result, useAlphaAsMask,
+			    matchColor);
 }
 
 std::vector<cv::Rect> MatchObject(QImage &img, cv::CascadeClassifier &cascade,

plugins/video/opencv-helpers.hpp

@@ -62,12 +62,12 @@ struct PatternImageData {
 };
 
 PatternImageData CreatePatternData(const QImage &pattern);
-void MatchPattern(QImage &img, const PatternImageData &patternData,
-		  double threshold, cv::Mat &result, double *pBestFitValue,
-		  bool useAlphaAsMask, cv::TemplateMatchModes matchMode);
-void MatchPattern(QImage &img, QImage &pattern, double threshold,
-		  cv::Mat &result, double *pBestFitValue, bool useAlphaAsMask,
-		  cv::TemplateMatchModes matchMode);
+double MatchPattern(QImage &img, const PatternImageData &patternData,
+		    double threshold, cv::Mat &result, bool useAlphaAsMask,
+		    cv::TemplateMatchModes matchMode);
+double MatchPattern(QImage &img, QImage &pattern, double threshold,
+		    cv::Mat &result, bool useAlphaAsMask,
+		    cv::TemplateMatchModes matchMode);
 std::vector<cv::Rect> MatchObject(QImage &img, cv::CascadeClassifier &cascade,
 				  double scaleFactor, int minNeighbors,
 				  const cv::Size &minSize,

plugins/video/preview-dialog.cpp

@@ -329,10 +329,10 @@ void PreviewImage::MarkPatternMatch(
 	const PatternImageData &patternImageData)
 {
 	cv::Mat result;
-	double matchValue = std::numeric_limits<double>::signaling_NaN();
-	MatchPattern(screenshot, patternImageData, patternMatchParams.threshold,
-		     result, &matchValue, patternMatchParams.useAlphaAsMask,
-		     patternMatchParams.matchMode);
+	double matchValue = MatchPattern(screenshot, patternImageData,
+					 patternMatchParams.threshold, result,
+					 patternMatchParams.useAlphaAsMask,
+					 patternMatchParams.matchMode);
 	emit ValueUpdate(matchValue);
 	if (result.total() == 0 || countNonZero(result) == 0) {
 		emit StatusUpdate(obs_module_text(

tests/CMakeLists.txt

@@ -1,22 +1,27 @@
 cmake_minimum_required(VERSION 3.14)
 project(advanced-scene-switcher-tests)
 
-get_target_property(ADVSS_SOURCE_DIR advanced-scene-switcher-lib SOURCE_DIR)
+set(CMAKE_AUTOUIC ON)
+
 add_executable(${PROJECT_NAME})
-target_compile_definitions(${PROJECT_NAME} PRIVATE UNIT_TEST)
+target_compile_definitions(${PROJECT_NAME} PRIVATE UNIT_TEST
+                                                   ADVSS_EXPORT_SYMBOLS=1)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 
-target_sources(
-  ${PROJECT_NAME} PRIVATE test-main.cpp mocks/obs-data.cpp
-                          mocks/path-helpers.cpp mocks/ui-helpers.cpp)
+target_sources(${PROJECT_NAME} PRIVATE test-main.cpp)
+
+get_target_property(ADVSS_SOURCE_DIR advanced-scene-switcher-lib SOURCE_DIR)
+get_target_property(ADVSS_BINARY_DIR advanced-scene-switcher-lib BINARY_DIR)
+
 target_include_directories(
   ${PROJECT_NAME}
-  PRIVATE mocks ${ADVSS_SOURCE_DIR}/lib/utils ${ADVSS_SOURCE_DIR}/lib/variables
+  PRIVATE ${ADVSS_SOURCE_DIR}/lib ${ADVSS_SOURCE_DIR}/lib/macro
+          ${ADVSS_SOURCE_DIR}/lib/utils ${ADVSS_SOURCE_DIR}/lib/variables
           ${ADVSS_SOURCE_DIR}/plugins/base/utils)
 
-# --- Qt --- #
+setup_obs_lib_dependency(${PROJECT_NAME})
 
-target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Widgets)
+# --- Qt --- #
 
 if(TARGET Qt6::Core)
   set(_QT_VERSION
@@ -28,25 +33,26 @@ elseif(TARGET Qt5::Core)
       CACHE INTERNAL "")
 endif()
 
-macro(add_qt_lib lib_name)
-  add_custom_command(
-    TARGET ${PROJECT_NAME}
-    POST_BUILD
-    COMMAND
-      ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:Qt${_QT_VERSION}::${lib_name}>
-      $<TARGET_FILE_DIR:${PROJECT_NAME}>)
-endmacro()
+# Include autogen headers so that generated ui_*.h files are found
+target_include_directories(
+  ${PROJECT_NAME}
+  PRIVATE "${ADVSS_BINARY_DIR}/advanced-scene-switcher-lib_autogen/include")
+foreach(_conf Release RelWithDebInfo Debug MinSizeRe)
+  target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+      "${ADVSS_BINARY_DIR}/advanced-scene-switcher-lib_autogen/include_${_conf}"
+  )
+endforeach()
 
-add_qt_lib(Core)
-add_qt_lib(Gui)
-add_qt_lib(Widgets)
+target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Widgets)
 
 set_target_properties(
   ${PROJECT_NAME}
   PROPERTIES AUTOMOC ON
              AUTOUIC ON
-             AUTORCC ON)
+             AUTORCC ON
+             AUTOUIC_SEARCH_PATHS "${ADVSS_SOURCE_DIR}/forms")
 
 # --- condition-logic --- #
 
@@ -83,12 +89,11 @@ target_include_directories(${PROJECT_NAME}
                            PRIVATE ${ADVSS_SOURCE_DIR}/deps/exprtk)
 
 if(MSVC)
-  target_compile_options(${PROJECT_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267
-                                                /bigobj)
+  target_compile_options(${PROJECT_NAME} PUBLIC /MP /d2FH4- /wd4267 /bigobj)
 else()
   target_compile_options(
     ${PROJECT_NAME} PUBLIC -Wno-error=unused-parameter -Wno-error=conversion
-                           -Wno-error=unused-value)
+                           -Wno-error=unused-value -Wno-error=unused-variable)
 endif()
 
 # --- regex --- #
@@ -122,6 +127,107 @@ target_sources(
           ${ADVSS_SOURCE_DIR}/lib/utils/resizing-text-edit.cpp
           ${ADVSS_SOURCE_DIR}/lib/variables/variable.cpp)
 
-# --- #
+# --- macro / macro-condition --- #
+
+target_sources(
+  ${PROJECT_NAME}
+  PRIVATE test-macro.cpp
+          test-macro-condition.cpp
+          stubs/path-helpers.cpp
+          stubs/ui-helpers.cpp
+          stubs/plugin-state-helpers.cpp
+          stubs/macro-action-macro.cpp
+          stubs/macro-edit.cpp
+          stubs/macro-dock-settings.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/temp-variable.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/sync-helpers.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/help-icon.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/auto-update-tooltip-label.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration-control.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration-control.hpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration-modifier.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration-modifier.hpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/duration.hpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/list-controls.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/list-editor.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/layout-helpers.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/log-helper.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/mouse-wheel-guard.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/section.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/splitter-helpers.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/resizable-widget.cpp
+          ${ADVSS_SOURCE_DIR}/lib/utils/string-list.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-action.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-action-macro.hpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-action-factory.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-condition.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-condition-factory.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-edit.hpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-helpers.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-input.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-ref.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-segment.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-selection.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro-signals.cpp
+          ${ADVSS_SOURCE_DIR}/lib/macro/macro.cpp
+          ${ADVSS_SOURCE_DIR}/lib/variables/variable-line-edit.cpp
+          ${ADVSS_SOURCE_DIR}/lib/variables/variable-spinbox.cpp
+          ${ADVSS_SOURCE_DIR}/lib/variables/variable-string.cpp)
+
+# --- Testing --- #
 
 enable_testing()
+add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
+
+if(WIN32)
+  # Copy all CMake-known transitive DLLs (Qt, OBS, etc.) next to the binary.
+  # This makes the test executable runnable directly without PATH changes.
+  add_custom_command(
+    TARGET ${PROJECT_NAME}
+    POST_BUILD
+    COMMAND
+      ${CMAKE_COMMAND} -E copy_if_different
+      $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    COMMAND_EXPAND_LISTS)
+
+  # Copy remaining OBS deps (zlib, srt, librist, ffmpeg, etc.) that are not
+  # CMake targets but are required at runtime. Derive the path from ZLIB::ZLIB
+  # which lives in the same deps directory.
+  get_target_property(_zlib_lib ZLIB::ZLIB IMPORTED_LOCATION_RELWITHDEBINFO)
+  if(NOT _zlib_lib)
+    get_target_property(_zlib_lib ZLIB::ZLIB IMPORTED_LOCATION_RELEASE)
+  endif()
+  if(_zlib_lib)
+    get_filename_component(_obs_deps_bin "${_zlib_lib}" DIRECTORY)
+    get_filename_component(_obs_deps_bin "${_obs_deps_bin}/../bin" ABSOLUTE)
+    add_custom_command(
+      TARGET ${PROJECT_NAME}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_directory "${_obs_deps_bin}"
+              $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+  else()
+    message(
+      WARNING "Could not determine OBS deps bin directory from ZLIB::ZLIB - "
+              "some DLLs may be missing at runtime")
+  endif()
+
+elseif(APPLE)
+  # On macOS, binaries use RPATH so copying is usually not needed. Fall back to
+  # DYLD_LIBRARY_PATH in case RPATH is not set correctly.
+  set_tests_properties(
+    ${PROJECT_NAME}
+    PROPERTIES
+      ENVIRONMENT
+      "DYLD_LIBRARY_PATH=$<TARGET_FILE_DIR:OBS::libobs>:$<TARGET_FILE_DIR:Qt${_QT_VERSION}::Core>"
+  )
+
+else()
+  # On Linux, same approach using LD_LIBRARY_PATH.
+  set_tests_properties(
+    ${PROJECT_NAME}
+    PROPERTIES
+      ENVIRONMENT
+      "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:OBS::libobs>:$<TARGET_FILE_DIR:Qt${_QT_VERSION}::Core>"
+  )
+endif()

tests/mocks/obs-data.cpp

@@ -1,502 +0,0 @@
-#include "obs-data.h"
-
-struct obs_data_item {};
-
-struct obs_data {};
-
-struct obs_data_array {};
-
-struct obs_data_number {};
-
-obs_data_t *obs_data_create()
-{
-	return nullptr;
-}
-
-obs_data_t *obs_data_create_from_json(const char *json_string)
-{
-	return nullptr;
-}
-
-obs_data_t *obs_data_create_from_json_file(const char *json_file)
-{
-	return nullptr;
-}
-
-obs_data_t *obs_data_create_from_json_file_safe(const char *json_file,
-						const char *backup_ext)
-{
-	return nullptr;
-}
-
-void obs_data_addref(obs_data_t *data) {}
-
-void obs_data_release(obs_data_t *data) {}
-
-const char *obs_data_get_json(obs_data_t *data)
-{
-	return "";
-}
-
-const char *obs_data_get_json_pretty(obs_data_t *data)
-{
-	return "";
-}
-
-const char *obs_data_get_last_json(obs_data_t *data)
-{
-	return "";
-}
-
-bool obs_data_save_json(obs_data_t *data, const char *file)
-{
-	return false;
-}
-
-bool obs_data_save_json_safe(obs_data_t *data, const char *file,
-			     const char *temp_ext, const char *backup_ext)
-{
-	return false;
-}
-
-bool obs_data_save_json_pretty_safe(obs_data_t *data, const char *file,
-				    const char *temp_ext,
-				    const char *backup_ext)
-{
-	return false;
-}
-
-obs_data_t *obs_data_get_defaults(obs_data_t *data)
-{
-	return nullptr;
-}
-
-void obs_data_apply(obs_data_t *target, obs_data_t *apply_data) {}
-
-void obs_data_erase(obs_data_t *data, const char *name) {}
-
-void obs_data_clear(obs_data_t *target) {}
-
-void obs_data_set_string(obs_data_t *data, const char *name, const char *val) {}
-
-void obs_data_set_int(obs_data_t *data, const char *name, long long val) {}
-
-void obs_data_set_double(obs_data_t *data, const char *name, double val) {}
-
-void obs_data_set_bool(obs_data_t *data, const char *name, bool val) {}
-
-void obs_data_set_obj(obs_data_t *data, const char *name, obs_data_t *obj) {}
-
-void obs_data_set_array(obs_data_t *data, const char *name,
-			obs_data_array_t *array)
-{
-}
-
-void obs_data_set_default_string(obs_data_t *data, const char *name,
-				 const char *val)
-{
-}
-
-void obs_data_set_default_int(obs_data_t *data, const char *name, long long val)
-{
-}
-
-void obs_data_set_default_double(obs_data_t *data, const char *name, double val)
-{
-}
-
-void obs_data_set_default_bool(obs_data_t *data, const char *name, bool val) {}
-
-void obs_data_set_default_obj(obs_data_t *data, const char *name,
-			      obs_data_t *obj)
-{
-}
-
-void obs_data_set_default_array(obs_data_t *data, const char *name,
-				obs_data_array_t *arr)
-{
-}
-
-void obs_data_set_autoselect_string(obs_data_t *data, const char *name,
-				    const char *val)
-{
-}
-
-void obs_data_set_autoselect_int(obs_data_t *data, const char *name,
-				 long long val)
-{
-}
-
-void obs_data_set_autoselect_double(obs_data_t *data, const char *name,
-				    double val)
-{
-}
-
-void obs_data_set_autoselect_bool(obs_data_t *data, const char *name, bool val)
-{
-}
-
-void obs_data_set_autoselect_obj(obs_data_t *data, const char *name,
-				 obs_data_t *obj)
-{
-}
-
-void obs_data_set_autoselect_array(obs_data_t *data, const char *name,
-				   obs_data_array_t *arr)
-{
-}
-
-const char *obs_data_get_string(obs_data_t *data, const char *name)
-{
-	return "";
-}
-
-long long obs_data_get_int(obs_data_t *data, const char *name)
-{
-	return 0;
-}
-
-double obs_data_get_double(obs_data_t *data, const char *name)
-{
-	return 0.0;
-}
-
-bool obs_data_get_bool(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-obs_data_t *obs_data_get_obj(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_get_array(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-const char *obs_data_get_default_string(obs_data_t *data, const char *name)
-{
-	return "";
-}
-
-long long obs_data_get_default_int(obs_data_t *data, const char *name)
-{
-	return 0;
-}
-
-double obs_data_get_default_double(obs_data_t *data, const char *name)
-{
-	return 0.0;
-}
-
-bool obs_data_get_default_bool(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-obs_data_t *obs_data_get_default_obj(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_get_default_array(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-const char *obs_data_get_autoselect_string(obs_data_t *data, const char *name)
-{
-	return "";
-}
-
-long long obs_data_get_autoselect_int(obs_data_t *data, const char *name)
-{
-	return 0;
-}
-
-double obs_data_get_autoselect_double(obs_data_t *data, const char *name)
-{
-	return 0.0;
-}
-
-bool obs_data_get_autoselect_bool(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-obs_data_t *obs_data_get_autoselect_obj(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_get_autoselect_array(obs_data_t *data,
-						const char *name)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_array_create()
-{
-	return nullptr;
-}
-
-void obs_data_array_addref(obs_data_array_t *array) {}
-
-void obs_data_array_release(obs_data_array_t *array) {}
-
-size_t obs_data_array_count(obs_data_array_t *array)
-{
-	return 0;
-}
-
-obs_data_t *obs_data_array_item(obs_data_array_t *array, size_t idx)
-{
-	return nullptr;
-}
-
-size_t obs_data_array_push_back(obs_data_array_t *array, obs_data_t *obj)
-{
-	return 0;
-}
-
-void obs_data_array_insert(obs_data_array_t *array, size_t idx, obs_data_t *obj)
-{
-}
-
-void obs_data_array_push_back_array(obs_data_array_t *array,
-				    obs_data_array_t *array2)
-{
-}
-
-void obs_data_array_erase(obs_data_array_t *array, size_t idx) {}
-
-void obs_data_array_enum(obs_data_array_t *array,
-			 void (*cb)(obs_data_t *data, void *param), void *param)
-{
-}
-
-/* ------------------------------------------------------------------------- */
-/* Item status inspection */
-
-bool obs_data_has_user_value(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-bool obs_data_has_default_value(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-bool obs_data_has_autoselect_value(obs_data_t *data, const char *name)
-{
-	return false;
-}
-
-bool obs_data_item_has_user_value(obs_data_item_t *item)
-{
-	return false;
-}
-
-bool obs_data_item_has_default_value(obs_data_item_t *item)
-{
-	return false;
-}
-
-bool obs_data_item_has_autoselect_value(obs_data_item_t *item)
-{
-	return false;
-}
-
-/* ------------------------------------------------------------------------- */
-/* Clearing data values */
-
-void obs_data_unset_user_value(obs_data_t *data, const char *name) {}
-
-void obs_data_unset_default_value(obs_data_t *data, const char *name) {}
-
-void obs_data_unset_autoselect_value(obs_data_t *data, const char *name) {}
-
-void obs_data_item_unset_user_value(obs_data_item_t *item) {}
-
-void obs_data_item_unset_default_value(obs_data_item_t *item) {}
-
-void obs_data_item_unset_autoselect_value(obs_data_item_t *item) {}
-
-/* ------------------------------------------------------------------------- */
-/* Item iteration */
-
-obs_data_item_t *obs_data_first(obs_data_t *data)
-{
-	return nullptr;
-}
-
-obs_data_item_t *obs_data_item_byname(obs_data_t *data, const char *name)
-{
-	return nullptr;
-}
-
-bool obs_data_item_next(obs_data_item_t **item)
-{
-	return false;
-}
-
-void obs_data_item_release(obs_data_item_t **item) {}
-
-void obs_data_item_remove(obs_data_item_t **item) {}
-
-enum obs_data_type obs_data_item_gettype(obs_data_item_t *item)
-{
-	return OBS_DATA_NULL;
-}
-
-enum obs_data_number_type obs_data_item_numtype(obs_data_item_t *item)
-{
-	return OBS_DATA_NUM_INVALID;
-}
-
-const char *obs_data_item_get_name(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-void obs_data_item_set_string(obs_data_item_t **item, const char *val) {}
-
-void obs_data_item_set_int(obs_data_item_t **item, long long val) {}
-
-void obs_data_item_set_double(obs_data_item_t **item, double val) {}
-
-void obs_data_item_set_bool(obs_data_item_t **item, bool val) {}
-
-void obs_data_item_set_obj(obs_data_item_t **item, obs_data_t *val) {}
-
-void obs_data_item_set_array(obs_data_item_t **item, obs_data_array_t *val) {}
-
-void obs_data_item_set_default_string(obs_data_item_t **item, const char *val)
-{
-}
-
-void obs_data_item_set_default_int(obs_data_item_t **item, long long val) {}
-
-void obs_data_item_set_default_double(obs_data_item_t **item, double val) {}
-
-void obs_data_item_set_default_bool(obs_data_item_t **item, bool val) {}
-
-void obs_data_item_set_default_obj(obs_data_item_t **item, obs_data_t *val) {}
-
-void obs_data_item_set_default_array(obs_data_item_t **item,
-				     obs_data_array_t *val)
-{
-}
-
-void obs_data_item_set_autoselect_string(obs_data_item_t **item,
-					 const char *val)
-{
-}
-
-void obs_data_item_set_autoselect_int(obs_data_item_t **item, long long val) {}
-
-void obs_data_item_set_autoselect_double(obs_data_item_t **item, double val) {}
-
-void obs_data_item_set_autoselect_bool(obs_data_item_t **item, bool val) {}
-
-void obs_data_item_set_autoselect_obj(obs_data_item_t **item, obs_data_t *val)
-{
-}
-
-void obs_data_item_set_autoselect_array(obs_data_item_t **item,
-					obs_data_array_t *val)
-{
-}
-
-const char *obs_data_item_get_string(obs_data_item_t *item)
-{
-	return "";
-}
-
-long long obs_data_item_get_int(obs_data_item_t *item)
-{
-	return 0;
-}
-
-double obs_data_item_get_double(obs_data_item_t *item)
-{
-	return 0.0;
-}
-
-bool obs_data_item_get_bool(obs_data_item_t *item)
-{
-	return false;
-}
-
-obs_data_t *obs_data_item_get_obj(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_item_get_array(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-const char *obs_data_item_get_default_string(obs_data_item_t *item)
-{
-	return "";
-}
-
-long long obs_data_item_get_default_int(obs_data_item_t *item)
-{
-	return 0;
-}
-
-double obs_data_item_get_default_double(obs_data_item_t *item)
-{
-	return 0.0;
-}
-
-bool obs_data_item_get_default_bool(obs_data_item_t *item)
-{
-	return false;
-}
-
-obs_data_t *obs_data_item_get_default_obj(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_item_get_default_array(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-const char *obs_data_item_get_autoselect_string(obs_data_item_t *item)
-{
-	return "";
-}
-
-long long obs_data_item_get_autoselect_int(obs_data_item_t *item)
-{
-	return 0;
-}
-
-double obs_data_item_get_autoselect_double(obs_data_item_t *item)
-{
-	return 0.0;
-}
-
-bool obs_data_item_get_autoselect_bool(obs_data_item_t *item)
-{
-	return false;
-}
-
-obs_data_t *obs_data_item_get_autoselect_obj(obs_data_item_t *item)
-{
-	return nullptr;
-}
-
-obs_data_array_t *obs_data_item_get_autoselect_array(obs_data_item_t *item)
-{
-	return nullptr;
-}

tests/mocks/obs-data.h

@@ -1,253 +0,0 @@
-#pragma once
-#include "export-symbol-helper.hpp"
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct obs_data;
-struct obs_data_item;
-struct obs_data_array;
-typedef struct obs_data obs_data_t;
-typedef struct obs_data_item obs_data_item_t;
-typedef struct obs_data_array obs_data_array_t;
-
-enum obs_data_type {
-	OBS_DATA_NULL,
-	OBS_DATA_STRING,
-	OBS_DATA_NUMBER,
-	OBS_DATA_BOOLEAN,
-	OBS_DATA_OBJECT,
-	OBS_DATA_ARRAY
-};
-
-enum obs_data_number_type {
-	OBS_DATA_NUM_INVALID,
-	OBS_DATA_NUM_INT,
-	OBS_DATA_NUM_DOUBLE
-};
-
-/* ------------------------------------------------------------------------- */
-/* Main usage functions */
-
-EXPORT obs_data_t *obs_data_create();
-EXPORT obs_data_t *obs_data_create_from_json(const char *json_string);
-EXPORT obs_data_t *obs_data_create_from_json_file(const char *json_file);
-EXPORT obs_data_t *obs_data_create_from_json_file_safe(const char *json_file,
-						       const char *backup_ext);
-EXPORT void obs_data_addref(obs_data_t *data);
-EXPORT void obs_data_release(obs_data_t *data);
-
-EXPORT const char *obs_data_get_json(obs_data_t *data);
-EXPORT const char *obs_data_get_json_pretty(obs_data_t *data);
-EXPORT const char *obs_data_get_last_json(obs_data_t *data);
-EXPORT bool obs_data_save_json(obs_data_t *data, const char *file);
-EXPORT bool obs_data_save_json_safe(obs_data_t *data, const char *file,
-				    const char *temp_ext,
-				    const char *backup_ext);
-EXPORT bool obs_data_save_json_pretty_safe(obs_data_t *data, const char *file,
-					   const char *temp_ext,
-					   const char *backup_ext);
-
-EXPORT void obs_data_apply(obs_data_t *target, obs_data_t *apply_data);
-
-EXPORT void obs_data_erase(obs_data_t *data, const char *name);
-EXPORT void obs_data_clear(obs_data_t *data);
-
-/* Set functions */
-EXPORT void obs_data_set_string(obs_data_t *data, const char *name,
-				const char *val);
-EXPORT void obs_data_set_int(obs_data_t *data, const char *name, long long val);
-EXPORT void obs_data_set_double(obs_data_t *data, const char *name, double val);
-EXPORT void obs_data_set_bool(obs_data_t *data, const char *name, bool val);
-EXPORT void obs_data_set_obj(obs_data_t *data, const char *name,
-			     obs_data_t *obj);
-EXPORT void obs_data_set_array(obs_data_t *data, const char *name,
-			       obs_data_array_t *array);
-
-/*
- * Creates an obs_data_t * filled with all default values.
- */
-EXPORT obs_data_t *obs_data_get_defaults(obs_data_t *data);
-
-/*
- * Default value functions.
- */
-EXPORT void obs_data_set_default_string(obs_data_t *data, const char *name,
-					const char *val);
-EXPORT void obs_data_set_default_int(obs_data_t *data, const char *name,
-				     long long val);
-EXPORT void obs_data_set_default_double(obs_data_t *data, const char *name,
-					double val);
-EXPORT void obs_data_set_default_bool(obs_data_t *data, const char *name,
-				      bool val);
-EXPORT void obs_data_set_default_obj(obs_data_t *data, const char *name,
-				     obs_data_t *obj);
-EXPORT void obs_data_set_default_array(obs_data_t *data, const char *name,
-				       obs_data_array_t *arr);
-
-/*
- * Application overrides
- * Use these to communicate the actual values of settings in case the user
- * settings aren't appropriate
- */
-EXPORT void obs_data_set_autoselect_string(obs_data_t *data, const char *name,
-					   const char *val);
-EXPORT void obs_data_set_autoselect_int(obs_data_t *data, const char *name,
-					long long val);
-EXPORT void obs_data_set_autoselect_double(obs_data_t *data, const char *name,
-					   double val);
-EXPORT void obs_data_set_autoselect_bool(obs_data_t *data, const char *name,
-					 bool val);
-EXPORT void obs_data_set_autoselect_obj(obs_data_t *data, const char *name,
-					obs_data_t *obj);
-EXPORT void obs_data_set_autoselect_array(obs_data_t *data, const char *name,
-					  obs_data_array_t *arr);
-
-/*
- * Get functions
- */
-EXPORT const char *obs_data_get_string(obs_data_t *data, const char *name);
-EXPORT long long obs_data_get_int(obs_data_t *data, const char *name);
-EXPORT double obs_data_get_double(obs_data_t *data, const char *name);
-EXPORT bool obs_data_get_bool(obs_data_t *data, const char *name);
-EXPORT obs_data_t *obs_data_get_obj(obs_data_t *data, const char *name);
-EXPORT obs_data_array_t *obs_data_get_array(obs_data_t *data, const char *name);
-
-EXPORT const char *obs_data_get_default_string(obs_data_t *data,
-					       const char *name);
-EXPORT long long obs_data_get_default_int(obs_data_t *data, const char *name);
-EXPORT double obs_data_get_default_double(obs_data_t *data, const char *name);
-EXPORT bool obs_data_get_default_bool(obs_data_t *data, const char *name);
-EXPORT obs_data_t *obs_data_get_default_obj(obs_data_t *data, const char *name);
-EXPORT obs_data_array_t *obs_data_get_default_array(obs_data_t *data,
-						    const char *name);
-
-EXPORT const char *obs_data_get_autoselect_string(obs_data_t *data,
-						  const char *name);
-EXPORT long long obs_data_get_autoselect_int(obs_data_t *data,
-					     const char *name);
-EXPORT double obs_data_get_autoselect_double(obs_data_t *data,
-					     const char *name);
-EXPORT bool obs_data_get_autoselect_bool(obs_data_t *data, const char *name);
-EXPORT obs_data_t *obs_data_get_autoselect_obj(obs_data_t *data,
-					       const char *name);
-EXPORT obs_data_array_t *obs_data_get_autoselect_array(obs_data_t *data,
-						       const char *name);
-
-/* Array functions */
-EXPORT obs_data_array_t *obs_data_array_create();
-EXPORT void obs_data_array_addref(obs_data_array_t *array);
-EXPORT void obs_data_array_release(obs_data_array_t *array);
-
-EXPORT size_t obs_data_array_count(obs_data_array_t *array);
-EXPORT obs_data_t *obs_data_array_item(obs_data_array_t *array, size_t idx);
-EXPORT size_t obs_data_array_push_back(obs_data_array_t *array,
-				       obs_data_t *obj);
-EXPORT void obs_data_array_insert(obs_data_array_t *array, size_t idx,
-				  obs_data_t *obj);
-EXPORT void obs_data_array_push_back_array(obs_data_array_t *array,
-					   obs_data_array_t *array2);
-EXPORT void obs_data_array_erase(obs_data_array_t *array, size_t idx);
-EXPORT void obs_data_array_enum(obs_data_array_t *array,
-				void (*cb)(obs_data_t *data, void *param),
-				void *param);
-
-/* ------------------------------------------------------------------------- */
-/* Item status inspection */
-
-EXPORT bool obs_data_has_user_value(obs_data_t *data, const char *name);
-EXPORT bool obs_data_has_default_value(obs_data_t *data, const char *name);
-EXPORT bool obs_data_has_autoselect_value(obs_data_t *data, const char *name);
-
-EXPORT bool obs_data_item_has_user_value(obs_data_item_t *data);
-EXPORT bool obs_data_item_has_default_value(obs_data_item_t *data);
-EXPORT bool obs_data_item_has_autoselect_value(obs_data_item_t *data);
-
-/* ------------------------------------------------------------------------- */
-/* Clearing data values */
-
-EXPORT void obs_data_unset_user_value(obs_data_t *data, const char *name);
-EXPORT void obs_data_unset_default_value(obs_data_t *data, const char *name);
-EXPORT void obs_data_unset_autoselect_value(obs_data_t *data, const char *name);
-
-EXPORT void obs_data_item_unset_user_value(obs_data_item_t *data);
-EXPORT void obs_data_item_unset_default_value(obs_data_item_t *data);
-EXPORT void obs_data_item_unset_autoselect_value(obs_data_item_t *data);
-
-/* ------------------------------------------------------------------------- */
-/* Item iteration */
-
-EXPORT obs_data_item_t *obs_data_first(obs_data_t *data);
-EXPORT obs_data_item_t *obs_data_item_byname(obs_data_t *data,
-					     const char *name);
-EXPORT bool obs_data_item_next(obs_data_item_t **item);
-EXPORT void obs_data_item_release(obs_data_item_t **item);
-EXPORT void obs_data_item_remove(obs_data_item_t **item);
-
-/* Gets Item type */
-EXPORT enum obs_data_type obs_data_item_gettype(obs_data_item_t *item);
-EXPORT enum obs_data_number_type obs_data_item_numtype(obs_data_item_t *item);
-EXPORT const char *obs_data_item_get_name(obs_data_item_t *item);
-
-/* Item set functions */
-EXPORT void obs_data_item_set_string(obs_data_item_t **item, const char *val);
-EXPORT void obs_data_item_set_int(obs_data_item_t **item, long long val);
-EXPORT void obs_data_item_set_double(obs_data_item_t **item, double val);
-EXPORT void obs_data_item_set_bool(obs_data_item_t **item, bool val);
-EXPORT void obs_data_item_set_obj(obs_data_item_t **item, obs_data_t *val);
-EXPORT void obs_data_item_set_array(obs_data_item_t **item,
-				    obs_data_array_t *val);
-
-EXPORT void obs_data_item_set_default_string(obs_data_item_t **item,
-					     const char *val);
-EXPORT void obs_data_item_set_default_int(obs_data_item_t **item,
-					  long long val);
-EXPORT void obs_data_item_set_default_double(obs_data_item_t **item,
-					     double val);
-EXPORT void obs_data_item_set_default_bool(obs_data_item_t **item, bool val);
-EXPORT void obs_data_item_set_default_obj(obs_data_item_t **item,
-					  obs_data_t *val);
-EXPORT void obs_data_item_set_default_array(obs_data_item_t **item,
-					    obs_data_array_t *val);
-
-EXPORT void obs_data_item_set_autoselect_string(obs_data_item_t **item,
-						const char *val);
-EXPORT void obs_data_item_set_autoselect_int(obs_data_item_t **item,
-					     long long val);
-EXPORT void obs_data_item_set_autoselect_double(obs_data_item_t **item,
-						double val);
-EXPORT void obs_data_item_set_autoselect_bool(obs_data_item_t **item, bool val);
-EXPORT void obs_data_item_set_autoselect_obj(obs_data_item_t **item,
-					     obs_data_t *val);
-EXPORT void obs_data_item_set_autoselect_array(obs_data_item_t **item,
-					       obs_data_array_t *val);
-
-/* Item get functions */
-EXPORT const char *obs_data_item_get_string(obs_data_item_t *item);
-EXPORT long long obs_data_item_get_int(obs_data_item_t *item);
-EXPORT double obs_data_item_get_double(obs_data_item_t *item);
-EXPORT bool obs_data_item_get_bool(obs_data_item_t *item);
-EXPORT obs_data_t *obs_data_item_get_obj(obs_data_item_t *item);
-EXPORT obs_data_array_t *obs_data_item_get_array(obs_data_item_t *item);
-
-EXPORT const char *obs_data_item_get_default_string(obs_data_item_t *item);
-EXPORT long long obs_data_item_get_default_int(obs_data_item_t *item);
-EXPORT double obs_data_item_get_default_double(obs_data_item_t *item);
-EXPORT bool obs_data_item_get_default_bool(obs_data_item_t *item);
-EXPORT obs_data_t *obs_data_item_get_default_obj(obs_data_item_t *item);
-EXPORT obs_data_array_t *obs_data_item_get_default_array(obs_data_item_t *item);
-
-EXPORT const char *obs_data_item_get_autoselect_string(obs_data_item_t *item);
-EXPORT long long obs_data_item_get_autoselect_int(obs_data_item_t *item);
-EXPORT double obs_data_item_get_autoselect_double(obs_data_item_t *item);
-EXPORT bool obs_data_item_get_autoselect_bool(obs_data_item_t *item);
-EXPORT obs_data_t *obs_data_item_get_autoselect_obj(obs_data_item_t *item);
-EXPORT obs_data_array_t *
-obs_data_item_get_autoselect_array(obs_data_item_t *item);
-
-#ifdef __cplusplus
-}
-#endif

tests/stubs/macro-action-macro.cpp

@@ -0,0 +1,123 @@
+#include "macro-action-macro.hpp"
+
+namespace advss {
+
+bool MacroActionMacro::_registered = false;
+const std::string MacroActionMacro::id = "macro";
+
+bool MacroActionMacro::PerformAction()
+{
+	return false;
+}
+
+void MacroActionMacro::LogAction() const {}
+
+bool MacroActionMacro::Save(obs_data_t *obj) const
+{
+	return false;
+}
+
+bool MacroActionMacro::Load(obs_data_t *obj)
+{
+	return false;
+}
+
+bool MacroActionMacro::PostLoad()
+{
+	return false;
+}
+
+std::string MacroActionMacro::GetShortDesc() const
+{
+	return "";
+}
+
+std::shared_ptr<MacroAction> MacroActionMacro::Create(Macro *m)
+{
+	return std::make_shared<MacroActionMacro>(m);
+}
+
+std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
+{
+	return std::make_shared<MacroActionMacro>(*this);
+}
+
+void MacroActionMacro::ResolveVariablesToFixedValues() {}
+
+void MacroActionMacro::RunOptions::Save(obs_data_t *obj) const {}
+
+void MacroActionMacro::RunOptions::Load(obs_data_t *obj) {}
+
+void MacroActionMacro::RunActions(Macro *actionMacro) const {}
+
+void MacroActionMacro::AdjustActionState(Macro *macro) const {}
+
+MacroActionMacroEdit::MacroActionMacroEdit(
+	QWidget *parent, std::shared_ptr<MacroActionMacro> entryData)
+	: ResizableWidget(parent),
+	  _actions(new QComboBox(this)),
+	  _macros(new MacroSelection(this)),
+	  _actionSelectionType(new QComboBox(this)),
+	  _label(new VariableLineEdit(this)),
+	  _actionTypes(new FilterComboBox(this)),
+	  _regex(new RegexConfigWidget(this)),
+	  _conditionMacros(new MacroSelection(this)),
+	  _conditionBehaviors(new QComboBox(this)),
+	  _reevaluateConditionState(new QCheckBox(this)),
+	  _actionSections(new QComboBox(this)),
+	  _skipWhenPaused(new QCheckBox(this)),
+	  _setInputs(new QCheckBox(this)),
+	  _inputs(new MacroInputEdit(this)),
+	  _entryLayout(new QHBoxLayout()),
+	  _conditionLayout(new QHBoxLayout()),
+	  _reevaluateConditionStateLayout(new QHBoxLayout()),
+	  _setInputsLayout(new QHBoxLayout()),
+	  _nestedMacro(new MacroEdit(this)),
+	  _entryData(entryData)
+{
+}
+
+MacroActionMacroEdit::~MacroActionMacroEdit() {}
+
+void MacroActionMacroEdit::UpdateEntryData() {}
+
+QWidget *MacroActionMacroEdit::Create(QWidget *parent,
+				      std::shared_ptr<MacroAction> action)
+{
+	return new MacroActionMacroEdit(
+		parent, std::dynamic_pointer_cast<MacroActionMacro>(action));
+}
+
+void MacroActionMacroEdit::MacroChanged(const QString &text) {}
+
+void MacroActionMacroEdit::ActionChanged(int value) {}
+
+void MacroActionMacroEdit::ActionSelectionTypeChanged(int value) {}
+
+void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value) {}
+
+void MacroActionMacroEdit::LabelChanged() {}
+
+void MacroActionMacroEdit::ActionTypeChanged(int value) {}
+
+void MacroActionMacroEdit::RegexChanged(const RegexConfig &config) {}
+
+void MacroActionMacroEdit::ConditionMacroChanged(const QString &text) {}
+
+void MacroActionMacroEdit::ConditionBehaviorChanged(int value) {}
+
+void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value) {}
+
+void MacroActionMacroEdit::ActionSectionChanged(int value) {}
+
+void MacroActionMacroEdit::SkipWhenPausedChanged(int value) {}
+
+void MacroActionMacroEdit::SetInputsChanged(int value) {}
+
+void MacroActionMacroEdit::InputsChanged(const StringList &inputs) {}
+
+void MacroActionMacroEdit::SetWidgetVisibility() {}
+
+void MacroActionMacroEdit::SetupMacroInput(Macro *macro) const {}
+
+} // namespace advss

tests/stubs/macro-dock-settings.cpp

@@ -0,0 +1,77 @@
+#include "macro-dock-settings.hpp"
+
+namespace advss {
+
+MacroDockSettings::MacroDockSettings(Macro *macro) : _macro(macro) {}
+MacroDockSettings::~MacroDockSettings() {}
+
+void MacroDockSettings::Save(obs_data_t *, bool) const {}
+void MacroDockSettings::Load(obs_data_t *) {}
+void MacroDockSettings::EnableDock(bool value)
+{
+	_registerDock = value;
+}
+void MacroDockSettings::SetIsStandaloneDock(bool value)
+{
+	_standaloneDock = value;
+}
+void MacroDockSettings::SetDockWindowName(const std::string &name)
+{
+	_dockWindow = name;
+}
+void MacroDockSettings::SetHasRunButton(bool value)
+{
+	_hasRunButton = value;
+}
+void MacroDockSettings::SetHasPauseButton(bool value)
+{
+	_hasPauseButton = value;
+}
+void MacroDockSettings::SetHasStatusLabel(bool value)
+{
+	_hasStatusLabel = value;
+}
+void MacroDockSettings::SetHighlightEnable(bool value)
+{
+	_highlight = value;
+}
+void MacroDockSettings::SetRunButtonText(const std::string &text)
+{
+	_runButtonText = text;
+}
+void MacroDockSettings::SetPauseButtonText(const std::string &text)
+{
+	_pauseButtonText = text;
+}
+void MacroDockSettings::SetUnpauseButtonText(const std::string &text)
+{
+	_unpauseButtonText = text;
+}
+void MacroDockSettings::SetConditionsTrueStatusText(const std::string &text)
+{
+	_conditionsTrueStatusText = text;
+}
+void MacroDockSettings::SetConditionsFalseStatusText(const std::string &text)
+{
+	_conditionsFalseStatusText = text;
+}
+
+StringVariable MacroDockSettings::ConditionsTrueStatusText() const
+{
+	return _conditionsTrueStatusText;
+}
+StringVariable MacroDockSettings::ConditionsFalseStatusText() const
+{
+	return _conditionsFalseStatusText;
+}
+
+void MacroDockSettings::HandleMacroNameChange() {}
+void MacroDockSettings::ResetDockIfEnabled() {}
+void MacroDockSettings::RemoveDock() {}
+
+std::string MacroDockSettings::GenerateId()
+{
+	return "";
+}
+
+} // namespace advss

tests/stubs/macro-edit.cpp

@@ -0,0 +1,134 @@
+#include "macro-edit.hpp"
+
+namespace advss {
+
+MacroEdit::MacroEdit(QWidget *parent, QStringList)
+	: QWidget(parent),
+	  ui(std::make_unique<Ui_MacroEdit>())
+{
+}
+
+void MacroEdit::SetMacro(const std::shared_ptr<Macro> &m)
+{
+	_currentMacro = m;
+}
+std::shared_ptr<Macro> MacroEdit::GetMacro() const
+{
+	return _currentMacro;
+}
+void MacroEdit::ClearSegmentWidgetCacheFor(Macro *) const {}
+void MacroEdit::SetControlsDisabled(bool) const {}
+void MacroEdit::HighlightAction(int, QColor) const {}
+void MacroEdit::HighlightElseAction(int, QColor) const {}
+void MacroEdit::HighlightCondition(int, QColor) const {}
+void MacroEdit::ResetConditionHighlights() {}
+void MacroEdit::ResetActionHighlights() {}
+void MacroEdit::SetActionData(Macro &) const {}
+void MacroEdit::SetElseActionData(Macro &) const {}
+void MacroEdit::SetConditionData(Macro &) const {}
+void MacroEdit::SwapActions(Macro *, int, int) {}
+void MacroEdit::SwapElseActions(Macro *, int, int) {}
+void MacroEdit::SwapConditions(Macro *, int, int) {}
+void MacroEdit::CopyMacroSegment() {}
+void MacroEdit::PasteMacroSegment() {}
+bool MacroEdit::IsEmpty() const
+{
+	return true;
+}
+void MacroEdit::ShowAllMacroSections() {}
+
+void MacroEdit::on_conditionAdd_clicked() {}
+void MacroEdit::on_conditionRemove_clicked() {}
+void MacroEdit::on_conditionTop_clicked() {}
+void MacroEdit::on_conditionUp_clicked() {}
+void MacroEdit::on_conditionDown_clicked() {}
+void MacroEdit::on_conditionBottom_clicked() {}
+void MacroEdit::on_actionAdd_clicked() {}
+void MacroEdit::on_actionRemove_clicked() {}
+void MacroEdit::on_actionTop_clicked() {}
+void MacroEdit::on_actionUp_clicked() {}
+void MacroEdit::on_actionDown_clicked() {}
+void MacroEdit::on_actionBottom_clicked() {}
+void MacroEdit::on_toggleElseActions_clicked() const {}
+void MacroEdit::on_elseActionAdd_clicked() {}
+void MacroEdit::on_elseActionRemove_clicked() {}
+void MacroEdit::on_elseActionTop_clicked() {}
+void MacroEdit::on_elseActionUp_clicked() {}
+void MacroEdit::on_elseActionDown_clicked() {}
+void MacroEdit::on_elseActionBottom_clicked() {}
+void MacroEdit::UpMacroSegmentHotkey() {}
+void MacroEdit::DownMacroSegmentHotkey() {}
+void MacroEdit::DeleteMacroSegmentHotkey() {}
+void MacroEdit::ShowMacroActionsContextMenu(const QPoint &) {}
+void MacroEdit::ShowMacroElseActionsContextMenu(const QPoint &) {}
+void MacroEdit::ShowMacroConditionsContextMenu(const QPoint &) {}
+void MacroEdit::ExpandAllActions() const {}
+void MacroEdit::ExpandAllElseActions() const {}
+void MacroEdit::ExpandAllConditions() const {}
+void MacroEdit::CollapseAllActions() const {}
+void MacroEdit::CollapseAllElseActions() const {}
+void MacroEdit::CollapseAllConditions() const {}
+void MacroEdit::MinimizeActions() const {}
+void MacroEdit::MaximizeActions() const {}
+void MacroEdit::MinimizeElseActions() const {}
+void MacroEdit::MaximizeElseActions() const {}
+void MacroEdit::MinimizeConditions() const {}
+void MacroEdit::MaximizeConditions() const {}
+void MacroEdit::SetElseActionsStateToHidden() const {}
+void MacroEdit::SetElseActionsStateToVisible() const {}
+void MacroEdit::MacroActionSelectionChanged(int) {}
+void MacroEdit::MacroActionReorder(int, int) {}
+void MacroEdit::AddMacroAction(Macro *, int, const std::string &, obs_data_t *)
+{
+}
+void MacroEdit::AddMacroAction(int) {}
+void MacroEdit::RemoveMacroAction(int) {}
+void MacroEdit::MoveMacroActionUp(int) {}
+void MacroEdit::MoveMacroActionDown(int) {}
+void MacroEdit::MacroElseActionSelectionChanged(int) {}
+void MacroEdit::MacroElseActionReorder(int, int) {}
+void MacroEdit::AddMacroElseAction(Macro *, int, const std::string &,
+				   obs_data_t *)
+{
+}
+void MacroEdit::AddMacroElseAction(int) {}
+void MacroEdit::RemoveMacroElseAction(int) {}
+void MacroEdit::MoveMacroElseActionUp(int) {}
+void MacroEdit::MoveMacroElseActionDown(int) {}
+void MacroEdit::MacroConditionSelectionChanged(int) {}
+void MacroEdit::MacroConditionReorder(int, int) {}
+void MacroEdit::AddMacroCondition(int) {}
+void MacroEdit::AddMacroCondition(Macro *, int, const std::string &,
+				  obs_data_t *, Logic::Type)
+{
+}
+void MacroEdit::RemoveMacroCondition(int) {}
+void MacroEdit::MoveMacroConditionUp(int) {}
+void MacroEdit::MoveMacroConditionDown(int) {}
+void MacroEdit::HighlightControls() const {}
+
+void MacroEdit::PopulateMacroActions(Macro &, uint32_t) {}
+void MacroEdit::PopulateMacroElseActions(Macro &, uint32_t) {}
+void MacroEdit::PopulateMacroConditions(Macro &, uint32_t) {}
+void MacroEdit::SetupMacroSegmentSelection(MacroSection, int) {}
+void MacroEdit::SetupContextMenu(const QPoint &,
+				 const std::function<void(MacroEdit *, int)> &,
+				 const std::function<void(MacroEdit *)> &,
+				 const std::function<void(MacroEdit *)> &,
+				 const std::function<void(MacroEdit *)> &,
+				 const std::function<void(MacroEdit *)> &,
+				 MacroSegmentList *)
+{
+}
+void MacroEdit::RunSegmentHighlightChecks() {}
+bool MacroEdit::ElseSectionIsVisible() const
+{
+	return false;
+}
+
+bool MacroEdit::eventFilter(QObject *, QEvent *)
+{
+	return false;
+}
+
+} // namespace advss

tests/stubs/plugin-state-helpers.cpp

@@ -0,0 +1,86 @@
+#include "plugin-state-helpers.hpp"
+
+namespace advss {
+
+void SavePluginSettings(obs_data_t *) {}
+void LoadPluginSettings(obs_data_t *) {}
+void AddSaveStep(std::function<void(obs_data_t *)>) {}
+void AddLoadStep(std::function<void(obs_data_t *)>) {}
+void AddPostLoadStep(std::function<void()>) {}
+void AddIntervalResetStep(std::function<void()>) {}
+void RunSaveSteps(obs_data_t *) {}
+void RunLoadSteps(obs_data_t *) {}
+void RunAndClearPostLoadSteps() {}
+void ClearPostLoadSteps() {}
+
+void AddPluginInitStep(std::function<void()>) {}
+void AddPluginPostLoadStep(std::function<void()>) {}
+void AddPluginCleanupStep(std::function<void()>) {}
+void RunPluginInitSteps() {}
+void RunPluginPostLoadSteps() {}
+void RunPluginCleanupSteps() {}
+
+void StopPlugin() {}
+void StartPlugin() {}
+bool PluginIsRunning()
+{
+	return false;
+}
+int GetIntervalValue()
+{
+	return 0;
+}
+void AddStartStep(std::function<void()>) {}
+void AddStopStep(std::function<void()>) {}
+void RunStartSteps() {}
+void RunStopSteps() {}
+void RunIntervalResetSteps() {}
+
+void SetPluginNoMatchBehavior(NoMatchBehavior) {}
+NoMatchBehavior GetPluginNoMatchBehavior()
+{
+	return NoMatchBehavior::NO_SWITCH;
+}
+void SetNoMatchScene(const OBSWeakSource &) {}
+
+std::string ForegroundWindowTitle()
+{
+	return "";
+}
+std::string PreviousForegroundWindowTitle()
+{
+	return "";
+}
+bool SettingsWindowIsOpened()
+{
+	return false;
+}
+bool HighlightUIElementsEnabled()
+{
+	return false;
+}
+
+bool OBSIsShuttingDown()
+{
+	return false;
+}
+bool InitialLoadIsComplete()
+{
+	return false;
+}
+bool IsFirstInterval()
+{
+	return false;
+}
+bool IsFirstIntervalAfterStop()
+{
+	return false;
+}
+
+void SetMacroHighlightingEnabled(bool) {}
+bool IsMacroHighlightingEnabled()
+{
+	return false;
+}
+
+} // namespace advss

tests/stubs/ui-helpers.cpp

@@ -47,4 +47,9 @@ QWidget *GetSettingsWindow()
 	return nullptr;
 }
 
+bool IsCursorInWidgetArea(QWidget *widget)
+{
+	return false;
+}
+
 } // namespace advss

tests/test-macro-condition.cpp

@@ -0,0 +1,351 @@
+#include "catch.hpp"
+
+#include <macro-condition.hpp>
+
+namespace {
+
+class StubCondition : public advss::MacroCondition {
+public:
+	StubCondition(bool initialValue = false)
+		: MacroCondition(nullptr),
+		  _value(initialValue)
+	{
+	}
+
+	void SetValue(bool value) { _value = value; }
+	bool CheckCondition() override { return _value; }
+	bool Save(obs_data_t *) const override { return true; }
+	bool Load(obs_data_t *) override { return true; }
+	std::string GetId() const override { return "stub"; }
+
+private:
+	bool _value;
+};
+
+} // namespace
+
+// ---------------------------------------------------------------------------
+// HasChanged
+// ---------------------------------------------------------------------------
+
+TEST_CASE("HasChanged is false on first evaluation", "[macro-condition]")
+{
+	StubCondition cond;
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.HasChanged());
+}
+
+TEST_CASE("HasChanged is false when value stays false", "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.HasChanged());
+}
+
+TEST_CASE("HasChanged is false when value stays true", "[macro-condition]")
+{
+	StubCondition cond(true);
+	cond.EvaluateCondition();
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.HasChanged());
+}
+
+TEST_CASE("HasChanged is true on rising edge (false to true)",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged());
+}
+
+TEST_CASE("HasChanged is true on falling edge (true to false)",
+	  "[macro-condition]")
+{
+	StubCondition cond(true);
+	cond.EvaluateCondition();
+	cond.SetValue(false);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged());
+}
+
+TEST_CASE("HasChanged resets to false after stable evaluation",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged());
+
+	cond.EvaluateCondition(); // value unchanged
+	REQUIRE_FALSE(cond.HasChanged());
+}
+
+TEST_CASE("EvaluateCondition returns the current condition value",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	REQUIRE_FALSE(cond.EvaluateCondition());
+
+	cond.SetValue(true);
+	REQUIRE(cond.EvaluateCondition());
+
+	cond.SetValue(false);
+	REQUIRE_FALSE(cond.EvaluateCondition());
+}
+
+TEST_CASE("Multiple alternating changes are each detected", "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition(); // baseline
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged()); // false -> true
+
+	cond.SetValue(false);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged()); // true -> false
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.HasChanged()); // false -> true again
+}
+
+// ---------------------------------------------------------------------------
+// IsRisingEdge
+// ---------------------------------------------------------------------------
+
+TEST_CASE("IsRisingEdge is false on first evaluation", "[macro-condition]")
+{
+	StubCondition cond(true);
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge is true on false-to-true transition",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge is false on true-to-false transition",
+	  "[macro-condition]")
+{
+	StubCondition cond(true);
+	cond.EvaluateCondition();
+	cond.SetValue(false);
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge is false when value stays true", "[macro-condition]")
+{
+	StubCondition cond(true);
+	cond.EvaluateCondition();
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge is false when value stays false", "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge resets to false after stable evaluation",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.IsRisingEdge());
+
+	cond.EvaluateCondition(); // value unchanged
+	REQUIRE_FALSE(cond.IsRisingEdge());
+}
+
+TEST_CASE("IsRisingEdge fires again after falling then rising",
+	  "[macro-condition]")
+{
+	StubCondition cond(false);
+	cond.EvaluateCondition();
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.IsRisingEdge());
+
+	cond.SetValue(false);
+	cond.EvaluateCondition();
+	REQUIRE_FALSE(cond.IsRisingEdge());
+
+	cond.SetValue(true);
+	cond.EvaluateCondition();
+	REQUIRE(cond.IsRisingEdge()); // second rising edge is detected
+}
+
+// ---------------------------------------------------------------------------
+// CheckDurationModifier - NONE (default, no time constraint)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("DurationModifier NONE passes through condition value",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	// Default modifier type is NONE
+	REQUIRE(cond.CheckDurationModifier(true));
+	REQUIRE_FALSE(cond.CheckDurationModifier(false));
+}
+
+// ---------------------------------------------------------------------------
+// CheckDurationModifier - MORE (true only after duration has elapsed)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("DurationModifier MORE returns false before duration elapses",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::MORE);
+	cond.SetDuration(advss::Duration(10.0)); // 10 seconds — won't elapse
+
+	REQUIRE_FALSE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE("DurationModifier MORE returns true after duration elapses",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::MORE);
+	cond.SetDuration(
+		advss::Duration(0.0)); // 0 seconds — elapses immediately
+
+	// First call starts the timer; with 0s duration it should already pass
+	REQUIRE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE("DurationModifier MORE resets when condition becomes false",
+	  "[duration-modifier]")
+{
+	StubCondition cond;
+	cond.SetDurationModifier(advss::DurationModifier::Type::MORE);
+	cond.SetDuration(advss::Duration(0.0));
+
+	cond.CheckDurationModifier(true);  // start timer
+	cond.CheckDurationModifier(false); // reset
+	// After reset a fresh call with true must re-start the timer and still pass
+	// (duration is 0 so it should pass immediately again)
+	REQUIRE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE("DurationModifier MORE returns false when condition is false",
+	  "[duration-modifier]")
+{
+	StubCondition cond;
+	cond.SetDurationModifier(advss::DurationModifier::Type::MORE);
+	cond.SetDuration(advss::Duration(0.0));
+
+	REQUIRE_FALSE(cond.CheckDurationModifier(false));
+}
+
+// ---------------------------------------------------------------------------
+// CheckDurationModifier - LESS (true only before duration elapses)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("DurationModifier LESS returns true before duration elapses",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::LESS);
+	cond.SetDuration(advss::Duration(10.0)); // won't elapse during test
+
+	REQUIRE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE("DurationModifier LESS returns false after duration elapses",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::LESS);
+	cond.SetDuration(advss::Duration(0.0)); // elapses immediately
+
+	// First call starts timer; with 0s it is already past
+	REQUIRE_FALSE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE("DurationModifier LESS returns false when condition is false",
+	  "[duration-modifier]")
+{
+	StubCondition cond;
+	cond.SetDurationModifier(advss::DurationModifier::Type::LESS);
+	cond.SetDuration(advss::Duration(10.0));
+
+	REQUIRE_FALSE(cond.CheckDurationModifier(false));
+}
+
+// ---------------------------------------------------------------------------
+// CheckDurationModifier - WITHIN (true while within window after going false)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("DurationModifier WITHIN returns true while condition is true",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::WITHIN);
+	cond.SetDuration(advss::Duration(10.0));
+
+	REQUIRE(cond.CheckDurationModifier(true));
+}
+
+TEST_CASE(
+	"DurationModifier WITHIN returns true immediately after condition goes false",
+	"[duration-modifier]")
+{
+	StubCondition cond;
+	cond.SetDurationModifier(advss::DurationModifier::Type::WITHIN);
+	cond.SetDuration(advss::Duration(10.0));
+
+	cond.CheckDurationModifier(
+		true); // condition was true — sets time remaining
+	REQUIRE(cond.CheckDurationModifier(false)); // still within window
+}
+
+TEST_CASE("DurationModifier WITHIN returns false before condition was ever true",
+	  "[duration-modifier]")
+{
+	StubCondition cond;
+	cond.SetDurationModifier(advss::DurationModifier::Type::WITHIN);
+	cond.SetDuration(advss::Duration(10.0));
+
+	// Timer was never started (condition never went true->false)
+	REQUIRE_FALSE(cond.CheckDurationModifier(false));
+}
+
+// ---------------------------------------------------------------------------
+// ResetDuration
+// ---------------------------------------------------------------------------
+
+TEST_CASE("ResetDuration causes MORE modifier to restart its timer",
+	  "[duration-modifier]")
+{
+	StubCondition cond(true);
+	cond.SetDurationModifier(advss::DurationModifier::Type::MORE);
+	cond.SetDuration(advss::Duration(10.0));
+
+	cond.CheckDurationModifier(true); // starts timer
+	cond.ResetDuration();             // reset
+
+	// After reset the timer restarts — 10s duration won't have elapsed
+	REQUIRE_FALSE(cond.CheckDurationModifier(true));
+}

tests/test-macro.cpp

@@ -0,0 +1,416 @@
+#include "catch.hpp"
+
+#include <macro.hpp>
+
+#include <memory>
+
+namespace {
+
+// ---------------------------------------------------------------------------
+// Stubs
+// ---------------------------------------------------------------------------
+
+class StubCondition : public advss::MacroCondition {
+public:
+	StubCondition(advss::Macro *m, bool initialValue = false)
+		: MacroCondition(m),
+		  _value(initialValue)
+	{
+	}
+
+	void SetValue(bool value) { _value = value; }
+	bool CheckCondition() override { return _value; }
+	bool Save(obs_data_t *) const override { return true; }
+	bool Load(obs_data_t *) override { return true; }
+	std::string GetId() const override { return "stub"; }
+
+private:
+	bool _value;
+};
+
+class StubAction : public advss::MacroAction {
+public:
+	StubAction(advss::Macro *m) : MacroAction(m) {}
+
+	bool PerformAction() override
+	{
+		_performCount++;
+		return true;
+	}
+
+	std::shared_ptr<MacroAction> Copy() const override
+	{
+		return std::make_shared<StubAction>(*this);
+	}
+
+	bool Save(obs_data_t *) const override { return true; }
+	bool Load(obs_data_t *) override { return true; }
+	std::string GetId() const override { return "stub"; }
+
+	int PerformCount() const { return _performCount; }
+
+private:
+	int _performCount = 0;
+};
+
+// Helpers to wire up conditions and actions onto a macro
+std::shared_ptr<StubCondition> AddCondition(advss::Macro &m,
+					    bool initialValue = false)
+{
+	auto cond = std::make_shared<StubCondition>(&m, initialValue);
+	cond->SetLogicType(advss::Logic::Type::ROOT_NONE);
+	m.Conditions().push_back(cond);
+	return cond;
+}
+
+std::shared_ptr<StubAction> AddAction(advss::Macro &m)
+{
+	auto action = std::make_shared<StubAction>(&m);
+	m.Actions().push_back(action);
+	return action;
+}
+
+std::shared_ptr<StubAction> AddElseAction(advss::Macro &m)
+{
+	auto action = std::make_shared<StubAction>(&m);
+	m.ElseActions().push_back(action);
+	return action;
+}
+
+} // namespace
+
+// ---------------------------------------------------------------------------
+// CheckConditions - basic matching
+// ---------------------------------------------------------------------------
+
+TEST_CASE("CheckConditions returns false with no conditions", "[macro]")
+{
+	advss::Macro m("test");
+	REQUIRE_FALSE(m.CheckConditions());
+}
+
+TEST_CASE("CheckConditions returns true when condition is true", "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	REQUIRE(m.CheckConditions());
+}
+
+TEST_CASE("CheckConditions returns false when condition is false", "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, false);
+	REQUIRE_FALSE(m.CheckConditions());
+}
+
+TEST_CASE("ConditionsMatched reflects last CheckConditions result", "[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, false);
+
+	m.CheckConditions();
+	REQUIRE_FALSE(m.ConditionsMatched());
+
+	cond->SetValue(true);
+	m.CheckConditions();
+	REQUIRE(m.ConditionsMatched());
+}
+
+TEST_CASE("CheckConditions returns false for group macros", "[macro]")
+{
+	std::vector<std::shared_ptr<advss::Macro>> children;
+	auto group = advss::Macro::CreateGroup("group", children);
+	REQUIRE_FALSE(group->CheckConditions());
+}
+
+// ---------------------------------------------------------------------------
+// Pause
+// ---------------------------------------------------------------------------
+
+TEST_CASE("CheckConditions respects pause", "[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, true);
+
+	m.SetPaused(true);
+	// When paused, conditions are not evaluated — _matched stays false
+	REQUIRE_FALSE(m.CheckConditions());
+}
+
+TEST_CASE("CheckConditions runs when ignorePause is true while paused",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+
+	m.SetPaused(true);
+	REQUIRE(m.CheckConditions(/*ignorePause=*/true));
+}
+
+// ---------------------------------------------------------------------------
+// ShouldRunActions - ActionTriggerMode::MACRO_RESULT_CHANGED (default)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("ShouldRunActions is false before first CheckConditions", "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+	// _actionModeMatch starts false, _matched starts false
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions MACRO_RESULT_CHANGED: true on first match",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	// Default mode is MACRO_RESULT_CHANGED.
+	// _lastMatched starts false, first check sets _matched=true -> changed
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::MACRO_RESULT_CHANGED);
+	m.CheckConditions();
+	REQUIRE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions MACRO_RESULT_CHANGED: false when result unchanged",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::MACRO_RESULT_CHANGED);
+	m.CheckConditions(); // false -> true: changed
+	m.CheckConditions(); // true -> true: unchanged
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+TEST_CASE(
+	"ShouldRunActions MACRO_RESULT_CHANGED: true again when result flips back",
+	"[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, true);
+	AddAction(m);
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::MACRO_RESULT_CHANGED);
+	m.CheckConditions(); // false -> true
+	REQUIRE(m.ShouldRunActions());
+	m.CheckConditions(); // true -> true
+	REQUIRE_FALSE(m.ShouldRunActions());
+	cond->SetValue(false);
+	m.CheckConditions(); // true -> false: changed
+	cond->SetValue(true);
+	m.CheckConditions(); // true -> false: changed
+	REQUIRE(m.ShouldRunActions());
+}
+
+// ---------------------------------------------------------------------------
+// ShouldRunActions - ActionTriggerMode::ALWAYS
+// ---------------------------------------------------------------------------
+
+TEST_CASE("ShouldRunActions ALWAYS: true every time conditions match",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(advss::Macro::ActionTriggerMode::ALWAYS);
+	m.CheckConditions();
+	REQUIRE(m.ShouldRunActions());
+
+	m.CheckConditions();
+	REQUIRE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions ALWAYS: false when conditions do not match",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, false);
+	// No else actions, so nothing to run
+	m.SetActionTriggerMode(advss::Macro::ActionTriggerMode::ALWAYS);
+	m.CheckConditions();
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+// ---------------------------------------------------------------------------
+// ShouldRunActions - ActionTriggerMode::ANY_CONDITION_CHANGED
+// ---------------------------------------------------------------------------
+
+TEST_CASE("ShouldRunActions ANY_CONDITION_CHANGED: true when condition changes",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, false);
+	AddAction(m);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_CHANGED);
+	m.CheckConditions(); // baseline — no change yet
+
+	cond->SetValue(true);
+	m.CheckConditions(); // changed: false -> true
+	REQUIRE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions ANY_CONDITION_CHANGED: false when condition stable",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_CHANGED);
+	m.CheckConditions(); // baseline
+	m.CheckConditions(); // stable
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+// ---------------------------------------------------------------------------
+// ShouldRunActions - ActionTriggerMode::ANY_CONDITION_TRIGGERED
+// ---------------------------------------------------------------------------
+
+TEST_CASE("ShouldRunActions ANY_CONDITION_TRIGGERED: true on rising edge",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, false);
+	AddAction(m);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED);
+	m.CheckConditions(); // baseline
+
+	cond->SetValue(true);
+	m.CheckConditions(); // rising edge
+	REQUIRE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions ANY_CONDITION_TRIGGERED: false on falling edge",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	auto cond = AddCondition(m, true);
+	AddElseAction(m); // need else actions so ShouldRunActions can be true
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED);
+	m.CheckConditions(); // baseline (first eval, no rising edge)
+
+	cond->SetValue(false);
+	m.CheckConditions(); // falling edge — not a rising edge
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+TEST_CASE("ShouldRunActions ANY_CONDITION_TRIGGERED: false when stable true",
+	  "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED);
+	m.CheckConditions(); // baseline
+	m.CheckConditions(); // stable true — no rising edge
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+// ---------------------------------------------------------------------------
+// RunCount
+// ---------------------------------------------------------------------------
+
+TEST_CASE("RunCount increments after PerformActions", "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(advss::Macro::ActionTriggerMode::ALWAYS);
+	m.CheckConditions();
+	REQUIRE(m.RunCount() == 0);
+
+	m.PerformActions(true);
+	REQUIRE(m.RunCount() == 1);
+
+	m.PerformActions(true);
+	REQUIRE(m.RunCount() == 2);
+}
+
+TEST_CASE("ResetRunCount resets to zero", "[macro]")
+{
+	advss::Macro m("test");
+	AddAction(m);
+
+	m.PerformActions(true);
+	m.PerformActions(true);
+	REQUIRE(m.RunCount() == 2);
+
+	m.ResetRunCount();
+	REQUIRE(m.RunCount() == 0);
+}
+
+// ---------------------------------------------------------------------------
+// Pause state
+// ---------------------------------------------------------------------------
+
+TEST_CASE("Paused is false by default", "[macro]")
+{
+	advss::Macro m("test");
+	REQUIRE_FALSE(m.Paused());
+}
+
+TEST_CASE("SetPaused toggles pause state", "[macro]")
+{
+	advss::Macro m("test");
+	m.SetPaused(true);
+	REQUIRE(m.Paused());
+	m.SetPaused(false);
+	REQUIRE_FALSE(m.Paused());
+}
+
+TEST_CASE("Paused macros don't run actions", "[macro]")
+{
+	advss::Macro m("test");
+	m.SetPaused(true);
+	REQUIRE(m.Paused());
+	auto action = AddAction(m);
+	m.PerformActions(true);
+	REQUIRE(action->PerformCount() == 0);
+}
+
+TEST_CASE("ShouldRunActions is false while paused", "[macro]")
+{
+	advss::Macro m("test");
+	AddCondition(m, true);
+	AddAction(m);
+
+	m.SetActionTriggerMode(advss::Macro::ActionTriggerMode::ALWAYS);
+	m.CheckConditions(/*ignorePause=*/true);
+	m.SetPaused(true);
+	REQUIRE_FALSE(m.ShouldRunActions());
+}
+
+// ---------------------------------------------------------------------------
+// ActionTriggerMode getter/setter
+// ---------------------------------------------------------------------------
+
+TEST_CASE("GetActionTriggerMode returns the set mode", "[macro]")
+{
+	advss::Macro m("test");
+	m.SetActionTriggerMode(advss::Macro::ActionTriggerMode::ALWAYS);
+	REQUIRE(m.GetActionTriggerMode() ==
+		advss::Macro::ActionTriggerMode::ALWAYS);
+
+	m.SetActionTriggerMode(
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED);
+	REQUIRE(m.GetActionTriggerMode() ==
+		advss::Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED);
+}

tests/test-regex.cpp

@@ -80,11 +80,3 @@ TEST_CASE("Matches (PartialMatchRegexConfig)", "[regex-config]")
 	result = regex.Matches(std::string("abc"), "a");
 	REQUIRE(result == true);
 }
-
-TEST_CASE("EscapeForRegex , [text-helpers]")
-{
-	REQUIRE(advss::EscapeForRegex("") == "");
-	REQUIRE(advss::EscapeForRegex("abcdefg") == "abcdefg");
-	REQUIRE(advss::EscapeForRegex("(abcdefg)") == "\\(abcdefg\\)");
-	REQUIRE(advss::EscapeForRegex("\\(abcdefg)") == "\\\\(abcdefg\\)");
-}