Fix crash when restoring scene item transition in parallel

If the connection was aborted by the local machine, the active
subsciptions were not cleared causing the new connection not attempt to
register any new subsciptions.

An event sub connection without any active subsciptions will be dropped
by Twitch after a certain amount of time.

Additionally the reconnection logic was triggering to frequently causing
unecessary load.

BUILDING.md

@@ -6,18 +6,18 @@ You have the option to ...
 
 Both methods require [CMake](https://cmake.org/download/).
 
-The plugin can be compiled for OBS 27 and above, although using the latest version of OBS is recommended to support all features.
+The plugin can be compiled for OBS 31 and above, although using the latest version of OBS is recommended to support all features.
 
 ## Compiling in tree (recommended for development)
 This section assumes that you have a working [OBS Studio development environment](https://obsproject.com/wiki/Building-OBS-Studio).  
 
-Add the "SceneSwitcher" source directory to your obs-studio source directory under obs-studio/UI/frontend-plugins/:
+Add the "SceneSwitcher" source directory to your obs-studio source directory under obs-studio/plugins:
 ```
-cd obs-studio/UI/frontend-plugins/
+cd obs-studio/plugins
 git clone --recursive https://github.com/WarmUpTill/SceneSwitcher.git
 ```
 
-Then modify the obs-studio/UI/frontend-plugins/CMakeLists.txt Example and add an entry for the scene switcher:
+Then modify the obs-studio/plugins/CMakeLists.txt and add an entry for the scene switcher:
 ```
 add_subdirectory(SceneSwitcher)
 ```

CMakeLists.txt

@@ -146,6 +146,8 @@ target_sources(
           lib/macro/macro-ref.hpp
           lib/macro/macro-run-button.cpp
           lib/macro/macro-run-button.hpp
+          lib/macro/macro-search.cpp
+          lib/macro/macro-search.hpp
           lib/macro/macro-segment-copy-paste.cpp
           lib/macro/macro-segment-copy-paste.hpp
           lib/macro/macro-segment-list.cpp
@@ -164,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)
 
@@ -182,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

cmake/common/buildspec_common.cmake

@@ -180,24 +180,46 @@ function(_check_dependencies)
       set(url ${url}/${version}/${file})
     endif()
 
+    set(MAX_DOWNLOAD_RETRIES 3)
+    set(RETRY_DELAY 60) # seconds
+
     if(NOT EXISTS "${dependencies_dir}/${file}")
       message(STATUS "Downloading ${url}")
-      file(
-        DOWNLOAD "${url}" "${dependencies_dir}/${file}"
-        STATUS download_status
-        EXPECTED_HASH SHA256=${hash})
 
-      list(GET download_status 0 error_code)
-      list(GET download_status 1 error_message)
-      if(error_code GREATER 0)
-        message(STATUS "Downloading ${url} - Failure")
+      set(download_success FALSE)
+
+      foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
+        message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
+
+        file(
+          DOWNLOAD "${url}" "${dependencies_dir}/${file}"
+          STATUS download_status
+          EXPECTED_HASH SHA256=${hash})
+
+        list(GET download_status 0 error_code)
+        list(GET download_status 1 error_message)
+
+        if(error_code EQUAL 0)
+          message(STATUS "Downloading ${url} - success on attempt ${i}")
+          set(download_success TRUE)
+          break()
+        else()
+          message(WARNING "Download failed (attempt ${i}): ${error_message}")
+          file(REMOVE "${dependencies_dir}/${file}")
+
+          if(NOT i EQUAL MAX_DOWNLOAD_RETRIES)
+            message(STATUS "Retrying in ${RETRY_DELAY} seconds...")
+            execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${RETRY_DELAY})
+          endif()
+        endif()
+      endforeach()
+
+      if(NOT download_success)
         message(
           FATAL_ERROR
-            "Unable to download ${url}, failed with error: ${error_message}")
-        file(REMOVE "${dependencies_dir}/${file}")
-      else()
-        message(STATUS "Downloading ${url} - done")
+            "Unable to download ${url} after ${MAX_DOWNLOAD_RETRIES} attempts")
       endif()
+      message(STATUS "Downloading ${url} - done")
     endif()
 
     if(NOT EXISTS "${dependencies_dir}/${destination}")

data/locale/de-DE.ini

@@ -291,14 +291,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 +309,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 +430,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"

data/locale/en-US.ini

@@ -43,7 +43,9 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="Display warni
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>Loading of the following plugin libraries was unsuccessful, which could result in some Advanced Scene Switcher functions not being available:%1Check the OBS logs for details.<br>This message can be disabled on the General tab.</body></html>"
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="The plugin installation seems to be corrupted and might crash!\nPlease make sure the plugin was installed correctly!"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can be represented via macros"
-AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache="Disable macro widget caching"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs="Always show all feature tabs"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip="Show tabs that are normally hidden until first used in a macro (e.g. Action Queues, Variables, Twitch, Websockets)."
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -74,6 +76,7 @@ AdvSceneSwitcher.generalTab.setTransitionBy="When changing transitions:"
 AdvSceneSwitcher.generalTab.transitionOverride="Set transition overrides"
 AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Change active transition type"
 AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
+AdvSceneSwitcher.generalTab.uiBehavior="UI settings"
 
 # Variables Tab
 AdvSceneSwitcher.variableTab.title="Variables"
@@ -91,6 +94,12 @@ AdvSceneSwitcher.variableTab.lastUsed.text.never="Never"
 AdvSceneSwitcher.variableTab.lastChanged.header="Last changed"
 AdvSceneSwitcher.variableTab.lastChanged.text.none="No change since launch"
 AdvSceneSwitcher.variableTab.lastChanged.tooltip="Times changed: %1\n\nPrevious value: %2"
+AdvSceneSwitcher.variableTab.search.placeholder="Search ..."
+AdvSceneSwitcher.variableTab.search.all="All columns"
+AdvSceneSwitcher.variableTab.search.name="Name column"
+AdvSceneSwitcher.variableTab.search.value="Value column"
+AdvSceneSwitcher.variableTab.addDock="Add dock"
+AdvSceneSwitcher.variableTab.clear="Clear"
 
 # Action Queue Tab
 AdvSceneSwitcher.actionQueueTab.title="Action Queues"
@@ -151,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."
@@ -270,6 +281,13 @@ AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton="Move selected action up in
 AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton="Move selected action down in the else section"
 AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton="Move selected action to the bottom in the else section"
 AdvSceneSwitcher.macroTab.tooltip.openMacroSettingsButton="Open macro settings"
+AdvSceneSwitcher.macroTab.search.placeholder="Search ..."
+AdvSceneSwitcher.macroTab.search.showSettings="Show search settings"
+AdvSceneSwitcher.macroTab.search.name="Name"
+AdvSceneSwitcher.macroTab.search.allSegments="Segment type"
+AdvSceneSwitcher.macroTab.search.conditions="Condition type"
+AdvSceneSwitcher.macroTab.search.actions="Action type"
+AdvSceneSwitcher.macroTab.search.label="Segment label"
 
 AdvSceneSwitcher.macroDock.pause="Pause"
 AdvSceneSwitcher.macroDock.unpause="Unpause"
@@ -571,14 +589,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"
@@ -589,12 +599,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"
@@ -900,7 +911,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"
@@ -928,6 +941,9 @@ AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field orde
 AdvSceneSwitcher.action.source.type.openInteractionDialog="Open interaction dialog"
 AdvSceneSwitcher.action.source.type.openFilterDialog="Open filter dialog"
 AdvSceneSwitcher.action.source.type.openPropertiesDialog="Open properties dialog"
+AdvSceneSwitcher.action.source.type.closeInteractionDialog="Close interaction dialog"
+AdvSceneSwitcher.action.source.type.closeFilterDialog="Close filter dialog"
+AdvSceneSwitcher.action.source.type.closePropertiesDialog="Close properties dialog"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}{{refresh}}"
 AdvSceneSwitcher.action.source.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -949,6 +965,7 @@ AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro prope
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
 AdvSceneSwitcher.action.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
+AdvSceneSwitcher.action.source.dialog.accept="Accept changes"
 AdvSceneSwitcher.action.media="Media"
 AdvSceneSwitcher.action.media.type.play="Play"
 AdvSceneSwitcher.action.media.type.pause="Pause"
@@ -984,12 +1001,16 @@ AdvSceneSwitcher.action.macro.type.disableAction="Disable action"
 AdvSceneSwitcher.action.macro.type.enableAction="Enable action"
 AdvSceneSwitcher.action.macro.type.toggleAction="Toggle action"
 AdvSceneSwitcher.action.macro.type.nestedMacro="Nested macro"
+AdvSceneSwitcher.action.macro.actionSelectionType.index="at index"
+AdvSceneSwitcher.action.macro.actionSelectionType.label="with label"
+AdvSceneSwitcher.action.macro.actionSelectionType.id="of action type"
 AdvSceneSwitcher.action.macro.type.nestedMacro.conditionHelp="This section allows you to define macro conditions.\n\nClick the plus button below to add a new condition."
 AdvSceneSwitcher.action.macro.type.nestedMacro.actionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nClick the plus button below to add a new action."
 AdvSceneSwitcher.action.macro.type.nestedMacro.elseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nClick the plus button below to add a new action."
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}of{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}of{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.actionState="{{actions}}{{actionSelectionType}}{{actionIndex}}{{label}}{{regex}}{{actionTypes}}in{{actionSections}}section of{{macros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin state"
 AdvSceneSwitcher.action.pluginState.type.stop="Stop the Advanced Scene Switcher plugin"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Change the no-match behaviour:"
@@ -1141,6 +1162,7 @@ AdvSceneSwitcher.action.http.entry.line2="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.variable="Variable"
 AdvSceneSwitcher.action.variable.type.set="Set to value"
 AdvSceneSwitcher.action.variable.type.append="Append"
+AdvSceneSwitcher.action.variable.type.copy="Copy variable"
 AdvSceneSwitcher.action.variable.type.appendVar="Append variable"
 AdvSceneSwitcher.action.variable.type.increment="Increment"
 AdvSceneSwitcher.action.variable.type.decrement="Decrement"
@@ -1167,6 +1189,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"
@@ -1189,8 +1213,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}}"
@@ -1233,12 +1257,14 @@ AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Disable chat's emote
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Send chat message"
 AdvSceneSwitcher.action.twitch.type.user.getInfo="Get user information"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="Get channel points reward information"
+AdvSceneSwitcher.action.twitch.type.channel.getInfo="Get channel information"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="Toggle reward name / variable selection control"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Cannot select category without selecting a Twitch account first!"
-AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="Using account{{account}}{{actions}}on{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="Using account{{account}}{{actions}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="Using account{{account}}{{actions}}for channel{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.layout.chat="Using account{{account}}{{actions}}on{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.channel.getInfo="Using account{{account}}{{actions}}of{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo="Using account{{account}}{{actions}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo="Using account{{account}}{{actions}}for channel{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="Enter title"
 AdvSceneSwitcher.action.twitch.marker.description="Describe marker"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Add a slight delay before capturing the clip"
@@ -1363,6 +1389,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"
 
@@ -1592,7 +1620,11 @@ AdvSceneSwitcher.twitchToken.moderator.chat.settings.manage="Manage channel's ch
 AdvSceneSwitcher.twitchToken.user.whispers.manage="Manage user's whispers."
 AdvSceneSwitcher.twitchToken.chat.read="View live stream chat messages."
 AdvSceneSwitcher.twitchToken.chat.edit="Send live stream chat messages."
-AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages. (Recommended)"
+AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages."
+AdvSceneSwitcher.twitchToken.validateTimestamps.tooltip="Verifies that incoming Twitch messages have valid timestamps to prevent replayed or spoofed messages.\nDisabling this won’t affect normal functionality, and you can try turning it off if you experience issues with the Twitch connection."
+AdvSceneSwitcher.twitchToken.warnIfInvalid="Display warning if the token expired or is invalid."
+AdvSceneSwitcher.twitchToken.warnIfInvalid.doNotShowAgain="Don't show again for this connection"
+AdvSceneSwitcher.twitchToken.warnIfInvalid.message="The Twitch connection \"%1\" is invalid.\nOpen connection settings or ignore?"
 
 AdvSceneSwitcher.twitch.selection.channel.open="Open channel"
 AdvSceneSwitcher.twitch.selection.channel.open.tooltip.details="Open channel in external application handling the HTTPS protocol."
@@ -2118,6 +2150,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"
@@ -2159,6 +2193,8 @@ AdvSceneSwitcher.tempVar.run.process.none.description="When not waiting for the
 
 AdvSceneSwitcher.tempVar.recording.durationSeconds="Recording duration"
 AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording duration in seconds.\nThis value does not change while the recording is paused and will be reset to zero if the recording is stopped."
+AdvSceneSwitcher.tempVar.recording.lastSavePath="Last save path"
+AdvSceneSwitcher.tempVar.recording.lastSavePath.description="The file path of the last saved recording."
 
 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."
@@ -2308,6 +2344,9 @@ AdvSceneSwitcher.tempVar.mqtt.message="Message"
 AdvSceneSwitcher.tempVar.cursor.x="Cursor position (X)"
 AdvSceneSwitcher.tempVar.cursor.y="Cursor position (Y)"
 
+AdvSceneSwitcher.tempVar.replay.lastSavePath="Last save path"
+AdvSceneSwitcher.tempVar.replay.lastSavePath.description="The file path of the last replay buffer saved."
+
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectCanvas="--select canvas--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"
@@ -2428,6 +2467,16 @@ 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"
+
 # This secion is copied from the OBS locale files
 
 # OBS commonly shared locale

data/locale/es-ES.ini

@@ -241,14 +241,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 +258,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 +351,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"

data/locale/fr-FR.ini

@@ -356,14 +356,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 +374,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 +511,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 +702,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"

data/locale/ja-JP.ini

@@ -42,7 +42,6 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="プラグイ
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>次のプラグイン ライブラリの読み込みに失敗したため、一部の高機能シーンスイッチャーが利用できなくなる可能性があります:%1詳細については、OBS ログを確認してください。<br>このメッセージは、[全般] タブで無効にすることができます。 </body></html>"
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="プラグインが正しくインストールできておらずクラッシュする可能性があります！\nプラグインが正しくインストールされているか確認してください！"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="旧来型マクロ設定のタブを非表示にする（廃止予定タブ）"
-AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache="マクロウィジェットのキャッシングを無効にする"
 AdvSceneSwitcher.generalTab.matchBehavior="マッチした場合の動作（廃止予定の設定項目）"
 AdvSceneSwitcher.generalTab.priority="優先順位"
 AdvSceneSwitcher.generalTab.priority.description="切り替え方法の優先順位（優先順位が高いものが上）"
@@ -556,14 +555,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="前"
@@ -574,12 +573,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="現在の値を取得"
@@ -871,7 +867,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="無効化"
@@ -1150,8 +1145,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}}"
@@ -1194,10 +1189,10 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="ユーザー情報を取得"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="チャンネルポイントリワード情報を取得"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="リワード名/変数選択コントロールの切り替え"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Twitchアカウントを選択しないとカテゴリを選択できません！"
-; AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{account}}{{actions}}を使用"
+; AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{account}}{{actions}}を使用"
 AdvSceneSwitcher.action.twitch.title.title="タイトルを入力"
 AdvSceneSwitcher.action.twitch.marker.description="マーカーの説明"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="クリップをキャプチャする前にわずかな遅延を追加します"

data/locale/pt-BR.ini

@@ -502,14 +502,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 +520,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 +782,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"
@@ -861,9 +862,9 @@ AdvSceneSwitcher.action.macro.type.stop="Parar ações"
 AdvSceneSwitcher.action.macro.type.disableAction="Desabilitar ação"
 AdvSceneSwitcher.action.macro.type.enableAction="Habilitar ação"
 AdvSceneSwitcher.action.macro.type.toggleAction="Alternar ação"
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}de{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}de{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado do plugin"
 AdvSceneSwitcher.action.pluginState.type.stop="Parar o plugin Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Alterar o comportamento em caso de não correspondência:"
@@ -1030,8 +1031,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}}"
@@ -1065,8 +1066,8 @@ AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Habilitar modo apenas
 AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Desabilitar modo apenas emotes no chat"
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Enviar mensagem de chat"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Não é possível selecionar categoria sem selecionar uma conta Twitch primeiro!"
-AdvSceneSwitcher.action.twitch.entry.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="Usando conta{{account}}{{actions}}em{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.layout.chat="Usando conta{{account}}{{actions}}em{{channel}}"
 AdvSceneSwitcher.action.twitch.title.title="Digite o título"
 AdvSceneSwitcher.action.twitch.marker.description="Descreva o marcador"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Adicionar um leve atraso antes de capturar o clipe"

data/locale/tr-TR.ini

@@ -281,7 +281,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"

data/locale/zh-CN.ini

@@ -530,14 +530,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 +548,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 +841,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="关闭"
@@ -920,9 +921,9 @@ AdvSceneSwitcher.action.macro.type.stop="停止操作"
 AdvSceneSwitcher.action.macro.type.disableAction="停用操作"
 AdvSceneSwitcher.action.macro.type.enableAction="启用操作"
 AdvSceneSwitcher.action.macro.type.toggleAction="切换操作开关"
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="插件状态"
 AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
 AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项时:"
@@ -1100,8 +1101,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}}"
@@ -1139,10 +1140,10 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="获取用户信息"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="获取频道积分奖励信息"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="切换奖励名称/变量选择控制"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="在未选择 Twitch 帐户的情况下无法选择类别!"
-AdvSceneSwitcher.action.twitch.entry.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="使用账户{{account}}{{actions}}{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="使用账户{{account}}{{actions}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="使用账户{{account}}{{actions}} 频道{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.layout.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.layout.chat="使用账户{{account}}{{actions}}{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo="使用账户{{account}}{{actions}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo="使用账户{{account}}{{actions}} 频道{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="输入标题"
 AdvSceneSwitcher.action.twitch.marker.description="标记描述"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="在捕捉视频片段前稍加延迟"

forms/advanced-scene-switcher.ui

@@ -68,365 +68,162 @@
             <x>0</x>
             <y>0</y>
             <width>962</width>
-            <height>1057</height>
+            <height>1160</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_31">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_2">
-               <item>
-                <widget class="QGroupBox" name="statusBox">
-                 <property name="title">
-                  <string>AdvSceneSwitcher.generalTab.status</string>
-                 </property>
-                 <layout class="QGridLayout" name="gridLayout_4">
-                  <item row="0" column="0">
-                   <layout class="QGridLayout" name="statusLayout">
-                    <item row="4" column="1">
-                     <widget class="QComboBox" name="autoStartEvent"/>
-                    </item>
-                    <item row="4" column="0">
-                     <widget class="QLabel" name="label_10">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="0">
-                     <layout class="QVBoxLayout" name="verticalLayout_33">
-                      <item>
-                       <widget class="QLabel" name="label_4">
-                        <property name="text">
-                         <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <widget class="QLabel" name="checkIntervalTooLowWarning">
-                        <property name="text">
-                         <string/>
-                        </property>
-                       </widget>
-                      </item>
-                     </layout>
-                    </item>
-                    <item row="3" column="1">
-                     <widget class="QComboBox" name="startupBehavior"/>
-                    </item>
-                    <item row="1" column="1">
-                     <widget class="QWidget" name="placeholder3" native="true"/>
-                    </item>
-                    <item row="1" column="0">
-                     <widget class="QWidget" name="placeholder" native="true"/>
-                    </item>
-                    <item row="3" column="0">
-                     <widget class="QLabel" name="label_64">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="2" column="1">
-                     <widget class="QWidget" name="placeholder2" native="true"/>
-                    </item>
-                    <item row="6" column="0">
-                     <widget class="QLabel" name="label_13">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="1">
-                     <widget class="QSpinBox" name="checkInterval">
-                      <property name="minimumSize">
-                       <size>
-                        <width>100</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <property name="suffix">
-                       <string notr="true">ms</string>
-                      </property>
-                      <property name="minimum">
-                       <number>10</number>
-                      </property>
-                      <property name="maximum">
-                       <number>20000</number>
-                      </property>
-                      <property name="value">
-                       <number>300</number>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="5" column="0">
-                     <widget class="QCheckBox" name="autoStartSceneEnable">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="5" column="1">
-                     <layout class="QHBoxLayout" name="autoStartSceneLayout">
-                      <item>
-                       <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
-                      </item>
-                      <item>
-                       <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
-                      </item>
-                      <item>
-                       <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
-                      </item>
-                     </layout>
-                    </item>
-                   </layout>
+            <widget class="QGroupBox" name="statusBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.status</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_4">
+              <item row="0" column="0">
+               <layout class="QGridLayout" name="statusLayout">
+                <item row="4" column="1">
+                 <widget class="QComboBox" name="autoStartEvent"/>
+                </item>
+                <item row="4" column="0">
+                 <widget class="QLabel" name="label_10">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <layout class="QVBoxLayout" name="verticalLayout_33">
+                  <item>
+                   <widget class="QLabel" name="label_4">
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="checkIntervalTooLowWarning">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
                   </item>
                  </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QGroupBox" name="generalSettingsBox">
-                 <property name="title">
-                  <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="verticalLayout_32">
+                </item>
+                <item row="3" column="1">
+                 <widget class="QComboBox" name="startupBehavior"/>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QWidget" name="placeholder3" native="true"/>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QWidget" name="placeholder" native="true"/>
+                </item>
+                <item row="3" column="0">
+                 <widget class="QLabel" name="label_64">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="1">
+                 <widget class="QWidget" name="placeholder2" native="true"/>
+                </item>
+                <item row="6" column="0">
+                 <widget class="QLabel" name="label_13">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QSpinBox" name="checkInterval">
+                  <property name="minimumSize">
+                   <size>
+                    <width>100</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="suffix">
+                   <string notr="true">ms</string>
+                  </property>
+                  <property name="minimum">
+                   <number>10</number>
+                  </property>
+                  <property name="maximum">
+                   <number>20000</number>
+                  </property>
+                  <property name="value">
+                   <number>300</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="5" column="0">
+                 <widget class="QCheckBox" name="autoStartSceneEnable">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="5" column="1">
+                 <layout class="QHBoxLayout" name="autoStartSceneLayout">
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_52">
-                    <item>
-                     <widget class="QLabel" name="label_21">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QComboBox" name="logLevel"/>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_49">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_50">
-                    <item>
-                     <widget class="QCheckBox" name="saveWindowGeo">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_55">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_2">
-                    <item>
-                     <widget class="QCheckBox" name="showTrayNotifications">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_2">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_48">
-                    <item>
-                     <widget class="QCheckBox" name="uiHintsDisable">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_52">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_11">
-                    <item>
-                     <widget class="QCheckBox" name="disableComboBoxFilter">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_13">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_12">
-                    <item>
-                     <widget class="QCheckBox" name="disableMacroWidgetCache">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_26">
-                    <item>
-                     <widget class="QCheckBox" name="warnPluginLoadFailure">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_19">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_24">
-                    <item>
-                     <widget class="QCheckBox" name="hideLegacyTabs">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_16">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
                   </item>
                  </layout>
-                </widget>
-               </item>
-               <item>
-                <layout class="QVBoxLayout" name="verticalLayout_18">
-                 <item>
-                  <widget class="QGroupBox" name="saveLoadBox">
-                   <property name="title">
-                    <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
-                   </property>
-                   <layout class="QVBoxLayout" name="verticalLayout_17">
-                    <item>
-                     <widget class="QPushButton" name="exportSettings">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QPushButton" name="importSettings">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-            </layout>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="groupBox_6">
+            <widget class="QGroupBox" name="saveLoadBox">
              <property name="title">
-              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
+              <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_37">
+             <layout class="QVBoxLayout" name="verticalLayout_17">
               <item>
-               <layout class="QHBoxLayout" name="cooldownLayout">
+               <widget class="QPushButton" name="exportSettings">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="importSettings">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="generalSettingsBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_32">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_52">
                 <item>
-                 <widget class="QCheckBox" name="enableCooldown">
+                 <widget class="QLabel" name="label_21">
                   <property name="text">
-                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
+                 <widget class="QComboBox" name="logLevel"/>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_21">
+                 <spacer name="horizontalSpacer_49">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -441,80 +238,72 @@
                </layout>
               </item>
               <item>
-               <layout class="QGridLayout" name="gridLayout">
-                <item row="0" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_43">
-                  <item>
-                   <widget class="QRadioButton" name="noMatchDontSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
-                    </property>
-                    <property name="checked">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="2" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_45">
-                  <item>
-                   <widget class="QRadioButton" name="noMatchRandomSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="1" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QRadioButton" name="noMatchSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene">
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="1" column="1">
-                 <layout class="QHBoxLayout" name="noMatchLayout">
-                  <item>
-                   <widget class="QLabel" name="label_2">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
+               <widget class="QCheckBox" name="showTrayNotifications">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="warnPluginLoadFailure">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.uiBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_2">
+              <item>
+               <widget class="QCheckBox" name="saveWindowGeo">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="alwaysShowMacroSearch">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="alwaysShowFeatureTabs">
+                <property name="toolTip">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip</string>
+                </property>
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="disableComboBoxFilter">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="uiHintsDisable">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="hideLegacyTabs">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
+                </property>
+               </widget>
               </item>
              </layout>
             </widget>
@@ -562,6 +351,109 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="matchBehaviorBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_37">
+              <item>
+               <layout class="QHBoxLayout" name="cooldownLayout">
+                <item>
+                 <widget class="QCheckBox" name="enableCooldown">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_21">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QGridLayout" name="gridLayout">
+                <item row="0" column="2">
+                 <widget class="QRadioButton" name="noMatchDontSwitch">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="2">
+                 <widget class="QRadioButton" name="noMatchRandomSwitch">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="2">
+                 <layout class="QHBoxLayout" name="horizontalLayout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QRadioButton" name="noMatchSwitch">
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene" native="true"/>
+                  </item>
+                 </layout>
+                </item>
+                <item row="1" column="1">
+                 <layout class="QHBoxLayout" name="noMatchLayout">
+                  <item>
+                   <widget class="QLabel" name="label_2">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="priorityBox">
              <property name="title">
@@ -576,15 +468,7 @@
                </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_10">
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_41">
-                  <item>
-                   <widget class="QListWidget" name="priorityList"/>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
+               <widget class="QListWidget" name="priorityList"/>
               </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_32">
@@ -721,6 +605,55 @@
              </property>
             </widget>
            </item>
+           <item>
+            <layout class="QHBoxLayout" name="macroSearchLayout">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLineEdit" name="macroSearchText">
+               <property name="placeholderText">
+                <string>AdvSceneSwitcher.macroTab.search.placeholder</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="macroSearchClear">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.variableTab.clear</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="macroSearchType"/>
+             </item>
+             <item>
+              <widget class="advss::RegexConfigWidget" name="macroSearchRegex" native="true"/>
+             </item>
+             <item>
+              <widget class="QPushButton" name="macroSearchShowSettings">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.search.showSettings</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
            <item>
             <widget class="advss::MacroTree" name="macros">
              <property name="showDropIndicator" stdset="0">
@@ -4164,12 +4097,7 @@
   <tabstop>autoStartSceneName</tabstop>
   <tabstop>autoStartSceneNameRegex</tabstop>
   <tabstop>logLevel</tabstop>
-  <tabstop>saveWindowGeo</tabstop>
-  <tabstop>showTrayNotifications</tabstop>
-  <tabstop>uiHintsDisable</tabstop>
-  <tabstop>disableComboBoxFilter</tabstop>
   <tabstop>warnPluginLoadFailure</tabstop>
-  <tabstop>hideLegacyTabs</tabstop>
   <tabstop>exportSettings</tabstop>
   <tabstop>importSettings</tabstop>
   <tabstop>noMatchDontSwitch</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();
 	}
 }
 
@@ -421,7 +418,7 @@ bool SwitcherData::CheckForMatch(OBSWeakSource &scene,
 
 static void ResetMacros()
 {
-	for (auto &m : GetMacros()) {
+	for (auto &m : GetTopLevelMacros()) {
 		ResetMacroRunCount(m.get());
 		ResetMacroConditionTimers(m.get());
 	}

lib/advanced-scene-switcher.hpp

@@ -65,7 +65,6 @@ public slots:
 	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
 	void on_disableComboBoxFilter_stateChanged(int state);
-	void on_disableMacroWidgetCache_stateChanged(int state);
 	void on_warnPluginLoadFailure_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
 	void on_priorityUp_clicked();

lib/general.cpp

@@ -3,6 +3,7 @@
 #include "filter-combo-box.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
+#include "macro-search.hpp"
 #include "macro-settings.hpp"
 #include "path-helpers.hpp"
 #include "selection-helpers.hpp"
@@ -185,16 +186,6 @@ void AdvSceneSwitcher::on_disableComboBoxFilter_stateChanged(int state)
 	FilterComboBox::SetFilterBehaviourEnabled(!state);
 }
 
-void AdvSceneSwitcher::on_disableMacroWidgetCache_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	switcher->disableMacroWidgetCache = state;
-	MacroSegmentList::SetCachingEnabled(!state);
-}
-
 void AdvSceneSwitcher::on_warnPluginLoadFailure_stateChanged(int state)
 {
 	if (loading) {
@@ -459,7 +450,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
 
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
 
 	// Reset on startup and scene collection change
 	ResetLastOpenedTab();
@@ -531,8 +522,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	obs_data_set_bool(obj, "disableHints", disableHints);
 	obs_data_set_bool(obj, "disableFilterComboboxFilter",
 			  disableFilterComboboxFilter);
-	obs_data_set_bool(obj, "disableMacroWidgetCache",
-			  disableMacroWidgetCache);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);
 
@@ -602,8 +591,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	disableHints = obs_data_get_bool(obj, "disableHints");
 	disableFilterComboboxFilter =
 		obs_data_get_bool(obj, "disableFilterComboboxFilter");
-	disableMacroWidgetCache =
-		obs_data_get_bool(obj, "disableMacroWidgetCache");
 	obs_data_set_default_bool(obj, "warnPluginLoadFailure", true);
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
@@ -927,9 +914,6 @@ void AdvSceneSwitcher::SetupGeneralTab()
 		switcher->disableFilterComboboxFilter);
 	FilterComboBox::SetFilterBehaviourEnabled(
 		!switcher->disableFilterComboboxFilter);
-	ui->disableMacroWidgetCache->setChecked(
-		switcher->disableMacroWidgetCache);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);
 
@@ -1013,6 +997,19 @@ void AdvSceneSwitcher::SetupGeneralTab()
 			switcher->CheckAutoStart();
 		});
 
+	ui->alwaysShowMacroSearch->setChecked(
+		GetMacroSearchSettings().showAlways);
+
+	connect(ui->alwaysShowMacroSearch, &QCheckBox::stateChanged, this,
+		[this](int enabled) {
+			GetMacroSearchSettings().showAlways = enabled;
+
+			if (loading) {
+				return;
+			}
+			CheckMacroSearchVisibility();
+		});
+
 	// Set up status control
 	auto statusControl = new StatusControl(this, true);
 	ui->statusLayout->addWidget(statusControl->StatusPrefixLabel(), 1, 0);
@@ -1032,6 +1029,8 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	setTabOrder(ui->importSettings, ui->cooldownTime);
 	setTabOrder(ui->cooldownTime, ui->noMatchDontSwitch);
 
+	SetupShowAllTabsCheckBox(ui->alwaysShowFeatureTabs, ui->tabWidget);
+
 	MinimizeSizeOfColumn(ui->statusLayout, 0);
 	setWindowTitle(windowTitle() + " - " + g_GIT_TAG);
 }

lib/macro/macro-action-edit.cpp

@@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list)
 }
 
 MacroActionEdit::MacroActionEdit(QWidget *parent,
-				 std::shared_ptr<MacroAction> *entryData,
-				 const std::string &id)
+				 std::shared_ptr<MacroAction> *entryData)
 	: MacroSegmentEdit(parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
@@ -117,7 +116,7 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 		*_entryData = MacroActionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 	}
 	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),

lib/macro/macro-action-edit.hpp

@@ -13,10 +13,8 @@ class MacroActionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 
 public:
-	MacroActionEdit(
-		QWidget *parent = nullptr,
-		std::shared_ptr<MacroAction> * = nullptr,
-		const std::string &id = MacroAction::GetDefaultID().data());
+	MacroActionEdit(QWidget *parent = nullptr,
+			std::shared_ptr<MacroAction> * = nullptr);
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroAction> *);
 

lib/macro/macro-action-macro.cpp

@@ -2,6 +2,7 @@
 #include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
+#include "macro-action-factory.hpp"
 
 namespace advss {
 
@@ -12,6 +13,74 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
 	{MacroActionMacro::Create, MacroActionMacroEdit::Create,
 	 "AdvSceneSwitcher.action.macro"});
 
+void MacroActionMacro::AdjustActionState(Macro *macro) const
+{
+	const auto &macroActions = _useElseSection ? macro->ElseActions()
+						   : macro->Actions();
+
+	std::vector<std::shared_ptr<MacroAction>> actionsToModify;
+	switch (_actionSelectionType) {
+	case SelectionType::INDEX: {
+		const bool isValidAction =
+			(_useElseSection &&
+			 IsValidElseActionIndex(macro, _actionIndex - 1)) ||
+			(!_useElseSection &&
+			 IsValidActionIndex(macro, _actionIndex - 1));
+
+		if (isValidAction) {
+			actionsToModify.emplace_back(
+				macroActions.at(_actionIndex - 1));
+		}
+		break;
+	}
+	case SelectionType::LABEL:
+		for (const auto &action : macroActions) {
+			if (!action->GetUseCustomLabel()) {
+				continue;
+			}
+
+			const auto label = action->GetCustomLabel();
+
+			if (_regex.Enabled()) {
+				if (_regex.Matches(label, _label)) {
+					actionsToModify.emplace_back(action);
+				}
+				continue;
+			}
+
+			if (label == std::string(_label)) {
+				actionsToModify.emplace_back(action);
+			}
+		}
+		break;
+	case SelectionType::ID:
+		for (const auto &action : macroActions) {
+			if (action->GetId() == _actionId) {
+				actionsToModify.emplace_back(action);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	for (const auto &action : actionsToModify) {
+		switch (_action) {
+		case Action::DISABLE_ACTION:
+			action->SetEnabled(false);
+			break;
+		case Action::ENABLE_ACTION:
+			action->SetEnabled(true);
+			break;
+		case Action::TOGGLE_ACTION:
+			action->SetEnabled(!action->Enabled());
+			break;
+		default:
+			break;
+		}
+	}
+}
+
 bool MacroActionMacro::PerformAction()
 {
 	if (_action == Action::NESTED_MACRO) {
@@ -24,47 +93,46 @@ bool MacroActionMacro::PerformAction()
 		return true;
 	}
 
-	switch (_action) {
-	case Action::PAUSE:
-		macro->SetPaused();
-		break;
-	case Action::UNPAUSE:
-		macro->SetPaused(false);
-		break;
-	case Action::TOGGLE_PAUSE:
-		macro->SetPaused(!macro->Paused());
-		break;
-	case Action::RESET_COUNTER:
-		macro->ResetRunCount();
-		break;
-	case Action::RUN_ACTIONS:
-		RunActions(macro.get());
-		break;
-	case Action::STOP:
-		macro->Stop();
-		break;
-	case Action::DISABLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			macro->Actions().at(_actionIndex - 1)->SetEnabled(false);
+	const auto performActionForMacro = [this](Macro *macro) {
+		switch (_action) {
+		case Action::PAUSE:
+			macro->SetPaused();
+			break;
+		case Action::UNPAUSE:
+			macro->SetPaused(false);
+			break;
+		case Action::TOGGLE_PAUSE:
+			macro->SetPaused(!macro->Paused());
+			break;
+		case Action::RESET_COUNTER:
+			macro->ResetRunCount();
+			break;
+		case Action::RUN_ACTIONS:
+			RunActions(macro);
+			break;
+		case Action::STOP:
+			macro->Stop();
+			break;
+		case Action::DISABLE_ACTION:
+		case Action::ENABLE_ACTION:
+		case Action::TOGGLE_ACTION:
+			AdjustActionState(macro);
+			break;
+		default:
+			break;
 		}
-		break;
-	case Action::ENABLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			macro->Actions().at(_actionIndex - 1)->SetEnabled(true);
-		}
-		break;
-	case Action::TOGGLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			auto action = macro->Actions().at(_actionIndex - 1);
-			action->SetEnabled(!action->Enabled());
-		}
-		break;
-	default:
-		break;
+	};
+
+	if (!IsGroupMacro(macro.get())) {
+		performActionForMacro(macro.get());
+		return true;
 	}
+
+	auto macros = GetGroupMacroEntries(macro.get());
+	for (const auto &macro : macros) {
+		performActionForMacro(macro.get());
+	}
+
 	return true;
 }
 
@@ -115,9 +183,14 @@ void MacroActionMacro::LogAction() const
 bool MacroActionMacro::Save(obs_data_t *obj) const
 {
 	MacroAction::Save(obj);
-	_macro.Save(obj);
-	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
+	_macro.Save(obj);
+	obs_data_set_int(obj, "actionSelectionType",
+			 static_cast<int>(_actionSelectionType));
+	_actionIndex.Save(obj, "actionIndex");
+	_label.Save(obj, "label");
+	obs_data_set_string(obj, "actionId", _actionId.c_str());
+	_regex.Save(obj);
 	_runOptions.Save(obj);
 	OBSDataAutoRelease nestedMacroData = obs_data_create();
 	_nestedMacro->Save(nestedMacroData);
@@ -129,10 +202,15 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 bool MacroActionMacro::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
-	_macro.Load(obj);
-	_actionIndex.Load(obj, "actionIndex");
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
+	_macro.Load(obj);
+	_actionSelectionType = static_cast<SelectionType>(
+		obs_data_get_int(obj, "actionSelectionType"));
+	_actionIndex.Load(obj, "actionIndex");
+	_label.Load(obj, "label");
+	_actionId = obs_data_get_string(obj, "actionId");
+	_regex.Load(obj);
 	_runOptions.Load(obj);
 
 	if (obs_data_has_user_value(obj, "nestedMacro")) {
@@ -183,6 +261,7 @@ std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
 void MacroActionMacro::ResolveVariablesToFixedValues()
 {
 	_actionIndex.ResolveVariables();
+	_label.ResolveVariables();
 }
 
 static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
@@ -266,7 +345,7 @@ static void populateConditionBehaviorSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
 }
 
-static void populateActionTypeSelection(QComboBox *list)
+static void populateActionSectionSelection(QComboBox *list)
 {
 	list->addItem(obs_module_text(
 		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
@@ -274,19 +353,47 @@ static void populateActionTypeSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }
 
+static void populateActionTypes(QComboBox *list)
+{
+	for (const auto &[id, info] : MacroActionFactory::GetActionTypes()) {
+		list->addItem(obs_module_text(info._name.c_str()),
+			      QString::fromStdString(id));
+	}
+}
+
+static void populateActionSelectionTypes(QComboBox *list)
+{
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.index"),
+		static_cast<int>(MacroActionMacro::SelectionType::INDEX));
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.label"),
+		static_cast<int>(MacroActionMacro::SelectionType::LABEL));
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.id"),
+		static_cast<int>(MacroActionMacro::SelectionType::ID));
+}
+
 MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget *parent, std::shared_ptr<MacroActionMacro> entryData)
 	: ResizableWidget(parent),
+	  _actions(new QComboBox()),
 	  _macros(new MacroSelection(parent)),
+	  _actionSelectionType(new QComboBox(this)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _actions(new QComboBox()),
+	  _label(new VariableLineEdit(this)),
+	  _actionTypes(new FilterComboBox(this)),
+	  _regex(new RegexConfigWidget(this)),
 	  _conditionMacros(new MacroSelection(parent)),
 	  _conditionBehaviors(new QComboBox()),
 	  _reevaluateConditionState(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
 				  "updateConditionMatchState"))),
-	  _actionTypes(new QComboBox()),
+	  _actionSections(new QComboBox(this)),
 	  _skipWhenPaused(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
 	  _setInputs(new QCheckBox(obs_module_text(
@@ -305,24 +412,36 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 {
 	populateActionSelection(_actions);
 	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionTypeSelection(_actionTypes);
+	populateActionSectionSelection(_actionSections);
+	populateActionSelectionTypes(_actionSelectionType);
+	populateActionTypes(_actionTypes);
 
 	_conditionMacros->HideSelectedMacro();
+	_conditionMacros->HideGroups();
 
 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
+	QWidget::connect(_actionSelectionType, SIGNAL(currentIndexChanged(int)),
+			 this, SLOT(ActionSelectionTypeChanged(int)));
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
+	QWidget::connect(_label, SIGNAL(editingFinished()), this,
+			 SLOT(LabelChanged()));
+	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(ActionTypeChanged(int)));
+	QWidget::connect(_regex,
+			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
+			 SLOT(RegexChanged(const RegexConfig &)));
 	QWidget::connect(_conditionMacros,
 			 SIGNAL(currentTextChanged(const QString &)), this,
 			 SLOT(ConditionMacroChanged(const QString &)));
 	QWidget::connect(_conditionBehaviors, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(ConditionBehaviorChanged(int)));
-	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ActionTypeChanged(int)));
+	QWidget::connect(_actionSections, SIGNAL(currentIndexChanged(int)),
+			 this, SLOT(ActionSectionChanged(int)));
 	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
 			 SLOT(SkipWhenPausedChanged(int)));
 	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
@@ -375,17 +494,24 @@ void MacroActionMacroEdit::UpdateEntryData()
 	if (!_entryData) {
 		return;
 	}
+
 	_actions->setCurrentIndex(
 		_actions->findData(static_cast<int>(_entryData->_action)));
+	_actionSelectionType->setCurrentIndex(_actionSelectionType->findData(
+		static_cast<int>(_entryData->_actionSelectionType)));
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
+	_label->setText(_entryData->_label);
+	_actionTypes->setCurrentIndex(_actionTypes->findData(
+		QString::fromStdString(_entryData->_actionId)));
+	_regex->SetRegexConfig(_entryData->_regex);
 	_macros->SetCurrentMacro(_entryData->_macro);
 	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
 	_conditionBehaviors->setCurrentIndex(
 		static_cast<int>(_entryData->_runOptions.logic));
 	_reevaluateConditionState->setChecked(
 		_entryData->_runOptions.reevaluateConditionState);
-	_actionTypes->setCurrentIndex(
+	_actionSections->setCurrentIndex(
 		_entryData->_runOptions.runElseActions ? 1 : 0);
 	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
 	_setInputs->setChecked(_entryData->_runOptions.setInputs);
@@ -424,12 +550,40 @@ void MacroActionMacroEdit::ActionChanged(int idx)
 	SetWidgetVisibility();
 }
 
+void MacroActionMacroEdit::ActionSelectionTypeChanged(int idx)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_actionSelectionType =
+		static_cast<MacroActionMacro::SelectionType>(
+			_actionSelectionType->itemData(idx).toInt());
+	SetWidgetVisibility();
+}
+
 void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_actionIndex = value;
 }
 
+void MacroActionMacroEdit::LabelChanged()
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_label = _label->text().toStdString();
+}
+
+void MacroActionMacroEdit::ActionTypeChanged(int idx)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_actionId =
+		_actionTypes->itemData(idx).toString().toStdString();
+}
+
+void MacroActionMacroEdit::RegexChanged(const RegexConfig &regex)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_regex = regex;
+}
+
 void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
 {
 	GUARD_LOADING_AND_LOCK();
@@ -451,10 +605,13 @@ void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
 	SetWidgetVisibility();
 }
 
-void MacroActionMacroEdit::ActionTypeChanged(int value)
+void MacroActionMacroEdit::ActionSectionChanged(int useElse)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = value;
+	_entryData->_runOptions.runElseActions = useElse;
+	_entryData->_useElseSection = useElse;
+	_actionIndex->SetType(useElse ? MacroSegmentSelection::Type::ELSE_ACTION
+				      : MacroSegmentSelection::Type::ACTION);
 }
 
 void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
@@ -483,7 +640,11 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	_entryLayout->removeWidget(_actions);
 	_entryLayout->removeWidget(_actionIndex);
 	_entryLayout->removeWidget(_macros);
+	_entryLayout->removeWidget(_actionSections);
+	_entryLayout->removeWidget(_label);
+	_entryLayout->removeWidget(_regex);
 	_entryLayout->removeWidget(_actionTypes);
+	_entryLayout->removeWidget(_actionSelectionType);
 	_conditionLayout->removeWidget(_conditionBehaviors);
 	_conditionLayout->removeWidget(_conditionMacros);
 
@@ -494,19 +655,40 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 		{"{{actions}}", _actions},
 		{"{{actionIndex}}", _actionIndex},
 		{"{{macros}}", _macros},
-		{"{{actionTypes}}", _actionTypes},
+		{"{{actionSections}}", _actionSections},
 		{"{{conditionBehaviors}}", _conditionBehaviors},
 		{"{{conditionMacros}}", _conditionMacros},
+		{"{{actionSelectionType}}", _actionSelectionType},
+		{"{{label}}", _label},
+		{"{{regex}}", _regex},
+		{"{{actionTypes}}", _actionTypes},
 
 	};
 
-	PlaceWidgets(
-		obs_module_text(
-			_entryData->_action ==
-					MacroActionMacro::Action::RUN_ACTIONS
-				? "AdvSceneSwitcher.action.macro.entry.run"
-				: "AdvSceneSwitcher.action.macro.entry.other"),
-		_entryLayout, placeholders);
+	const auto action = _entryData->_action;
+	const char *layoutText = "";
+	switch (action) {
+	case MacroActionMacro::Action::PAUSE:
+	case MacroActionMacro::Action::UNPAUSE:
+	case MacroActionMacro::Action::TOGGLE_PAUSE:
+	case MacroActionMacro::Action::RESET_COUNTER:
+	case MacroActionMacro::Action::STOP:
+	case MacroActionMacro::Action::NESTED_MACRO:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.other";
+		break;
+	case MacroActionMacro::Action::RUN_ACTIONS:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.run";
+		break;
+	case MacroActionMacro::Action::DISABLE_ACTION:
+	case MacroActionMacro::Action::ENABLE_ACTION:
+	case MacroActionMacro::Action::TOGGLE_ACTION:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.actionState";
+		break;
+	default:
+		break;
+	}
+
+	PlaceWidgets(obs_module_text(layoutText), _entryLayout, placeholders);
 
 	if (_entryData->_runOptions.logic ==
 	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
@@ -515,56 +697,63 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	} else {
 		PlaceWidgets(
 			obs_module_text(
-				"AdvSceneSwitcher.action.macro.entry.run.condition"),
+				"AdvSceneSwitcher.action.macro.layout.run.condition"),
 			_conditionLayout, placeholders);
 	}
 
-	if (_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS ||
-	    _entryData->_action == MacroActionMacro::Action::STOP) {
+	if (action == MacroActionMacro::Action::RUN_ACTIONS ||
+	    action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
 	} else {
 		_macros->ShowAllMacros();
 	}
 
+	const auto actionSelectionType = _entryData->_actionSelectionType;
 	const bool isModifyingActionState =
-		_entryData->_action ==
-			MacroActionMacro::Action::DISABLE_ACTION ||
-		_entryData->_action ==
-			MacroActionMacro::Action::ENABLE_ACTION ||
-		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
-	_actionIndex->setVisible(isModifyingActionState);
+		action == MacroActionMacro::Action::DISABLE_ACTION ||
+		action == MacroActionMacro::Action::ENABLE_ACTION ||
+		action == MacroActionMacro::Action::TOGGLE_ACTION;
+	_actionSelectionType->setVisible(isModifyingActionState);
+	_actionIndex->setVisible(
+		isModifyingActionState &&
+		actionSelectionType == MacroActionMacro::SelectionType::INDEX);
+	_label->setVisible(isModifyingActionState &&
+			   actionSelectionType ==
+				   MacroActionMacro::SelectionType::LABEL);
+	_regex->setVisible(isModifyingActionState &&
+			   actionSelectionType ==
+				   MacroActionMacro::SelectionType::LABEL);
+	_actionTypes->setVisible(isModifyingActionState &&
+				 actionSelectionType ==
+					 MacroActionMacro::SelectionType::ID);
 
 	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
+			 action == MacroActionMacro::Action::RUN_ACTIONS);
 	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
+		action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.logic !=
 			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
 	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
 	SetLayoutVisible(_reevaluateConditionStateLayout,
 			 needsAdditionalConditionWidgets);
 	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
-	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN_ACTIONS &&
+			 action == MacroActionMacro::Action::RUN_ACTIONS);
+	_inputs->setVisible(action == MacroActionMacro::Action::RUN_ACTIONS &&
 			    _entryData->_runOptions.setInputs);
 	HighlightMacroSettingsButton(
-		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
+		action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.setInputs &&
 		!_inputs->HasInputsToSet());
-	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
-	_skipWhenPaused->setVisible(_entryData->_action ==
+	_actionSections->setVisible(
+		action == MacroActionMacro::Action::RUN_ACTIONS ||
+		isModifyingActionState);
+	_skipWhenPaused->setVisible(action ==
 				    MacroActionMacro::Action::RUN_ACTIONS);
 
-	_nestedMacro->setVisible(_entryData->_action ==
+	_nestedMacro->setVisible(action ==
 				 MacroActionMacro::Action::NESTED_MACRO);
-	_macros->setVisible(_entryData->_action !=
-			    MacroActionMacro::Action::NESTED_MACRO);
-	SetResizingEnabled(_entryData->_action ==
-			   MacroActionMacro::Action::NESTED_MACRO);
+	_macros->setVisible(action != MacroActionMacro::Action::NESTED_MACRO);
+	SetResizingEnabled(action == MacroActionMacro::Action::NESTED_MACRO);
 
 	if (_nestedMacro->IsEmpty()) {
 		_nestedMacro->ShowAllMacroSections();

lib/macro/macro-action-macro.hpp

@@ -5,7 +5,9 @@
 #include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"
+#include "regex-config.hpp"
 #include "resizable-widget.hpp"
+#include "variable-line-edit.hpp"
 
 #include <QCheckBox>
 #include <QHBoxLayout>
@@ -55,14 +57,23 @@ public:
 		TOGGLE_PAUSE,
 		NESTED_MACRO,
 	};
+
+	enum class SelectionType { INDEX, LABEL, ID };
+
 	Action _action = Action::NESTED_MACRO;
+	SelectionType _actionSelectionType = SelectionType::INDEX;
+	bool _useElseSection = false;
 	IntVariable _actionIndex = 1;
+	StringVariable _label = "Custom label";
+	std::string _actionId;
+	RegexConfig _regex;
 	RunOptions _runOptions = {};
 	std::shared_ptr<Macro> _nestedMacro = std::make_shared<Macro>();
 	int _customWidgetHeight = 0;
 
 private:
 	void RunActions(Macro *actionMacro) const;
+	void AdjustActionState(Macro *) const;
 
 	static bool _registered;
 	static const std::string id;
@@ -82,11 +93,15 @@ public:
 private slots:
 	void MacroChanged(const QString &text);
 	void ActionChanged(int value);
+	void ActionSelectionTypeChanged(int value);
 	void ActionIndexChanged(const IntVariable &value);
+	void LabelChanged();
+	void ActionTypeChanged(int value);
+	void RegexChanged(const RegexConfig &);
 	void ConditionMacroChanged(const QString &text);
 	void ConditionBehaviorChanged(int value);
 	void ReevaluateConditionStateChanged(int value);
-	void ActionTypeChanged(int value);
+	void ActionSectionChanged(int value);
 	void SkipWhenPausedChanged(int value);
 	void SetInputsChanged(int value);
 	void InputsChanged(const StringList &);
@@ -98,13 +113,17 @@ private:
 	void SetWidgetVisibility();
 	void SetupMacroInput(Macro *) const;
 
-	MacroSelection *_macros;
-	MacroSegmentSelection *_actionIndex;
 	QComboBox *_actions;
+	MacroSelection *_macros;
+	QComboBox *_actionSelectionType;
+	MacroSegmentSelection *_actionIndex;
+	VariableLineEdit *_label;
+	FilterComboBox *_actionTypes;
+	RegexConfigWidget *_regex;
 	MacroSelection *_conditionMacros;
 	QComboBox *_conditionBehaviors;
 	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionTypes;
+	QComboBox *_actionSections;
 	QCheckBox *_skipWhenPaused;
 	QCheckBox *_setInputs;
 	MacroInputEdit *_inputs;

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_),
@@ -286,6 +323,14 @@ bool MacroActionVariable::PerformAction()
 	case Action::APPEND:
 		apppend(*var, _strValue);
 		break;
+	case Action::COPY_VAR: {
+		auto var2 = _variable2.lock();
+		if (!var2) {
+			return true;
+		}
+		var->SetValue(var2->Value());
+		break;
+	}
 	case Action::APPEND_VAR: {
 		auto var2 = _variable2.lock();
 		if (!var2) {
@@ -450,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;
@@ -490,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");
 
@@ -548,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");
 
@@ -670,6 +722,8 @@ static inline void populateActionSelection(QComboBox *list)
 		actions = {
 			{MacroActionVariable::Action::SET_VALUE,
 			 "AdvSceneSwitcher.action.variable.type.set"},
+			{MacroActionVariable::Action::COPY_VAR,
+			 "AdvSceneSwitcher.action.variable.type.copy"},
 			{MacroActionVariable::Action::APPEND,
 			 "AdvSceneSwitcher.action.variable.type.append"},
 			{MacroActionVariable::Action::PAD,
@@ -714,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,
@@ -791,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()),
@@ -827,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(
@@ -863,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 &)),
@@ -891,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,
@@ -951,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(
@@ -965,9 +1032,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{strValue}}", _strValue},
 		{"{{numValue}}", _numValue},
 		{"{{segmentIndex}}", _segmentIdx},
-		{"{{subStringStart}}", _subStringStart},
-		{"{{subStringSize}}", _subStringSize},
-		{"{{regexMatchIdx}}", _regexMatchIdx},
 		{"{{findRegex}}", _findRegex},
 		{"{{findStr}}", _findStr},
 		{"{{replaceStr}}", _replaceStr},
@@ -999,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(
@@ -1025,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);
 
@@ -1046,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;
@@ -1080,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));
@@ -1105,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);
 
@@ -1447,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();
@@ -1485,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(
@@ -1500,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 ||
@@ -1521,6 +1604,7 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 	}
 
 	_variables2->setVisible(
+		_entryData->_action == MacroActionVariable::Action::COPY_VAR ||
 		_entryData->_action ==
 			MacroActionVariable::Action::APPEND_VAR ||
 		_entryData->_action ==
@@ -1550,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);
@@ -1623,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"
@@ -55,6 +56,8 @@ public:
 		RANDOM_NUMBER,
 		QUERY_JSON,
 		ARRAY_JSON,
+		COPY_VAR,
+		RANDOM_LIST_VALUE,
 	};
 
 	Action _action = Action::SET_VALUE;
@@ -106,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;
 
@@ -118,6 +125,7 @@ private:
 	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
 	void GenerateRandomNumber(Variable *);
+	void PickRandomValue(Variable *);
 
 	std::weak_ptr<MacroSegment> _macroSegment;
 	int _segmentIdxLoadValue = -1;
@@ -174,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> &);
 
@@ -193,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;
@@ -224,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-edit.cpp

@@ -100,7 +100,7 @@ void DurationModifierEdit::Collapse(bool collapse)
 
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	const std::string &id, bool isRootCondition)
+	bool isRootCondition)
 	: MacroSegmentEdit(parent),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
@@ -239,7 +239,7 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->SetLogicType(logic);
 		(*_entryData)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 	}
 	auto widget =
 		MacroConditionFactory::CreateWidget(id, this, *_entryData);

lib/macro/macro-condition-edit.hpp

@@ -34,11 +34,9 @@ class MacroConditionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 
 public:
-	MacroConditionEdit(
-		QWidget *parent = nullptr,
-		std::shared_ptr<MacroCondition> * = nullptr,
-		const std::string &id = MacroCondition::GetDefaultID().data(),
-		bool root = true);
+	MacroConditionEdit(QWidget *parent = nullptr,
+			   std::shared_ptr<MacroCondition> * = nullptr,
+			   bool root = true);
 	bool IsRootNode() const;
 	void SetRootNode(bool);
 	void SetupWidgets(bool basicSetup = false);

lib/macro/macro-condition-macro.cpp

@@ -102,7 +102,7 @@ bool MacroConditionMacro::CheckActionStateCondition()
 	if (!macro) {
 		return false;
 	}
-	if (!IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1, false)) {
+	if (!IsValidActionIndex(macro.get(), _actionIndex - 1)) {
 		return false;
 	}
 	if (_type == Type::ACTION_DISABLED) {
@@ -315,6 +315,7 @@ MacroConditionMacroEdit::MacroConditionMacroEdit(
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION))
 {
+	_macros->HideGroups();
 	_count->setMaximum(10000000);
 	populateTypeSelection(_types);
 	populateCounterConditionSelection(_counterConditions);

lib/macro/macro-dock.cpp

@@ -110,7 +110,7 @@ void MacroDock::RunClicked()
 		return;
 	}
 
-	auto ret = macro->PerformActions(true);
+	auto ret = macro->PerformActions(true, true, true);
 	if (!ret) {
 		QString err =
 			obs_module_text("AdvSceneSwitcher.macroTab.runFail");

lib/macro/macro-edit.cpp

@@ -418,8 +418,7 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx)
 	ui->actionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
-						    actions[afterIdx]->GetId());
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 		ui->actionsList->Add(newEntry);
 	}
 
@@ -444,8 +443,7 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx)
 	ui->elseActionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
-						    actions[afterIdx]->GetId());
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 		ui->elseActionsList->Add(newEntry);
 	}
 
@@ -472,8 +470,7 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
 
 	for (; afterIdx < conditions.size(); afterIdx++) {
 		auto newEntry = new MacroConditionEdit(
-			this, &conditions[afterIdx],
-			conditions[afterIdx]->GetId(), root);
+			this, &conditions[afterIdx], root);
 		ui->conditionsList->Add(newEntry);
 		root = false;
 	}
@@ -1080,11 +1077,10 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 			macro->Actions().at(idx)->Load(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		macro->UpdateActionIndices();
 		ui->actionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->Actions()[idx], id));
+			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
 		SetActionData(*macro);
 	}
 	HighlightAction(idx);
@@ -1383,11 +1379,11 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		macro->UpdateElseActionIndices();
 		ui->elseActionsList->Insert(
-			idx, new MacroActionEdit(
-				     this, &macro->ElseActions()[idx], id));
+			idx,
+			new MacroActionEdit(this, &macro->ElseActions()[idx]));
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
@@ -1583,13 +1579,13 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 			macro->Conditions().at(idx)->Load(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		(*cond)->SetLogicType(logic);
 		macro->UpdateConditionIndices();
 		ui->conditionsList->Insert(
 			idx,
 			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       id, idx == 0));
+					       idx == 0));
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);

lib/macro/macro-helpers.cpp

@@ -1,5 +1,6 @@
 #include "macro-helpers.hpp"
 #include "macro.hpp"
+#include "macro-action-macro.hpp"
 #include "plugin-state-helpers.hpp"
 
 namespace advss {
@@ -8,6 +9,87 @@ static std::atomic_bool abortMacroWait = {false};
 static std::atomic_bool macroSceneSwitched = {false};
 static std::atomic_int shutdownConditionCount = {0};
 
+static void appendNestedMacros(std::deque<std::shared_ptr<Macro>> &macros,
+			       Macro *macro)
+{
+	if (!macro) {
+		return;
+	}
+
+	const auto iterate = [&macros](const std::deque<
+				       std::shared_ptr<MacroAction>> &actions) {
+		for (const auto &action : actions) {
+			const auto nestedMacroAction =
+				dynamic_cast<MacroActionMacro *>(action.get());
+			if (!nestedMacroAction) {
+				continue;
+			}
+
+			macros.push_back(nestedMacroAction->_nestedMacro);
+			appendNestedMacros(
+				macros, nestedMacroAction->_nestedMacro.get());
+		}
+	};
+
+	iterate(macro->Actions());
+	iterate(macro->ElseActions());
+}
+
+std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros()
+{
+	static std::deque<std::shared_ptr<Macro>> macros;
+	return macros;
+}
+
+std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros()
+{
+	static std::deque<std::shared_ptr<Macro>> tempMacros;
+	return tempMacros;
+}
+
+std::deque<std::shared_ptr<Macro>> GetAllMacros()
+{
+	auto macros = GetTopLevelMacros();
+	for (const auto &topLevelMacro : macros) {
+		appendNestedMacros(macros, topLevelMacro.get());
+	}
+
+	const auto &tempMacros = GetTemporaryMacros();
+	macros.insert(macros.end(), tempMacros.begin(), tempMacros.end());
+	for (const auto &tempMacro : tempMacros) {
+		appendNestedMacros(macros, tempMacro.get());
+	}
+
+	return macros;
+}
+
+Macro *GetMacroByName(const char *name)
+{
+	for (const auto &m : GetTopLevelMacros()) {
+		if (m->Name() == name) {
+			return m.get();
+		}
+	}
+
+	return nullptr;
+}
+
+Macro *GetMacroByQString(const QString &name)
+{
+	return GetMacroByName(name.toUtf8().constData());
+}
+
+std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
+{
+	for (const auto &m : GetTopLevelMacros()) {
+		if (m->Name() == name) {
+			return m;
+		}
+	}
+
+	return {};
+}
+
 std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *macro)
 {
@@ -17,6 +99,15 @@ GetMacroActions(Macro *macro)
 	return macro->Actions();
 }
 
+std::optional<std::deque<std::shared_ptr<MacroAction>>>
+GetMacroElseActions(Macro *macro)
+{
+	if (!macro) {
+		return {};
+	}
+	return macro->ElseActions();
+}
+
 std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *macro)
 {
@@ -26,9 +117,32 @@ GetMacroConditions(Macro *macro)
 	return macro->Conditions();
 }
 
-std::string_view GetSceneSwitchActionId()
+bool IsGroupMacro(Macro *macro)
 {
-	return MacroAction::GetDefaultID();
+	return macro && macro->IsGroup();
+}
+
+std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *macro)
+{
+	if (!macro || !macro->IsGroup()) {
+		return {};
+	}
+
+	std::vector<std::shared_ptr<Macro>> entries;
+	entries.reserve(macro->GroupSize());
+
+	const auto &macros = GetTopLevelMacros();
+	for (auto it = macros.begin(); it < macros.end(); it++) {
+		if ((*it)->Name() != macro->Name()) {
+			continue;
+		}
+		for (uint32_t i = 1; i <= macro->GroupSize(); i++) {
+			entries.emplace_back(*std::next(it, i));
+		}
+		break;
+	}
+
+	return entries;
 }
 
 std::condition_variable &GetMacroWaitCV()
@@ -128,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) {
@@ -144,20 +263,42 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }
 
-bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
+bool IsValidActionIndex(const Macro *m, const int idx)
 {
 	if (!m || idx < 0) {
 		return false;
 	}
-	if (isCondition) {
-		if (idx >= (int)m->Conditions().size()) {
-			return false;
-		}
-	} else {
-		if (idx >= (int)m->Actions().size()) {
-			return false;
-		}
+
+	if (idx >= (int)m->Actions().size()) {
+		return false;
 	}
+
+	return true;
+}
+
+bool IsValidElseActionIndex(const Macro *m, const int idx)
+{
+	if (!m || idx < 0) {
+		return false;
+	}
+
+	if (idx >= (int)m->ElseActions().size()) {
+		return false;
+	}
+
+	return true;
+}
+
+bool IsValidConditionIndex(const Macro *m, const int idx)
+{
+	if (!m || idx < 0) {
+		return false;
+	}
+
+	if (idx >= (int)m->Conditions().size()) {
+		return false;
+	}
+
 	return true;
 }
 

lib/macro/macro-helpers.hpp

@@ -1,12 +1,13 @@
 #pragma once
 #include "export-symbol-helper.hpp"
 
+#include <QString>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <deque>
 #include <optional>
-#include <string_view>
 #include <thread>
 
 struct obs_data;
@@ -18,16 +19,25 @@ class Macro;
 class MacroAction;
 class MacroCondition;
 
-EXPORT std::deque<std::shared_ptr<Macro>> &GetMacros();
+static const int macro_func = 10;
+
+EXPORT std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros();
+std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros();
+EXPORT std::deque<std::shared_ptr<Macro>> GetAllMacros();
+
+Macro *GetMacroByName(const char *name);
+Macro *GetMacroByQString(const QString &name);
+std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 
 EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *);
+EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
+GetMacroElseActions(Macro *);
 EXPORT std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *);
 
-std::string_view GetSceneSwitchActionId();
-
-constexpr auto macro_func = 10;
+EXPORT bool IsGroupMacro(Macro *);
+EXPORT std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *);
 
 EXPORT std::condition_variable &GetMacroWaitCV();
 EXPORT std::condition_variable &GetMacroTransitionCV();
@@ -58,6 +68,7 @@ EXPORT void AddMacroHelperThread(Macro *, std::thread &&);
 EXPORT bool CheckMacros();
 
 EXPORT bool RunMacroActions(Macro *);
+bool RunMacroElseActions(Macro *);
 EXPORT bool RunMacros();
 void StopAllMacros();
 
@@ -68,6 +79,8 @@ EXPORT void InvalidateMacroTempVarValues();
 EXPORT void ResetMacroConditionTimers(Macro *);
 EXPORT void ResetMacroRunCount(Macro *);
 
-bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition);
+bool IsValidActionIndex(const Macro *m, const int idx);
+bool IsValidElseActionIndex(const Macro *m, const int idx);
+bool IsValidConditionIndex(const Macro *m, const int idx);
 
 } // namespace advss

lib/macro/macro-search.cpp

@@ -0,0 +1,323 @@
+#include "macro-search.hpp"
+#include "layout-helpers.hpp"
+#include "macro.hpp"
+#include "macro-action-factory.hpp"
+#include "macro-condition-factory.hpp"
+#include "macro-helpers.hpp"
+#include "macro-signals.hpp"
+#include "plugin-state-helpers.hpp"
+#include "ui-helpers.hpp"
+
+#include <obs.hpp>
+
+#include <QComboBox>
+#include <QLayout>
+#include <QLineEdit>
+#include <QPushButton>
+
+namespace advss {
+
+static bool searchEnabled = false;
+static bool setup();
+static bool setupDone = setup();
+
+static QLayout *searchLayout = nullptr;
+static QComboBox *searchType = nullptr;
+static RegexConfigWidget *searchRegex = nullptr;
+static QPushButton *showSettings = nullptr;
+static std::function<void()> refreshFilter;
+
+static void save(obs_data_t *data)
+{
+	GetMacroSearchSettings().Save(data, "macroSearchSettings");
+}
+
+static void load(obs_data_t *data)
+{
+	GetMacroSearchSettings().Load(data, "macroSearchSettings");
+}
+
+static bool setup()
+{
+	AddSaveStep(save);
+	AddLoadStep(load);
+	return true;
+}
+
+void MacroSearchSettings::Save(obs_data_t *data, const char *name)
+{
+	OBSDataAutoRelease settings = obs_data_create();
+	obs_data_set_bool(settings, "showAlways", showAlways);
+	obs_data_set_int(settings, "searchType", static_cast<int>(searchType));
+	obs_data_set_string(settings, "searchString", searchString.c_str());
+	regex.Save(settings);
+	obs_data_set_obj(data, name, settings);
+}
+
+void MacroSearchSettings::Load(obs_data_t *data, const char *name)
+{
+	OBSDataAutoRelease settings = obs_data_get_obj(data, name);
+	showAlways = obs_data_get_bool(settings, "showAlways");
+	searchType = static_cast<SearchType>(
+		obs_data_get_int(settings, "searchType"));
+	searchString = obs_data_get_string(settings, "searchString");
+	regex.Load(settings);
+}
+
+static void showAdvancedSearchSettings(bool show)
+{
+	assert(searchType);
+	assert(searchRegex);
+
+	searchType->setVisible(show);
+	searchRegex->setVisible(show);
+}
+
+static bool shouldShowSearch()
+{
+	static const int showSearchThreshold = 10;
+	return GetMacroSearchSettings().showAlways ||
+	       GetTopLevelMacros().size() >= showSearchThreshold;
+}
+
+void CheckMacroSearchVisibility()
+{
+	assert(searchLayout);
+	assert(searchType);
+	assert(searchRegex);
+	assert(showSettings);
+
+	searchEnabled = shouldShowSearch();
+	SetLayoutVisible(searchLayout, searchEnabled);
+	showAdvancedSearchSettings(false);
+	showSettings->setChecked(false);
+	refreshFilter();
+}
+
+void SetupMacroSearchWidgets(QLayout *searchLayoutArg, QLineEdit *searchText,
+			     QPushButton *searchClear, QComboBox *searchTypeArg,
+			     RegexConfigWidget *searchRegexArg,
+			     QPushButton *showSettingsArg,
+			     const std::function<void()> &refreshArg)
+{
+	searchLayout = searchLayoutArg;
+	searchType = searchTypeArg;
+	searchRegex = searchRegexArg;
+	refreshFilter = refreshArg;
+	showSettings = showSettingsArg;
+
+	searchClear->setMaximumWidth(22);
+	SetButtonIcon(searchClear, GetThemeTypeName() == "Light"
+					   ? "theme:Light/close.svg"
+					   : "theme:Dark/close.svg");
+	searchClear->setDisabled(GetMacroSearchSettings().searchString.empty());
+
+	QWidget::connect(searchClear, &QPushButton::clicked, searchClear,
+			 [=]() {
+				 searchText->setText("");
+				 searchClear->setDisabled(true);
+			 });
+
+	const auto ph = searchText->placeholderText();
+	const QFontMetrics fm(searchText->font());
+	const int width = fm.horizontalAdvance(ph);
+	// Add a little padding so the text isn't cramped
+	searchText->setMinimumWidth(width + 10);
+
+	searchText->setText(
+		QString::fromStdString(GetMacroSearchSettings().searchString));
+	QWidget::connect(searchText, &QLineEdit::textChanged, searchText,
+			 [searchClear](const QString &text) {
+				 GetMacroSearchSettings().searchString =
+					 text.toStdString();
+				 searchClear->setDisabled(text.isEmpty());
+				 refreshFilter();
+			 });
+
+	searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.macroTab.search.name"),
+		static_cast<int>(MacroSearchSettings::SearchType::NAME));
+	searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.macroTab.search.allSegments"),
+		static_cast<int>(
+			MacroSearchSettings::SearchType::ALL_SEGMENTS));
+	searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.macroTab.search.conditions"),
+		static_cast<int>(MacroSearchSettings::SearchType::CONDITIONS));
+	searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.macroTab.search.actions"),
+		static_cast<int>(MacroSearchSettings::SearchType::ACTIONS));
+	searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.macroTab.search.label"),
+		static_cast<int>(MacroSearchSettings::SearchType::LABEL));
+	searchType->setCurrentIndex(searchType->findData(
+		static_cast<int>(GetMacroSearchSettings().searchType)));
+	QWidget::connect(
+		searchType, &QComboBox::currentIndexChanged, searchType, []() {
+			GetMacroSearchSettings().searchType =
+				static_cast<MacroSearchSettings::SearchType>(
+					searchType->currentData().toInt());
+			refreshFilter();
+		});
+
+	searchRegex->SetRegexConfig(GetMacroSearchSettings().regex);
+	QWidget::connect(searchRegex, &RegexConfigWidget::RegexConfigChanged,
+			 searchRegex, [](const RegexConfig &regex) {
+				 GetMacroSearchSettings().regex = regex;
+				 refreshFilter();
+			 });
+
+	showSettings->setCheckable(true);
+	showSettings->setMaximumWidth(11);
+	SetButtonIcon(showSettings, GetThemeTypeName() == "Light"
+					    ? ":/res/images/dots-vert.svg"
+					    : "theme:Dark/dots-vert.svg");
+	QWidget::connect(showSettings, &QPushButton::toggled, showSettings,
+			 showAdvancedSearchSettings);
+
+	QWidget::connect(MacroSignalManager::Instance(),
+			 &MacroSignalManager::Rename, searchText,
+			 []() { refreshFilter(); });
+
+	CheckMacroSearchVisibility();
+}
+
+MacroSearchSettings &GetMacroSearchSettings()
+{
+	static MacroSearchSettings settings;
+	return settings;
+}
+
+static bool stringMatches(const std::string &text)
+{
+	const auto &settings = GetMacroSearchSettings();
+	const auto &regex = settings.regex;
+	const auto &searchString = settings.searchString;
+
+	if (regex.Enabled()) {
+		return regex.Matches(text, searchString);
+	}
+
+	return QString::fromStdString(text).contains(
+		QString::fromStdString(searchString), Qt::CaseInsensitive);
+}
+
+static bool segmentTypeMatches(MacroSegment *segment, bool isCondition)
+{
+	if (!segment) {
+		return false;
+	}
+
+	const auto getNameFromId =
+		isCondition ? MacroConditionFactory::GetConditionName
+			    : MacroActionFactory::GetActionName;
+	const auto name = getNameFromId(segment->GetId());
+	return stringMatches(obs_module_text(name.c_str()));
+}
+
+static bool segmentLabelMatches(MacroSegment *segment)
+{
+	if (!segment) {
+		return false;
+	}
+
+	if (!segment->GetUseCustomLabel()) {
+		return false;
+	}
+
+	const auto label = segment->GetCustomLabel();
+	return stringMatches(label);
+}
+
+bool MacroMatchesSearchFilter(Macro *macro)
+{
+	assert(macro);
+
+	if (!searchEnabled) {
+		return true;
+	}
+
+	const auto &settings = GetMacroSearchSettings();
+
+	if (settings.searchString.empty()) {
+		return true;
+	}
+
+	if (macro->IsGroup()) {
+		const auto groupEntries = GetGroupMacroEntries(macro);
+		for (const auto &entry : groupEntries) {
+			if (MacroMatchesSearchFilter(entry.get())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	switch (settings.searchType) {
+	case MacroSearchSettings::SearchType::NAME: {
+		const auto name = macro->Name();
+		return stringMatches(name);
+	}
+	case MacroSearchSettings::SearchType::ALL_SEGMENTS:
+		for (const auto &condition : macro->Conditions()) {
+			if (segmentTypeMatches(condition.get(), true)) {
+				return true;
+			}
+		}
+		for (const auto &action : macro->Actions()) {
+			if (segmentTypeMatches(action.get(), false)) {
+				return true;
+			}
+		}
+		for (const auto &action : macro->ElseActions()) {
+			if (segmentTypeMatches(action.get(), false)) {
+				return true;
+			}
+		}
+		return false;
+	case MacroSearchSettings::SearchType::CONDITIONS:
+		for (const auto &condition : macro->Conditions()) {
+			if (segmentTypeMatches(condition.get(), true)) {
+				return true;
+			}
+		}
+		return false;
+	case MacroSearchSettings::SearchType::ACTIONS:
+		for (const auto &action : macro->Actions()) {
+			if (segmentTypeMatches(action.get(), false)) {
+				return true;
+			}
+		}
+		for (const auto &action : macro->ElseActions()) {
+			if (segmentTypeMatches(action.get(), false)) {
+				return true;
+			}
+		}
+		return false;
+	case MacroSearchSettings::SearchType::LABEL:
+		for (const auto &condition : macro->Conditions()) {
+			if (segmentLabelMatches(condition.get())) {
+				return true;
+			}
+		}
+		for (const auto &action : macro->Actions()) {
+			if (segmentLabelMatches(action.get())) {
+				return true;
+			}
+		}
+		for (const auto &action : macro->ElseActions()) {
+			if (segmentLabelMatches(action.get())) {
+				return true;
+			}
+		}
+		return false;
+	default:
+		break;
+	}
+
+	// Unhandled search type
+	assert(false);
+	return true;
+}
+
+} // namespace advss

lib/macro/macro-search.hpp

@@ -0,0 +1,43 @@
+#pragma once
+#include "regex-config.hpp"
+
+#include <functional>
+#include <string>
+
+class QComboBox;
+class QLayout;
+class QLineEdit;
+class QPushButton;
+
+namespace advss {
+
+class Macro;
+
+struct MacroSearchSettings {
+	void Save(obs_data_t *data, const char *name);
+	void Load(obs_data_t *data, const char *name);
+
+	enum class SearchType {
+		NAME = 0,
+		ALL_SEGMENTS = 10,
+		CONDITIONS = 20,
+		ACTIONS = 30,
+		LABEL = 40,
+	};
+
+	SearchType searchType = SearchType::NAME;
+	std::string searchString;
+	RegexConfig regex;
+	bool showAlways = false;
+};
+
+void CheckMacroSearchVisibility();
+void SetupMacroSearchWidgets(QLayout *searchLayout, QLineEdit *searchText,
+			     QPushButton *searchClear, QComboBox *searchType,
+			     RegexConfigWidget *searchRegex,
+			     QPushButton *showSettings,
+			     const std::function<void()> &refresh);
+MacroSearchSettings &GetMacroSearchSettings();
+bool MacroMatchesSearchFilter(Macro *macro);
+
+} // namespace advss

lib/macro/macro-segment-selection.cpp

@@ -73,35 +73,46 @@ void MacroSegmentSelection::MacroSegmentOrderChanged()
 }
 
 static QString GetMacroSegmentDescription(Macro *macro, int idx,
-					  bool isCondition)
+					  MacroSegmentSelection::Type type)
 {
 	if (!macro) {
 		return "";
 	}
-	if (!IsValidMacroSegmentIndex(macro, idx, isCondition)) {
+
+	MacroSegment *segment;
+
+	switch (type) {
+	case MacroSegmentSelection::Type::CONDITION:
+		if (!IsValidConditionIndex(macro, idx)) {
+			return "";
+		}
+		segment = GetMacroConditions(macro)->at(idx).get();
+		break;
+	case MacroSegmentSelection::Type::ACTION:
+		if (!IsValidActionIndex(macro, idx)) {
+			return "";
+		}
+		segment = GetMacroActions(macro)->at(idx).get();
+		break;
+	case MacroSegmentSelection::Type::ELSE_ACTION:
+		if (!IsValidElseActionIndex(macro, idx)) {
+			return "";
+		}
+		segment = GetMacroElseActions(macro)->at(idx).get();
+		break;
+	default:
 		return "";
 	}
 
-	MacroSegment *segment;
-	if (isCondition) {
-		segment = GetMacroConditions(macro)->at(idx).get();
-	} else {
-		segment = GetMacroActions(macro)->at(idx).get();
-	}
+	const auto idToName = type == MacroSegmentSelection::Type::CONDITION
+				      ? MacroConditionFactory::GetConditionName
+				      : MacroActionFactory::GetActionName;
+	const QString typeStr =
+		obs_module_text(idToName(segment->GetId()).c_str());
+	const QString description =
+		QString::fromStdString(segment->GetShortDesc());
 
-	QString description = QString::fromStdString(segment->GetShortDesc());
-	QString type;
-	if (isCondition) {
-		type = obs_module_text(MacroConditionFactory::GetConditionName(
-					       segment->GetId())
-					       .c_str());
-	} else {
-		type = obs_module_text(
-			MacroActionFactory::GetActionName(segment->GetId())
-				.c_str());
-	}
-
-	QString result = type;
+	QString result = typeStr;
 	if (!description.isEmpty()) {
 		result += ": " + description;
 	}
@@ -123,11 +134,25 @@ void MacroSegmentSelection::SetupDescription() const
 		return;
 	}
 
+	bool validIndex = false;
+	switch (_type) {
+	case Type::CONDITION:
+		validIndex = IsValidConditionIndex(_macro, index - 1);
+		break;
+	case Type::ACTION:
+		validIndex = IsValidActionIndex(_macro, index - 1);
+		break;
+	case Type::ELSE_ACTION:
+		validIndex = IsValidElseActionIndex(_macro, index - 1);
+		break;
+	default:
+		break;
+	}
+
 	QString description;
-	if (IsValidMacroSegmentIndex(_macro, index - 1,
-				     _type == Type::CONDITION)) {
-		description = GetMacroSegmentDescription(
-			_macro, index - 1, _type == Type::CONDITION);
+	if (validIndex) {
+		description =
+			GetMacroSegmentDescription(_macro, index - 1, _type);
 	} else {
 		description = obs_module_text(
 			"AdvSceneSwitcher.macroSegmentSelection.invalid");
@@ -165,8 +190,23 @@ void MacroSegmentSelection::MarkSelectedSegment()
 	if (index.GetType() == IntVariable::Type::VARIABLE) {
 		return;
 	}
-	if (!IsValidMacroSegmentIndex(_macro, index - 1,
-				      _type == Type::CONDITION)) {
+
+	bool validIndex = false;
+	switch (_type) {
+	case Type::CONDITION:
+		validIndex = IsValidConditionIndex(_macro, index - 1);
+		break;
+	case Type::ACTION:
+		validIndex = IsValidActionIndex(_macro, index - 1);
+		break;
+	case Type::ELSE_ACTION:
+		validIndex = IsValidElseActionIndex(_macro, index - 1);
+		break;
+	default:
+		break;
+	}
+
+	if (!validIndex) {
 		return;
 	}
 

lib/macro/macro-segment-selection.hpp

@@ -8,7 +8,7 @@ class Macro;
 class MacroSegmentSelection : public QWidget {
 	Q_OBJECT
 public:
-	enum class Type { CONDITION, ACTION };
+	enum class Type { CONDITION, ACTION, ELSE_ACTION };
 
 	MacroSegmentSelection(QWidget *parent, Type type,
 			      bool allowVariables = true);

lib/macro/macro-selection.cpp

@@ -14,10 +14,7 @@ MacroSelection::MacroSelection(QWidget *parent)
 	: FilterComboBox(parent,
 			 obs_module_text("AdvSceneSwitcher.selectMacro"))
 {
-	for (const auto &m : GetMacros()) {
-		if (m->IsGroup()) {
-			continue;
-		}
+	for (const auto &m : GetTopLevelMacros()) {
 		addItem(QString::fromStdString(m->Name()));
 	}
 
@@ -66,6 +63,22 @@ void MacroSelection::HideSelectedMacro()
 	qobject_cast<QListView *>(view())->setRowHidden(idx, true);
 }
 
+void MacroSelection::HideGroups()
+{
+	for (const auto &macro : GetTopLevelMacros()) {
+		if (!macro->IsGroup()) {
+			continue;
+		}
+
+		int idx = findText(QString::fromStdString(macro->Name()));
+		if (idx == -1) {
+			continue;
+		}
+
+		qobject_cast<QListView *>(view())->setRowHidden(idx, true);
+	}
+}
+
 void MacroSelection::ShowAllMacros()
 {
 	auto v = qobject_cast<QListView *>(view());

lib/macro/macro-selection.hpp

@@ -15,6 +15,7 @@ public:
 	MacroSelection(QWidget *parent);
 	void SetCurrentMacro(const MacroRef &);
 	void HideSelectedMacro(); // Macro currently being edited
+	void HideGroups();
 	void ShowAllMacros();
 
 private slots:

lib/macro/macro-tab.cpp

@@ -4,6 +4,7 @@
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
 #include "macro-settings.hpp"
+#include "macro-search.hpp"
 #include "macro-signals.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
@@ -24,6 +25,8 @@ namespace advss {
 
 static QObject *addPulse = nullptr;
 static QTimer onChangeHighlightTimer;
+static std::chrono::high_resolution_clock::time_point
+	lastOnChangeHighlightCheckTime{};
 
 static void disableAddButtonHighlight()
 {
@@ -146,20 +149,7 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 static void addGroupSubitems(std::vector<std::shared_ptr<Macro>> &macros,
 			     const std::shared_ptr<Macro> &group)
 {
-	std::vector<std::shared_ptr<Macro>> subitems;
-	subitems.reserve(group->GroupSize());
-
-	// Find all subitems
-	auto allMacros = GetMacros();
-	for (auto it = allMacros.begin(); it < allMacros.end(); it++) {
-		if ((*it)->Name() != group->Name()) {
-			continue;
-		}
-		for (uint32_t i = 1; i <= group->GroupSize(); i++) {
-			subitems.emplace_back(*std::next(it, i));
-		}
-		break;
-	}
+	auto subitems = GetGroupMacroEntries(group.get());
 
 	// Remove subitems which were already selected to avoid duplicates
 	for (const auto &subitem : subitems) {
@@ -207,7 +197,7 @@ void AdvSceneSwitcher::RemoveMacro(std::shared_ptr<Macro> &macro)
 	// Don't cache widgets for about to be deleted macros
 	MacroSegmentList::SetCachingEnabled(false);
 	ui->macros->Remove(macro);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
+	MacroSegmentList::SetCachingEnabled(true);
 
 	MacroSignalManager::Instance()->Remove(name);
 }
@@ -410,13 +400,17 @@ void AdvSceneSwitcher::ImportMacros()
 	int groupSize = 0;
 	std::shared_ptr<Macro> group;
 	std::vector<std::shared_ptr<Macro>> importedMacros;
+	auto &tempMacros = GetTemporaryMacros();
 
 	auto lock = LockContext();
 	for (size_t i = 0; i < count; i++) {
+		tempMacros.clear();
+
 		OBSDataAutoRelease array_obj = obs_data_array_item(array, i);
 		auto macro = std::make_shared<Macro>();
+		tempMacros.emplace_back(macro);
 		macro->Load(array_obj);
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 
 		if (macroNameExists(macro->Name()) &&
 		    !ResolveMacroImportNameConflict(macro)) {
@@ -425,7 +419,7 @@ void AdvSceneSwitcher::ImportMacros()
 		}
 
 		importedMacros.emplace_back(macro);
-		GetMacros().emplace_back(macro);
+		GetTopLevelMacros().emplace_back(macro);
 		if (groupSize > 0 && !macro->IsGroup()) {
 			Macro::PrepareMoveToGroup(group, macro);
 			groupSize--;
@@ -444,9 +438,10 @@ void AdvSceneSwitcher::ImportMacros()
 	for (const auto &macro : importedMacros) {
 		macro->PostLoad();
 	}
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
+	tempMacros.clear();
 
-	ui->macros->Reset(GetMacros(),
+	ui->macros->Reset(GetTopLevelMacros(),
 			  GetGlobalMacroSettings()._highlightExecuted);
 	disableAddButtonHighlight();
 }
@@ -557,10 +552,14 @@ void AdvSceneSwitcher::HighlightOnChange() const
 		return;
 	}
 
-	if (macro->OnChangePreventedActionsRecently()) {
+	if (macro->OnChangePreventedActionsSince(
+		    lastOnChangeHighlightCheckTime)) {
 		HighlightWidget(ui->runMacroOnChange, Qt::yellow,
 				Qt::transparent, true);
 	}
+
+	lastOnChangeHighlightCheckTime =
+		std::chrono::high_resolution_clock::now();
 }
 
 void AdvSceneSwitcher::on_macroSettings_clicked()
@@ -610,17 +609,20 @@ setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
 	auto toolbar = new QToolBar();
 	toolbar->setIconSize({16, 16});
 
-	QAction *lastSeperator = nullptr;
+	QAction *lastSeparator = nullptr;
 
 	for (const auto &widgetGroup : widgetGroups) {
 		for (const auto &widget : widgetGroup) {
+			if (!widget) {
+				continue;
+			}
 			toolbar->addWidget(widget);
 		}
-		lastSeperator = toolbar->addSeparator();
+		lastSeparator = toolbar->addSeparator();
 	}
 
-	if (lastSeperator) {
-		toolbar->removeAction(lastSeperator);
+	if (lastSeparator) {
+		toolbar->removeAction(lastSeparator);
 	}
 
 	// Prevent "extension" button from showing up
@@ -633,7 +635,9 @@ void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macros->installEventFilter(this);
 
-	if (GetMacros().size() == 0 && !switcher->disableHints) {
+	auto &macros = GetTopLevelMacros();
+
+	if (macros.size() == 0 && !switcher->disableHints) {
 		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
 	}
 
@@ -641,8 +645,7 @@ void AdvSceneSwitcher::SetupMacroTab()
 					   {ui->macroUp, ui->macroDown}});
 	ui->macroControlLayout->addWidget(macroControls);
 
-	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+	ui->macros->Reset(macros, GetGlobalMacroSettings()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
 		SLOT(MacroSelectionChanged()));
 	ui->runMacro->SetMacroTree(ui->macros);
@@ -655,6 +658,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()));
@@ -671,6 +676,12 @@ void AdvSceneSwitcher::SetupMacroTab()
 				switcher->macroListMacroEditSplitterPosition);
 		}
 	}
+
+	SetupMacroSearchWidgets(ui->macroSearchLayout, ui->macroSearchText,
+				ui->macroSearchClear, ui->macroSearchType,
+				ui->macroSearchRegex,
+				ui->macroSearchShowSettings,
+				[this]() { ui->macros->RefreshFilter(); });
 }
 
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
@@ -752,7 +763,7 @@ void AdvSceneSwitcher::CopyMacro()
 	newMacro->Load(data);
 	newMacro->PostLoad();
 	newMacro->SetName(name);
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);

lib/macro/macro-tree.cpp

@@ -1,21 +1,21 @@
 #include "macro-tree.hpp"
 #include "macro.hpp"
+#include "macro-search.hpp"
 #include "macro-signals.hpp"
 #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>);
 
@@ -61,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 */
@@ -76,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()
@@ -107,10 +215,19 @@ 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->OnChangePreventedActionsSince(_lastHighlightCheckTime)) {
+		HighlightWidget(this, Qt::yellow, QColor(0, 0, 0, 0), true);
+	}
+
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }
 
@@ -187,7 +304,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);
@@ -213,7 +330,6 @@ void MacroTreeModel::Reset(std::deque<std::shared_ptr<Macro>> &newItems)
 	_macros = newItems;
 	endResetModel();
 
-	UpdateGroupState(false);
 	_mt->ResetWidgets();
 }
 
@@ -458,9 +574,6 @@ void MacroTreeModel::Remove(std::shared_ptr<Macro> item)
 
 	_mt->selectionModel()->clear();
 
-	if (isGroup) {
-		UpdateGroupState(true);
-	}
 	assert(IsInValidState());
 }
 
@@ -549,7 +662,6 @@ MacroTreeModel::MacroTreeModel(MacroTree *st_,
 	  _mt(st_),
 	  _macros(macros)
 {
-	UpdateGroupState(false);
 }
 
 int MacroTreeModel::rowCount(const QModelIndex &parent) const
@@ -703,7 +815,6 @@ void MacroTreeModel::GroupSelectedItems(QModelIndexList &indices)
 		offset++;
 	}
 
-	_hasGroups = true;
 	_mt->selectionModel()->clear();
 
 	Reset(_macros);
@@ -761,29 +872,12 @@ 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)
 {
 	_highlight = highlight;
-	MacroTreeModel *mtm = new MacroTreeModel(this, macros);
+
+	auto mtm = new MacroTreeModel(this, macros);
 	setModel(mtm);
 	GetModel()->Reset(macros);
 	connect(selectionModel(),
@@ -840,7 +934,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);
@@ -869,7 +962,7 @@ void MacroTree::UpdateWidgets(bool force)
 
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		std::shared_ptr<Macro> item = mtm->_macros[i];
-		MacroTreeItem *widget = GetItemWidget(i);
+		auto widget = GetItemWidget(i);
 
 		if (!widget) {
 			UpdateWidget(mtm->createIndex(i, 0, nullptr), item);
@@ -1184,7 +1277,7 @@ bool MacroTree::SelectionEmpty() const
 
 bool MacroTree::GroupsExist() const
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (macro->IsGroup()) {
 			return true;
 		}
@@ -1204,6 +1297,12 @@ void MacroTree::CollapseGroup(std::shared_ptr<Macro> item) const
 	mtm->CollapseGroup(item);
 }
 
+void MacroTree::RefreshFilter()
+{
+	UpdateWidgets();
+	doItemsLayout();
+}
+
 void MacroTree::MoveItemBefore(const std::shared_ptr<Macro> &item,
 			       const std::shared_ptr<Macro> &after) const
 {
@@ -1218,7 +1317,7 @@ void MacroTree::MoveItemAfter(const std::shared_ptr<Macro> &item,
 
 MacroTreeModel *MacroTree::GetModel() const
 {
-	return reinterpret_cast<MacroTreeModel *>(model());
+	return qobject_cast<MacroTreeModel *>(model());
 }
 
 void MacroTree::Remove(std::shared_ptr<Macro> item) const
@@ -1306,7 +1405,7 @@ void MacroTree::UngroupSelectedGroups()
 
 void MacroTree::ExpandAll()
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}
@@ -1316,7 +1415,7 @@ void MacroTree::ExpandAll()
 
 void MacroTree::CollapseAll()
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}
@@ -1333,8 +1432,8 @@ void MacroTree::SelectionChangedHelper(const QItemSelection &,
 
 inline MacroTreeItem *MacroTree::GetItemWidget(int idx) const
 {
-	QWidget *widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
-	return reinterpret_cast<MacroTreeItem *>(widget);
+	auto widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
+	return qobject_cast<MacroTreeItem *>(widget);
 }
 
 void MacroTree::paintEvent(QPaintEvent *event)
@@ -1361,14 +1460,25 @@ MacroTreeDelegate::MacroTreeDelegate(QObject *parent)
 QSize MacroTreeDelegate::sizeHint(const QStyleOptionViewItem &option,
 				  const QModelIndex &index) const
 {
-	MacroTree *tree = qobject_cast<MacroTree *>(parent());
-	QWidget *item = tree->indexWidget(index);
+	auto tree = qobject_cast<MacroTree *>(parent());
+	auto widget = tree->indexWidget(index);
 
-	if (!item) {
+	if (!widget) {
 		return QStyledItemDelegate::sizeHint(option, index);
 	}
 
-	return QSize(item->sizeHint());
+	auto name = index.data(Qt::AccessibleTextRole).toString();
+	auto macro = GetMacroByQString(name);
+
+	if (!macro) {
+		return QStyledItemDelegate::sizeHint(option, index);
+	}
+
+	if (MacroMatchesSearchFilter(macro)) {
+		return QSize(widget->sizeHint());
+	}
+
+	return QSize(0, 0);
 }
 
 } // namespace advss

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;
@@ -142,6 +144,7 @@ public:
 	bool GroupsExist() const;
 	void ExpandGroup(std::shared_ptr<Macro> item) const;
 	void CollapseGroup(std::shared_ptr<Macro> item) const;
+	void RefreshFilter();
 
 public slots:
 	void GroupSelectedItems();

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

@@ -17,8 +17,6 @@
 
 namespace advss {
 
-static std::deque<std::shared_ptr<Macro>> macros;
-
 Macro::Macro(const std::string &name) : _dockSettings(this)
 {
 	SetName(name);
@@ -59,6 +57,7 @@ Macro::CreateGroup(const std::string &name,
 
 void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 {
+	auto &macros = GetTopLevelMacros();
 	auto it = std::find(macros.begin(), macros.end(), group);
 	if (it == macros.end()) {
 		return;
@@ -75,6 +74,7 @@ void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 
 void Macro::PrepareMoveToGroup(Macro *group, std::shared_ptr<Macro> item)
 {
+	auto &macros = GetTopLevelMacros();
 	for (const auto &m : macros) {
 		if (m.get() == group) {
 			PrepareMoveToGroup(m, item);
@@ -242,8 +242,12 @@ bool Macro::CheckConditions(bool ignorePause)
 	vblog(LOG_INFO, "Macro %s returned %d", _name.c_str(), _matched);
 
 	_conditionSateChanged = _lastMatched != _matched;
-	if (!_conditionSateChanged && _performActionsOnChange) {
-		_onPreventedActionExecution = true;
+	const bool hasActionsToExecute = _matched ? (_actions.size() > 0)
+						  : (_elseActions.size() > 0);
+	if (!_conditionSateChanged && _performActionsOnChange &&
+	    hasActionsToExecute) {
+		_lastOnChangeActionsPreventedTime =
+			std::chrono::high_resolution_clock::now();
 	}
 
 	_lastMatched = _matched;
@@ -302,6 +306,16 @@ bool Macro::WasExecutedSince(const TimePoint &time) const
 	return _lastExecutionTime > time;
 }
 
+bool Macro::OnChangePreventedActionsSince(const TimePoint &time) const
+{
+	return _lastOnChangeActionsPreventedTime > time;
+}
+
+Macro::TimePoint Macro::GetLastExecutionTime() const
+{
+	return _lastExecutionTime;
+}
+
 bool Macro::ConditionsShouldBeChecked() const
 {
 	if (!_useCustomConditionCheckInterval) {
@@ -948,12 +962,12 @@ bool Macro::PostLoad()
 bool Macro::SwitchesScene() const
 {
 	for (const auto &a : _actions) {
-		if (a->GetId() == GetSceneSwitchActionId()) {
+		if (a->GetId() == MacroAction::GetDefaultID()) {
 			return true;
 		}
 	}
 	for (const auto &a : _elseActions) {
-		if (a->GetId() == GetSceneSwitchActionId()) {
+		if (a->GetId() == MacroAction::GetDefaultID()) {
 			return true;
 		}
 	}
@@ -986,18 +1000,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();
 	}
@@ -1114,7 +1118,7 @@ void Macro::SetHotkeysDesc() const
 void SaveMacros(obs_data_t *obj)
 {
 	obs_data_array_t *macroArray = obs_data_array_create();
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		obs_data_t *array_obj = obs_data_create();
 
 		m->Save(array_obj);
@@ -1128,7 +1132,9 @@ void SaveMacros(obs_data_t *obj)
 
 void LoadMacros(obs_data_t *obj)
 {
+	auto &macros = GetTopLevelMacros();
 	macros.clear();
+
 	obs_data_array_t *macroArray = obs_data_get_array(obj, "macros");
 	size_t count = obs_data_array_count(macroArray);
 
@@ -1178,15 +1184,10 @@ void LoadMacros(obs_data_t *obj)
 	}
 }
 
-std::deque<std::shared_ptr<Macro>> &GetMacros()
-{
-	return macros;
-}
-
 bool CheckMacros()
 {
 	bool matchFound = false;
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		if (!m->ConditionsShouldBeChecked()) {
 			vblog(LOG_INFO,
 			      "skipping condition check for macro \"%s\" "
@@ -1213,7 +1214,7 @@ bool RunMacros()
 	// reordered while macros are currently being executed.
 	// For example, this can happen if a macro is performing a wait action,
 	// as the main lock will be unlocked during this time.
-	auto runPhaseMacros = macros;
+	auto runPhaseMacros = GetTopLevelMacros();
 
 	// Avoid deadlocks when opening settings window and calling frontend
 	// API functions at the same time.
@@ -1253,41 +1254,14 @@ bool RunMacros()
 
 void StopAllMacros()
 {
-	for (const auto &m : macros) {
+	for (const auto &m : GetAllMacros()) {
 		m->Stop();
 	}
 }
 
-Macro *GetMacroByName(const char *name)
-{
-	for (const auto &m : macros) {
-		if (m->Name() == name) {
-			return m.get();
-		}
-	}
-
-	return nullptr;
-}
-
-Macro *GetMacroByQString(const QString &name)
-{
-	return GetMacroByName(name.toUtf8().constData());
-}
-
-std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
-{
-	for (const auto &m : macros) {
-		if (m->Name() == name) {
-			return m;
-		}
-	}
-
-	return {};
-}
-
 void InvalidateMacroTempVarValues()
 {
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		// Do not invalidate the temp vars set during condition checks
 		// or action executions running in parallel to the "main" macro
 		// loop, as otherwise access to the information stored in those
@@ -1302,6 +1276,8 @@ void InvalidateMacroTempVarValues()
 
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval()
 {
+	auto &macros = GetTopLevelMacros();
+
 	if (macros.empty()) {
 		return {};
 	}

lib/macro/macro.hpp

@@ -9,8 +9,6 @@
 #include "temp-variable.hpp"
 
 #include <future>
-#include <QString>
-#include <QByteArray>
 #include <string>
 #include <deque>
 #include <memory>
@@ -139,7 +137,8 @@ public:
 	const QList<int> &GetElseActionSplitterPosition() const;
 	bool HasValidSplitterPositions() const;
 	bool WasExecutedSince(const TimePoint &) const;
-	bool OnChangePreventedActionsRecently();
+	bool OnChangePreventedActionsSince(const TimePoint &) const;
+	TimePoint GetLastExecutionTime() const;
 	void ResetUIHelpers();
 
 	// Hotkeys
@@ -170,6 +169,7 @@ private:
 	TimePoint _lastCheckTime{};
 	TimePoint _lastUnpauseTime{};
 	TimePoint _lastExecutionTime{};
+	TimePoint _lastOnChangeActionsPreventedTime{};
 	std::vector<std::thread> _helperThreads;
 
 	std::deque<std::shared_ptr<MacroCondition>> _conditions;
@@ -206,9 +206,6 @@ private:
 
 	MacroInputVariables _inputVariables;
 
-	// UI helpers
-	bool _onPreventedActionExecution = false;
-
 	QList<int> _actionConditionSplitterPosition;
 	QList<int> _elseActionSplitterPosition;
 
@@ -217,13 +214,9 @@ private:
 
 void LoadMacros(obs_data_t *obj);
 void SaveMacros(obs_data_t *obj);
-std::deque<std::shared_ptr<Macro>> &GetMacros();
 bool CheckMacros();
 bool RunMacros();
 void StopAllMacros();
-Macro *GetMacroByName(const char *name);
-Macro *GetMacroByQString(const QString &name);
-std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 void InvalidateMacroTempVarValues();
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
 

lib/osx/advanced-scene-switcher-osx.mm

@@ -258,7 +258,7 @@ bool IsFullscreen(const std::string &title)
 	return false;
 }
 
-std::optional<std::string> GetTextInWindow(const std::string &window)
+std::optional<std::string> GetTextInWindow(const std::string &)
 {
 	// Not implemented
 	return {};

lib/queue/action-queue.cpp

@@ -113,7 +113,7 @@ void ActionQueue::Add(const std::shared_ptr<MacroAction> &action)
 		action->Save(data);
 		copy->Load(data);
 		copy->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		copy->ResolveVariablesToFixedValues();
 		_actions.emplace_back(copy);
 	} else {
@@ -423,7 +423,7 @@ void ImportQueues(obs_data_t *data)
 		importedQueues->emplace_back(queue);
 	}
 
-	QeueUITask(signalImportedQueues, importedQueues);
+	QueueUITask(signalImportedQueues, importedQueues);
 }
 
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

lib/switcher-data.hpp

@@ -163,7 +163,6 @@ public:
 	bool warnPluginLoadFailure = true;
 	bool disableHints = false;
 	bool disableFilterComboboxFilter = false;
-	bool disableMacroWidgetCache = false;
 	bool hideLegacyTabs = true;
 	bool saveWindowGeo = false;
 	QPoint windowPos = {};

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,40 @@ 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.
+	//
+	// On macOS, an additional QTimer::singleShot wrapper is required for
+	// this to work correctly.
+
+	auto json = obs_data_get_json(settings);
+	static QString jsonQString = json ? json : "";
+
+	static const auto askForBackupWrapper = [](void *) {
+#ifdef __APPLE__
+		QTimer::singleShot(0,
+				   static_cast<QMainWindow *>(
+					   obs_frontend_get_main_window()),
+				   []() {
+#endif
+					   showBackupDialogs(jsonQString);
+#ifdef __APPLE__
+				   });
+#endif
+	};
+
+	std::thread t([]() {
+		obs_queue_task(OBS_TASK_UI, askForBackupWrapper, nullptr,
+			       false);
+	});
+	t.detach();
+}
+
 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/canvas-helpers.cpp

@@ -67,7 +67,7 @@ int GetCanvasCount()
 	return 1;
 #else
 	static const auto enumCanvases = [](void *countPtr,
-					    obs_canvas_t *canvas) -> bool {
+					    obs_canvas_t *) -> bool {
 		auto count = static_cast<int *>(countPtr);
 		(*count)++;
 		return true;
@@ -145,6 +145,15 @@ OBSWeakSource GetActiveCanvasScene(const OBSWeakCanvas &weakCanvas)
 	}
 #endif
 
+	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+
+	// The frontend scene order does not necessarily match the order of the
+	// scenes in the canvas.
+	if (canvas == mainCanvas) {
+		OBSSourceAutoRelease scene = obs_frontend_get_current_scene();
+		return OBSGetWeakRef(scene);
+	}
+
 	static const auto enumCanvasScenes = [](void *scenePtr,
 						obs_source_t *source) -> bool {
 		auto scene = static_cast<OBSWeakSource *>(scenePtr);
@@ -181,6 +190,25 @@ OBSWeakSource GetSceneAtIndex(const OBSWeakCanvas &weakCanvas, int idx)
 	}
 #endif
 
+	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+
+	// The frontend scene order does not necessarily match the order of the
+	// scenes in the canvas.
+	// So, rely on obs_frontend_get_scenes() in case of the main canvas
+	// instead.
+	if (canvas == mainCanvas) {
+		struct obs_frontend_source_list scenes = {0};
+		obs_frontend_get_scenes(&scenes);
+		if (idx >= (int)scenes.sources.num) {
+			obs_frontend_source_list_free(&scenes);
+			return nullptr;
+		}
+
+		auto scene = OBSGetWeakRef(scenes.sources.array[idx]);
+		obs_frontend_source_list_free(&scenes);
+		return scene;
+	}
+
 	struct Data {
 		const int idx;
 		int currentIdx;
@@ -223,6 +251,29 @@ int GetIndexOfScene(const OBSWeakCanvas &weakCanvas, const OBSWeakSource &scene)
 		return 0;
 	}
 #endif
+	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+
+	// The frontend scene order does not necessarily match the order of the
+	// scenes in the canvas.
+	// So, rely on obs_frontend_get_scenes() in case of the main canvas
+	// instead.
+	if (canvas == mainCanvas) {
+		struct obs_frontend_source_list scenes = {0};
+		obs_frontend_get_scenes(&scenes);
+
+		OBSSourceAutoRelease sceneSource = OBSGetStrongRef(scene);
+		int idx = 0;
+
+		for (size_t i = 0; i < scenes.sources.num; i++) {
+			if (scenes.sources.array[i] == sceneSource) {
+				idx = i;
+				break;
+			}
+		}
+
+		obs_frontend_source_list_free(&scenes);
+		return idx;
+	}
 
 	struct Data {
 		int idx;
@@ -246,6 +297,12 @@ int GetIndexOfScene(const OBSWeakCanvas &weakCanvas, const OBSWeakSource &scene)
 	return data.idx;
 }
 
+OBSWeakCanvas GetMainCanvas()
+{
+	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+	return OBSGetWeakRef(mainCanvas);
+}
+
 #if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(31, 1, 0)
 
 obs_canvas_t *obs_canvas_get_ref(obs_canvas_t *)

lib/utils/canvas-helpers.hpp

@@ -42,6 +42,7 @@ EXPORT OBSWeakSource GetActiveCanvasScene(const OBSWeakCanvas &canvas);
 EXPORT OBSWeakSource GetSceneAtIndex(const OBSWeakCanvas &weakCanvas, int idx);
 EXPORT int GetIndexOfScene(const OBSWeakCanvas &weakCanvas,
 			   const OBSWeakSource &scene);
+EXPORT OBSWeakCanvas GetMainCanvas();
 
 class CanvasSelection : public FilterComboBox {
 	Q_OBJECT

lib/utils/crash-handler.cpp

@@ -0,0 +1,153 @@
+#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.
+	//
+	// On macOS, an additional QTimer::singleShot wrapper is required for
+	// this to work correctly.
+	static const auto showDialogWrapper = [](void *) {
+#ifdef __APPLE__
+		QTimer::singleShot(0,
+				   static_cast<QMainWindow *>(
+					   obs_frontend_get_main_window()),
+				   []() {
+#endif
+					   askForStartupSkip();
+#ifdef __APPLE__
+				   });
+#endif
+	};
+
+	std::thread t([]() {
+		obs_queue_task(OBS_TASK_UI, showDialogWrapper, nullptr, false);
+	});
+	t.detach();
+
+	return true;
+}
+
+} // namespace advss

lib/utils/crash-handler.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace advss {
+
+bool ShouldSkipPluginStartOnUncleanShutdown();
+
+} // 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/math-helpers.cpp

@@ -56,7 +56,7 @@ std::optional<double> GetDouble(const std::string &str)
 std::optional<int> GetInt(const std::string &str)
 {
 	char *end = nullptr;
-	int value = std::strtol(str.c_str(), &end, 10);
+	int value = (int)std::strtol(str.c_str(), &end, 10);
 
 	if (end != str.c_str() && *end == '\0' && value != INT_MAX &&
 	    value != INT_MIN) {

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

@@ -113,12 +113,13 @@ void RunLoadSteps(obs_data_t *obj)
 	}
 }
 
-void RunPostLoadSteps()
+void RunAndClearPostLoadSteps()
 {
 	std::lock_guard<std::mutex> lock(postLoadMutex);
 	for (const auto &func : getPostLoadSteps()) {
 		func();
 	}
+	getPostLoadSteps().clear();
 }
 
 void ClearPostLoadSteps()
@@ -135,7 +136,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);
 }
 

lib/utils/plugin-state-helpers.hpp

@@ -14,7 +14,7 @@ EXPORT void AddPostLoadStep(std::function<void()>);
 EXPORT void AddIntervalResetStep(std::function<void()>);
 void RunSaveSteps(obs_data_t *);
 void RunLoadSteps(obs_data_t *);
-EXPORT void RunPostLoadSteps();
+EXPORT void RunAndClearPostLoadSteps();
 void ClearPostLoadSteps();
 
 EXPORT void AddPluginInitStep(std::function<void()>);

lib/utils/resource-table.cpp

@@ -8,7 +8,7 @@
 
 namespace advss {
 
-ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
+ResourceTable::ResourceTable(QWidget *parent, const QString &help,
 			     const QString &addToolTip,
 			     const QString &removeToolTip,
 			     const QStringList &headers,
@@ -65,13 +65,16 @@ ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
 			 [openSettings]() { openSettings(); });
 
 	auto settingsShortcut = new QShortcut(QKeySequence("F2"), this);
+	settingsShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(settingsShortcut, &QShortcut::activated, this,
 			 openSettings);
 	auto removeShortcut = new QShortcut(QKeySequence("Del"), this);
+	removeShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(removeShortcut, &QShortcut::activated, this,
 			 [this]() { Remove(); });
 
 	auto newShortcut = new QShortcut(QKeySequence("Ctrl+N"), this);
+	newShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(newShortcut, &QShortcut::activated, this,
 			 [this]() { Add(); });
 }

lib/utils/resource-table.hpp

@@ -14,7 +14,7 @@ class ADVSS_EXPORT ResourceTable : public QWidget {
 	Q_OBJECT
 
 public:
-	ResourceTable(QTabWidget *parent, const QString &help,
+	ResourceTable(QWidget *parent, const QString &help,
 		      const QString &addToolTip, const QString &removeToolTip,
 		      const QStringList &headers,
 		      const std::function<void()> &openSettings);

lib/utils/scene-selection.cpp

@@ -103,10 +103,11 @@ void SceneSelection::Load(obs_data_t *obj, const char *name,
 	OBSDataAutoRelease data =
 		obs_data_get_obj(obj, selectionSaveName.data());
 
-	if (obs_data_has_user_value(data, canvasSaveName.data())) {
-		_canvas = GetWeakCanvasByName(
-			obs_data_get_string(data, canvasSaveName.data()));
-	} else {
+	const char *canvasName =
+		obs_data_get_string(data, canvasSaveName.data());
+	_canvas = GetWeakCanvasByName(
+		obs_data_get_string(data, canvasSaveName.data()));
+	if (strcmp(canvasName, "") == 0) {
 		OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 		_canvas = obs_canvas_get_weak_canvas(mainCanvas);
 		obs_weak_canvas_release(_canvas);
@@ -334,6 +335,7 @@ static QStringList getCanvasScenesList(obs_weak_canvas_t *weakCanvas)
 
 	QStringList list;
 	obs_canvas_enum_scenes(canvas, enumCanvasScenes, &list);
+	list.sort();
 	return list;
 }
 

lib/utils/scene-selection.hpp

@@ -30,7 +30,7 @@ public:
 
 private:
 	OBSWeakSource _scene;
-	OBSWeakCanvas _canvas;
+	OBSWeakCanvas _canvas = GetMainCanvas();
 	SceneGroup *_group = nullptr;
 	std::weak_ptr<Variable> _variable;
 	Type _type = Type::SCENE;

lib/utils/source-helpers.cpp

@@ -1,4 +1,5 @@
 #include "source-helpers.hpp"
+#include "canvas-helpers.hpp"
 
 #include <obs-frontend-api.h>
 
@@ -28,15 +29,43 @@ std::string GetWeakSourceName(obs_weak_source_t *weak_source)
 
 OBSWeakSource GetWeakSourceByName(const char *name)
 {
-	OBSWeakSource weak;
-	obs_source_t *source = obs_get_source_by_name(name);
+	OBSSourceAutoRelease source = obs_get_source_by_name(name);
 	if (source) {
-		weak = obs_source_get_weak_source(source);
-		obs_weak_source_release(weak);
-		obs_source_release(source);
+		return OBSGetWeakRef(source);
 	}
 
-	return weak;
+#if LIBOBS_API_VER > MAKE_SEMANTIC_VERSION(31, 1, 0)
+	struct SearchData {
+		const char *name;
+		OBSWeakSource &scene;
+	};
+
+	static const auto enumCanvasScenes = [](void *dataPtr,
+						obs_source_t *source) -> bool {
+		auto data = static_cast<SearchData *>(dataPtr);
+		if (strcmp(data->name, obs_source_get_name(source)) == 0) {
+			data->scene = OBSGetWeakRef(source);
+			return false;
+		}
+
+		return true;
+	};
+
+	static const auto enumCanvases = [](void *dataPtr,
+					    obs_canvas_t *canvas) -> bool {
+		obs_canvas_enum_scenes(canvas, enumCanvasScenes, dataPtr);
+
+		auto data = static_cast<SearchData *>(dataPtr);
+		return data->scene == nullptr;
+	};
+
+	OBSWeakSource weakScene;
+	SearchData searchData{name, weakScene};
+	obs_enum_canvases(enumCanvases, &searchData);
+	return weakScene;
+#else
+	return nullptr;
+#endif
 }
 
 OBSWeakSource GetWeakSourceByQString(const QString &name)

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/tab-helpers.cpp

@@ -1,6 +1,7 @@
 #include "tab-helpers.hpp"
 #include "log-helper.hpp"
 #include "obs-module-helper.hpp"
+#include "plugin-state-helpers.hpp"
 
 #include <obs.hpp>
 #include <QTabBar>
@@ -33,6 +34,21 @@ struct TabCallbacks {
 static std::unordered_map<const char *, TabCallbacks> createTabCallbacks;
 
 static int lastOpenedTab = -1;
+static bool alwaysShowTabs = false;
+
+[[maybe_unused]] static bool _ = []() {
+	AddPluginInitStep([]() {
+		AddSaveStep([](obs_data_t *data) {
+			obs_data_set_bool(data, "alwaysShowTabs",
+					  alwaysShowTabs);
+		});
+		AddLoadStep([](obs_data_t *data) {
+			alwaysShowTabs =
+				obs_data_get_bool(data, "alwaysShowTabs");
+		});
+	});
+	return true;
+}();
 
 void SetTabVisibleByName(QTabWidget *tabWidget, bool visible,
 			 const QString &name)
@@ -197,7 +213,41 @@ void SetupOtherTabs(QTabWidget *tabWidget)
 				.c_str());
 		tabWidget->insertTab(0, widget, tabText);
 		callbacks.setupTab(tabWidget);
+
+		if (alwaysShowTabs) {
+			tabWidget->setTabVisible(0, true);
+		}
 	}
 }
 
+void SetupShowAllTabsCheckBox(QCheckBox *checkBox, QTabWidget *tabWidget)
+{
+	const auto stateChanged = [tabWidget](int state) {
+		const bool newState = (state != 0);
+		if (newState == alwaysShowTabs) {
+			return;
+		}
+
+		alwaysShowTabs = newState;
+
+		// Only show currently hidden tabs, but don't hide tabs which
+		// are already visible
+		if (!alwaysShowTabs) {
+			return;
+		}
+
+		for (const auto &[name, _] : createTabCallbacks) {
+			const auto localeKey =
+				std::string("AdvSceneSwitcher.") + name +
+				".title";
+			auto tabText = obs_module_text(localeKey.c_str());
+			SetTabVisibleByName(tabWidget, true, tabText);
+		}
+	};
+
+	checkBox->setChecked(alwaysShowTabs);
+	QWidget::connect(checkBox, &QCheckBox::stateChanged, checkBox,
+			 stateChanged);
+}
+
 } // namespace advss

lib/utils/tab-helpers.hpp

@@ -2,6 +2,8 @@
 #include "export-symbol-helper.hpp"
 
 #include <obs-data.h>
+
+#include <QCheckBox>
 #include <QTabWidget>
 
 namespace advss {
@@ -19,5 +21,6 @@ void SetupOtherTabs(QTabWidget *tabWidget);
 void SaveTabOrder(obs_data_t *obj);
 void LoadTabOrder(obs_data_t *obj);
 bool MacroTabIsInFocus();
+void SetupShowAllTabsCheckBox(QCheckBox *checkBox, QTabWidget *tabWidget);
 
 } // namespace advss

lib/utils/temp-variable.cpp

@@ -190,29 +190,6 @@ static bool isMatchingNestedMacroAction(MacroAction *action, const Macro *macro)
 	return nestedMacroAction->_nestedMacro.get() == macro;
 }
 
-static void appendNestedMacros(std::deque<std::shared_ptr<Macro>> &macros,
-			       Macro *macro)
-{
-	if (!macro) {
-		return;
-	}
-
-	for (const auto &action : macro->Actions()) {
-		const auto nestedMacroAction =
-			dynamic_cast<MacroActionMacro *>(action.get());
-		if (nestedMacroAction) {
-			macros.push_back(nestedMacroAction->_nestedMacro);
-		}
-	}
-	for (const auto &action : macro->ElseActions()) {
-		const auto nestedMacroAction =
-			dynamic_cast<MacroActionMacro *>(action.get());
-		if (nestedMacroAction) {
-			macros.push_back(nestedMacroAction->_nestedMacro);
-		}
-	}
-}
-
 static Macro *getParentMacro(const Macro *targetMacro,
 			     const std::vector<Macro *> &macros)
 {
@@ -263,8 +240,10 @@ static Macro *getParentMacro(const Macro *targetMacro,
 
 static Macro *getParentMacro(const Macro *macro)
 {
+	const auto &topLevelMacros = GetTopLevelMacros();
 	std::vector<Macro *> macros;
-	for (const auto &macro : GetMacros()) {
+	macros.reserve(topLevelMacros.size());
+	for (const auto &macro : topLevelMacros) {
 		macros.emplace_back(macro.get());
 	}
 	return getParentMacro(macro, macros);
@@ -301,8 +280,9 @@ void TempVariableRef::Save(obs_data_t *obj, Macro *macro,
 
 void TempVariableRef::Load(obs_data_t *obj, Macro *macroPtr, const char *name)
 {
+	const auto macros = GetAllMacros();
 	std::weak_ptr<Macro> macro;
-	for (const auto &macroShared : GetMacros()) {
+	for (const auto &macroShared : macros) {
 		if (macroShared.get() == macroPtr) {
 			macro = macroShared;
 			break;
@@ -340,9 +320,9 @@ void TempVariableRef::PostLoad(int idx, SegmentType type,
 		return;
 	}
 
-	Macro *macro = nullptr;
+	auto macro = childMacro.get();
 	for (int i = 0; i < _depth; i++) {
-		macro = getParentMacro(childMacro.get());
+		macro = getParentMacro(macro);
 	}
 
 	if (!macro) {
@@ -486,15 +466,9 @@ void TempVariableSelection::MacroSegmentsChanged()
 	SetVariable(currentSelection);
 }
 
-void TempVariableSelection::SegmentTempVarsChanged(MacroSegment *segment)
+void TempVariableSelection::SegmentTempVarsChanged(MacroSegment *)
 {
-	const auto currentSegment = GetSegment();
-	const auto currentMacro = currentSegment ? currentSegment->GetMacro()
-						 : nullptr;
-	const auto changeMacro = segment ? segment->GetMacro() : nullptr;
-	if (currentMacro == changeMacro) {
-		MacroSegmentsChanged();
-	}
+	MacroSegmentsChanged();
 }
 
 void TempVariableSelection::HighlightChanged(int idx)

lib/utils/temp-variable.hpp

@@ -75,7 +75,7 @@ private:
 	void PostLoad(int idx, SegmentType, const std::weak_ptr<Macro> &);
 
 	std::string _id = "";
-	std::weak_ptr<MacroSegment> _segment;
+	std::weak_ptr<MacroSegment> _segment = {};
 	int _depth = 0;
 
 	friend TempVariable;

lib/utils/ui-helpers.cpp

@@ -178,7 +178,7 @@ std::string GetThemeTypeName()
 #endif
 }
 
-void QeueUITask(void (*task)(void *param), void *param)
+void QueueUITask(void (*task)(void *param), void *param)
 {
 	obs_queue_task(OBS_TASK_UI, task, param, false);
 }

lib/utils/ui-helpers.hpp

@@ -35,7 +35,7 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
 EXPORT std::string GetThemeTypeName();
 EXPORT QWidget *GetSettingsWindow();
 
-void QeueUITask(void (*task)(void *param), void *param);
+EXPORT void QueueUITask(void (*task)(void *param), void *param);
 
 bool IsCursorInWidgetArea(QWidget *widget);
 

lib/variables/variable-tab.cpp

@@ -8,6 +8,9 @@
 #include "ui-helpers.hpp"
 #include "variable.hpp"
 
+#include <obs-frontend-api.h>
+
+#include <QLayout>
 #include <QTimer>
 
 namespace advss {
@@ -16,14 +19,62 @@ static bool registerTab();
 static void setupTab(QTabWidget *);
 static bool registerTabDone = registerTab();
 
-static VariableTable *tabWidget = nullptr;
+static VariableTable *dockWidget = nullptr;
+static bool addDock = false;
+
+static VariableTable::Settings tabSettings;
+static VariableTable::Settings dockSettings;
+
+static void save(obs_data_t *data)
+{
+	tabSettings.Save(data, "tabSettings");
+	dockSettings.Save(data, "dockSettings");
+	obs_data_set_bool(data, "addVariablesDock", addDock);
+}
+
+static void enableDock(bool enable)
+{
+	if (OBSIsShuttingDown()) {
+		return;
+	}
+
+	obs_frontend_remove_dock("advss-variable-dock");
+
+	addDock = enable;
+	if (!addDock) {
+		return;
+	}
+
+	dockWidget = new VariableTable(dockSettings);
+	dockWidget->HideDockOptions();
+	if (obs_frontend_add_dock_by_id(
+		    "advss-variable-dock",
+		    obs_module_text("AdvSceneSwitcher.variableTab.title"),
+		    dockWidget)) {
+		return;
+	}
+
+	blog(LOG_INFO, "failed to register variable dock!");
+	dockWidget->deleteLater();
+	dockWidget = nullptr;
+}
+
+static void load(obs_data_t *data)
+{
+	tabSettings.Load(data, "tabSettings");
+	dockSettings.Load(data, "dockSettings");
+
+	enableDock(obs_data_get_bool(data, "addVariablesDock"));
+}
 
 static bool registerTab()
 {
 	AddPluginInitStep([]() {
-		AddSetupTabCallback("variableTab", VariableTable::Create,
-				    setupTab);
+		AddSetupTabCallback("variableTab",
+				    VariableTable::CreateTabTable, setupTab);
 	});
+	AddSaveStep(save);
+	AddLoadStep(load);
 	return true;
 }
 
@@ -34,10 +85,14 @@ static void setTabVisible(QTabWidget *tabWidget, bool visible)
 		obs_module_text("AdvSceneSwitcher.variableTab.title"));
 }
 
-VariableTable *VariableTable::Create()
+VariableTable *VariableTable::CreateTabTable()
 {
-	tabWidget = new VariableTable();
-	return tabWidget;
+	return new VariableTable(tabSettings);
+}
+
+void VariableTable::HideDockOptions() const
+{
+	_addDock->hide();
 }
 
 void VariableTable::Add()
@@ -163,15 +218,14 @@ static void updateVariableStatus(QTableWidget *table)
 	}
 }
 
-static void openSettingsDialog()
+static void openSettingsDialog(VariableTable *table)
 {
-	auto selectedRows =
-		tabWidget->Table()->selectionModel()->selectedRows();
+	auto selectedRows = table->Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
 
-	auto cell = tabWidget->Table()->item(selectedRows.last().row(), 0);
+	auto cell = table->Table()->item(selectedRows.last().row(), 0);
 	if (!cell) {
 		return;
 	}
@@ -194,15 +248,14 @@ static void openSettingsDialog()
 
 void VariableTable::Remove()
 {
-	auto selectedRows =
-		tabWidget->Table()->selectionModel()->selectedRows();
+	auto selectedRows = Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
 
 	QStringList varNames;
 	for (const auto &row : selectedRows) {
-		auto cell = tabWidget->Table()->item(row.row(), 0);
+		auto cell = Table()->item(row.row(), 0);
 		if (!cell) {
 			continue;
 		}
@@ -235,7 +288,52 @@ void VariableTable::Remove()
 	}
 }
 
-VariableTable::VariableTable(QTabWidget *parent)
+void VariableTable::Filter()
+{
+	const auto itemMatches = [&](const QTableWidgetItem *item) {
+		if (!item) {
+			return false;
+		}
+
+		if (_settings.searchString.empty()) {
+			return true;
+		}
+
+		const auto text = item->text();
+
+		if (_settings.regex.Enabled()) {
+			return _settings.regex.Matches(text.toStdString(),
+						       _settings.searchString);
+		}
+
+		return text.contains(
+			QString::fromStdString(_settings.searchString),
+			Qt::CaseInsensitive);
+	};
+
+	for (int row = 0; row < Table()->rowCount(); ++row) {
+		bool match = false;
+
+		if (_settings.searchType == Settings::SearchType::ALL) {
+			for (int col = 0; col < Table()->columnCount(); ++col) {
+				if (itemMatches(Table()->item(row, col))) {
+					match = true;
+					break;
+				}
+			}
+		} else {
+			if (itemMatches(Table()->item(
+				    row,
+				    static_cast<int>(_settings.searchType)))) {
+				match = true;
+			}
+		}
+
+		Table()->setRowHidden(row, !match);
+	}
+}
+
+VariableTable::VariableTable(Settings &settings, QWidget *parent)
 	: ResourceTable(
 		  parent, obs_module_text("AdvSceneSwitcher.variableTab.help"),
 		  obs_module_text(
@@ -253,13 +351,113 @@ VariableTable::VariableTable(QTabWidget *parent)
 				     "AdvSceneSwitcher.variableTab.lastUsed.header")
 			  << obs_module_text(
 				     "AdvSceneSwitcher.variableTab.lastChanged.header"),
-		  openSettingsDialog)
+		  [this]() { openSettingsDialog(this); }),
+	  _searchField(new QLineEdit(this)),
+	  _clear(new QPushButton(this)),
+	  _searchType(new QComboBox(this)),
+	  _regexWidget(new RegexConfigWidget(this)),
+	  _addDock(new QCheckBox(
+		  obs_module_text("AdvSceneSwitcher.variableTab.addDock"))),
+	  _settings(settings)
 {
+	_clear->setMaximumWidth(22);
+	SetButtonIcon(_clear, GetThemeTypeName() == "Light"
+				      ? "theme:Light/close.svg"
+				      : "theme:Dark/close.svg");
+	_clear->setToolTip(
+		obs_module_text("AdvSceneSwitcher.variableTab.clear"));
+	_clear->setDisabled(_settings.searchString.empty());
+
+	connect(_clear, &QPushButton::clicked, this, [this]() {
+		_searchField->setText("");
+		_clear->setDisabled(true);
+	});
+
 	for (const auto &variable : GetVariables()) {
 		auto v = std::static_pointer_cast<Variable>(variable);
 		AddItemTableRow(Table(), getCellLabels(v.get()));
 	}
 
+	connect(Table(), &QTableWidget::itemChanged, this,
+		[this]() { Filter(); });
+
+	_searchField->setPlaceholderText(obs_module_text(
+		("AdvSceneSwitcher.variableTab.search.placeholder")));
+	_searchField->setText(QString::fromStdString(_settings.searchString));
+	connect(_searchField, &QLineEdit::textChanged, this,
+		[this](const QString &text) {
+			_settings.searchString = text.toStdString();
+			_clear->setDisabled(text.isEmpty());
+			Filter();
+		});
+
+	_searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.variableTab.search.all"),
+		Settings::SearchType::ALL);
+	_searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.variableTab.search.name"),
+		Settings::SearchType::NAME);
+	_searchType->addItem(
+		obs_module_text("AdvSceneSwitcher.variableTab.search.value"),
+		Settings::SearchType::VALUE);
+	_searchType->setCurrentIndex(
+		_searchType->findData(_settings.searchType));
+
+	connect(_searchType, &QComboBox::currentIndexChanged, this, [this]() {
+		_settings.searchType = static_cast<Settings::SearchType>(
+			_searchType->currentData().toInt());
+	});
+
+	_regexWidget->SetRegexConfig(_settings.regex);
+	connect(_regexWidget, &RegexConfigWidget::RegexConfigChanged, this,
+		[this](const RegexConfig &regex) {
+			_settings.regex = regex;
+			Filter();
+		});
+
+	_addDock->setChecked(addDock);
+	connect(_addDock, &QCheckBox::stateChanged, this,
+		[this](int checked) { enableDock(checked); });
+
+	QWidget::connect(VariableSignalManager::Instance(),
+			 &VariableSignalManager::Rename, this,
+			 [this](const QString &oldName,
+				const QString &newName) {
+				 RenameItemTableRow(Table(), oldName, newName);
+			 });
+	QWidget::connect(
+		VariableSignalManager::Instance(), &VariableSignalManager::Add,
+		this, [this](const QString &name) {
+			AddItemTableRow(
+				Table(),
+				getCellLabels(GetVariableByQString(name)));
+			SetHelpVisible(false);
+			HighlightAddButton(false);
+		});
+	QWidget::connect(VariableSignalManager::Instance(),
+			 &VariableSignalManager::Remove, this,
+			 [this](const QString &name) {
+				 RemoveItemTableRow(Table(), name);
+				 if (Table()->rowCount() == 0) {
+					 SetHelpVisible(true);
+					 HighlightAddButton(true);
+				 }
+			 });
+
+	auto timer = new QTimer(this);
+	timer->setInterval(1000);
+	QWidget::connect(timer, &QTimer::timeout,
+			 [this]() { updateVariableStatus(Table()); });
+	timer->start();
+
+	auto searchLayout = new QHBoxLayout();
+	searchLayout->addWidget(_searchField);
+	searchLayout->addWidget(_clear);
+	searchLayout->addWidget(_searchType);
+	searchLayout->addWidget(_regexWidget);
+	searchLayout->addWidget(_addDock);
+	qobject_cast<QVBoxLayout *>(layout())->insertLayout(0, searchLayout);
+
 	SetHelpVisible(GetVariables().empty());
 }
 
@@ -270,36 +468,26 @@ static void setupTab(QTabWidget *tab)
 	}
 
 	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Rename, tab,
-			 [](const QString &oldName, const QString &newName) {
-				 RenameItemTableRow(tabWidget->Table(), oldName,
-						    newName);
-			 });
-	QWidget::connect(
-		VariableSignalManager::Instance(), &VariableSignalManager::Add,
-		tab, [tab](const QString &name) {
-			AddItemTableRow(
-				tabWidget->Table(),
-				getCellLabels(GetVariableByQString(name)));
-			tabWidget->SetHelpVisible(false);
-			tabWidget->HighlightAddButton(false);
-			setTabVisible(tab, true);
-		});
-	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Remove, tab,
-			 [](const QString &name) {
-				 RemoveItemTableRow(tabWidget->Table(), name);
-				 if (tabWidget->Table()->rowCount() == 0) {
-					 tabWidget->SetHelpVisible(true);
-					 tabWidget->HighlightAddButton(true);
-				 }
-			 });
+			 &VariableSignalManager::Add, tab,
+			 [tab](const QString &) { setTabVisible(tab, true); });
+}
 
-	auto timer = new QTimer(tabWidget);
-	timer->setInterval(1000);
-	QWidget::connect(timer, &QTimer::timeout,
-			 []() { updateVariableStatus(tabWidget->Table()); });
-	timer->start();
+void VariableTable::Settings::Save(obs_data_t *data, const char *name)
+{
+	OBSDataAutoRelease settings = obs_data_create();
+	obs_data_set_int(settings, "searchType", static_cast<int>(searchType));
+	obs_data_set_string(settings, "searchString", searchString.c_str());
+	regex.Save(settings);
+	obs_data_set_obj(data, name, settings);
+}
+
+void VariableTable::Settings::Load(obs_data_t *data, const char *name)
+{
+	OBSDataAutoRelease settings = obs_data_get_obj(data, name);
+	searchType = static_cast<SearchType>(
+		obs_data_get_int(settings, "searchType"));
+	searchString = obs_data_get_string(settings, "searchString");
+	regex.Load(settings);
 }
 
 } // namespace advss

lib/variables/variable-tab.hpp

@@ -1,5 +1,8 @@
 #pragma once
 #include "resource-table.hpp"
+#include "regex-config.hpp"
+
+#include <QComboBox>
 
 namespace advss {
 
@@ -7,14 +10,34 @@ class VariableTable final : public ResourceTable {
 	Q_OBJECT
 
 public:
-	static VariableTable *Create();
+	struct Settings {
+		void Save(obs_data_t *data, const char *name);
+		void Load(obs_data_t *data, const char *name);
+
+		enum SearchType { ALL = -1, NAME = 0, VALUE = 1 };
+
+		SearchType searchType = SearchType::ALL;
+		std::string searchString;
+		RegexConfig regex;
+	};
+
+	VariableTable(Settings &settings, QWidget *parent = nullptr);
+	static VariableTable *CreateTabTable();
+	void HideDockOptions() const;
 
 private slots:
 	void Add();
 	void Remove();
+	void Filter();
 
 private:
-	VariableTable(QTabWidget *parent = nullptr);
+	QLineEdit *_searchField;
+	QPushButton *_clear;
+	QComboBox *_searchType;
+	RegexConfigWidget *_regexWidget;
+	QCheckBox *_addDock;
+
+	Settings &_settings;
 };
 
 } // namespace advss

lib/variables/variable.cpp

@@ -456,7 +456,7 @@ void ImportVariables(obs_data_t *data)
 
 	obs_data_array_release(array);
 
-	QeueUITask(signalImportedVariables, importedVars);
+	QueueUITask(signalImportedVariables, importedVars);
 }
 
 std::chrono::high_resolution_clock::time_point GetLastVariableChangeTime()

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-hotkey.cpp

@@ -601,10 +601,10 @@ static void populateHotkeyNames(QComboBox *list,
 MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 	QWidget *parent, std::shared_ptr<MacroActionHotkey> entryData)
 	: QWidget(parent),
-	  _actionType(new QComboBox()),
-	  _hotkeyType(new QComboBox()),
-	  _obsHotkeys(new QComboBox()),
-	  _keys(new QComboBox()),
+	  _actionType(new FilterComboBox()),
+	  _hotkeyType(new FilterComboBox()),
+	  _obsHotkeys(new FilterComboBox()),
+	  _keys(new FilterComboBox()),
 	  _leftShift(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.hotkey.leftShift"))),
 	  _rightShift(new QCheckBox(obs_module_text(

plugins/base/macro-action-hotkey.hpp

@@ -85,11 +85,14 @@ private slots:
 	void DurationChanged(const Duration &);
 	void OnlySendToOBSChanged(int state);
 
-protected:
-	QComboBox *_actionType;
-	QComboBox *_hotkeyType;
-	QComboBox *_obsHotkeys;
-	QComboBox *_keys;
+private:
+	void RepopulateOBSHotkeySelection();
+	void SetWidgetVisibility();
+
+	FilterComboBox *_actionType;
+	FilterComboBox *_hotkeyType;
+	FilterComboBox *_obsHotkeys;
+	FilterComboBox *_keys;
 	QCheckBox *_leftShift;
 	QCheckBox *_rightShift;
 	QCheckBox *_leftCtrl;
@@ -101,15 +104,10 @@ protected:
 	DurationSelection *_duration;
 	QCheckBox *_onlySendToOBS;
 	QLabel *_noKeyPressSimulationWarning;
-
-	std::shared_ptr<MacroActionHotkey> _entryData;
-
-private:
-	void RepopulateOBSHotkeySelection();
-	void SetWidgetVisibility();
-
 	QHBoxLayout *_entryLayout;
 	QHBoxLayout *_keyConfigLayout;
+
+	std::shared_ptr<MacroActionHotkey> _entryData;
 	bool _loading = true;
 };
 

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) {
@@ -137,31 +130,51 @@ bool MacroActionSwitchScene::WaitForTransition(OBSWeakSource &scene,
 bool MacroActionSwitchScene::PerformAction()
 {
 	OBSWeakSource sceneToSwitchTo;
-	OBSWeakCanvas canvas;
+	OBSWeakCanvas canvasToSwitchFor;
+
+	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+	OBSWeakCanvas mainCanvasWeak = OBSGetWeakRef(mainCanvas);
+
+	const auto getActiveSceneHelper = [this](const OBSWeakCanvas &canvas) {
+		OBSWeakSource activeScene;
+		if (IsMainCanvas(canvas) && _sceneType == SceneType::PREVIEW) {
+			OBSSourceAutoRelease previewSource =
+				obs_frontend_get_current_preview_scene();
+			return OBSGetWeakRef(previewSource);
+		} else {
+			return GetActiveCanvasScene(canvas);
+		}
+	};
 
 	switch (_action) {
 	case Action::SCENE_NAME:
 		sceneToSwitchTo = _scene.GetScene();
-		canvas = _scene.GetCanvas();
+		canvasToSwitchFor = _scene.GetCanvas();
 		break;
 	case Action::SCENE_LIST_NEXT: {
-		const auto activeScene = GetActiveCanvasScene(_canvas);
-		const int currentIndex = GetIndexOfScene(_canvas, activeScene);
-		sceneToSwitchTo = GetSceneAtIndex(_canvas, currentIndex + 1);
-		canvas = _canvas;
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
+		const auto activeScene =
+			getActiveSceneHelper(canvasToSwitchFor);
+		const int currentIndex =
+			GetIndexOfScene(canvasToSwitchFor, activeScene);
+		sceneToSwitchTo =
+			GetSceneAtIndex(canvasToSwitchFor, currentIndex + 1);
 		break;
 	}
 	case Action::SCENE_LIST_PREVIOUS: {
-		const auto activeScene = GetActiveCanvasScene(_canvas);
-		const int currentIndex = GetIndexOfScene(_canvas, activeScene);
-		sceneToSwitchTo = GetSceneAtIndex(_canvas, currentIndex - 1);
-		canvas = _canvas;
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
+		const auto activeScene =
+			getActiveSceneHelper(canvasToSwitchFor);
+		const int currentIndex =
+			GetIndexOfScene(canvasToSwitchFor, activeScene);
+		sceneToSwitchTo =
+			GetSceneAtIndex(canvasToSwitchFor, currentIndex - 1);
 		break;
 	}
 	case Action::SCENE_LIST_INDEX: {
-		sceneToSwitchTo =
-			GetSceneAtIndex(_canvas, _index.GetValue() - 1);
-		canvas = _canvas;
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
+		sceneToSwitchTo = GetSceneAtIndex(canvasToSwitchFor,
+						  _index.GetValue() - 1);
 		break;
 	}
 	default:
@@ -176,11 +189,12 @@ bool MacroActionSwitchScene::PerformAction()
 	}
 
 	auto transition = _transition.GetTransition();
-	SwitchScene({sceneToSwitchTo, transition,
-		     (int)(_duration.Milliseconds())},
-		    obs_frontend_preview_program_mode_active(), canvas);
+	SwitchScene(
+		{sceneToSwitchTo, transition, (int)(_duration.Milliseconds())},
+		obs_frontend_preview_program_mode_active(), canvasToSwitchFor);
 	if (_blockUntilTransitionDone && sceneToSwitchTo &&
-	    sceneToSwitchTo != GetCurrentScene() && IsMainCanvas(canvas)) {
+	    sceneToSwitchTo != GetCurrentScene() &&
+	    IsMainCanvas(canvasToSwitchFor)) {
 		return WaitForTransition(sceneToSwitchTo, transition);
 	}
 	return true;
@@ -392,6 +406,7 @@ void MacroActionSwitchSceneEdit::SetWidgetData() const
 	_sceneTypes->setCurrentIndex(_sceneTypes->findData(
 		static_cast<int>(_entryData->_sceneType)));
 	_scenes->SetScene(_entryData->_scene);
+	_canvas->SetCanvas(_entryData->_canvas);
 	_transitions->SetTransition(_entryData->_transition);
 	_duration->SetDuration(_entryData->_duration);
 	_blockUntilTransitionDone->setChecked(
@@ -431,7 +446,7 @@ void MacroActionSwitchSceneEdit::SceneSelectionCanvasChanged(
 	SetWidgetVisibility();
 }
 
-void MacroActionSwitchSceneEdit::ActionChanged(int value)
+void MacroActionSwitchSceneEdit::ActionChanged(int)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionSwitchScene::Action>(
@@ -481,7 +496,7 @@ shouldShowDurationInTransitionLayout(MacroActionSwitchScene::SceneType type,
 		return true;
 	}
 
-	if (isUsingFixedLengthTransition(transition.GetTransition())) {
+	if (IsFixedLengthTransition(transition.GetTransition())) {
 		return false;
 	}
 
@@ -561,9 +576,17 @@ void MacroActionSwitchSceneEdit::SetWidgetVisibility()
 		     {{"{{transitions}}", _transitions},
 		      {"{{duration}}", _duration}});
 
-	const auto canvas = action == MacroActionSwitchScene::Action::SCENE_NAME
-				    ? _entryData->_scene.GetCanvas()
-				    : _entryData->_canvas;
+	OBSWeakCanvas canvas;
+	if (action == MacroActionSwitchScene::Action::SCENE_NAME) {
+		canvas = _entryData->_scene.GetCanvas();
+	} else {
+		if (_entryData->_canvas) {
+			canvas = _entryData->_canvas;
+		} else {
+			OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
+			canvas = OBSGetWeakRef(mainCanvas);
+		}
+	}
 	const bool isMainCanvas = IsMainCanvas(canvas);
 	SetLayoutVisible(_transitionLayout, isMainCanvas);
 	_blockUntilTransitionDone->setVisible(isMainCanvas);
@@ -580,7 +603,7 @@ void MacroActionSwitchSceneEdit::SetWidgetVisibility()
 	_notSupportedWarning->setText(
 		fmt.arg(QString::fromStdString(GetWeakCanvasName(canvas))));
 	_notSupportedWarning->setVisible(
-		!IsMainCanvas(canvas) &&
+		!isMainCanvas &&
 		_entryData->_sceneType ==
 			MacroActionSwitchScene::SceneType::PREVIEW);
 

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-sequence.cpp

@@ -194,6 +194,7 @@ MacroActionSequenceEdit::MacroActionSequenceEdit(
 	  _resetIndex(new VariableSpinBox()),
 	  _layout(new QHBoxLayout())
 {
+	_macros->HideGroups();
 	populateActionSelection(_actions);
 
 	_resetIndex->setMinimum(1);

plugins/base/macro-action-source.cpp

@@ -7,6 +7,8 @@
 
 #include <obs-frontend-api.h>
 
+#include <QMainWindow>
+
 namespace advss {
 
 const std::string MacroActionSource::id = "source";
@@ -37,6 +39,12 @@ const static std::map<MacroActionSource::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.source.type.openFilterDialog"},
 	{MacroActionSource::Action::OPEN_PROPERTIES_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.openPropertiesDialog"},
+	{MacroActionSource::Action::CLOSE_INTERACTION_DIALOG,
+	 "AdvSceneSwitcher.action.source.type.closeInteractionDialog"},
+	{MacroActionSource::Action::CLOSE_FILTER_DIALOG,
+	 "AdvSceneSwitcher.action.source.type.closeFilterDialog"},
+	{MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG,
+	 "AdvSceneSwitcher.action.source.type.closePropertiesDialog"},
 };
 
 const static std::map<obs_deinterlace_mode, std::string> deinterlaceModes = {
@@ -108,9 +116,81 @@ static bool isInteractable(obs_source_t *source)
 	return (flags & OBS_SOURCE_INTERACTION) != 0;
 }
 
+static void closeSourceDialog(obs_source_t *source, bool accept,
+			      const char *className)
+{
+	if (!source) {
+		return;
+	}
+
+	auto mainWindow =
+		reinterpret_cast<QMainWindow *>(obs_frontend_get_main_window());
+	if (!mainWindow) {
+		return;
+	}
+
+	for (const auto widget : mainWindow->children()) {
+		auto dialog = qobject_cast<QDialog *>(widget);
+		if (!dialog) {
+			continue;
+		}
+
+		if (dialog->metaObject()->className() != QString(className)) {
+			continue;
+		}
+
+		const char *name = obs_source_get_name(source);
+		if (!name) {
+			continue;
+		}
+
+		if (!dialog->windowTitle().contains(QString(name))) {
+			continue;
+		}
+
+		if (accept) {
+			dialog->accept();
+			return;
+		}
+
+		// dialog->reject() will ask for confirmation
+		// Try to avoid this by finding and pressing the cancel button
+		for (const auto widget : dialog->children()) {
+			auto buttons = qobject_cast<QDialogButtonBox *>(widget);
+			if (!buttons) {
+				continue;
+			}
+
+			for (auto *button : buttons->buttons()) {
+				if (buttons->buttonRole(button) ==
+				    QDialogButtonBox::RejectRole) {
+					button->click();
+					break;
+				}
+			}
+		}
+	}
+}
+
+template<typename F> void QueueUITaskLambda(F &&func)
+{
+	using FnType = std::decay_t<F>;
+	auto *heapFunc = new FnType(std::forward<F>(func));
+
+	QueueUITask(
+		[](void *param) {
+			std::unique_ptr<FnType> fn(
+				static_cast<FnType *>(param));
+			(*fn)();
+		},
+		heapFunc);
+}
+
 bool MacroActionSource::PerformAction()
 {
-	auto s = obs_weak_source_get_source(_source.GetSource());
+	OBSSource s = obs_weak_source_get_source(_source.GetSource());
+	obs_source_release(s);
+
 	switch (_action) {
 	case Action::ENABLE:
 		obs_source_set_enabled(s, true);
@@ -172,10 +252,31 @@ bool MacroActionSource::PerformAction()
 	case Action::OPEN_PROPERTIES_DIALOG:
 		obs_frontend_open_source_properties(s);
 		break;
+	case Action::CLOSE_INTERACTION_DIALOG:
+		if (!isInteractable(s)) {
+			// Nothing to do
+			break;
+		}
+
+		QueueUITaskLambda([&]() {
+			closeSourceDialog(s, true, "OBSBasicInteraction");
+		});
+		break;
+	case Action::CLOSE_FILTER_DIALOG:
+		QueueUITaskLambda([&]() {
+			closeSourceDialog(s, _acceptDialog, "OBSBasicFilters");
+		});
+		break;
+	case Action::CLOSE_PROPERTIES_DIALOG:
+		QueueUITaskLambda([&]() {
+			closeSourceDialog(s, _acceptDialog,
+					  "OBSBasicProperties");
+		});
+		break;
 	default:
 		break;
 	}
-	obs_source_release(s);
+
 	return true;
 }
 
@@ -207,6 +308,7 @@ bool MacroActionSource::Save(obs_data_t *obj) const
 			 static_cast<int>(_deinterlaceMode));
 	obs_data_set_int(obj, "deinterlaceOrder",
 			 static_cast<int>(_deinterlaceOrder));
+	obs_data_set_bool(obj, "acceptDialog", _acceptDialog);
 	return true;
 }
 
@@ -231,6 +333,7 @@ bool MacroActionSource::Load(obs_data_t *obj)
 		obs_data_get_int(obj, "deinterlaceMode"));
 	_deinterlaceOrder = static_cast<obs_deinterlace_field_order>(
 		obs_data_get_int(obj, "deinterlaceOrder"));
+	_acceptDialog = obs_data_get_bool(obj, "acceptDialog");
 	return true;
 }
 
@@ -307,7 +410,9 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	  _warning(new QLabel(
 		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
 	  _refreshSettingSelection(new QPushButton(
-		  obs_module_text("AdvSceneSwitcher.action.source.refresh")))
+		  obs_module_text("AdvSceneSwitcher.action.source.refresh"))),
+	  _acceptDialog(new QCheckBox(obs_module_text(
+		  "AdvSceneSwitcher.action.source.dialog.accept")))
 {
 	populateActionSelection(_actions);
 
@@ -347,6 +452,8 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 SLOT(SelectionChanged(const SourceSetting &)));
 	QWidget::connect(_refreshSettingSelection, SIGNAL(clicked()), this,
 			 SLOT(RefreshVariableSourceSelectionValue()));
+	QWidget::connect(_acceptDialog, SIGNAL(stateChanged(int)), this,
+			 SLOT(AcceptDialogChanged(int)));
 
 	auto entryLayout = new QHBoxLayout;
 	entryLayout->setContentsMargins(0, 0, 0, 0);
@@ -374,6 +481,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	mainLayout->addLayout(_settingsLayout);
 	mainLayout->addWidget(_warning);
 	mainLayout->addWidget(_settingsString);
+	mainLayout->addWidget(_acceptDialog);
 	auto buttonLayout = new QHBoxLayout;
 	buttonLayout->setContentsMargins(0, 0, 0, 0);
 	buttonLayout->addWidget(_getSettings);
@@ -406,6 +514,7 @@ void MacroActionSourceEdit::UpdateEntryData()
 		static_cast<int>(_entryData->_settingsInputMethod)));
 	_tempVars->SetVariable(_entryData->_tempVar);
 	_manualSettingValue->setPlainText(_entryData->_manualSettingValue);
+	_acceptDialog->setChecked(_entryData->_acceptDialog);
 
 	SetWidgetVisibility();
 }
@@ -531,6 +640,12 @@ void MacroActionSourceEdit::RefreshVariableSourceSelectionValue()
 	_sourceSettings->SetSource(_entryData->_source.GetSource());
 }
 
+void MacroActionSourceEdit::AcceptDialogChanged(int state)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_acceptDialog = state;
+}
+
 static QString GetIndividualListEntryName()
 {
 	static const auto matchesInput =
@@ -613,6 +728,12 @@ void MacroActionSourceEdit::SetWidgetVisibility()
 		_entryData->_source.GetType() ==
 			SourceSelection::Type::VARIABLE);
 
+	_acceptDialog->setVisible(
+		_entryData->_action ==
+			MacroActionSource::Action::CLOSE_FILTER_DIALOG ||
+		_entryData->_action ==
+			MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG);
+
 	adjustSize();
 	updateGeometry();
 }

plugins/base/macro-action-source.hpp

@@ -5,9 +5,10 @@
 #include "source-selection.hpp"
 #include "source-setting.hpp"
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QLabel>
 #include <QPushButton>
-#include <QComboBox>
 
 namespace advss {
 
@@ -33,6 +34,7 @@ public:
 		OBS_DEINTERLACE_FIELD_ORDER_TOP;
 	TempVariableRef _tempVar;
 	SourceSetting _setting;
+	bool _acceptDialog = false;
 
 	enum class Action {
 		ENABLE,
@@ -45,6 +47,9 @@ public:
 		OPEN_INTERACTION_DIALOG,
 		OPEN_FILTER_DIALOG,
 		OPEN_PROPERTIES_DIALOG,
+		CLOSE_INTERACTION_DIALOG,
+		CLOSE_FILTER_DIALOG,
+		CLOSE_PROPERTIES_DIALOG,
 	};
 	Action _action = Action::SETTINGS;
 
@@ -91,6 +96,7 @@ private slots:
 	void SelectionChanged(const SourceSetting &);
 	void ManualSettingsValueChanged();
 	void RefreshVariableSourceSelectionValue();
+	void AcceptDialogChanged(int);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -112,6 +118,7 @@ private:
 	QComboBox *_deinterlaceOrder;
 	QLabel *_warning;
 	QPushButton *_refreshSettingSelection;
+	QCheckBox *_acceptDialog;
 
 	std::shared_ptr<MacroActionSource> _entryData;
 	bool _loading = true;

plugins/base/macro-action-timer.cpp

@@ -31,15 +31,16 @@ bool MacroActionTimer::PerformAction()
 	if (!macro) {
 		return true;
 	}
-	auto conditions = *GetMacroConditions(macro.get());
-	for (auto condition : conditions) {
+
+	const auto updateCondition = [this](MacroCondition *condition) {
 		if (condition->GetId() != id) {
-			continue;
+			return;
 		}
+
 		auto timerCondition =
-			dynamic_cast<MacroConditionTimer *>(condition.get());
+			dynamic_cast<MacroConditionTimer *>(condition);
 		if (!timerCondition) {
-			continue;
+			return;
 		}
 
 		switch (_actionType) {
@@ -59,6 +60,23 @@ bool MacroActionTimer::PerformAction()
 		default:
 			break;
 		}
+	};
+
+	const auto updateMacro = [&](Macro *macro) {
+		auto conditions = *GetMacroConditions(macro);
+		for (auto condition : conditions) {
+			updateCondition(condition.get());
+		}
+	};
+
+	if (!IsGroupMacro(macro.get())) {
+		updateMacro(macro.get());
+		return true;
+	}
+
+	auto macros = GetGroupMacroEntries(macro.get());
+	for (const auto &macro : macros) {
+		updateMacro(macro.get());
 	}
 	return true;
 }
@@ -131,7 +149,7 @@ void MacroActionTimer::ResolveVariablesToFixedValues()
 	_duration.ResolveVariables();
 }
 
-static inline void populateTypeSelection(QComboBox *list)
+static void populateTypeSelection(QComboBox *list)
 {
 	for (const auto &[_, name] : timerActions) {
 		list->addItem(obs_module_text(name.c_str()));
@@ -140,12 +158,11 @@ static inline void populateTypeSelection(QComboBox *list)
 
 MacroActionTimerEdit::MacroActionTimerEdit(
 	QWidget *parent, std::shared_ptr<MacroActionTimer> entryData)
-	: QWidget(parent)
+	: QWidget(parent),
+	  _macros(new MacroSelection(parent)),
+	  _duration(new DurationSelection(this)),
+	  _timerAction(new QComboBox(this))
 {
-	_macros = new MacroSelection(parent);
-	_duration = new DurationSelection();
-	_timerAction = new QComboBox();
-
 	populateTypeSelection(_timerAction);
 
 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
@@ -155,15 +172,13 @@ MacroActionTimerEdit::MacroActionTimerEdit(
 	QWidget::connect(_timerAction, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionTypeChanged(int)));
 
-	_mainLayout = new QHBoxLayout;
-	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
-		{"{{macros}}", _macros},
-		{"{{duration}}", _duration},
-		{"{{timerAction}}", _timerAction},
-	};
+	auto layout = new QHBoxLayout;
 	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.timer.entry"),
-		     _mainLayout, widgetPlaceholders);
-	setLayout(_mainLayout);
+		     layout,
+		     {{"{{macros}}", _macros},
+		      {"{{duration}}", _duration},
+		      {"{{timerAction}}", _timerAction}});
+	setLayout(layout);
 
 	_entryData = entryData;
 	UpdateEntryData();

plugins/base/macro-action-timer.hpp

@@ -58,16 +58,14 @@ private slots:
 signals:
 	void HeaderInfoChanged(const QString &);
 
-protected:
+private:
 	void SetWidgetVisibility();
 
 	MacroSelection *_macros;
 	DurationSelection *_duration;
 	QComboBox *_timerAction;
-	std::shared_ptr<MacroActionTimer> _entryData;
 
-private:
-	QHBoxLayout *_mainLayout;
+	std::shared_ptr<MacroActionTimer> _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-process.cpp

@@ -154,7 +154,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
 		QString::fromStdString(_entryData->GetShortDesc()));
 }
 
-void MacroConditionProcessEdit::showEvent(QShowEvent *event)
+void MacroConditionProcessEdit::showEvent(QShowEvent *)
 {
 	const QSignalBlocker b(_processSelection);
 	const auto text = _processSelection->currentText();

plugins/base/macro-condition-recording.cpp

@@ -31,6 +31,10 @@ static int currentRecordingDurationInSeconds = 0;
 
 bool MacroConditionRecord::CheckCondition()
 {
+	char *lastSavePath = obs_frontend_get_last_recording();
+	SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
+	bfree(lastSavePath);
+
 	switch (_condition) {
 	case Condition::STOP:
 		return !obs_frontend_recording_active();
@@ -74,6 +78,14 @@ void MacroConditionRecord::SetCondition(Condition condition)
 void MacroConditionRecord::SetupTempVars()
 {
 	MacroCondition::SetupTempVars();
+
+	AddTempvar(
+		"lastSavePath",
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.recording.lastSavePath"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.recording.lastSavePath.description"));
+
 	switch (_condition) {
 	case Condition::DURATION:
 		AddTempvar(

plugins/base/macro-condition-replay-buffer.cpp

@@ -58,6 +58,10 @@ bool MacroConditionReplayBuffer::ReplayBufferWasSaved()
 
 bool MacroConditionReplayBuffer::CheckCondition()
 {
+	char *lastSavePath = obs_frontend_get_last_replay();
+	SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
+	bfree(lastSavePath);
+
 	switch (_state) {
 	case Condition::STOP:
 		return !obs_frontend_replay_buffer_active();
@@ -85,6 +89,16 @@ bool MacroConditionReplayBuffer::Load(obs_data_t *obj)
 	return true;
 }
 
+void MacroConditionReplayBuffer::SetupTempVars()
+{
+	MacroCondition::SetupTempVars();
+	AddTempvar(
+		"lastSavePath",
+		obs_module_text("AdvSceneSwitcher.tempVar.replay.lastSavePath"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.replay.lastSavePath.description"));
+}
+
 static inline void populateStateSelection(QComboBox *list)
 {
 	for (const auto &entry : conditions) {

plugins/base/macro-condition-replay-buffer.hpp

@@ -6,7 +6,7 @@
 
 namespace advss {
 
-class MacroConditionReplayBuffer : public MacroCondition {
+class MacroConditionReplayBuffer final : public MacroCondition {
 public:
 	MacroConditionReplayBuffer(Macro *m) : MacroCondition(m) {}
 	bool CheckCondition();
@@ -27,6 +27,7 @@ public:
 	Condition _state = Condition::STOP;
 
 private:
+	void SetupTempVars();
 	bool ReplayBufferWasSaved();
 
 	bool _saveTimeInitialized = false;
@@ -35,7 +36,7 @@ private:
 	static const std::string id;
 };
 
-class MacroConditionReplayBufferEdit : public QWidget {
+class MacroConditionReplayBufferEdit final : public QWidget {
 	Q_OBJECT
 
 public:
@@ -55,11 +56,10 @@ public:
 private slots:
 	void StateChanged(int value);
 
-protected:
-	QComboBox *_state;
-	std::shared_ptr<MacroConditionReplayBuffer> _entryData;
-
 private:
+	QComboBox *_state;
+
+	std::shared_ptr<MacroConditionReplayBuffer> _entryData;
 	bool _loading = true;
 };
 

plugins/base/macro-condition-slideshow.cpp

@@ -252,6 +252,7 @@ MacroConditionSlideshowEdit::MacroConditionSlideshowEdit(
 	setToolTip(obs_module_text(
 		"AdvSceneSwitcher.condition.slideshow.updateInterval.tooltip"));
 	_index->setMinimum(1);
+	_index->setMaximum(9999);
 	populateConditionSelection(_conditions);
 
 	QWidget::connect(_conditions, SIGNAL(currentIndexChanged(int)), this,

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/hotkey-helpers.hpp

@@ -10,7 +10,7 @@ namespace advss {
 enum class HotkeyType;
 
 bool CanSimulateKeyPresses();
-void PressKeys(const std::vector<HotkeyType> keys, int duration);
+void PressKeys(const std::vector<HotkeyType> &keys, int duration);
 
 class Hotkey {
 public:

plugins/base/utils/linux/linux.cpp

@@ -188,7 +188,7 @@ static const std::unordered_map<HotkeyType, long> keyTable = {
 	{HotkeyType::Key_NumpadEnter, XK_KP_Enter},
 };
 
-void PressKeys(const std::vector<HotkeyType> keys, int duration)
+void PressKeys(const std::vector<HotkeyType> &keys, int duration)
 {
 	if (!canSimulateKeyPresses) {
 		return;

plugins/base/utils/osx/osx.mm

@@ -9,7 +9,7 @@ bool CanSimulateKeyPresses()
 	return canSimulateKeyPresses;
 }
 
-void PressKeys(const std::vector<HotkeyType> keys, int duration)
+void PressKeys(const std::vector<HotkeyType> &, int)
 {
 	// Not supported on MacOS
 	return;