Add MIDI device name check

.github/scripts/.Aptfile

@@ -9,5 +9,4 @@ package 'libxtst-dev'
 package 'libxss-dev'
 package 'libopencv-dev'
 package 'libtesseract-dev'
-package 'libprocps-dev'
-package 'libusb-1.0-0-dev'
+package 'libprocps-dev'

.github/scripts/.Brewfile

@@ -3,4 +3,3 @@ brew "coreutils"
 brew "cmake"
 brew "jq"
 brew "xcbeautify"
-brew "automake"

.github/scripts/.Wingetfile

@@ -1,4 +1,3 @@
 package 'cmake', path: 'Cmake\bin', bin: 'cmake'
 package 'innosetup', path: 'Inno Setup 6', bin: 'iscc'
-package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
-package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'
+package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'

.github/scripts/.build-deps.zsh

@@ -380,7 +380,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         pushd ${advss_dep_path}
         log_info "Prepare openssl ..."
         rm -rf openssl
-        git clone https://github.com/openssl/openssl.git --branch openssl-3.1.2 --depth 1
+        git clone git://git.openssl.org/openssl.git --branch openssl-3.1.2 --depth 1
         mv openssl openssl_x86
         cp -r openssl_x86 openssl_arm
 
@@ -405,55 +405,6 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         log_info "Clean up openssl dir..."
         mv openssl_x86 openssl
         rm -rf openssl_arm
-        popd
-
-        pushd ${project_root}/deps/libusb
-        log_info "Prepare libusb ..."
-
-        log_info "Building libusb x86 (deps) ..."
-        export MACOSX_DEPLOYMENT_TARGET=10.9
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./autogen.sh
-        ./configure --host=x86_64-apple-darwin --prefix=${advss_dep_path}
-        make && make install
-
-        log_info "Building libusb x86 ..."
-        make clean
-        rm -r ${project_root}/deps/libusb/out_x86
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_x86
-        make && make install
-
-        log_info "Building libusb arm ..."
-        make clean
-        export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        export CC=$(xcrun --sdk macosx --find clang)
-        export CXX=$(xcrun --sdk macosx --find clang++)
-        export CFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export CXXFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export LDFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-        mkdir ${project_root}/deps/libusb/out_arm
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_arm
-        make && make install
-
-        log_info "Combine arm and x86 libusb binaries ..."
-        lipo -create ${project_root}/deps/libusb/out_x86/lib/libusb-1.0.0.dylib \
-          ${project_root}/deps/libusb/out_arm/lib/libusb-1.0.0.dylib \
-          -output ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib
-        mv ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        install_name_tool -id @rpath/libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        log_info "Clean up libusb ..."
-
-        unset SDKROOT
-        unset CC
-        unset CXX
-        unset CFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MACOSX_DEPLOYMENT_TARGET
-
-        popd
       ;;
     linux)
       # Nothing to do for now

.github/scripts/Build-Deps-Windows.ps1

@@ -199,26 +199,6 @@ function Build {
 
     Log-Information "Install tesseract..."
     Invoke-External cmake --install "${TesseractBuildPath}" --prefix "${ADVSSDepPath}" @TesseractCmakeArgs
-
-    Push-Location -Stack BuildLibusbTemp
-    Ensure-Location $ProjectRoot
-
-    $LibusbPath = "${ProjectRoot}/deps/libusb"
-
-    Log-Information "Building libusb..."
-    $msbuildExe = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1
-
-    if ($msbuildExe) {
-        Invoke-External $msbuildExe "${LibusbPath}/msvc/libusb.sln" /property:Configuration=Release /property:Platform=x64
-
-        $libusbBuildResultDirectory = "${LibusbPath}/build/v143/x64/Release"
-        if (-not (Test-Path -Path $libusbBuildResultDirectory)) {
-            $libusbBuildResultDirectory = "${LibusbPath}/x64/Release/dll"
-        }
-        Copy-Item -Path "${libusbBuildResultDirectory}/*" -Destination ${ADVSSDepPath} -Recurse -Force
-    } else {
-        Log-Information "Failed to locate msbuild.exe - skipping libusb build"
-    }
 }
 
 Build

.gitmodules

@@ -25,6 +25,3 @@
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json.git
-[submodule "deps/libusb"]
-	path = deps/libusb
-	url = https://github.com/libusb/libusb.git

CMakeLists.txt

@@ -120,16 +120,14 @@ target_sources(
           lib/macro/macro-export-import-dialog.hpp
           lib/macro/macro-helpers.cpp
           lib/macro/macro-helpers.hpp
-          lib/macro/macro-input.cpp
-          lib/macro/macro-input.hpp
           lib/macro/macro-list.cpp
           lib/macro/macro-list.hpp
+          lib/macro/macro-properties.cpp
+          lib/macro/macro-properties.hpp
           lib/macro/macro-ref.cpp
           lib/macro/macro-ref.hpp
           lib/macro/macro-run-button.cpp
           lib/macro/macro-run-button.hpp
-          lib/macro/macro-segment-copy-paste.cpp
-          lib/macro/macro-segment-copy-paste.hpp
           lib/macro/macro-segment-list.cpp
           lib/macro/macro-segment-list.hpp
           lib/macro/macro-segment-selection.cpp
@@ -138,8 +136,6 @@ target_sources(
           lib/macro/macro-segment.hpp
           lib/macro/macro-selection.cpp
           lib/macro/macro-selection.hpp
-          lib/macro/macro-settings.cpp
-          lib/macro/macro-settings.hpp
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
           lib/macro/macro-tree.hpp
@@ -157,8 +153,6 @@ target_sources(
           lib/utils/backup.hpp
           lib/utils/curl-helper.cpp
           lib/utils/curl-helper.hpp
-          lib/utils/cursor-shape-changer.cpp
-          lib/utils/cursor-shape-changer.hpp
           lib/utils/double-slider.cpp
           lib/utils/double-slider.hpp
           lib/utils/duration-control.cpp
@@ -170,16 +164,10 @@ target_sources(
           lib/utils/file-selection.hpp
           lib/utils/filter-combo-box.cpp
           lib/utils/filter-combo-box.hpp
-          lib/utils/help-icon.hpp
-          lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
           lib/utils/item-selection-helpers.hpp
           lib/utils/layout-helpers.cpp
           lib/utils/layout-helpers.hpp
-          lib/utils/list-controls.cpp
-          lib/utils/list-controls.hpp
-          lib/utils/list-editor.cpp
-          lib/utils/list-editor.hpp
           lib/utils/log-helper.cpp
           lib/utils/log-helper.hpp
           lib/utils/math-helpers.cpp
@@ -231,8 +219,6 @@ target_sources(
           lib/utils/splitter-helpers.hpp
           lib/utils/status-control.cpp
           lib/utils/status-control.hpp
-          lib/utils/string-list.cpp
-          lib/utils/string-list.hpp
           lib/utils/switch-button.cpp
           lib/utils/switch-button.hpp
           lib/utils/sync-helpers.cpp
@@ -349,9 +335,6 @@ if(OS_WINDOWS)
   if(MSVC)
     target_compile_options(${LIB_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267
                                               /bigobj)
-
-    # Workaround for MSVC incompatibility in CI environment
-    add_compile_definitions(${target_name} _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
   endif()
   target_sources(${LIB_NAME} PRIVATE lib/win/advanced-scene-switcher-win.cpp)
   add_definitions(-D_WEBSOCKETPP_CPP11_STL_)

build-aux/CI/check-locale.py

@@ -12,13 +12,11 @@ class localeEntry:
     locale = ""
     widgetPlaceholders = []
     qStringArgs = []
-    lineNum = -1
 
-    def __init__(self, locale, widgetPlaceholders, qStringArgs, lineNum) -> None:
+    def __init__(self, locale, widgetPlaceholders, qStringArgs) -> None:
         self.locale = locale
         self.widgetPlaceholders = widgetPlaceholders
         self.qStringArgs = qStringArgs
-        self.lineNum = lineNum
 
 
 def getNonDefaultLocales(dir):
@@ -34,7 +32,7 @@ def getNonDefaultLocales(dir):
 def getAllLocaleEntries(file):
     localeEntries = []
     with open(file, "r", encoding="UTF-8") as f:
-        for lineNum, line in enumerate(f):
+        for line in f.readlines():
             widgetPlaceholders = []
             qStringArgs = []
 
@@ -51,9 +49,7 @@ def getAllLocaleEntries(file):
                 qStringArgs.append(match.group(0))
 
             localeEntries.append(
-                localeEntry(
-                    line.split("=")[0], widgetPlaceholders, qStringArgs, lineNum + 1
-                )
+                localeEntry(line.split("=")[0], widgetPlaceholders, qStringArgs)
             )
 
     return localeEntries
@@ -77,8 +73,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
         if expectedLocaleEntry is None:
             result = False
             print(
-                'ERROR: Locale entry "{}" from "{}:{}" not found in "{}"'.format(
-                    localeEntry.locale, file, localeEntry.lineNum, defaultLocaleFile
+                'ERROR: Locale entry "{}" from "{}" not found in "{}"'.format(
+                    localeEntry.locale, file, defaultLocaleFile
                 )
             )
             continue
@@ -87,13 +83,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if placeholder not in expectedLocaleEntry.widgetPlaceholders:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" widget placeholder while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        placeholder,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" widget placeholder while "{}" does not'.format(
+                        localeEntry.locale, file, placeholder, defaultLocaleFile
                     )
                 )
 
@@ -101,8 +92,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if placeholder not in localeEntry.widgetPlaceholders:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" widget placeholder'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, placeholder
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" widget placeholder'.format(
+                        localeEntry.locale, file, placeholder
                     )
                 )
 
@@ -110,13 +101,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if arg not in expectedLocaleEntry.qStringArgs:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" QString arg while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        arg,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" QString arg while "{}" does not'.format(
+                        localeEntry.locale, file, arg, defaultLocaleFile
                     )
                 )
 
@@ -124,8 +110,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if arg not in localeEntry.qStringArgs:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" QString arg'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, arg
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" QString arg'.format(
+                        localeEntry.locale, file, arg
                     )
                 )
 

cmake/common/advss_helpers.cmake

@@ -60,36 +60,10 @@ if(OS_MACOS)
       ${dep}_Development)
   endfunction()
 
-  function(install_advss_plugin_dependency_file target dep)
-    get_filename_component(_FILENAME ${dep} NAME)
-    string(REGEX REPLACE "\\.[^.]*$" "" _FILENAMENOEXT ${_FILENAME})
-    set(_DEP_NAME "${target}-${_FILENAMENOEXT}")
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      NAMELINK_COMPONENT ${_DEP_NAME}_Development)
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL)
-
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND
-        "${CMAKE_COMMAND}" --install ${CMAKE_CURRENT_BINARY_DIR} --config
-        $<CONFIG> --prefix ${CMAKE_INSTALL_PREFIX} --component obs_${_DEP_NAME}
-      COMMENT "Installing ${_DEP_NAME} to OBS rundir\n"
-      VERBATIM)
+  function(install_advss_plugin_dependency_file ${target} dep)
+    target_sources(advanced-scene-switcher PRIVATE ${dep})
+    set_source_files_properties(${dep} PROPERTIES MACOSX_PACKAGE_LOCATION
+                                                  ${ADVSS_BUNDLE_PLUGIN_DIR})
   endfunction()
 
   # --- End of section ---

data/locale/de-DE.ini

@@ -427,6 +427,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Warnung: Ein zu häufiges Speichern kan
 AdvSceneSwitcher.action.replay.type.stop="Replay Buffer stoppen"
 AdvSceneSwitcher.action.replay.type.start="Replay Buffer starten"
 AdvSceneSwitcher.action.replay.type.save="Replay Buffer speichern"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Stream"
 AdvSceneSwitcher.action.streaming.type.stop="Stream stoppen"
 AdvSceneSwitcher.action.streaming.type.start="Stream starten"
@@ -468,6 +469,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Nicht mehr pausieren"
 AdvSceneSwitcher.action.macro.type.resetCounter="Zähler zurücksetzen"
 AdvSceneSwitcher.action.macro.type.run="Aktionen ausführen"
 AdvSceneSwitcher.action.macro.type.stop="Aktionen stoppen"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin-Status"
 AdvSceneSwitcher.action.pluginState.type.stop="Erweiterten Automatischen Szenenwechsler stoppen"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Ändern des Nichtübereinstimmungsverhaltens:"

data/locale/en-US.ini

@@ -99,8 +99,8 @@ AdvSceneSwitcher.actionQueueTab.isRunning.header="Is running"
 AdvSceneSwitcher.actionQueueTab.runOnStartup.header="Run on startup"
 AdvSceneSwitcher.actionQueueTab.yes="Yes"
 AdvSceneSwitcher.actionQueueTab.no="No"
-AdvSceneSwitcher.actionQueueTab.removeSingleQueuePopup.text="Are you sure you want to remove \"%1\"?"
-AdvSceneSwitcher.actionQueueTab.removeMultipleQueuesPopup.text="Are you sure you want to remove %1 action queues?"
+AdvSceneSwitcher.actionQueueTab.removeSingleConnectionPopup.text="Are you sure you want to remove \"%1\"?"
+AdvSceneSwitcher.actionQueueTab.removeMultipleConnectionsPopup.text="Are you sure you want to remove %1 action queues?"
 
 ; Websocket Connections Tab
 AdvSceneSwitcher.websocketConnectionTab.title="Websocket Connections"
@@ -177,15 +177,9 @@ AdvSceneSwitcher.macroTab.minimize="Minimize"
 AdvSceneSwitcher.macroTab.segment.useCustomLabel="Use custom label"
 AdvSceneSwitcher.macroTab.segment.defaultCustomLabel="My label"
 AdvSceneSwitcher.macroTab.segment.setCustomLabel="Set label ..."
-AdvSceneSwitcher.macroTab.segment.copy="Copy"
-AdvSceneSwitcher.macroTab.segment.paste="Paste"
 AdvSceneSwitcher.macroTab.highlightSettings="Visual settings"
 AdvSceneSwitcher.macroTab.hotkeySettings="Hotkey settings"
 AdvSceneSwitcher.macroTab.generalSettings="General settings"
-AdvSceneSwitcher.macroTab.inputSettings="Input settings"
-AdvSceneSwitcher.macroTab.inputSettings.description="This section will allow you to specify variables, which will be treated as input parameters for the selected macro.\nWhen executing the macro using the \"Macro\" action type, you will have the option to set the values for those variables."
-AdvSceneSwitcher.macroTab.inputSettings.invalid="<Invalid selection>"
-AdvSceneSwitcher.macroTab.inputSettings.noInputs="No inputs are defined for the selected macro!\nOpen the settings of the macro to define inputs.\nThe settings button is highlighted above."
 AdvSceneSwitcher.macroTab.dockSettings="Dock settings"
 AdvSceneSwitcher.macroTab.highlightExecutedMacros="Highlight recently executed macros"
 AdvSceneSwitcher.macroTab.highlightTrueConditions="Highlight conditions of currently selected macro that evaluated to true recently"
@@ -230,7 +224,7 @@ AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton="Move selected action to t
 AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton="Move selected action up in the else section"
 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.tooltip.openMacroPropertiesButton="Open macro properties"
 
 AdvSceneSwitcher.macroDock.pause="Pause"
 AdvSceneSwitcher.macroDock.unpause="Unpause"
@@ -457,16 +451,11 @@ AdvSceneSwitcher.condition.source.type.settingsMatch="Settings match"
 AdvSceneSwitcher.condition.source.type.settingsChanged="Settings changed"
 AdvSceneSwitcher.condition.source.type.individualSettingMatches="Setting value matches"
 AdvSceneSwitcher.condition.source.type.individualSettingChanged="Setting value changed"
-AdvSceneSwitcher.condition.source.type.width="Width"
-AdvSceneSwitcher.condition.source.type.height="Height"
-AdvSceneSwitcher.condition.source.sizeCompare.less="Smaller than"
-AdvSceneSwitcher.condition.source.sizeCompare.equal="Equals"
-AdvSceneSwitcher.condition.source.sizeCompare.more="Bigger than"
 AdvSceneSwitcher.condition.source.refresh="Refresh"
 AdvSceneSwitcher.condition.source.refreshTooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
 AdvSceneSwitcher.condition.source.sceneVisibilityHint="Scene specific visibility can be checked using the \"Scene item visibility\" condition"
 AdvSceneSwitcher.condition.source.getSettings="Get current settings"
-AdvSceneSwitcher.condition.source.entry.line1="{{sources}}{{conditions}}{{settingSelection}}{{refresh}}{{sizeCompareMethods}}{{size}}"
+AdvSceneSwitcher.condition.source.entry.line1="{{sources}}{{conditions}}{{settingSelection}}{{refresh}}"
 AdvSceneSwitcher.condition.source.entry.line2="{{settings}}"
 AdvSceneSwitcher.condition.source.entry.line3="{{regex}}{{getSettings}}"
 AdvSceneSwitcher.condition.virtualCamera="Virtual camera"
@@ -603,7 +592,15 @@ AdvSceneSwitcher.condition.run="Run"
 AdvSceneSwitcher.condition.run.entry="Process exits before timeout of{{timeout}}seconds"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}Check for exit code{{exitCode}}"
 AdvSceneSwitcher.condition.midi="MIDI"
+<<<<<<< HEAD
 AdvSceneSwitcher.condition.midi.entry="Message was received from{{device}}which matches:"
+=======
+AdvSceneSwitcher.condition.midi.condition.message="MIDI message was received"
+AdvSceneSwitcher.condition.midi.condition.deviceName="MIDI device is connected"
+AdvSceneSwitcher.condition.midi.condition.deviceName.info="On some platforms with certain APIs dynamic MIDI device detection might not function.\nSo this type of check might not be 100% reliable in all circumstances."
+AdvSceneSwitcher.condition.midi.entry.message="{{conditions}}from{{device}}which matches:"
+AdvSceneSwitcher.condition.midi.entry.deviceName="{{conditions}}{{deviceNames}}{{regex}}{{deviceListInfo}}"
+>>>>>>> c4e35d1a (Add MIDI device name check)
 AdvSceneSwitcher.condition.midi.entry.listen="Set MIDI message selection to messages incoming on selected device:{{listenButton}}"
 AdvSceneSwitcher.condition.display="Display"
 AdvSceneSwitcher.condition.display.type.displayName="Name of connected displays matches"
@@ -620,7 +617,7 @@ AdvSceneSwitcher.condition.slideshow.condition.slideChanged="Slide changed"
 AdvSceneSwitcher.condition.slideshow.condition.slideIndex="Current slide number is"
 AdvSceneSwitcher.condition.slideshow.condition.slidePath="Current slide path is"
 AdvSceneSwitcher.condition.slideshow.updateIntervalTooltip="Information about the slide show status will only be updated based on the configured time between slides"
-AdvSceneSwitcher.condition.slideshow.entry="{{sources}}{{conditions}}{{index}}{{path}}{{regex}}"
+AdvSceneSwitcher.condition.slideshow.entry="{{sources}}{{conditions}}{{index}}{{path}}"
 AdvSceneSwitcher.condition.twitch="Twitch"
 AdvSceneSwitcher.condition.twitch.type.event.channel.stream.online="Stream went online"
 AdvSceneSwitcher.condition.twitch.type.event.channel.stream.offline="Stream went offline"
@@ -692,27 +689,6 @@ AdvSceneSwitcher.condition.clipboard.condition.isImage="Clipboard contains an im
 AdvSceneSwitcher.condition.clipboard.condition.isURL="Clipboard contains an URL"
 AdvSceneSwitcher.condition.clipboard.condition.matches="Clipboard content matches"
 AdvSceneSwitcher.condition.clipboard.condition.entry="{{conditions}}{{regex}}{{urlInfo}}"
-AdvSceneSwitcher.condition.folder="Folder watch"
-AdvSceneSwitcher.condition.folder.tooltip="This condition type will allow you to monitor the contents of a folder.\nNote that the monitoring will *not* recursively scan for changes in sub directories within directories of the selected folder!\nNote that if there are several changes during a short period of time, some of the changes might not emit this signal.\nHowever, the last change in the sequence of changes always will."
-AdvSceneSwitcher.condition.folder.condition.any="Any change happened"
-AdvSceneSwitcher.condition.folder.condition.fileAdd="A file was added"
-AdvSceneSwitcher.condition.folder.condition.fileChange="A file was modified"
-AdvSceneSwitcher.condition.folder.condition.fileRemove="A file was removed"
-AdvSceneSwitcher.condition.folder.condition.folderAdd="A directory was added"
-AdvSceneSwitcher.condition.folder.condition.folderRemove="A directory was removed"
-AdvSceneSwitcher.condition.folder.entry="{{conditions}}in{{folder}}{{tooltip}}"
-AdvSceneSwitcher.condition.folder.enableFilter="Only evaluate to true, if the changed path matches a patern"
-AdvSceneSwitcher.condition.folder.entry.filter="{{filter}}{{regex}}"
-AdvSceneSwitcher.condition.usb="USB"
-AdvSceneSwitcher.condition.usb.description="A USB device matching the following properties is connected:"
-AdvSceneSwitcher.condition.usb.vendorID="Vendor ID:"
-AdvSceneSwitcher.condition.usb.productID="Product ID:"
-AdvSceneSwitcher.condition.usb.busNumber="Bus Number:"
-AdvSceneSwitcher.condition.usb.deviceAddress="Device Address:"
-AdvSceneSwitcher.condition.usb.vendorName="Vendor Name:"
-AdvSceneSwitcher.condition.usb.productName="Product Name:"
-AdvSceneSwitcher.condition.usb.serialNumber="Serial Number:"
-AdvSceneSwitcher.condition.noDevicesFoundWarning="No USB devices detected!\nThe plugin might not have the required permissions to check for USB devices."
 
 ; Macro Actions
 AdvSceneSwitcher.action.scene="Switch scene"
@@ -758,12 +734,10 @@ AdvSceneSwitcher.action.recording.split.hint="Make sure to enable automatic file
 AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Replay buffer"
 AdvSceneSwitcher.action.replay.saveWarn="Warning: Saving too frequently might result in the replay buffer not actually being saved!"
-AdvSceneSwitcher.action.replay.durationWarn="Warning: Changing the maximum replay time will only apply the next time the replay buffer is started!"
 AdvSceneSwitcher.action.replay.type.stop="Stop replay buffer"
 AdvSceneSwitcher.action.replay.type.start="Start replay buffer"
 AdvSceneSwitcher.action.replay.type.save="Save replay buffer"
-AdvSceneSwitcher.action.replay.type.duration="Set maximum replay time"
-AdvSceneSwitcher.action.replay.entry="{{actions}}{{duration}}"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Streaming"
 AdvSceneSwitcher.action.streaming.type.stop="Stop streaming"
 AdvSceneSwitcher.action.streaming.type.start="Start streaming"
@@ -809,12 +783,6 @@ 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.interact="Interact"
-AdvSceneSwitcher.action.source.type.interact.selectType="Interaction type:{{type}}"
-AdvSceneSwitcher.action.source.type.interact.mouseClick="Send mouse click"
-AdvSceneSwitcher.action.source.type.interact.mouseMove="Send mouse move"
-AdvSceneSwitcher.action.source.type.interact.mouseWheel="Send mouse wheel"
-AdvSceneSwitcher.action.source.type.interact.keyPress="Send key press"
 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\""
@@ -852,24 +820,12 @@ AdvSceneSwitcher.action.macro="Macro"
 AdvSceneSwitcher.action.macro.type.pause="Pause"
 AdvSceneSwitcher.action.macro.type.unpause="Unpause"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reset counter"
-AdvSceneSwitcher.action.macro.type.run="Run macro"
-AdvSceneSwitcher.action.macro.type.run.conditions.ignore="Do not consider condition state"
-AdvSceneSwitcher.action.macro.type.run.conditions.true="Only if conditions evaluate to true"
-AdvSceneSwitcher.action.macro.type.run.conditions.false="Only if conditions evaluate to false"
-AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState="Reevaluate the condition state before executing this action"
-AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help="The plugin operates in phases:\n * The phase evaluating the macro conditions\n * The phase running macro actions\nMacros executed before this particular action might have side effects on the condition state of macros.\nCheck this option if you want those side effects to be taken into account when evaluating the condition state."
-AdvSceneSwitcher.action.macro.type.run.actionType.regular="actions"
-AdvSceneSwitcher.action.macro.type.run.actionType.else="else-actions"
-AdvSceneSwitcher.action.macro.type.run.skipWhenPaused="Skip execution when macro is paused"
-AdvSceneSwitcher.action.macro.type.run.setInputs="Set inputs"
-AdvSceneSwitcher.action.macro.type.run.setInputs.description="Input variables can be defined in the macro settings.\nDefining input variables will allow you to modify the values of variables before an action is executed."
+AdvSceneSwitcher.action.macro.type.run="Run actions"
 AdvSceneSwitcher.action.macro.type.stop="Stop actions"
 AdvSceneSwitcher.action.macro.type.disableAction="Disable action"
 AdvSceneSwitcher.action.macro.type.enableAction="Enable action"
 AdvSceneSwitcher.action.macro.type.toggleAction="Toggle 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.entry="{{actions}}{{actionIndex}}{{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:"
@@ -1014,11 +970,9 @@ AdvSceneSwitcher.action.variable.type.sceneItemCount="Set to scene item count of
 AdvSceneSwitcher.action.variable.type.stringLength="Set to length of string"
 AdvSceneSwitcher.action.variable.type.extractJson="Extract json field with name"
 AdvSceneSwitcher.action.variable.type.setToTempvar="Set to macro property"
-AdvSceneSwitcher.action.variable.type.setToTempvar.help="This action type will allow you to extract values out of segments of the current macro and assign those values to the selected variable.\nFor example, you can get the current scene name from a scene condition and assign this name to a variable."
 AdvSceneSwitcher.action.variable.type.sceneItemName="Set to scene item name at index"
 AdvSceneSwitcher.action.variable.type.padValue="Pad current value"
 AdvSceneSwitcher.action.variable.type.truncateValue="Truncate current value"
-AdvSceneSwitcher.action.variable.type.swapValues="Swap variable values"
 AdvSceneSwitcher.action.variable.truncateOrPadDirection.left="Left"
 AdvSceneSwitcher.action.variable.truncateOrPadDirection.right="Right"
 AdvSceneSwitcher.action.variable.askForValuePromptDefault="Assign value to variable \"%1\":"
@@ -1032,7 +986,7 @@ AdvSceneSwitcher.action.variable.invalidSelection="Invalid selection!"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="Getting variable values from %1 actions is not supported!"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Getting variable values from %1 conditions is not supported!"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Current value:"
-AdvSceneSwitcher.action.variable.entry.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}"
+AdvSceneSwitcher.action.variable.entry.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}"
 AdvSceneSwitcher.action.variable.entry.pad="{{actions}}of{{variables}}to length{{stringLength}}by adding{{paddingCharSelection}}to the{{direction}}"
 AdvSceneSwitcher.action.variable.entry.truncate="{{actions}}of{{variables}}to length{{stringLength}}by removing characters from the{{direction}}"
 AdvSceneSwitcher.action.variable.entry.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}"
@@ -1098,8 +1052,6 @@ AdvSceneSwitcher.action.queue.entry.add="{{actions}}actions of macro{{macros}}to
 AdvSceneSwitcher.action.queue.entry.other="{{actions}}queue{{queues}}"
 AdvSceneSwitcher.action.window="Window"
 AdvSceneSwitcher.action.window.type.setFocusWindow="Focus window"
-AdvSceneSwitcher.action.window.type.setFocusWindow.limitation="The focus action can only be performed under certain circumstances"
-AdvSceneSwitcher.action.window.type.setFocusWindow.limitation.details="At least one of the following conditions must be true:\n    OBS is the foreground process.\n    There is currently no foreground window, and thus no foreground process.\n    OBS received the last input event."
 AdvSceneSwitcher.action.window.type.maximizeWindow="Maximize window"
 AdvSceneSwitcher.action.window.type.minimizeWindow="Minimize window"
 AdvSceneSwitcher.action.window.type.closeWindow="Close window"
@@ -1135,11 +1087,6 @@ AdvSceneSwitcher.item.emptyName="Empty name not allowed!"
 AdvSceneSwitcher.item.nameNotAvailable="Name not available!"
 AdvSceneSwitcher.item.nameReserved="Name reserved!"
 
-AdvSceneSwitcher.listControls.add="Add"
-AdvSceneSwitcher.listControls.remove="Remove"
-AdvSceneSwitcher.listControls.up="Up"
-AdvSceneSwitcher.listControls.down="Down"
-
 AdvSceneSwitcher.macroSegmentSelection.invalid="Invalid selection!"
 
 AdvSceneSwitcher.validation.text.maxLength="Only %1 characters are allowed in this field!"
@@ -1154,7 +1101,6 @@ AdvSceneSwitcher.variable.save="Save / load behavior"
 AdvSceneSwitcher.variable.save.dontSave="Don't save variable value"
 AdvSceneSwitcher.variable.save.save="Save variable value"
 AdvSceneSwitcher.variable.save.default="Set to value"
-AdvSceneSwitcher.variable.selectionDialog="Select variable:"
 
 AdvSceneSwitcher.tooltip.availableVariables="Variables are supported, use ${VarName} to retrieve the value of VarName"
 
@@ -1463,13 +1409,24 @@ AdvSceneSwitcher.tempVar.twitch.status.prediction.description="The status of the
 
 AdvSceneSwitcher.tempVar.twitch.id.goal="Goal ID"
 AdvSceneSwitcher.tempVar.twitch.type.goal="Goal type"
-AdvSceneSwitcher.tempVar.twitch.type.goal.description="The type of goal. Possible values are:\n    follow — The goal is to increase followers.\n    subscription — The goal is to increase subscriptions. This type shows the net increase or decrease in tier points associated with the subscriptions.\n    subscription_count — The goal is to increase subscriptions. This type shows the net increase or decrease in the number of subscriptions.\n    new_subscription — The goal is to increase subscriptions. This type shows only the net increase in tier points associated with the subscriptions (it does not account for users that unsubscribed since the goal started).\n    new_subscription_count — The goal is to increase subscriptions. This type shows only the net increase in the number of subscriptions (it does not account for users that unsubscribed since the goal started)."
+AdvSceneSwitcher.tempVar.twitch.type.goal.description="The type of goal. Possible values are:\n
+    follow — The goal is to increase followers.\n
+    subscription — The goal is to increase subscriptions. This type shows the net increase or decrease in tier points associated with the subscriptions.\n
+    subscription_count — The goal is to increase subscriptions. This type shows the net increase or decrease in the number of subscriptions.\n
+    new_subscription — The goal is to increase subscriptions. This type shows only the net increase in tier points associated with the subscriptions (it does not account for users that unsubscribed since the goal started).\n
+    new_subscription_count — The goal is to increase subscriptions. This type shows only the net increase in the number of subscriptions (it does not account for users that unsubscribed since the goal started)."
 AdvSceneSwitcher.tempVar.twitch.description.goal="Goal description"
 AdvSceneSwitcher.tempVar.twitch.description.goal.description="A description of the goal, if specified. The description may contain a maximum of 40 characters."
 AdvSceneSwitcher.tempVar.twitch.is_achieved.goal="Goal is achieved"
 AdvSceneSwitcher.tempVar.twitch.is_achieved.goal.description="A Boolean value that indicates whether the broadcaster achieved their goal. Is true if the goal was achieved; otherwise, false."
 AdvSceneSwitcher.tempVar.twitch.current_amount.goal="Goal current amount"
-AdvSceneSwitcher.tempVar.twitch.current_amount.goal.description="The goal's current value.\nThe goal's type determines how this value is increased or decreased.\n    If type is follow, this field is set to the broadcaster's current number of followers. This number increases with new followers and decreases when users unfollow the broadcaster.\n    If type is subscription, this field is increased and decreased by the points value associated with the subscription tier. For example, if a tier-two subscription is worth 2 points, this field is increased or decreased by 2, not 1.\n    If type is subscription_count, this field is increased by 1 for each new subscription and decreased by 1 for each user that unsubscribes.\n    If type is new_subscription, this field is increased by the points value associated with the subscription tier. For example, if a tier-two subscription is worth 2 points, this field is increased by 2, not 1.\n    If type is new_subscription_count, this field is increased by 1 for each new subscription."
+AdvSceneSwitcher.tempVar.twitch.current_amount.goal.description="The goal's current value.\n
+The goal's type determines how this value is increased or decreased.\n
+    If type is follow, this field is set to the broadcaster's current number of followers. This number increases with new followers and decreases when users unfollow the broadcaster.\n
+    If type is subscription, this field is increased and decreased by the points value associated with the subscription tier. For example, if a tier-two subscription is worth 2 points, this field is increased or decreased by 2, not 1.\n
+    If type is subscription_count, this field is increased by 1 for each new subscription and decreased by 1 for each user that unsubscribes.\n
+    If type is new_subscription, this field is increased by the points value associated with the subscription tier. For example, if a tier-two subscription is worth 2 points, this field is increased by 2, not 1.\n
+    If type is new_subscription_count, this field is increased by 1 for each new subscription."
 AdvSceneSwitcher.tempVar.twitch.target_amount.goal="Goal target amount"
 AdvSceneSwitcher.tempVar.twitch.target_amount.goal.description="The goal's target value. For example, if the broadcaster has 200 followers before creating the goal, and their goal is to double that number, this field is set to 400."
 AdvSceneSwitcher.tempVar.twitch.started_at.goal="Goal start time"
@@ -1773,35 +1730,6 @@ AdvSceneSwitcher.tempVar.clipboard.text.description="The text contained in the c
 AdvSceneSwitcher.tempVar.file.content="File content"
 AdvSceneSwitcher.tempVar.file.date="File modification date"
 
-AdvSceneSwitcher.tempVar.folder.newFiles="New files"
-AdvSceneSwitcher.tempVar.folder.changedFiles="Changed files"
-AdvSceneSwitcher.tempVar.folder.removedFiles="Removed files"
-AdvSceneSwitcher.tempVar.folder.newDirs="New directories"
-AdvSceneSwitcher.tempVar.folder.removedDirs="Removed directories"
-
-AdvSceneSwitcher.tempVar.source.width="Source width"
-AdvSceneSwitcher.tempVar.source.height="Source height"
-AdvSceneSwitcher.tempVar.source.setting="Setting value"
-AdvSceneSwitcher.tempVar.source.settings="Settings string"
-
-AdvSceneSwitcher.tempVar.filter.setting="Setting value"
-AdvSceneSwitcher.tempVar.filter.settings="Settings string"
-
-AdvSceneSwitcher.tempVar.slideShow.index="Slide index"
-AdvSceneSwitcher.tempVar.slideShow.index.description="The index of the slide currently being displayed.\nIf the index cannot be determined, -1 is returned."
-AdvSceneSwitcher.tempVar.slideShow.path="Slide path"
-AdvSceneSwitcher.tempVar.slideShow.path.description="The filesystem path of the slide currently being displayed."
-AdvSceneSwitcher.tempVar.slideShow.fileName="Slide file name"
-AdvSceneSwitcher.tempVar.slideShow.fileName.description="The name of file of the slide currently being displayed."
-
-AdvSceneSwitcher.tempVar.usb.vendorID="Vendor ID"
-AdvSceneSwitcher.tempVar.usb.productID="Product ID"
-AdvSceneSwitcher.tempVar.usb.busNumber="Bus Number"
-AdvSceneSwitcher.tempVar.usb.deviceAddress="Device Address"
-AdvSceneSwitcher.tempVar.usb.vendorName="Vendor Name"
-AdvSceneSwitcher.tempVar.usb.productName="Product Name"
-AdvSceneSwitcher.tempVar.usb.serialNumber="Serial Number"
-
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"
 AdvSceneSwitcher.selectCurrentScene="Current Scene"
@@ -1893,27 +1821,6 @@ AdvSceneSwitcher.audio.monitor.both="Monitor and Output"
 
 AdvSceneSwitcher.noSettingsButtons="No buttons found!"
 
-AdvSceneSwitcher.clearBufferOnMatch="Clear message buffer when matching message was found"
-
-AdvSceneSwitcher.key="Key:"
-AdvSceneSwitcher.key.up="Key up:"
-
-AdvSceneSwitcher.modifierKey="Modifier keys:"
-AdvSceneSwitcher.modifierKey.shift="Shift"
-AdvSceneSwitcher.modifierKey.ctrl="Ctrl"
-AdvSceneSwitcher.modifierKey.alt="Alt"
-AdvSceneSwitcher.modifierKey.meta="Meta"
-
-AdvSceneSwitcher.mouse.button="Mouse button:"
-AdvSceneSwitcher.mouse.button.left="Left"
-AdvSceneSwitcher.mouse.button.middle="Middle"
-AdvSceneSwitcher.mouse.button.right="Right"
-AdvSceneSwitcher.mouse.position="Mouse position:"
-AdvSceneSwitcher.mouse.up="Mouse up event:"
-AdvSceneSwitcher.mouse.count="Mouse click count:"
-AdvSceneSwitcher.mouse.leave="Mouse leave event:"
-AdvSceneSwitcher.mouse.scrollAmount="Mouse scroll amount:"
-
 ; Legacy tabs below - please don't waste your time adding translations for these :)
 ; Transition Tab
 AdvSceneSwitcher.transitionTab.title="Transition"

data/locale/es-ES.ini

@@ -348,6 +348,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Advertencia: ¡Guardar con demasiada fr
 AdvSceneSwitcher.action.replay.type.stop="Detener el búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.start="Iniciar búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.save="Guardar búfer de reproducción"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Transmisión"
 AdvSceneSwitcher.action.streaming.type.stop="Detener transmisión"
 AdvSceneSwitcher.action.streaming.type.start="Iniciar transmisión"
@@ -385,6 +386,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Reanudar"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reiniciar contador"
 AdvSceneSwitcher.action.macro.type.run="Ejecutar"
 AdvSceneSwitcher.action.macro.type.stop="Detener"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado del complemento"
 AdvSceneSwitcher.action.pluginState.type.stop="Detener el complemento Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Cambiar el comportamiento de no coincidencia:"

data/locale/fr-FR.ini

@@ -446,7 +446,6 @@ AdvSceneSwitcher.condition.run="Exécution"
 AdvSceneSwitcher.condition.run.entry="Le processus se termine avant le délai de{{timeout}}secondes"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}Vérifier le code de sortie{{exitCode}}
 AdvSceneSwitcher.condition.midi="MIDI"
-AdvSceneSwitcher.condition.midi.entry="Message reçu depuis{{device}}qui correspond à :"
 AdvSceneSwitcher.condition.midi.entry.listen="Définir la sélection des messages MIDI pour les messages entrants sur l'appareil sélectionné :{{listenButton}}"
 AdvSceneSwitcher.condition.display="Affichage"
 AdvSceneSwitcher.condition.display.type.displayName="Le nom des écrans connectés correspond à"

data/locale/ru-RU.ini

@@ -137,6 +137,7 @@ AdvSceneSwitcher.action.replay="Буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.stop="Остановить буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.start="Начать воспроизведение буфера"
 AdvSceneSwitcher.action.replay.type.save="Сохранить буфер воспроизведения"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.stop="Остановить потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.start="Начать потоковое вещание"

data/locale/tr-TR.ini

@@ -279,6 +279,7 @@ AdvSceneSwitcher.action.replay="Tekrar arabelleği"
 AdvSceneSwitcher.action.replay.type.stop="Tekrar arabelleğini durdur"
 AdvSceneSwitcher.action.replay.type.start="Tekrar arabelleğini başlat"
 AdvSceneSwitcher.action.replay.type.save="Tekrar arabelleğini kaydet"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Yayın"
 AdvSceneSwitcher.action.streaming.type.stop="Yayın durdur"
 AdvSceneSwitcher.action.streaming.type.start="Yayın başlat"
@@ -314,6 +315,7 @@ AdvSceneSwitcher.action.macro.type.pause="Duraklat"
 AdvSceneSwitcher.action.macro.type.unpause="Duraklatma"
 AdvSceneSwitcher.action.macro.type.resetCounter="Sayacı sıfırla"
 AdvSceneSwitcher.action.macro.type.run="Çalıştır"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Eklenti durumu"
 AdvSceneSwitcher.action.pluginState.type.stop="Advanced Scene Switcher eklentisini durdurun"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Eşleşmeme davranışını değiştirin:"

data/locale/zh-CN.ini

@@ -434,7 +434,6 @@ AdvSceneSwitcher.condition.run="运行"
 AdvSceneSwitcher.condition.run.entry="进程在超时 {{timeout}} 秒之前退出"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}检查退出代码{{exitCode}}"
 AdvSceneSwitcher.condition.midi="MIDI"
-AdvSceneSwitcher.condition.midi.entry="从{{device}} 收到的信息,符合:(从不咕咕的阿坤:这个好像是声卡工作是录音相关的功能,英文太抽象了,我就硬译过来了,如有相关设备,音乐好的,可以根据英文翻译好发给我!)"
 AdvSceneSwitcher.condition.midi.entry.listen="将MIDI信息选择设置为从选定设备上接收的信息: {{listenButton}}"
 AdvSceneSwitcher.condition.display="显示器"
 AdvSceneSwitcher.condition.display.type.displayName="连接的显示器的名称匹配"
@@ -481,6 +480,7 @@ AdvSceneSwitcher.action.replay.saveWarn="警告：保存过于频繁可能会导
 AdvSceneSwitcher.action.replay.type.stop="停止回放缓存"
 AdvSceneSwitcher.action.replay.type.start="启动回放缓存"
 AdvSceneSwitcher.action.replay.type.save="保存回放缓存"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="推流"
 AdvSceneSwitcher.action.streaming.type.stop="停止推流"
 AdvSceneSwitcher.action.streaming.type.start="开始推流"
@@ -523,6 +523,7 @@ AdvSceneSwitcher.action.macro.type.unpause="取消暂停"
 AdvSceneSwitcher.action.macro.type.resetCounter="复位计数器"
 AdvSceneSwitcher.action.macro.type.run="运行操作"
 AdvSceneSwitcher.action.macro.type.stop="停止操作"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="插件状态"
 AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
 AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项时:"

forms/advanced-scene-switcher.ui

@@ -68,7 +68,7 @@
             <x>0</x>
             <y>0</y>
             <width>962</width>
-            <height>1040</height>
+            <height>1033</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -572,22 +572,40 @@
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_32">
                 <item>
-                 <widget class="QToolButton" name="priorityUp">
+                 <widget class="QPushButton" name="priorityUp">
+                  <property name="maximumSize">
+                   <size>
+                    <width>22</width>
+                    <height>22</height>
+                   </size>
+                  </property>
                   <property name="icon">
                    <iconset>
                     <normaloff>../../../forms/images/up.png</normaloff>../../../forms/images/up.png</iconset>
                   </property>
+                  <property name="flat">
+                   <bool>true</bool>
+                  </property>
                   <property name="themeID" stdset="0">
                    <string notr="true">upArrowIconSmall</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="priorityDown">
+                 <widget class="QPushButton" name="priorityDown">
+                  <property name="maximumSize">
+                   <size>
+                    <width>22</width>
+                    <height>22</height>
+                   </size>
+                  </property>
                   <property name="icon">
                    <iconset>
                     <normaloff>../../../forms/images/down.png</normaloff>../../../forms/images/down.png</iconset>
                   </property>
+                  <property name="flat">
+                   <bool>true</bool>
+                  </property>
                   <property name="themeID" stdset="0">
                    <string notr="true">downArrowIconSmall</string>
                   </property>
@@ -721,47 +739,135 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="macroControlLayout">
+            <layout class="QHBoxLayout" name="horizontalLayout_61">
              <item>
-              <widget class="QToolButton" name="macroAdd">
+              <widget class="QPushButton" name="macroAdd">
+               <property name="maximumSize">
+                <size>
+                 <width>22</width>
+                 <height>16777215</height>
+                </size>
+               </property>
                <property name="toolTip">
                 <string>AdvSceneSwitcher.macroTab.tooltip.macroAddButton</string>
                </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
                <property name="themeID" stdset="0">
                 <string notr="true">addIconSmall</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="macroRemove">
+              <widget class="QPushButton" name="macroRemove">
+               <property name="maximumSize">
+                <size>
+                 <width>22</width>
+                 <height>16777215</height>
+                </size>
+               </property>
                <property name="toolTip">
                 <string>AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton</string>
                </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
                <property name="themeID" stdset="0">
                 <string notr="true">removeIconSmall</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="macroUp">
+              <spacer name="horizontalSpacer_130">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>5</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="Line" name="line_46">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_131">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>5</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QPushButton" name="macroUp">
+               <property name="maximumSize">
+                <size>
+                 <width>22</width>
+                 <height>16777215</height>
+                </size>
+               </property>
                <property name="toolTip">
                 <string>AdvSceneSwitcher.macroTab.tooltip.macroUpButton</string>
                </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
                <property name="themeID" stdset="0">
                 <string notr="true">upArrowIconSmall</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="macroDown">
+              <widget class="QPushButton" name="macroDown">
+               <property name="maximumSize">
+                <size>
+                 <width>22</width>
+                 <height>16777215</height>
+                </size>
+               </property>
                <property name="toolTip">
                 <string>AdvSceneSwitcher.macroTab.tooltip.macroDownButton</string>
                </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
                <property name="themeID" stdset="0">
                 <string notr="true">downArrowIconSmall</string>
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_65">
+               <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>
           </layout>
@@ -854,13 +960,22 @@
               </spacer>
              </item>
              <item>
-              <widget class="QToolButton" name="macroSettings">
+              <widget class="QPushButton" name="macroProperties">
+               <property name="maximumSize">
+                <size>
+                 <width>22</width>
+                 <height>16777215</height>
+                </size>
+               </property>
                <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.tooltip.openMacroSettingsButton</string>
+                <string>AdvSceneSwitcher.macroTab.tooltip.openMacroPropertiesButton</string>
                </property>
                <property name="text">
                 <string/>
                </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
                <property name="themeID" stdset="0">
                 <string notr="true">propertiesIconSmall</string>
                </property>
@@ -898,67 +1013,173 @@
                 </widget>
                </item>
                <item>
-                <layout class="QHBoxLayout" name="conditionControlsLayout">
+                <layout class="QHBoxLayout" name="horizontalLayout_12">
                  <property name="leftMargin">
                   <number>9</number>
                  </property>
                  <item>
-                  <widget class="QToolButton" name="conditionAdd">
+                  <widget class="QPushButton" name="conditionAdd">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
                    <property name="toolTip">
                     <string>AdvSceneSwitcher.macroTab.tooltip.conditionAddButton</string>
                    </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
                    <property name="themeID" stdset="0">
                     <string notr="true">addIconSmall</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="conditionRemove">
+                  <widget class="QPushButton" name="conditionRemove">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
                    <property name="toolTip">
                     <string>AdvSceneSwitcher.macroTab.tooltip.conditionRemoveButton</string>
                    </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
                    <property name="themeID" stdset="0">
                     <string notr="true">removeIconSmall</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="conditionTop">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionTopButton</string>
+                  <spacer name="horizontalSpacer_135">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeType">
+                    <enum>QSizePolicy::Fixed</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>5</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item>
+                  <widget class="Line" name="line_48">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="conditionUp">
+                  <spacer name="horizontalSpacer_134">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeType">
+                    <enum>QSizePolicy::Fixed</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>5</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="conditionTop">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionTopButton</string>
+                   </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="conditionUp">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
                    <property name="toolTip">
                     <string>AdvSceneSwitcher.macroTab.tooltip.conditionUpButton</string>
                    </property>
                    <property name="text">
                     <string/>
                    </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
                    <property name="themeID" stdset="0">
                     <string notr="true">upArrowIconSmall</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="conditionDown">
+                  <widget class="QPushButton" name="conditionDown">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
                    <property name="toolTip">
                     <string>AdvSceneSwitcher.macroTab.tooltip.conditionDownButton</string>
                    </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
                    <property name="themeID" stdset="0">
                     <string notr="true">downArrowIconSmall</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="conditionBottom">
+                  <widget class="QPushButton" name="conditionBottom">
+                   <property name="maximumSize">
+                    <size>
+                     <width>22</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
                    <property name="toolTip">
                     <string>AdvSceneSwitcher.macroTab.tooltip.conditionBottomButton</string>
                    </property>
+                   <property name="flat">
+                    <bool>true</bool>
+                   </property>
                   </widget>
                  </item>
+                 <item>
+                  <spacer name="horizontalSpacer_15">
+                   <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>
               </layout>
@@ -992,62 +1213,155 @@
                  </widget>
                 </item>
                 <item>
-                 <layout class="QHBoxLayout" name="actionControlsLayout">
+                 <layout class="QHBoxLayout" name="horizontalLayout_21">
                   <property name="leftMargin">
                    <number>9</number>
                   </property>
                   <item>
-                   <widget class="QToolButton" name="actionAdd">
+                   <widget class="QPushButton" name="actionAdd">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.actionAddButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">addIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="actionRemove">
+                   <widget class="QPushButton" name="actionRemove">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.actionRemoveButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">removeIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="actionTop">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionTopButton</string>
+                   <spacer name="horizontalSpacer_133">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::Fixed</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>5</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="Line" name="line_47">
+                    <property name="orientation">
+                     <enum>Qt::Vertical</enum>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="actionUp">
+                   <spacer name="horizontalSpacer_132">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::Fixed</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>5</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="actionTop">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="toolTip">
+                     <string>AdvSceneSwitcher.macroTab.tooltip.actionTopButton</string>
+                    </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="actionUp">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.actionUpButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">upArrowIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="actionDown">
+                   <widget class="QPushButton" name="actionDown">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.actionDownButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">downArrowIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="actionBottom">
+                   <widget class="QPushButton" name="actionBottom">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.actionBottomButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                   <item>
@@ -1064,13 +1378,22 @@
                    </spacer>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="toggleElseActions">
+                   <widget class="QPushButton" name="toggleElseActions">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.toggleShowElseSection</string>
                     </property>
                     <property name="checkable">
                      <bool>true</bool>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                  </layout>
@@ -1102,64 +1425,170 @@
                  </widget>
                 </item>
                 <item>
-                 <layout class="QHBoxLayout" name="elseActionControlsLayout">
+                 <layout class="QHBoxLayout" name="horizontalLayout_33">
                   <property name="leftMargin">
                    <number>9</number>
                   </property>
                   <item>
-                   <widget class="QToolButton" name="elseActionAdd">
+                   <widget class="QPushButton" name="elseActionAdd">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.elseActionAddButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">addIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="elseActionRemove">
+                   <widget class="QPushButton" name="elseActionRemove">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.elseActionRemoveButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">removeIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="elseActionTop">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton</string>
+                   <spacer name="horizontalSpacer_138">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::Fixed</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>5</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="Line" name="line_50">
+                    <property name="orientation">
+                     <enum>Qt::Vertical</enum>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="elseActionUp">
+                   <spacer name="horizontalSpacer_139">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::Fixed</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>5</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="elseActionTop">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="toolTip">
+                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton</string>
+                    </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="elseActionUp">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">upArrowIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="elseActionDown">
+                   <widget class="QPushButton" name="elseActionDown">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                     <property name="themeID" stdset="0">
                      <string notr="true">downArrowIconSmall</string>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="elseActionBottom">
+                   <widget class="QPushButton" name="elseActionBottom">
+                    <property name="maximumSize">
+                     <size>
+                      <width>22</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
                     <property name="toolTip">
                      <string>AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton</string>
                     </property>
+                    <property name="flat">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
+                  <item>
+                   <spacer name="horizontalSpacer_22">
+                    <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>
                </layout>
@@ -4604,7 +5033,7 @@
   <tabstop>runMacro</tabstop>
   <tabstop>runMacroInParallel</tabstop>
   <tabstop>runMacroOnChange</tabstop>
-  <tabstop>macroSettings</tabstop>
+  <tabstop>macroProperties</tabstop>
   <tabstop>conditionsList</tabstop>
   <tabstop>conditionAdd</tabstop>
   <tabstop>conditionRemove</tabstop>

lib/advanced-scene-switcher.cpp

@@ -70,9 +70,6 @@ static void DisplayMissingDependencyWarning()
 	QString warning(obs_module_text(
 		"AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage"));
 	DisplayMessage(warning.arg(failedLibsString));
-
-	// Only display the warning once per plugin load
-	switcher->loadFailureLibs.clear();
 }
 
 static void DisplayMissingDataDirWarning()
@@ -243,7 +240,7 @@ void SwitcherData::Thread()
 			if (duration.count() < 1) {
 				blog(LOG_INFO,
 				     "detected busy loop - refusing to sleep less than 1ms");
-				duration = std::chrono::milliseconds(10);
+				duration = std::chrono::milliseconds(50);
 			}
 		}
 
@@ -753,36 +750,6 @@ QWidget *GetSettingsWindow()
 	return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;
 }
 
-void AdvSceneSwitcher::HighligthMacroSettingsButton(bool enable)
-{
-	static QObject *highlight = nullptr;
-	if ((highlight && enable) || (!highlight && !enable)) {
-		return;
-	}
-
-	if (highlight && !enable) {
-		highlight->deleteLater();
-		highlight = nullptr;
-		return;
-	}
-
-	if (!HighlightUIElementsEnabled()) {
-		return;
-	}
-
-	highlight = HighlightWidget(ui->macroSettings, Qt::green);
-}
-
-void HighligthMacroSettingsButton(bool enable)
-{
-	auto window = GetSettingsWindow();
-	if (!window) {
-		return;
-	}
-	static_cast<AdvSceneSwitcher *>(window)->HighligthMacroSettingsButton(
-		enable);
-}
-
 void SetupActionQueues();
 
 extern "C" EXPORT void InitSceneSwitcher(obs_module_t *module,

lib/advanced-scene-switcher.hpp

@@ -12,7 +12,6 @@ class MacroActionEdit;
 class MacroConditionEdit;
 class Duration;
 class SequenceWidget;
-enum class LogicType;
 struct SceneGroup;
 
 /*******************************************************************************
@@ -96,7 +95,6 @@ public:
 	void SetConditionData(Macro &m);
 	void SwapActions(Macro *m, int pos1, int pos2);
 	void SwapConditions(Macro *m, int pos1, int pos2);
-	void HighligthMacroSettingsButton(bool enable = true);
 
 public slots:
 	void on_macroAdd_clicked();
@@ -154,16 +152,12 @@ public slots:
 	void SetElseActionsStateToVisible();
 	void MacroActionSelectionChanged(int idx);
 	void MacroActionReorder(int to, int target);
-	void AddMacroAction(Macro *macro, int idx, const std::string &id,
-			    obs_data_t *data);
 	void AddMacroAction(int idx);
 	void RemoveMacroAction(int idx);
 	void MoveMacroActionUp(int idx);
 	void MoveMacroActionDown(int idx);
 	void MacroElseActionSelectionChanged(int idx);
 	void MacroElseActionReorder(int to, int target);
-	void AddMacroElseAction(Macro *macro, int idx, const std::string &id,
-				obs_data_t *data);
 	void AddMacroElseAction(int idx);
 	void RemoveMacroElseAction(int idx);
 	void SwapElseActions(Macro *m, int pos1, int pos2);
@@ -172,16 +166,16 @@ public slots:
 	void MacroConditionSelectionChanged(int idx);
 	void MacroConditionReorder(int to, int target);
 	void AddMacroCondition(int idx);
-	void AddMacroCondition(Macro *macro, int idx, const std::string &id,
-			       obs_data_t *data, LogicType logic);
 	void RemoveMacroCondition(int idx);
 	void MoveMacroConditionUp(int idx);
 	void MoveMacroConditionDown(int idx);
+	void FadeOutActionControls();
+	void FadeOutConditionControls();
+	void ResetOpacityActionControls();
+	void ResetOpacityConditionControls();
 	void HighlightControls();
 	void HighlightOnChange();
-	void on_macroSettings_clicked();
-	void CopyMacroSegment();
-	void PasteMacroSegment();
+	void on_macroProperties_clicked();
 
 signals:
 	void MacroAdded(const QString &name);
@@ -190,6 +184,9 @@ signals:
 	void MacroSegmentOrderChanged();
 	void SegmentTempVarsChanged();
 	void HighlightMacrosChanged(bool value);
+	void HighlightActionsChanged(bool value);
+	void HighlightElseActionsChanged(bool value);
+	void HighlightConditionsChanged(bool value);
 
 	void ConnectionAdded(const QString &);
 	void ConnectionRenamed(const QString &oldName, const QString &newName);
@@ -411,6 +408,5 @@ public slots:
 
 void OpenSettingsWindow();
 QWidget *GetSettingsWindow();
-void HighligthMacroSettingsButton(bool enable);
 
 } // namespace advss

lib/general.cpp

@@ -431,7 +431,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	}
 
 	LoadMacros(obj);
-	LoadGlobalMacroSettings(obj);
+	LoadGlobalMacroProperties(obj);
 	loadWindowTitleSwitches(obj);
 	loadScreenRegionSwitches(obj);
 	loadPauseSwitches(obj);
@@ -466,7 +466,7 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 
 	saveSceneGroups(obj);
 	SaveMacros(obj);
-	SaveGlobalMacroSettings(obj);
+	SaveGlobalMacroProperties(obj);
 	SaveVariables(obj);
 	saveWindowTitleSwitches(obj);
 	saveScreenRegionSwitches(obj);

lib/legacy/scene-group.cpp

@@ -12,7 +12,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 SceneGroupEditWidget *typeEdit = nullptr;
 
 std::deque<SceneGroup> &GetSceneGroups()
@@ -170,8 +170,7 @@ void AdvSceneSwitcher::on_sceneGroupAdd_clicked()
 	item->setData(Qt::UserRole, text);
 	ui->sceneGroups->setCurrentItem(item);
 
-	addPulse->deleteLater();
-	addPulse = nullptr;
+	ui->sceneGroupAdd->disconnect(addPulse);
 	ui->sceneGroupHelp->setVisible(false);
 
 	emit SceneGroupAdded(QString::fromStdString(name));
@@ -513,8 +512,8 @@ void AdvSceneSwitcher::SetupSceneGroupTab()
 
 	if (switcher->sceneGroups.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneGroupAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneGroupAdd,
+					       QColor(Qt::green));
 		}
 		ui->sceneGroupHelp->setVisible(true);
 	} else {

lib/legacy/scene-trigger.cpp

@@ -12,7 +12,7 @@
 namespace advss {
 
 bool SceneTrigger::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_triggerAdd_clicked()
 {
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_triggerAdd_clicked()
 	listAddClicked(ui->sceneTriggers,
 		       new SceneTriggerWidget(this,
 					      &switcher->sceneTriggers.back()),
-		       ui->triggerAdd, addPulse);
+		       ui->triggerAdd, &addPulse);
 
 	ui->triggerHelp->setVisible(false);
 }
@@ -370,8 +370,8 @@ void AdvSceneSwitcher::SetupTriggerTab()
 
 	if (switcher->sceneTriggers.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->triggerAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->triggerAdd, QColor(Qt::green));
 		}
 		ui->triggerHelp->setVisible(true);
 	} else {

lib/legacy/switch-audio.cpp

@@ -12,7 +12,7 @@
 namespace advss {
 
 bool AudioSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_audioAdd_clicked()
 {
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_audioAdd_clicked()
 	AudioSwitchWidget *sw =
 		new AudioSwitchWidget(this, &switcher->audioSwitches.back());
 
-	listAddClicked(ui->audioSwitches, sw, ui->audioAdd, addPulse);
+	listAddClicked(ui->audioSwitches, sw, ui->audioAdd, &addPulse);
 
 	ui->audioHelp->setVisible(false);
 }
@@ -232,8 +232,7 @@ void AdvSceneSwitcher::SetupAudioTab()
 
 	if (switcher->audioSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->audioAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->audioAdd, QColor(Qt::green));
 		}
 		ui->audioHelp->setVisible(true);
 	} else {

lib/legacy/switch-executable.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool ExecutableSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_executableAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_executableAdd_clicked()
 	listAddClicked(ui->executables,
 		       new ExecutableSwitchWidget(
 			       this, &switcher->executableSwitches.back()),
-		       ui->executableAdd, addPulse);
+		       ui->executableAdd, &addPulse);
 
 	ui->exeHelp->setVisible(false);
 }
@@ -177,8 +177,8 @@ void AdvSceneSwitcher::SetupExecutableTab()
 
 	if (switcher->executableSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->executableAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->executableAdd,
+					       QColor(Qt::green));
 		}
 		ui->exeHelp->setVisible(true);
 	} else {

lib/legacy/switch-file.cpp

@@ -18,7 +18,7 @@
 namespace advss {
 
 bool FileSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 static std::hash<std::string> strHash;
 
 void AdvSceneSwitcher::on_browseButton_clicked()
@@ -291,7 +291,7 @@ void AdvSceneSwitcher::on_fileAdd_clicked()
 	listAddClicked(ui->fileSwitches,
 		       new FileSwitchWidget(this,
 					    &switcher->fileSwitches.back()),
-		       ui->fileAdd, addPulse);
+		       ui->fileAdd, &addPulse);
 
 	ui->fileHelp->setVisible(false);
 }
@@ -441,8 +441,7 @@ void AdvSceneSwitcher::SetupFileTab()
 
 	if (switcher->fileSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->fileAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->fileAdd, QColor(Qt::green));
 		}
 		ui->fileHelp->setVisible(true);
 	} else {

lib/legacy/switch-media.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool MediaSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 constexpr auto media_played_to_end_idx = 8;
 constexpr auto media_any_idx = 9;
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_mediaAdd_clicked()
 	listAddClicked(ui->mediaSwitches,
 		       new MediaSwitchWidget(this,
 					     &switcher->mediaSwitches.back()),
-		       ui->mediaAdd, addPulse);
+		       ui->mediaAdd, &addPulse);
 
 	ui->mediaHelp->setVisible(false);
 }
@@ -252,8 +252,7 @@ void AdvSceneSwitcher::SetupMediaTab()
 
 	if (switcher->mediaSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->mediaAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->mediaAdd, QColor(Qt::green));
 		}
 		ui->mediaHelp->setVisible(true);
 	} else {

lib/legacy/switch-pause.cpp

@@ -10,7 +10,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_pauseAdd_clicked()
 {
@@ -20,7 +20,7 @@ void AdvSceneSwitcher::on_pauseAdd_clicked()
 	listAddClicked(ui->pauseEntries,
 		       new PauseEntryWidget(this,
 					    &switcher->pauseEntries.back()),
-		       ui->pauseAdd, addPulse);
+		       ui->pauseAdd, &addPulse);
 
 	ui->pauseHelp->setVisible(false);
 }
@@ -264,8 +264,7 @@ void AdvSceneSwitcher::SetupPauseTab()
 
 	if (switcher->pauseEntries.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->pauseAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->pauseAdd, QColor(Qt::green));
 		}
 		ui->pauseHelp->setVisible(true);
 	} else {

lib/legacy/switch-random.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool RandomSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_randomAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_randomAdd_clicked()
 	listAddClicked(ui->randomSwitches,
 		       new RandomSwitchWidget(this,
 					      &switcher->randomSwitches.back()),
-		       ui->randomAdd, addPulse);
+		       ui->randomAdd, &addPulse);
 
 	ui->randomHelp->setVisible(false);
 }
@@ -131,8 +131,8 @@ void AdvSceneSwitcher::SetupRandomTab()
 
 	if (switcher->randomSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->randomAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->randomAdd, QColor(Qt::green));
 		}
 		ui->randomHelp->setVisible(true);
 	} else {
@@ -147,8 +147,8 @@ void AdvSceneSwitcher::SetupRandomTab()
 		}");
 	if (switcher->switchIfNotMatching != NoMatchBehavior::RANDOM_SWITCH) {
 		if (!switcher->disableHints) {
-			HighlightWidget(ui->randomDisabledWarning,
-					QColor(Qt::red), QColor(0, 0, 0, 0));
+			PulseWidget(ui->randomDisabledWarning, QColor(Qt::red),
+				    QColor(0, 0, 0, 0));
 		}
 	} else {
 		ui->randomDisabledWarning->setVisible(false);

lib/legacy/switch-screen-region.cpp

@@ -11,7 +11,7 @@
 namespace advss {
 
 bool ScreenRegionSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::ClearFrames(QListWidget *list)
 {
@@ -79,7 +79,7 @@ void AdvSceneSwitcher::on_screenRegionAdd_clicked()
 	listAddClicked(ui->screenRegionSwitches,
 		       new ScreenRegionWidget(
 			       this, &switcher->screenRegionSwitches.back()),
-		       ui->screenRegionAdd, addPulse);
+		       ui->screenRegionAdd, &addPulse);
 
 	ui->regionHelp->setVisible(false);
 }
@@ -248,8 +248,8 @@ void AdvSceneSwitcher::SetupRegionTab()
 
 	if (switcher->screenRegionSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->screenRegionAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->screenRegionAdd,
+					       QColor(Qt::green));
 		}
 		ui->regionHelp->setVisible(true);
 	} else {

lib/legacy/switch-sequence.cpp

@@ -16,7 +16,7 @@ namespace advss {
 constexpr auto max_extend_text_size = 150;
 
 bool SceneSequenceSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 {
@@ -26,7 +26,7 @@ void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 	listAddClicked(ui->sceneSequenceSwitches,
 		       new SequenceWidget(
 			       this, &switcher->sceneSequenceSwitches.back()),
-		       ui->sceneSequenceAdd, addPulse);
+		       ui->sceneSequenceAdd, &addPulse);
 
 	ui->sequenceHelp->setVisible(false);
 }
@@ -299,8 +299,8 @@ void AdvSceneSwitcher::SetupSequenceTab()
 
 	if (switcher->sceneSequenceSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneSequenceAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneSequenceAdd,
+					       QColor(Qt::green));
 		}
 		ui->sequenceHelp->setVisible(true);
 	} else {

lib/legacy/switch-time.cpp

@@ -7,7 +7,7 @@
 namespace advss {
 
 bool TimeSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_timeAdd_clicked()
 {
@@ -17,7 +17,7 @@ void AdvSceneSwitcher::on_timeAdd_clicked()
 	listAddClicked(ui->timeSwitches,
 		       new TimeSwitchWidget(this,
 					    &switcher->timeSwitches.back()),
-		       ui->timeAdd, addPulse);
+		       ui->timeAdd, &addPulse);
 
 	ui->timeHelp->setVisible(false);
 }
@@ -197,8 +197,7 @@ void AdvSceneSwitcher::SetupTimeTab()
 
 	if (switcher->timeSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->timeAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->timeAdd, QColor(Qt::green));
 		}
 		ui->timeHelp->setVisible(true);
 	} else {

lib/legacy/switch-video.cpp

@@ -14,7 +14,7 @@
 namespace advss {
 
 bool VideoSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_videoAdd_clicked()
 {
@@ -24,7 +24,7 @@ void AdvSceneSwitcher::on_videoAdd_clicked()
 	VideoSwitchWidget *sw =
 		new VideoSwitchWidget(this, &switcher->videoSwitches.back());
 
-	listAddClicked(ui->videoSwitches, sw, ui->videoAdd, addPulse);
+	listAddClicked(ui->videoSwitches, sw, ui->videoAdd, &addPulse);
 
 	ui->videoHelp->setVisible(false);
 }
@@ -202,8 +202,7 @@ void AdvSceneSwitcher::SetupVideoTab()
 
 	if (switcher->videoSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->videoAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->videoAdd, QColor(Qt::green));
 		}
 		ui->videoHelp->setVisible(true);
 	} else {

lib/legacy/switch-window.cpp

@@ -11,7 +11,7 @@
 namespace advss {
 
 bool WindowSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_windowAdd_clicked()
 {
@@ -21,7 +21,7 @@ void AdvSceneSwitcher::on_windowAdd_clicked()
 	listAddClicked(ui->windowSwitches,
 		       new WindowSwitchWidget(this,
 					      &switcher->windowSwitches.back()),
-		       ui->windowAdd, addPulse);
+		       ui->windowAdd, &addPulse);
 
 	ui->windowHelp->setVisible(false);
 }
@@ -335,8 +335,8 @@ void AdvSceneSwitcher::SetupTitleTab()
 
 	if (switcher->windowSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->windowAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->windowAdd, QColor(Qt::green));
 		}
 		ui->windowHelp->setVisible(true);
 	} else {

lib/macro/macro-action-edit.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-edit.hpp"
 #include "advanced-scene-switcher.hpp"
 #include "macro-helpers.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "plugin-state-helpers.hpp"
 #include "section.hpp"
@@ -29,7 +29,8 @@ static inline void populateActionSelection(QComboBox *list)
 MacroActionEdit::MacroActionEdit(QWidget *parent,
 				 std::shared_ptr<MacroAction> *entryData,
 				 const std::string &id)
-	: MacroSegmentEdit(parent),
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightActions,
+			   parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
 	  _entryData(entryData)
@@ -39,6 +40,8 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 			 SLOT(ActionSelectionChanged(const QString &)));
 	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
 			 SLOT(ActionEnableChanged(bool)));
+	QWidget::connect(window(), SIGNAL(HighlightActionsChanged(bool)), this,
+			 SLOT(EnableHighlight(bool)));
 	QWidget::connect(&_actionStateTimer, SIGNAL(timeout()), this,
 			 SLOT(UpdateActionState()));
 
@@ -158,20 +161,33 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }
 
-void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
-				      const std::string &id, obs_data_t *data)
+void AdvSceneSwitcher::AddMacroAction(int idx)
 {
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
+	auto macro = GetSelectedMacro();
+	if (!macro) {
 		return;
 	}
 
+	if (idx < 0 || idx > (int)macro->Actions().size()) {
+		return;
+	}
+
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->Actions().at(idx - 1)->GetId();
+	} else {
+		id = MacroAction::GetDefaultID();
+	}
 	{
 		auto lock = LockContext();
-		macro->Actions().emplace(macro->Actions().begin() + idx,
-					 MacroActionFactory::Create(id, macro));
-		if (data) {
+		macro->Actions().emplace(
+			macro->Actions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Actions().at(idx - 1)->Save(data);
 			macro->Actions().at(idx)->Load(data);
+			obs_data_release(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
 		RunPostLoadSteps();
@@ -182,37 +198,9 @@ void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
 		SetActionData(*macro);
 	}
 	HighlightAction(idx);
-	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->Actions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Actions().at(idx - 1)->Save(data);
-	}
-	AddMacroAction(macro.get(), idx, id, data);
-}
-
 void AdvSceneSwitcher::on_actionAdd_clicked()
 {
 	auto macro = GetSelectedMacro();
@@ -228,6 +216,7 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
 	if (currentActionIdx != -1) {
 		MacroActionSelectionChanged(currentActionIdx + 1);
 	}
+	ui->actionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::RemoveMacroAction(int idx)
@@ -322,6 +311,7 @@ void AdvSceneSwitcher::on_elseActionAdd_clicked()
 	if (currentElseActionIdx != -1) {
 		MacroElseActionSelectionChanged(currentElseActionIdx + 1);
 	}
+	ui->elseActionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::on_elseActionRemove_clicked()
@@ -460,21 +450,31 @@ void AdvSceneSwitcher::MacroElseActionReorder(int to, int from)
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
-					  const std::string &id,
-					  obs_data_t *data)
+void AdvSceneSwitcher::AddMacroElseAction(int idx)
 {
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
+	auto macro = GetSelectedMacro();
+	if (!macro) {
 		return;
 	}
 
+	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
+		return;
+	}
+
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->ElseActions().at(idx - 1)->GetId();
+	} else {
+		id = MacroAction::GetDefaultID();
+	}
 	{
 		auto lock = LockContext();
-		macro->ElseActions().emplace(macro->ElseActions().begin() + idx,
-					     MacroActionFactory::Create(id,
-									macro));
-		if (data) {
+		macro->ElseActions().emplace(
+			macro->ElseActions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			OBSDataAutoRelease data = obs_data_create();
+			macro->ElseActions().at(idx - 1)->Save(data);
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
@@ -486,37 +486,9 @@ void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
-	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroElseAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->ElseActions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->ElseActions().at(idx - 1)->Save(data);
-	}
-	AddMacroElseAction(macro.get(), idx, id, data);
-}
-
 void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 {
 	auto macro = GetSelectedMacro();
@@ -535,7 +507,7 @@ void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 		SetMacroAbortWait(true);
 		GetMacroWaitCV().notify_all();
 		macro->UpdateElseActionIndices();
-		SetElseActionData(*macro);
+		SetActionData(*macro);
 	}
 	MacroElseActionSelectionChanged(-1);
 	lastInteracted = MacroSection::ELSE_ACTIONS;

lib/macro/macro-action-macro.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-macro.hpp"
-#include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
 
@@ -49,7 +48,9 @@ bool MacroActionMacro::PerformAction()
 		macro->ResetRunCount();
 		break;
 	case Action::RUN:
-		RunActions(macro.get());
+		if (!macro->Paused()) {
+			macro->PerformActions(true, false, true);
+		}
 		break;
 	case Action::STOP:
 		macro->Stop();
@@ -126,7 +127,6 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 	_macro.Save(obj);
 	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
-	_runOptions.Save(obj);
 	return true;
 }
 
@@ -137,15 +137,6 @@ bool MacroActionMacro::Load(obs_data_t *obj)
 	_actionIndex.Load(obj, "actionIndex");
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
-	_runOptions.Load(obj);
-	return true;
-}
-
-bool MacroActionMacro::PostLoad()
-{
-	MacroRefAction::PostLoad();
-	MacroAction::PostLoad();
-	_runOptions.macro.PostLoad();
 	return true;
 }
 
@@ -169,68 +160,11 @@ void MacroActionMacro::ResolveVariablesToFixedValues()
 	_actionIndex.ResolveVariables();
 }
 
-static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
-			     const StringList &inputs)
+static inline void populateActionSelection(QComboBox *list)
 {
-	if (setInputs) {
-		macro->GetInputVariables().SetValues(inputs);
+	for (auto entry : actionTypes) {
+		list->addItem(obs_module_text(entry.second.c_str()));
 	}
-	macro->PerformActions(!runElseActions, false, true);
-}
-
-void MacroActionMacro::RunActions(Macro *actionMacro) const
-{
-	if (_runOptions.skipWhenPaused && actionMacro->Paused()) {
-		return;
-	}
-
-	if (_runOptions.logic == RunOptions::Logic::IGNORE_CONDITIONS) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-		return;
-	}
-
-	auto conditionMacro = _runOptions.macro.GetMacro();
-	if (!conditionMacro) {
-		return;
-	}
-
-	if (_runOptions.reevaluateConditionState) {
-		conditionMacro->CeckMatch(true);
-	}
-
-	if ((_runOptions.logic == RunOptions::Logic::CONDITIONS &&
-	     conditionMacro->Matched()) ||
-	    (_runOptions.logic == RunOptions::Logic::INVERT_CONDITIONS &&
-	     !conditionMacro->Matched())) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-	}
-}
-
-static void populateActionSelection(QComboBox *list)
-{
-	for (const auto &[_, name] : actionTypes) {
-		list->addItem(obs_module_text(name.c_str()));
-	}
-}
-
-static void populateConditionBehaviorSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.ignore"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.true"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
-}
-
-static void populateActionTypeSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }
 
 MacroActionMacroEdit::MacroActionMacroEdit(
@@ -239,28 +173,9 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	  _macros(new MacroSelection(parent)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _actions(new QComboBox()),
-	  _conditionMacros(new MacroSelection(parent)),
-	  _conditionBehaviors(new QComboBox()),
-	  _reevaluateConditionState(new QCheckBox(
-		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
-				  "updateConditionMatchState"))),
-	  _actionTypes(new QComboBox()),
-	  _skipWhenPaused(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
-	  _setInputs(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.setInputs"))),
-	  _inputs(new MacroInputEdit()),
-	  _entryLayout(new QHBoxLayout()),
-	  _conditionLayout(new QHBoxLayout()),
-	  _reevaluateConditionStateLayout(new QHBoxLayout()),
-	  _setInputsLayout(new QHBoxLayout())
+	  _actions(new QComboBox())
 {
 	populateActionSelection(_actions);
-	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionTypeSelection(_actionTypes);
-
-	_conditionMacros->HideSelectedMacro();
 
 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
@@ -269,53 +184,20 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
-	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(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
-			 SLOT(SkipWhenPausedChanged(int)));
-	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
-			 SLOT(SetInputsChanged(int)));
-	QWidget::connect(_inputs,
-			 SIGNAL(MacroInputValuesChanged(const StringList &)),
-			 this, SLOT(InputsChanged(const StringList &)));
-	QWidget::connect(_reevaluateConditionState, SIGNAL(stateChanged(int)),
-			 this, SLOT(ReevaluateConditionStateChanged(int)));
 
-	_setInputsLayout->addWidget(_setInputs);
-	_setInputsLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.setInputs.description")));
-	_setInputsLayout->addStretch();
+	auto mainLayout = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.macro.entry"),
+		     mainLayout,
+		     {{"{{actions}}", _actions},
+		      {"{{actionIndex}}", _actionIndex},
+		      {"{{macros}}", _macros}});
+	setLayout(mainLayout);
 
-	_reevaluateConditionStateLayout->addWidget(_reevaluateConditionState);
-	_reevaluateConditionStateLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help")));
-	_reevaluateConditionStateLayout->addStretch();
-
-	auto layout = new QVBoxLayout();
-	layout->addLayout(_entryLayout);
-	layout->addLayout(_conditionLayout);
-	layout->addLayout(_reevaluateConditionStateLayout);
-	layout->addLayout(_setInputsLayout);
-	layout->addWidget(_inputs);
-	layout->addWidget(_skipWhenPaused);
-	setLayout(layout);
 	_entryData = entryData;
 	UpdateEntryData();
 	_loading = false;
 }
 
-void HighligthMacroSettingsButton(bool enable);
-
-MacroActionMacroEdit::~MacroActionMacroEdit()
-{
-	HighligthMacroSettingsButton(false);
-}
-
 void MacroActionMacroEdit::UpdateEntryData()
 {
 	if (!_entryData) {
@@ -325,132 +207,45 @@ void MacroActionMacroEdit::UpdateEntryData()
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	_macros->SetCurrentMacro(_entryData->_macro);
-	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
-	_conditionBehaviors->setCurrentIndex(
-		static_cast<int>(_entryData->_runOptions.logic));
-	_reevaluateConditionState->setChecked(
-		_entryData->_runOptions.reevaluateConditionState);
-	_actionTypes->setCurrentIndex(
-		_entryData->_runOptions.runElseActions ? 1 : 0);
-	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
-	_setInputs->setChecked(_entryData->_runOptions.setInputs);
-	SetupMacroInput(_entryData->_macro.GetMacro().get());
 	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::MacroChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macro = text;
-	const auto &macro = _entryData->_macro.GetMacro();
-	_actionIndex->SetMacro(macro);
-	SetupMacroInput(macro.get());
+	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
-	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::ActionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionMacro::Action>(value);
 	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_actionIndex = value;
 }
 
-void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.macro = text;
-}
-
-void MacroActionMacroEdit::ConditionBehaviorChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.logic =
-		static_cast<MacroActionMacro::RunOptions::Logic>(value);
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.reevaluateConditionState = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ActionTypeChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = value;
-}
-
-void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.skipWhenPaused = value;
-}
-
-void MacroActionMacroEdit::SetInputsChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.setInputs = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::InputsChanged(const StringList &inputs)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.inputs = inputs;
-	adjustSize();
-	updateGeometry();
-}
-
 void MacroActionMacroEdit::SetWidgetVisibility()
 {
-	_entryLayout->removeWidget(_actions);
-	_entryLayout->removeWidget(_actionIndex);
-	_entryLayout->removeWidget(_macros);
-	_entryLayout->removeWidget(_actionTypes);
-	_conditionLayout->removeWidget(_conditionBehaviors);
-	_conditionLayout->removeWidget(_conditionMacros);
-
-	ClearLayout(_entryLayout);
-	ClearLayout(_conditionLayout);
-
-	const std::unordered_map<std::string, QWidget *> placeholders = {
-		{"{{actions}}", _actions},
-		{"{{actionIndex}}", _actionIndex},
-		{"{{macros}}", _macros},
-		{"{{actionTypes}}", _actionTypes},
-		{"{{conditionBehaviors}}", _conditionBehaviors},
-		{"{{conditionMacros}}", _conditionMacros},
-
-	};
-
-	PlaceWidgets(
-		obs_module_text(
-			_entryData->_action == MacroActionMacro::Action::RUN
-				? "AdvSceneSwitcher.action.macro.entry.run"
-				: "AdvSceneSwitcher.action.macro.entry.other"),
-		_entryLayout, placeholders);
-
-	if (_entryData->_runOptions.logic ==
-	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
-		_conditionLayout->addWidget(_conditionBehaviors);
-		_conditionLayout->addStretch();
-	} else {
-		PlaceWidgets(
-			obs_module_text(
-				"AdvSceneSwitcher.action.macro.entry.run.condition"),
-			_conditionLayout, placeholders);
-	}
-
 	if (_entryData->_action == MacroActionMacro::Action::RUN ||
 	    _entryData->_action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
@@ -465,73 +260,6 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 			MacroActionMacro::Action::ENABLE_ACTION ||
 		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
 	_actionIndex->setVisible(isModifyingActionState);
-
-	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN &&
-		_entryData->_runOptions.logic !=
-			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
-	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
-	SetLayoutVisible(_reevaluateConditionStateLayout,
-			 needsAdditionalConditionWidgets);
-	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN &&
-			    _entryData->_runOptions.setInputs);
-	HighligthMacroSettingsButton(_entryData->_action ==
-					     MacroActionMacro::Action::RUN &&
-				     _entryData->_runOptions.setInputs &&
-				     !_inputs->HasInputsToSet());
-	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN);
-	_skipWhenPaused->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN);
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroActionMacroEdit::SetupMacroInput(Macro *macro) const
-{
-	if (macro) {
-		_inputs->SetInputVariablesAndValues(
-			macro->GetInputVariables(),
-			_entryData->_runOptions.inputs);
-	} else {
-		_inputs->SetInputVariablesAndValues({}, {});
-	}
-}
-
-void MacroActionMacro::RunOptions::Save(obs_data_t *obj) const
-{
-	OBSDataAutoRelease data = obs_data_create();
-	obs_data_set_int(data, "logic", static_cast<int>(logic));
-	obs_data_set_bool(data, "reevaluateConditionState",
-			  reevaluateConditionState);
-	obs_data_set_bool(data, "runElseActions", runElseActions);
-	obs_data_set_bool(data, "skipWhenPaused", skipWhenPaused);
-	obs_data_set_bool(data, "setInputs", setInputs);
-	inputs.Save(data, "inputs");
-	macro.Save(data);
-	obs_data_set_obj(obj, "runOptions", data);
-}
-
-void MacroActionMacro::RunOptions::Load(obs_data_t *obj)
-{
-	if (!obs_data_has_user_value(obj, "runOptions")) {
-		return;
-	}
-	OBSDataAutoRelease data = obs_data_get_obj(obj, "runOptions");
-	logic = static_cast<Logic>(obs_data_get_int(data, "logic"));
-	reevaluateConditionState =
-		obs_data_get_bool(data, "reevaluateConditionState");
-	runElseActions = obs_data_get_bool(data, "runElseActions");
-	skipWhenPaused = obs_data_get_bool(data, "skipWhenPaused");
-	setInputs = obs_data_get_bool(data, "setInputs");
-	inputs.Load(data, "inputs");
-	macro.Load(data);
 }
 
 } // namespace advss

lib/macro/macro-action-macro.hpp

@@ -1,45 +1,25 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"
 
-#include <QCheckBox>
 #include <QHBoxLayout>
 
 namespace advss {
 
-class MacroActionMacro final : public MacroRefAction {
+class MacroActionMacro : public MacroRefAction {
 public:
 	MacroActionMacro(Macro *m) : MacroAction(m), MacroRefAction(m) {}
 	bool PerformAction();
 	void LogAction() const;
 	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);
-	bool PostLoad();
 	std::string GetShortDesc() const;
 	std::string GetId() const { return id; };
 	static std::shared_ptr<MacroAction> Create(Macro *m);
 	std::shared_ptr<MacroAction> Copy() const;
 	void ResolveVariablesToFixedValues();
 
-	struct RunOptions {
-		void Save(obs_data_t *obj) const;
-		void Load(obs_data_t *obj);
-		enum class Logic {
-			IGNORE_CONDITIONS,
-			CONDITIONS,
-			INVERT_CONDITIONS,
-		};
-		Logic logic;
-		bool reevaluateConditionState = false;
-		bool runElseActions = false;
-		bool skipWhenPaused = true;
-		bool setInputs = false;
-		StringList inputs;
-		MacroRef macro;
-	};
-
 	enum class Action {
 		PAUSE,
 		UNPAUSE,
@@ -50,25 +30,21 @@ public:
 		ENABLE_ACTION,
 		TOGGLE_ACTION,
 	};
-	Action _action = Action::RUN;
+	Action _action = Action::PAUSE;
 	IntVariable _actionIndex = 1;
-	RunOptions _runOptions = {};
 
 private:
-	void RunActions(Macro *actionMacro) const;
-
 	static bool _registered;
 	static const std::string id;
 };
 
-class MacroActionMacroEdit final : public QWidget {
+class MacroActionMacroEdit : public QWidget {
 	Q_OBJECT
 
 public:
 	MacroActionMacroEdit(
 		QWidget *parent,
 		std::shared_ptr<MacroActionMacro> entryData = nullptr);
-	~MacroActionMacroEdit();
 	void UpdateEntryData();
 	static QWidget *Create(QWidget *parent,
 			       std::shared_ptr<MacroAction> action)
@@ -82,37 +58,18 @@ private slots:
 	void MacroChanged(const QString &text);
 	void ActionChanged(int value);
 	void ActionIndexChanged(const IntVariable &value);
-	void ConditionMacroChanged(const QString &text);
-	void ConditionBehaviorChanged(int value);
-	void ReevaluateConditionStateChanged(int value);
-	void ActionTypeChanged(int value);
-	void SkipWhenPausedChanged(int value);
-	void SetInputsChanged(int value);
-	void InputsChanged(const StringList &);
-
 signals:
 	void HeaderInfoChanged(const QString &);
 
-private:
-	void SetWidgetVisibility();
-	void SetupMacroInput(Macro *) const;
-
+protected:
 	MacroSelection *_macros;
 	MacroSegmentSelection *_actionIndex;
 	QComboBox *_actions;
-	MacroSelection *_conditionMacros;
-	QComboBox *_conditionBehaviors;
-	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionTypes;
-	QCheckBox *_skipWhenPaused;
-	QCheckBox *_setInputs;
-	MacroInputEdit *_inputs;
-	QHBoxLayout *_entryLayout;
-	QHBoxLayout *_conditionLayout;
-	QHBoxLayout *_reevaluateConditionStateLayout;
-	QHBoxLayout *_setInputsLayout;
-
 	std::shared_ptr<MacroActionMacro> _entryData;
+
+private:
+	void SetWidgetVisibility();
+
 	bool _loading = true;
 };
 

lib/macro/macro-action-variable.cpp

@@ -58,8 +58,6 @@ const static std::map<MacroActionVariable::Type, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.variable.type.padValue"},
 	{MacroActionVariable::Type::TRUNCATE,
 	 "AdvSceneSwitcher.action.variable.type.truncateValue"},
-	{MacroActionVariable::Type::SWAP_VALUES,
-	 "AdvSceneSwitcher.action.variable.type.swapValues"},
 };
 
 static void apppend(Variable &var, const std::string &value)
@@ -394,17 +392,6 @@ bool MacroActionVariable::PerformAction()
 		var->SetValue(
 			truncate(var->Value(), _direction, _stringLength));
 		return true;
-	case Type::SWAP_VALUES: {
-		auto var2 = _variable2.lock();
-		if (!var2) {
-			return true;
-		}
-
-		auto tempValue = var->Value();
-		var->SetValue(var2->Value());
-		var2->SetValue(tempValue);
-		return true;
-	}
 	}
 
 	return true;
@@ -643,8 +630,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _scenes(new SceneSelectionWidget(this, true, false, true, true,
 					   true)),
 	  _tempVars(new TempVariableSelection(this)),
-	  _tempVarsHelp(new HelpIcon(obs_module_text(
-		  "AdvSceneSwitcher.action.variable.type.setToTempvar.help"))),
 	  _sceneItemIndex(new VariableSpinBox()),
 	  _direction(new QComboBox()),
 	  _stringLength(new VariableSpinBox()),
@@ -757,7 +742,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{envVariableName}}", _envVariable},
 		{"{{scenes}}", _scenes},
 		{"{{tempVars}}", _tempVars},
-		{"{{tempVarsHelp}}", _tempVarsHelp},
 		{"{{sceneItemIndex}}", _sceneItemIndex},
 		{"{{direction}}", _direction},
 		{"{{stringLength}}", _stringLength},
@@ -1218,7 +1202,6 @@ void MacroActionVariableEdit::SelectionChanged(const TempVariableRef &var)
 
 	auto lock = LockContext();
 	_entryData->_tempVar = var;
-	SetWidgetVisibility();
 }
 
 void MacroActionVariableEdit::SceneItemIndexChanged(
@@ -1285,7 +1268,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		{"{{envVariableName}}", _envVariable},
 		{"{{scenes}}", _scenes},
 		{"{{tempVars}}", _tempVars},
-		{"{{tempVarsHelp}}", _tempVarsHelp},
 		{"{{sceneItemIndex}}", _sceneItemIndex},
 		{"{{direction}}", _direction},
 		{"{{stringLength}}", _stringLength},
@@ -1322,9 +1304,8 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		AddStretchIfNecessary(_entryLayout);
 	}
 
-	_variables2->setVisible(
-		_entryData->_type == MacroActionVariable::Type::APPEND_VAR ||
-		_entryData->_type == MacroActionVariable::Type::SWAP_VALUES);
+	_variables2->setVisible(_entryData->_type ==
+				MacroActionVariable::Type::APPEND_VAR);
 	_strValue->setVisible(
 		_entryData->_type ==
 			MacroActionVariable::Type::SET_FIXED_VALUE ||
@@ -1400,10 +1381,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			MacroActionVariable::Type::SCENE_ITEM_NAME);
 	_tempVars->setVisible(_entryData->_type ==
 			      MacroActionVariable::Type::SET_TO_TEMPVAR);
-	_tempVarsHelp->setVisible(
-		_entryData->_type ==
-			MacroActionVariable::Type::SET_TO_TEMPVAR &&
-		!_entryData->_tempVar.HasValidID());
 	_sceneItemIndex->setVisible(_entryData->_type ==
 				    MacroActionVariable::Type::SCENE_ITEM_NAME);
 	_direction->setVisible(

lib/macro/macro-action-variable.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "help-icon.hpp"
 #include "macro-segment-selection.hpp"
 #include "regex-config.hpp"
 #include "resizing-text-edit.hpp"
@@ -49,7 +48,6 @@ public:
 		SCENE_ITEM_NAME,
 		PAD,
 		TRUNCATE,
-		SWAP_VALUES,
 	};
 
 	Type _type = Type::SET_FIXED_VALUE;
@@ -187,7 +185,6 @@ private:
 	VariableLineEdit *_envVariable;
 	SceneSelectionWidget *_scenes;
 	TempVariableSelection *_tempVars;
-	HelpIcon *_tempVarsHelp;
 	VariableSpinBox *_sceneItemIndex;
 	QComboBox *_direction;
 	VariableSpinBox *_stringLength;

lib/macro/macro-condition-edit.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
@@ -121,7 +121,8 @@ void DurationModifierEdit::Collapse(bool collapse)
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
 	const std::string &id, bool root)
-	: MacroSegmentEdit(parent),
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightConditions,
+			   parent),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
 	  _dur(new DurationModifierEdit()),
@@ -138,6 +139,8 @@ MacroConditionEdit::MacroConditionEdit(
 	QWidget::connect(_dur, SIGNAL(ModifierChanged(DurationModifier::Type)),
 			 this,
 			 SLOT(DurationModifierChanged(DurationModifier::Type)));
+	QWidget::connect(window(), SIGNAL(HighlightConditionsChanged(bool)),
+			 this, SLOT(EnableHighlight(bool)));
 
 	populateLogicSelection(_logicSelection, root);
 	populateConditionSelection(_conditionSelection);
@@ -296,7 +299,6 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 	}
 
 	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
 		return;
 	}
 
@@ -313,31 +315,16 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 		id = MacroCondition::GetDefaultID();
 		logic = LogicType::ROOT_NONE;
 	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Conditions().at(idx - 1)->Save(data);
-	}
-	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
-}
-
-void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
-					 const std::string &id,
-					 obs_data_t *data, LogicType logic)
-{
-	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
-		return;
-	}
-
 	{
 		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
 			macro->Conditions().begin() + idx,
-			MacroConditionFactory::Create(id, macro));
-		if (data) {
+			MacroConditionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Conditions().at(idx - 1)->Save(data);
 			macro->Conditions().at(idx)->Load(data);
+			obs_data_release(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
 		RunPostLoadSteps();
@@ -350,7 +337,6 @@ void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);
-	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -369,6 +355,7 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
 	if (currentConditionIdx != -1) {
 		MacroConditionSelectionChanged(currentConditionIdx + 1);
 	}
+	ui->conditionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::RemoveMacroCondition(int idx)

lib/macro/macro-dock.cpp

@@ -167,7 +167,7 @@ void MacroDock::Highlight()
 	}
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    macro->WasExecutedSince(_lastHighlightCheckTime)) {
-		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
 	}
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }

lib/macro/macro-input.cpp

@@ -1,241 +0,0 @@
-#include "macro-input.hpp"
-#include "layout-helpers.hpp"
-#include "log-helper.hpp"
-#include "obs-module-helper.hpp"
-#include "variable-line-edit.hpp"
-
-#include <algorithm>
-#include <obs.hpp>
-
-namespace advss {
-
-void MacroInputVariables::Save(obs_data_t *obj) const
-{
-	OBSDataArrayAutoRelease array = obs_data_array_create();
-	for (auto &var : _inputVariables) {
-		OBSDataAutoRelease arrayObj = obs_data_create();
-		auto variable = var.lock();
-		if (variable) {
-			obs_data_set_string(arrayObj, "variableName",
-					    variable->Name().c_str());
-		} else {
-			obs_data_set_bool(arrayObj, "invalidVariable", true);
-		}
-		obs_data_array_push_back(array, arrayObj);
-	}
-	obs_data_set_array(obj, "inputVariables", array);
-}
-
-void MacroInputVariables::Load(obs_data_t *obj)
-{
-	OBSDataArrayAutoRelease array =
-		obs_data_get_array(obj, "inputVariables");
-	const size_t count = obs_data_array_count(array);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease arrayObj = obs_data_array_item(array, i);
-		const bool isInvalid =
-			obs_data_get_bool(arrayObj, "invalidVariable");
-		if (isInvalid) {
-			_inputVariables.emplace_back();
-		} else {
-			const auto name =
-				obs_data_get_string(arrayObj, "variableName");
-			_inputVariables.emplace_back(
-				GetWeakVariableByName(name));
-		}
-	}
-}
-
-void MacroInputVariables::SetValues(const StringList &values)
-{
-	if (_inputVariables.size() != (size_t)values.size()) {
-		blog(LOG_WARNING,
-		     "%s - sizes do not match (variables: %d, values %d)",
-		     __func__, (int)_inputVariables.size(), (int)values.size());
-	}
-
-	for (size_t index = 0;
-	     index < _inputVariables.size() && index < (size_t)values.size();
-	     index++) {
-		auto variable = _inputVariables.at(index).lock();
-		if (!variable) {
-			continue;
-		}
-
-		variable->SetValue(values.at(index));
-	}
-}
-
-MacroInputSelection::MacroInputSelection(QWidget *parent) : ListEditor(parent)
-{
-	_list->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-}
-
-void MacroInputSelection::SetInputs(const MacroInputVariables &inputs)
-{
-	_currentSelection = inputs;
-	for (const auto &var : inputs._inputVariables) {
-		auto variable = var.lock();
-		const auto name =
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid");
-
-		QVariant v = QVariant::fromValue(name);
-		auto item = new QListWidgetItem(name, _list);
-		item->setData(Qt::UserRole, name);
-	}
-	UpdateListSize();
-}
-
-void MacroInputSelection::Add()
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(this, varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	_currentSelection._inputVariables.emplace_back(
-		GetWeakVariableByName(varName));
-
-	QVariant v = QVariant::fromValue(QString::fromStdString(varName));
-	auto item = new QListWidgetItem(QString::fromStdString(varName), _list);
-	item->setData(Qt::UserRole, QString::fromStdString(varName));
-	UpdateListSize();
-}
-
-void MacroInputSelection::Remove()
-{
-	auto item = _list->currentItem();
-	int idx = _list->currentRow();
-	if (!item || idx == -1) {
-		return;
-	}
-
-	_currentSelection._inputVariables.erase(
-		std::next(_currentSelection._inputVariables.begin(), idx));
-
-	delete item;
-	UpdateListSize();
-}
-
-void MacroInputSelection::Up()
-{
-	int idx = _list->currentRow();
-	if (idx < 1) {
-		return;
-	}
-
-	_list->insertItem(idx - 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx - 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx),
-		std::next(_currentSelection._inputVariables.begin(), idx - 1));
-}
-
-void MacroInputSelection::Down()
-{
-	int idx = _list->currentRow();
-	if (idx < 0 || idx >= _list->count()) {
-		return;
-	}
-
-	_list->insertItem(idx + 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx + 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx + 1),
-		std::next(_currentSelection._inputVariables.begin(), idx));
-}
-
-void MacroInputSelection::Clicked(QListWidgetItem *item)
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(this, varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	item->setText(QString::fromStdString(varName));
-	int idx = _list->currentRow();
-
-	_currentSelection._inputVariables.at(idx) =
-		GetWeakVariableByName(varName);
-}
-
-MacroInputEdit::MacroInputEdit(QWidget *parent)
-	: QWidget(parent),
-	  _layout(new QGridLayout())
-{
-	setLayout(_layout);
-}
-
-void MacroInputEdit::SetInputVariablesAndValues(
-	const MacroInputVariables &inputs, const StringList &values)
-{
-	_variables = inputs;
-	_values = values;
-	if ((size_t)_values.size() < _variables._inputVariables.size()) {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-		for (int i = 0;
-		     _variables._inputVariables.size() - (size_t)_values.size();
-		     i++) {
-			_values.push_back({});
-		}
-#else
-		_values.resize(_variables._inputVariables.size());
-#endif
-	}
-	SetupWidgets();
-}
-
-bool MacroInputEdit::HasInputsToSet() const
-{
-	return !_variables._inputVariables.empty();
-}
-
-void HighligthMacroSettingsButton(bool enable);
-
-void MacroInputEdit::SetupWidgets()
-{
-	ClearLayout(_layout);
-
-	auto &vars = _variables._inputVariables;
-	if (vars.empty()) {
-		_layout->addWidget(new QLabel(obs_module_text(
-			"AdvSceneSwitcher.macroTab.inputSettings.noInputs")));
-		adjustSize();
-		updateGeometry();
-		return;
-	}
-
-	for (size_t index = 0; index < vars.size(); index++) {
-		auto variable = vars.at(index).lock();
-		QLabel *label = new QLabel(
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid"));
-		_layout->addWidget(label, index, 0);
-		auto valueEdit = new VariableLineEdit(this);
-		valueEdit->setEnabled(!!variable);
-		valueEdit->setText(_values.at(index));
-		connect(valueEdit, &VariableLineEdit::editingFinished,
-			[this, valueEdit, index]() {
-				_values[index] =
-					valueEdit->text().toStdString();
-				emit MacroInputValuesChanged(_values);
-			});
-		_layout->addWidget(valueEdit, index, 1);
-	}
-
-	adjustSize();
-	updateGeometry();
-}
-
-} // namespace advss

lib/macro/macro-input.hpp

@@ -1,63 +0,0 @@
-#pragma once
-#include "list-editor.hpp"
-#include "string-list.hpp"
-#include "variable.hpp"
-
-#include <QGridLayout>
-#include <memory>
-#include <vector>
-
-namespace advss {
-
-class MacroInputVariables {
-public:
-	void Save(obs_data_t *obj) const;
-	void Load(obs_data_t *obj);
-	void SetValues(const StringList &values);
-
-private:
-	std::vector<std::weak_ptr<Variable>> _inputVariables;
-	friend class MacroInputSelection;
-	friend class MacroInputEdit;
-};
-
-class MacroInputSelection final : public ListEditor {
-	Q_OBJECT
-
-public:
-	MacroInputSelection(QWidget *parent = nullptr);
-	void SetInputs(const MacroInputVariables &inputs);
-	MacroInputVariables GetInputs() const { return _currentSelection; }
-
-private slots:
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
-	void Clicked(QListWidgetItem *);
-
-private:
-	MacroInputVariables _currentSelection;
-};
-
-class MacroInputEdit final : public QWidget {
-	Q_OBJECT
-
-public:
-	MacroInputEdit(QWidget *parent = nullptr);
-	void SetInputVariablesAndValues(const MacroInputVariables &inputs,
-					const StringList &values);
-	bool HasInputsToSet() const;
-
-signals:
-	void MacroInputValuesChanged(const StringList &);
-
-private:
-	void SetupWidgets();
-
-	MacroInputVariables _variables;
-	StringList _values;
-	QGridLayout *_layout;
-};
-
-} // namespace advss

lib/macro/macro-list.cpp

@@ -7,16 +7,68 @@
 namespace advss {
 
 MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
-	: ListEditor(parent, reorder),
-	  _allowDuplicates(allowDuplicates)
+	: QWidget(parent),
+	  _list(new QListWidget()),
+	  _add(new QPushButton()),
+	  _remove(new QPushButton()),
+	  _up(new QPushButton()),
+	  _down(new QPushButton()),
+	  _controlsLayout(new QHBoxLayout()),
+	  _allowDuplicates(allowDuplicates),
+	  _reorder(reorder)
 {
+	_add->setMaximumWidth(22);
+	_add->setProperty("themeID",
+			  QVariant(QString::fromUtf8("addIconSmall")));
+	_add->setFlat(true);
+	_remove->setMaximumWidth(22);
+	_remove->setProperty("themeID",
+			     QVariant(QString::fromUtf8("removeIconSmall")));
+	_remove->setFlat(true);
+	_up->setMaximumWidth(22);
+	_up->setProperty("themeID",
+			 QVariant(QString::fromUtf8("upArrowIconSmall")));
+	_up->setFlat(true);
+	_down->setMaximumWidth(22);
+	_down->setProperty("themeID",
+			   QVariant(QString::fromUtf8("downArrowIconSmall")));
+	_down->setFlat(true);
+
+	QWidget::connect(_add, SIGNAL(clicked()), this, SLOT(Add()));
+	QWidget::connect(_remove, SIGNAL(clicked()), this, SLOT(Remove()));
+	QWidget::connect(_up, SIGNAL(clicked()), this, SLOT(Up()));
+	QWidget::connect(_down, SIGNAL(clicked()), this, SLOT(Down()));
+	QWidget::connect(_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
+			 this, SLOT(MacroItemClicked(QListWidgetItem *)));
 	QWidget::connect(window(),
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));
 	QWidget::connect(window(), SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
-	UpdateListSize();
+
+	_controlsLayout->addWidget(_add);
+	_controlsLayout->addWidget(_remove);
+	if (reorder) {
+		QFrame *line = new QFrame();
+		line->setFrameShape(QFrame::VLine);
+		line->setFrameShadow(QFrame::Sunken);
+		_controlsLayout->addWidget(line);
+	}
+	_controlsLayout->addWidget(_up);
+	_controlsLayout->addWidget(_down);
+	_controlsLayout->addStretch();
+
+	auto mainLayout = new QVBoxLayout;
+	mainLayout->setContentsMargins(0, 0, 0, 0);
+	mainLayout->addWidget(_list);
+	mainLayout->addLayout(_controlsLayout);
+	setLayout(mainLayout);
+
+	_up->setVisible(reorder);
+	_down->setVisible(reorder);
+
+	SetMacroListSize();
 }
 
 void MacroList::SetContent(const std::vector<MacroRef> &macros)
@@ -37,15 +89,12 @@ void MacroList::SetContent(const std::vector<MacroRef> &macros)
 			new QListWidgetItem(listEntryName, _list);
 		item->setData(Qt::UserRole, listEntryName);
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }
 
-QAction *MacroList::AddControl(QWidget *widget, bool addSeperator)
+void MacroList::AddControl(QWidget *widget)
 {
-	if (addSeperator) {
-		_controls->addSeparator();
-	}
-	return _controls->addWidget(widget);
+	_controlsLayout->insertWidget(_controlsLayout->count() - 1, widget);
 }
 
 int MacroList::CurrentRow()
@@ -73,7 +122,7 @@ void MacroList::MacroRemove(const QString &name)
 		delete _list->item(idx);
 		idx = FindEntry(name.toStdString());
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }
 
 void MacroList::Add()
@@ -93,7 +142,7 @@ void MacroList::Add()
 	auto item =
 		new QListWidgetItem(QString::fromStdString(macroName), _list);
 	item->setData(Qt::UserRole, QString::fromStdString(macroName));
-	UpdateListSize();
+	SetMacroListSize();
 	emit Added(macroName);
 }
 
@@ -105,7 +154,7 @@ void MacroList::Remove()
 		return;
 	}
 	delete item;
-	UpdateListSize();
+	SetMacroListSize();
 	emit Removed(idx);
 }
 
@@ -129,7 +178,7 @@ void MacroList::Down()
 	}
 }
 
-void MacroList::Clicked(QListWidgetItem *item)
+void MacroList::MacroItemClicked(QListWidgetItem *item)
 {
 	std::string macroName;
 	bool accepted = MacroSelectionDialog::AskForMacro(this, macroName);
@@ -167,4 +216,10 @@ int MacroList::FindEntry(const std::string &macro)
 	return idx;
 }
 
+void MacroList::SetMacroListSize()
+{
+	SetHeightToContentHeight(_list);
+	adjustSize();
+}
+
 } // namespace advss

lib/macro/macro-list.hpp

@@ -1,15 +1,18 @@
 #pragma once
-#include "list-editor.hpp"
 #include "macro-ref.hpp"
 
+#include <QListWidget>
+#include <QPushButton>
+#include <QHBoxLayout>
+
 namespace advss {
 
-class ADVSS_EXPORT MacroList final : public ListEditor {
+class ADVSS_EXPORT MacroList : public QWidget {
 	Q_OBJECT
 public:
 	MacroList(QWidget *parent, bool allowDuplicates, bool reorder);
 	void SetContent(const std::vector<MacroRef> &);
-	QAction *AddControl(QWidget *, bool addSeperator = true);
+	void AddControl(QWidget *);
 	int CurrentRow();
 
 private slots:
@@ -19,7 +22,7 @@ private slots:
 	void Remove();
 	void Up();
 	void Down();
-	void Clicked(QListWidgetItem *);
+	void MacroItemClicked(QListWidgetItem *);
 
 signals:
 	void Added(const std::string &);
@@ -30,8 +33,16 @@ signals:
 
 private:
 	int FindEntry(const std::string &macro);
+	void SetMacroListSize();
 
+	QListWidget *_list;
+	QPushButton *_add;
+	QPushButton *_remove;
+	QPushButton *_up;
+	QPushButton *_down;
+	QHBoxLayout *_controlsLayout;
 	const bool _allowDuplicates;
+	const bool _reorder;
 };
 
 } // namespace advss

lib/macro/macro-properties.cpp

@@ -1,4 +1,4 @@
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "layout-helpers.hpp"
 #include "obs-module-helper.hpp"
 #include "macro.hpp"
@@ -10,9 +10,9 @@
 
 namespace advss {
 
-static GlobalMacroSettings macroSettings;
+static MacroProperties macroProperties;
 
-void GlobalMacroSettings::Save(obs_data_t *obj) const
+void MacroProperties::Save(obs_data_t *obj) const
 {
 	auto data = obs_data_create();
 	obs_data_set_bool(data, "highlightExecuted", _highlightExecuted);
@@ -20,16 +20,13 @@ void GlobalMacroSettings::Save(obs_data_t *obj) const
 	obs_data_set_bool(data, "highlightActions", _highlightActions);
 	obs_data_set_bool(data, "newMacroRegisterHotkey",
 			  _newMacroRegisterHotkeys);
-	obs_data_set_obj(obj, "macroSettings", data);
+	obs_data_set_obj(obj, "macroProperties", data);
 	obs_data_release(data);
 }
 
-void GlobalMacroSettings::Load(obs_data_t *obj)
+void MacroProperties::Load(obs_data_t *obj)
 {
-	auto data = obs_data_get_obj(
-		obj, obs_data_has_user_value(obj, "macroProperties")
-			     ? "macroProperties"
-			     : "macroSettings");
+	auto data = obs_data_get_obj(obj, "macroProperties");
 	obs_data_set_default_bool(data, "highlightExecuted", true);
 	obs_data_set_default_bool(data, "highlightConditions", true);
 	obs_data_set_default_bool(data, "highlightActions", true);
@@ -41,9 +38,9 @@ void GlobalMacroSettings::Load(obs_data_t *obj)
 	obs_data_release(data);
 }
 
-MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
-					 const GlobalMacroSettings &settings,
-					 Macro *macro)
+MacroPropertiesDialog::MacroPropertiesDialog(QWidget *parent,
+					     const MacroProperties &prop,
+					     Macro *macro)
 	: QDialog(parent),
 	  _executed(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.highlightExecutedMacros"))),
@@ -59,7 +56,6 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 		  "AdvSceneSwitcher.macroTab.currentSkipExecutionOnStartup"))),
 	  _currentStopActionsIfNotDone(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.currentStopActionsIfNotDone"))),
-	  _currentInputs(new MacroInputSelection()),
 	  _currentMacroRegisterDock(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.currentRegisterDock"))),
 	  _currentMacroDockAddRunButton(new QCheckBox(obs_module_text(
@@ -105,16 +101,6 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	generalLayout->addWidget(_currentStopActionsIfNotDone);
 	generalOptions->setLayout(generalLayout);
 
-	auto inputOptions = new QGroupBox(
-		obs_module_text("AdvSceneSwitcher.macroTab.inputSettings"));
-	auto description = new QLabel(obs_module_text(
-		"AdvSceneSwitcher.macroTab.inputSettings.description"));
-	description->setWordWrap(true);
-	auto inputLayout = new QVBoxLayout();
-	inputLayout->addWidget(description);
-	inputLayout->addWidget(_currentInputs);
-	inputOptions->setLayout(inputLayout);
-
 	int row = 0;
 	_dockLayout->addWidget(_currentMacroRegisterDock, row, 1, 1, 2);
 	row++;
@@ -171,13 +157,13 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
 	connect(_currentMacroRegisterDock, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::DockEnableChanged);
+		&MacroPropertiesDialog::DockEnableChanged);
 	connect(_currentMacroDockAddRunButton, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::RunButtonEnableChanged);
+		&MacroPropertiesDialog::RunButtonEnableChanged);
 	connect(_currentMacroDockAddPauseButton, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::PauseButtonEnableChanged);
+		&MacroPropertiesDialog::PauseButtonEnableChanged);
 	connect(_currentMacroDockAddStatusLabel, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::StatusLabelEnableChanged);
+		&MacroPropertiesDialog::StatusLabelEnableChanged);
 
 	auto scrollArea = new QScrollArea(this);
 	scrollArea->setWidgetResizable(true);
@@ -188,7 +174,6 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	layout->addWidget(highlightOptions);
 	layout->addWidget(hotkeyOptions);
 	layout->addWidget(generalOptions);
-	layout->addWidget(inputOptions);
 	layout->addWidget(_dockOptions);
 	layout->setContentsMargins(0, 0, 0, 0);
 	scrollArea->setWidget(contentWidget);
@@ -198,15 +183,14 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	dialogLayout->addWidget(buttonbox);
 	setLayout(dialogLayout);
 
-	_executed->setChecked(settings._highlightExecuted);
-	_conditions->setChecked(settings._highlightConditions);
-	_actions->setChecked(settings._highlightActions);
-	_newMacroRegisterHotkeys->setChecked(settings._newMacroRegisterHotkeys);
+	_executed->setChecked(prop._highlightExecuted);
+	_conditions->setChecked(prop._highlightConditions);
+	_actions->setChecked(prop._highlightActions);
+	_newMacroRegisterHotkeys->setChecked(prop._newMacroRegisterHotkeys);
 
 	if (!macro || macro->IsGroup()) {
 		hotkeyOptions->hide();
 		generalOptions->hide();
-		inputOptions->hide();
 		_dockOptions->hide();
 		return;
 	}
@@ -214,7 +198,6 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	_currentMacroRegisterHotkeys->setChecked(macro->PauseHotkeysEnabled());
 	_currentSkipOnStartup->setChecked(macro->SkipExecOnStart());
 	_currentStopActionsIfNotDone->setChecked(macro->StopActionsIfNotDone());
-	_currentInputs->SetInputs(macro->GetInputVariables());
 	const bool dockEnabled = macro->DockEnabled();
 	_currentMacroRegisterDock->setChecked(dockEnabled);
 	_currentMacroDockAddRunButton->setChecked(macro->DockHasRunButton());
@@ -262,7 +245,7 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 		       20);
 }
 
-void MacroSettingsDialog::DockEnableChanged(int enabled)
+void MacroPropertiesDialog::DockEnableChanged(int enabled)
 {
 	_currentMacroDockAddRunButton->setVisible(enabled);
 	_currentMacroDockAddPauseButton->setVisible(enabled);
@@ -287,37 +270,37 @@ void MacroSettingsDialog::DockEnableChanged(int enabled)
 	Resize();
 }
 
-void MacroSettingsDialog::RunButtonEnableChanged(int enabled)
+void MacroPropertiesDialog::RunButtonEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _runButtonTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::PauseButtonEnableChanged(int enabled)
+void MacroPropertiesDialog::PauseButtonEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _pauseButtonTextRow, enabled);
 	SetGridLayoutRowVisible(_dockLayout, _unpauseButtonTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::StatusLabelEnableChanged(int enabled)
+void MacroPropertiesDialog::StatusLabelEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _conditionsTrueTextRow, enabled);
 	SetGridLayoutRowVisible(_dockLayout, _conditionsFalseTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::Resize()
+void MacroPropertiesDialog::Resize()
 {
 	_dockOptions->adjustSize();
 	_dockOptions->updateGeometry();
 }
 
-bool MacroSettingsDialog::AskForSettings(QWidget *parent,
-					 GlobalMacroSettings &userInput,
-					 Macro *macro)
+bool MacroPropertiesDialog::AskForSettings(QWidget *parent,
+					   MacroProperties &userInput,
+					   Macro *macro)
 {
-	MacroSettingsDialog dialog(parent, userInput, macro);
+	MacroPropertiesDialog dialog(parent, userInput, macro);
 	dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
 	if (dialog.exec() != DialogCode::Accepted) {
 		return false;
@@ -354,23 +337,23 @@ bool MacroSettingsDialog::AskForSettings(QWidget *parent,
 		dialog._conditionsTrueStatusText->text().toStdString());
 	macro->SetConditionsFalseStatusText(
 		dialog._conditionsFalseStatusText->text().toStdString());
-	macro->SetInputVariables(dialog._currentInputs->GetInputs());
+
 	return true;
 }
 
-GlobalMacroSettings &GetGlobalMacroSettings()
+MacroProperties &GetGlobalMacroProperties()
 {
-	return macroSettings;
+	return macroProperties;
 }
 
-void SaveGlobalMacroSettings(obs_data_t *obj)
+void SaveGlobalMacroProperties(obs_data_t *obj)
 {
-	macroSettings.Save(obj);
+	macroProperties.Save(obj);
 }
 
-void LoadGlobalMacroSettings(obs_data_t *obj)
+void LoadGlobalMacroProperties(obs_data_t *obj)
 {
-	macroSettings.Load(obj);
+	macroProperties.Load(obj);
 }
 
 } // namespace advss

lib/macro/macro-properties.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "variable-line-edit.hpp"
-#include "macro-input.hpp"
 
 #include <QWidget>
 #include <QDialog>
@@ -14,7 +13,7 @@ namespace advss {
 
 class Macro;
 
-class GlobalMacroSettings {
+class MacroProperties {
 public:
 	void Save(obs_data_t *obj) const;
 	void Load(obs_data_t *obj);
@@ -26,14 +25,13 @@ public:
 };
 
 // Dialog for configuring global and individual macro specific settings
-class MacroSettingsDialog : public QDialog {
+class MacroPropertiesDialog : public QDialog {
 	Q_OBJECT
 
 public:
-	MacroSettingsDialog(QWidget *parent, const GlobalMacroSettings &,
-			    Macro *macro);
-	static bool AskForSettings(QWidget *parent,
-				   GlobalMacroSettings &userInput,
+	MacroPropertiesDialog(QWidget *parent, const MacroProperties &,
+			      Macro *macro);
+	static bool AskForSettings(QWidget *parent, MacroProperties &userInput,
 				   Macro *macro);
 private slots:
 	void DockEnableChanged(int);
@@ -52,7 +50,6 @@ private:
 	QCheckBox *_currentMacroRegisterHotkeys;
 	QCheckBox *_currentSkipOnStartup;
 	QCheckBox *_currentStopActionsIfNotDone;
-	MacroInputSelection *_currentInputs;
 	QCheckBox *_currentMacroRegisterDock;
 	QCheckBox *_currentMacroDockAddRunButton;
 	QCheckBox *_currentMacroDockAddPauseButton;
@@ -73,8 +70,8 @@ private:
 	int _conditionsFalseTextRow = -1;
 };
 
-GlobalMacroSettings &GetGlobalMacroSettings();
-void SaveGlobalMacroSettings(obs_data_t *obj);
-void LoadGlobalMacroSettings(obs_data_t *obj);
+MacroProperties &GetGlobalMacroProperties();
+void SaveGlobalMacroProperties(obs_data_t *obj);
+void LoadGlobalMacroProperties(obs_data_t *obj);
 
 } // namespace advss

lib/macro/macro-segment-copy-paste.cpp

@@ -1,104 +0,0 @@
-#include "advanced-scene-switcher.hpp"
-#include "macro.hpp"
-
-#include <QShortcut>
-
-namespace advss {
-
-struct MacroSegmentCopyInfo {
-	enum class Type { NONE, CONDITION, ACTION, ELSE };
-	Type type = Type::NONE;
-	std::shared_ptr<MacroSegment> segment;
-};
-static MacroSegmentCopyInfo copyInfo;
-
-void AdvSceneSwitcher::CopyMacroSegment()
-{
-	copyInfo.segment.reset();
-	copyInfo.type = MacroSegmentCopyInfo::Type::NONE;
-
-	if (currentConditionIdx == -1 && currentActionIdx == -1 &&
-	    currentElseActionIdx == -1) {
-		return;
-	}
-
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (currentConditionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::CONDITION;
-		copyInfo.segment = macro->Conditions().at(currentConditionIdx);
-	} else if (currentActionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ACTION;
-		copyInfo.segment = macro->Actions().at(currentActionIdx);
-	} else if (currentElseActionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ELSE;
-		copyInfo.segment =
-			macro->ElseActions().at(currentElseActionIdx);
-	} else {
-		assert(false);
-	}
-}
-
-void AdvSceneSwitcher::PasteMacroSegment()
-{
-	if (copyInfo.type == MacroSegmentCopyInfo::Type::NONE) {
-		return;
-	}
-
-	auto macro = GetSelectedMacro();
-	if (!macro || !copyInfo.segment) {
-		return;
-	}
-
-	OBSDataAutoRelease data = obs_data_create();
-	copyInfo.segment->Save(data);
-
-	switch (copyInfo.type) {
-	case MacroSegmentCopyInfo::Type::CONDITION: {
-		const auto condition = std::static_pointer_cast<MacroCondition>(
-			copyInfo.segment);
-		auto logic = condition->GetLogicType();
-		if (logic > LogicType::ROOT_LAST &&
-		    macro->Conditions().empty()) {
-			logic = LogicType::ROOT_NONE;
-		}
-		if (logic < LogicType::ROOT_LAST &&
-		    !macro->Conditions().empty()) {
-			logic = LogicType::OR;
-		}
-		AddMacroCondition(macro.get(), macro->Conditions().size(),
-				  copyInfo.segment->GetId(), data.Get(), logic);
-		break;
-	}
-	case MacroSegmentCopyInfo::Type::ACTION:
-		AddMacroAction(macro.get(), macro->Actions().size(),
-			       copyInfo.segment->GetId(), data.Get());
-		break;
-	case MacroSegmentCopyInfo::Type::ELSE:
-		AddMacroElseAction(macro.get(), macro->ElseActions().size(),
-				   copyInfo.segment->GetId(), data.Get());
-		break;
-	default:
-		break;
-	}
-}
-
-bool MacroSegmentIsInClipboard()
-{
-	return copyInfo.type != MacroSegmentCopyInfo::Type::NONE;
-}
-
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window)
-{
-	auto copyShortcut = new QShortcut(QKeySequence("Ctrl+C"), window);
-	QWidget::connect(copyShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::CopyMacroSegment);
-	auto pasteShortcut = new QShortcut(QKeySequence("Ctrl+V"), window);
-	QWidget::connect(pasteShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::PasteMacroSegment);
-}
-
-} // namespace advss

lib/macro/macro-segment-copy-paste.hpp

@@ -1,8 +0,0 @@
-namespace advss {
-
-class AdvSceneSwitcher;
-
-bool MacroSegmentIsInClipboard();
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window);
-
-} // namespace advss

lib/macro/macro-segment-list.cpp

@@ -130,7 +130,7 @@ void MacroSegmentList::Highlight(int idx, QColor color)
 	if (!widget) {
 		return;
 	}
-	HighlightWidget(widget, color, QColor(0, 0, 0, 0), true);
+	PulseWidget(widget, color, QColor(0, 0, 0, 0), true);
 }
 
 void MacroSegmentList::SetCollapsed(bool collapse)
@@ -176,8 +176,7 @@ bool MacroSegmentList::eventFilter(QObject *object, QEvent *event)
 
 void MacroSegmentList::mousePressEvent(QMouseEvent *event)
 {
-	if (event->button() == Qt::LeftButton ||
-	    event->button() == Qt::RightButton) {
+	if (event->button() == Qt::LeftButton) {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		_dragPosition = GetDragIndex(event->globalPos());
 #else

lib/macro/macro-segment-selection.cpp

@@ -175,7 +175,7 @@ void MacroSegmentSelection::MarkSelectedSegment()
 			index - 1, QColor(Qt::lightGray));
 	}
 
-	HighlightWidget(this, QColor(Qt::lightGray), QColor(0, 0, 0, 0), true);
+	PulseWidget(this, QColor(Qt::lightGray), QColor(0, 0, 0, 0), true);
 }
 
 } // namespace advss

lib/macro/macro-segment.cpp

@@ -59,12 +59,12 @@ std::string MacroSegment::GetShortDesc() const
 	return "";
 }
 
-void MacroSegment::EnableHighlight()
+void MacroSegment::SetHighlight()
 {
 	_highlight = true;
 }
 
-bool MacroSegment::GetHighlightAndReset()
+bool MacroSegment::Highlight()
 {
 	if (_highlight) {
 		_highlight = false;
@@ -194,7 +194,7 @@ void DecrementVariableRef(MacroSegment *segment)
 	segment->_variableRefs--;
 }
 
-MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
+MacroSegmentEdit::MacroSegmentEdit(bool highlight, QWidget *parent)
 	: QWidget(parent),
 	  _section(new Section(300)),
 	  _headerInfo(new QLabel()),
@@ -203,7 +203,8 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 	  _noBorderframe(new QFrame),
 	  _borderFrame(new QFrame),
 	  _dropLineAbove(new QFrame),
-	  _dropLineBelow(new QFrame)
+	  _dropLineBelow(new QFrame),
+	  _showHighlight(highlight)
 {
 	_dropLineAbove->setLineWidth(3);
 	_dropLineAbove->setFixedHeight(11);
@@ -281,6 +282,10 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 
 	// Enable dragging while clicking on the header text
 	_headerInfo->installEventFilter(this);
+
+	_timer.setInterval(1500);
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(Highlight()));
+	_timer.start();
 }
 
 bool MacroSegmentEdit::eventFilter(QObject *obj, QEvent *ev)
@@ -325,6 +330,22 @@ void MacroSegmentEdit::Collapsed(bool collapsed)
 	}
 }
 
+void MacroSegmentEdit::Highlight()
+{
+	if (!Data()) {
+		return;
+	}
+
+	if (_showHighlight && Data()->Highlight()) {
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+	}
+}
+
+void MacroSegmentEdit::EnableHighlight(bool value)
+{
+	_showHighlight = value;
+}
+
 void MacroSegmentEdit::SetFocusPolicyOfWidgets()
 {
 	QList<QWidget *> widgets = this->findChildren<QWidget *>();

lib/macro/macro-segment.hpp

@@ -37,8 +37,8 @@ public:
 	virtual bool PostLoad();
 	virtual std::string GetShortDesc() const;
 	virtual std::string GetId() const = 0;
-	void EnableHighlight();
-	bool GetHighlightAndReset();
+	void SetHighlight();
+	bool Highlight();
 	virtual std::string GetVariableValue() const;
 
 protected:
@@ -87,7 +87,7 @@ class MacroSegmentEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	MacroSegmentEdit(QWidget *parent = nullptr);
+	MacroSegmentEdit(bool highlight, QWidget *parent = nullptr);
 	// Use this function to avoid accidental edits when scrolling through
 	// list of actions and conditions
 	void SetFocusPolicyOfWidgets();
@@ -100,6 +100,8 @@ public slots:
 
 protected slots:
 	void Collapsed(bool);
+	void Highlight();
+	void EnableHighlight(bool);
 signals:
 	void MacroAdded(const QString &name);
 	void MacroRemoved(const QString &name);
@@ -141,6 +143,9 @@ private:
 	QFrame *_dropLineAbove;
 	QFrame *_dropLineBelow;
 
+	bool _showHighlight;
+	QTimer _timer;
+
 	friend class MacroSegmentList;
 };
 

lib/macro/macro-selection.cpp

@@ -19,13 +19,11 @@ MacroSelection::MacroSelection(QWidget *parent)
 		addItem(QString::fromStdString(m->Name()));
 	}
 
-	QWidget::connect(GetSettingsWindow(),
-			 SIGNAL(MacroAdded(const QString &)), this,
+	QWidget::connect(parent, SIGNAL(MacroAdded(const QString &)), this,
 			 SLOT(MacroAdd(const QString &)));
-	QWidget::connect(GetSettingsWindow(),
-			 SIGNAL(MacroRemoved(const QString &)), this,
+	QWidget::connect(parent, SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
-	QWidget::connect(GetSettingsWindow(),
+	QWidget::connect(parent,
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));

lib/macro/macro-tab.cpp

@@ -1,11 +1,9 @@
 #include "advanced-scene-switcher.hpp"
 #include "action-queue.hpp"
-#include "cursor-shape-changer.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
-#include "macro-settings.hpp"
-#include "macro-segment-copy-paste.hpp"
+#include "macro-properties.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
 #include "math-helpers.hpp"
@@ -24,7 +22,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 static QTimer onChangeHighlightTimer;
 
 static bool macroNameExists(const std::string &name)
@@ -87,7 +85,7 @@ bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr<Macro> &res,
 	}
 
 	res = std::make_shared<Macro>(
-		name, GetGlobalMacroSettings()._newMacroRegisterHotkeys);
+		name, GetGlobalMacroProperties()._newMacroRegisterHotkeys);
 	return true;
 }
 
@@ -100,8 +98,7 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 	}
 
 	ui->macros->Add(newMacro);
-	addPulse->deleteLater();
-	addPulse = nullptr;
+	ui->macroAdd->disconnect(addPulse);
 	emit MacroAdded(QString::fromStdString(name));
 }
 
@@ -464,7 +461,7 @@ void AdvSceneSwitcher::ImportMacros()
 	RunPostLoadSteps();
 
 	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+			  GetGlobalMacroProperties()._highlightExecuted);
 }
 
 void AdvSceneSwitcher::on_macroName_editingFinished()
@@ -744,8 +741,8 @@ void AdvSceneSwitcher::MacroSelectionChanged()
 
 void AdvSceneSwitcher::HighlightOnChange()
 {
-	if (!GetGlobalMacroSettings()._highlightActions &&
-	    !GetGlobalMacroSettings()._highlightExecuted) {
+	if (!GetGlobalMacroProperties()._highlightActions &&
+	    !GetGlobalMacroProperties()._highlightExecuted) {
 		return;
 	}
 
@@ -755,38 +752,38 @@ void AdvSceneSwitcher::HighlightOnChange()
 	}
 
 	if (macro->OnChangePreventedActionsRecently()) {
-		HighlightWidget(ui->runMacroOnChange, Qt::yellow,
-				Qt::transparent, true);
+		PulseWidget(ui->runMacroOnChange, Qt::yellow, Qt::transparent,
+			    true);
 	}
 }
 
-void AdvSceneSwitcher::on_macroSettings_clicked()
+void AdvSceneSwitcher::on_macroProperties_clicked()
 {
-	GlobalMacroSettings prop = GetGlobalMacroSettings();
-	bool accepted = MacroSettingsDialog::AskForSettings(
+	MacroProperties prop = GetGlobalMacroProperties();
+	bool accepted = MacroPropertiesDialog::AskForSettings(
 		this, prop, GetSelectedMacro().get());
 	if (!accepted) {
 		return;
 	}
-	GetGlobalMacroSettings() = prop;
+	GetGlobalMacroProperties() = prop;
 	emit HighlightMacrosChanged(prop._highlightExecuted);
+	emit HighlightActionsChanged(prop._highlightActions);
+	emit HighlightConditionsChanged(prop._highlightConditions);
 }
 
 static void moveControlsToSplitter(QSplitter *splitter, int idx,
 				   QLayoutItem *item)
 {
-	static int splitterHandleWidth = 32;
+	static int splitterHandleWidth = 38;
 	auto handle = splitter->handle(idx);
 	auto layout = item->layout();
-	int leftMargin, rightMargin;
-	layout->getContentsMargins(&leftMargin, nullptr, &rightMargin, nullptr);
-	layout->setContentsMargins(leftMargin, 0, rightMargin, 0);
+	layout->setContentsMargins(7, 7, 7, 7);
 	handle->setLayout(layout);
 	splitter->setHandleWidth(splitterHandleWidth);
 	splitter->setStyleSheet("QSplitter::handle {background: transparent;}");
 }
 
-static bool shouldRestoreSplitter(const QList<int> &pos)
+bool shouldRestoreSplitter(const QList<int> &pos)
 {
 	if (pos.size() == 0) {
 		return false;
@@ -800,77 +797,16 @@ static bool shouldRestoreSplitter(const QList<int> &pos)
 	return true;
 }
 
-static void runSegmentHighligtChecksHelper(MacroSegmentList *list)
-{
-	MacroSegmentEdit *widget = nullptr;
-	for (int i = 0; (widget = list->WidgetAt(i)); i++) {
-		if (widget->Data() && widget->Data()->GetHighlightAndReset()) {
-			list->Highlight(i);
-		}
-	}
-}
-
-static void runSegmentHighligtChecks(AdvSceneSwitcher *ss)
-{
-	if (!ss || !HighlightUIElementsEnabled()) {
-		return;
-	}
-	auto macro = ss->GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	const auto &settings = GetGlobalMacroSettings();
-	if (settings._highlightConditions) {
-		runSegmentHighligtChecksHelper(ss->ui->conditionsList);
-	}
-	if (settings._highlightActions) {
-		runSegmentHighligtChecksHelper(ss->ui->actionsList);
-		runSegmentHighligtChecksHelper(ss->ui->elseActionsList);
-	}
-}
-
-static QToolBar *
-setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
-		     &widgetGroups)
-{
-	auto toolbar = new QToolBar();
-	toolbar->setIconSize({16, 16});
-
-	QAction *lastSeperator = nullptr;
-
-	for (const auto &widgetGroup : widgetGroups) {
-		for (const auto &widget : widgetGroup) {
-			toolbar->addWidget(widget);
-		}
-		lastSeperator = toolbar->addSeparator();
-	}
-
-	if (lastSeperator) {
-		toolbar->removeAction(lastSeperator);
-	}
-
-	// Prevent "extension" button from showing up
-	toolbar->setSizePolicy(QSizePolicy::MinimumExpanding,
-			       QSizePolicy::Preferred);
-	return toolbar;
-}
-
 void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macroElseActions->installEventFilter(this);
 	ui->macros->installEventFilter(this);
 
 	if (GetMacros().size() == 0 && !switcher->disableHints) {
-		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
+		addPulse = PulseWidget(ui->macroAdd, QColor(Qt::green));
 	}
-
-	auto macroControls = setupToolBar({{ui->macroAdd, ui->macroRemove},
-					   {ui->macroUp, ui->macroDown}});
-	ui->macroControlLayout->addWidget(macroControls);
-
 	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+			  GetGlobalMacroProperties()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionAboutToChange()), this,
 		SLOT(MacroSelectionAboutToChange()));
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
@@ -920,7 +856,13 @@ void AdvSceneSwitcher::SetupMacroTab()
 		SLOT(HighlightOnChange()));
 	onChangeHighlightTimer.start();
 
-	// Set action and condition toolbars
+	// Move condition controls into splitter handle layout
+	moveControlsToSplitter(ui->macroActionConditionSplitter, 1,
+			       ui->macroConditionsLayout->takeAt(1));
+	moveControlsToSplitter(ui->macroElseActionSplitter, 1,
+			       ui->macroActionsLayout->takeAt(1));
+
+	// Set action and condition control icons
 	const std::string pathPrefix =
 		GetDataFilePath("res/images/" + GetThemeTypeName());
 	SetButtonIcon(ui->actionTop, (pathPrefix + "DoubleUp.svg").c_str());
@@ -935,44 +877,6 @@ void AdvSceneSwitcher::SetupMacroTab()
 	SetButtonIcon(ui->toggleElseActions,
 		      (pathPrefix + "NotEqual.svg").c_str());
 
-	auto conditionToolbar =
-		setupToolBar({{ui->conditionAdd, ui->conditionRemove},
-			      {ui->conditionTop, ui->conditionUp,
-			       ui->conditionDown, ui->conditionBottom}});
-	auto actionToolbar = setupToolBar({{ui->actionAdd, ui->actionRemove},
-					   {ui->actionTop, ui->actionUp,
-					    ui->actionDown, ui->actionBottom}});
-	auto elseActionToolbar =
-		setupToolBar({{ui->elseActionAdd, ui->elseActionRemove},
-			      {ui->elseActionTop, ui->elseActionUp,
-			       ui->elseActionDown, ui->elseActionBottom}});
-
-	ui->conditionControlsLayout->addWidget(conditionToolbar);
-	ui->actionControlsLayout->insertWidget(0, actionToolbar);
-	ui->elseActionControlsLayout->addWidget(elseActionToolbar);
-
-	// Move condition controls into splitter handle layout
-	moveControlsToSplitter(ui->macroActionConditionSplitter, 1,
-			       ui->macroConditionsLayout->takeAt(1));
-	moveControlsToSplitter(ui->macroElseActionSplitter, 1,
-			       ui->macroActionsLayout->takeAt(1));
-
-	// Override splitter cursor icon when hovering over controls in splitter
-	SetCursorOnWidgetHover(ui->conditionAdd, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionRemove,
-			       Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionTop, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionUp, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionDown, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionBottom,
-			       Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionAdd, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionRemove, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionTop, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionUp, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionDown, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionBottom, Qt::CursorShape::ArrowCursor);
-
 	// Reserve more space for macro edit area than for the macro list
 	ui->macroListMacroEditSplitter->setStretchFactor(0, 1);
 	ui->macroListMacroEditSplitter->setStretchFactor(1, 4);
@@ -987,14 +891,6 @@ void AdvSceneSwitcher::SetupMacroTab()
 				switcher->macroListMacroEditSplitterPosition);
 		}
 	}
-
-	SetupSegmentCopyPasteShortcutHandlers(this);
-
-	// Macro segment highlight
-	auto timer = new QTimer(this);
-	connect(timer, &QTimer::timeout,
-		[this]() { runSegmentHighligtChecks(this); });
-	timer->start(1500);
 }
 
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
@@ -1082,19 +978,16 @@ static void setupConextMenu(AdvSceneSwitcher *ss, const QPoint &pos,
 			    MacroSegmentList *list)
 {
 	QMenu menu;
+	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.expandAll"),
+		       ss, [ss, expand]() { expand(ss); });
+	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.collapseAll"),
+		       ss, [ss, collapse]() { collapse(ss); });
+	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.maximize"),
+		       ss, [ss, maximize]() { maximize(ss); });
+	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.minimize"),
+		       ss, [ss, minimize]() { minimize(ss); });
+
 	auto segmentEdit = list->WidgetAt(pos);
-
-	auto copy = menu.addAction(
-		obs_module_text("AdvSceneSwitcher.macroTab.segment.copy"), ss,
-		[ss]() { ss->CopyMacroSegment(); });
-	copy->setEnabled(!!segmentEdit);
-	auto paste = menu.addAction(
-		obs_module_text("AdvSceneSwitcher.macroTab.segment.paste"), ss,
-		[ss]() { ss->PasteMacroSegment(); });
-	paste->setEnabled(MacroSegmentIsInClipboard());
-
-	menu.addSeparator();
-
 	if (segmentEdit) {
 		auto customLabel = menu.addAction(obs_module_text(
 			"AdvSceneSwitcher.macroTab.segment.useCustomLabel"));
@@ -1106,21 +999,6 @@ static void setupConextMenu(AdvSceneSwitcher *ss, const QPoint &pos,
 				 std::bind(handleCustomLabelChange, segmentEdit,
 					   customLabel));
 	}
-
-	menu.addSeparator();
-
-	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.expandAll"),
-		       ss, [ss, expand]() { expand(ss); });
-	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.collapseAll"),
-		       ss, [ss, collapse]() { collapse(ss); });
-
-	menu.addSeparator();
-
-	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.maximize"),
-		       ss, [ss, maximize]() { maximize(ss); });
-	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.minimize"),
-		       ss, [ss, minimize]() { minimize(ss); });
-
 	menu.exec(list->mapToGlobal(pos));
 }
 
@@ -1173,8 +1051,7 @@ void AdvSceneSwitcher::CopyMacro()
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);
-	addPulse->deleteLater();
-	addPulse = nullptr;
+	ui->macroAdd->disconnect(addPulse);
 	emit MacroAdded(QString::fromStdString(name));
 }
 
@@ -1466,47 +1343,58 @@ static void fade(QWidget *widget, bool fadeOut)
 	animation->start(QPropertyAnimation::DeleteWhenStopped);
 }
 
-static void fadeWidgets(const std::vector<QWidget *> &widgets, bool fadeOut)
+void AdvSceneSwitcher::FadeOutActionControls()
 {
-	for (const auto &widget : widgets) {
-		fade(widget, fadeOut);
-	}
+	fade(ui->actionAdd, true);
+	fade(ui->actionRemove, true);
+	fade(ui->actionTop, true);
+	fade(ui->actionUp, true);
+	fade(ui->actionDown, true);
+	fade(ui->actionBottom, true);
+}
+
+void AdvSceneSwitcher::FadeOutConditionControls()
+{
+	fade(ui->conditionAdd, true);
+	fade(ui->conditionRemove, true);
+	fade(ui->conditionTop, true);
+	fade(ui->conditionUp, true);
+	fade(ui->conditionDown, true);
+	fade(ui->conditionBottom, true);
+}
+
+void AdvSceneSwitcher::ResetOpacityActionControls()
+{
+	fade(ui->actionAdd, false);
+	fade(ui->actionRemove, false);
+	fade(ui->actionTop, false);
+	fade(ui->actionUp, false);
+	fade(ui->actionDown, false);
+	fade(ui->actionBottom, false);
+}
+
+void AdvSceneSwitcher::ResetOpacityConditionControls()
+{
+	fade(ui->conditionAdd, false);
+	fade(ui->conditionRemove, false);
+	fade(ui->conditionTop, false);
+	fade(ui->conditionUp, false);
+	fade(ui->conditionDown, false);
+	fade(ui->conditionBottom, false);
 }
 
 void AdvSceneSwitcher::HighlightControls()
 {
-	const std::vector<QWidget *> conditionControls{
-		ui->conditionAdd, ui->conditionRemove, ui->conditionTop,
-		ui->conditionUp,  ui->conditionDown,   ui->conditionBottom,
-	};
-	const std::vector<QWidget *> actionControls{
-		ui->actionAdd, ui->actionRemove, ui->actionTop,
-		ui->actionUp,  ui->actionDown,   ui->actionBottom,
-	};
-	const std::vector<QWidget *> elseActionControls{
-		ui->elseActionAdd, ui->elseActionRemove, ui->elseActionTop,
-		ui->elseActionUp,  ui->elseActionDown,   ui->elseActionBottom,
-	};
-
-	if ((currentActionIdx == -1 && currentConditionIdx == -1 &&
-	     currentElseActionIdx == -1)) {
-		fadeWidgets(conditionControls, false);
-		fadeWidgets(actionControls, false);
-		fadeWidgets(elseActionControls, false);
-	} else if (currentConditionIdx != -1) {
-		fadeWidgets(conditionControls, false);
-		fadeWidgets(actionControls, true);
-		fadeWidgets(elseActionControls, true);
+	if ((currentActionIdx == -1 && currentConditionIdx == -1) ||
+	    (currentActionIdx != -1 && currentConditionIdx != -1)) {
+		ResetOpacityActionControls();
+		ResetOpacityConditionControls();
 	} else if (currentActionIdx != -1) {
-		fadeWidgets(conditionControls, true);
-		fadeWidgets(actionControls, false);
-		fadeWidgets(elseActionControls, true);
-	} else if (currentElseActionIdx != -1) {
-		fadeWidgets(conditionControls, true);
-		fadeWidgets(actionControls, true);
-		fadeWidgets(elseActionControls, false);
+		FadeOutConditionControls();
+		ResetOpacityActionControls();
 	} else {
-		assert(false);
+		FadeOutActionControls();
+		ResetOpacityConditionControls();
 	}
 }
 

lib/macro/macro-tree.cpp

@@ -108,7 +108,7 @@ void MacroTreeItem::HighlightIfExecuted()
 
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    _macro->WasExecutedSince(_lastHighlightCheckTime)) {
-		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
 	}
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }

lib/macro/macro.cpp

@@ -101,7 +101,7 @@ void Macro::PrepareMoveToGroup(std::shared_ptr<Macro> group,
 	}
 }
 
-bool Macro::CeckMatch(bool ignorePause)
+bool Macro::CeckMatch()
 {
 	if (_isGroup) {
 		return false;
@@ -109,7 +109,7 @@ bool Macro::CeckMatch(bool ignorePause)
 
 	_matched = false;
 	for (auto &c : _conditions) {
-		if (_paused && !ignorePause) {
+		if (_paused) {
 			vblog(LOG_INFO, "Macro %s is paused", _name.c_str());
 			return false;
 		}
@@ -137,37 +137,37 @@ bool Macro::CeckMatch(bool ignorePause)
 		case LogicType::AND:
 			_matched = _matched && cond;
 			if (cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		case LogicType::OR:
 			_matched = _matched || cond;
 			if (cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		case LogicType::AND_NOT:
 			_matched = _matched && !cond;
 			if (!cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		case LogicType::OR_NOT:
 			_matched = _matched || !cond;
 			if (!cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		case LogicType::ROOT_NONE:
 			_matched = cond;
 			if (cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		case LogicType::ROOT_NOT:
 			_matched = !cond;
 			if (!cond) {
-				c->EnableHighlight();
+				c->SetHighlight();
 			}
 			break;
 		default:
@@ -185,7 +185,6 @@ bool Macro::CeckMatch(bool ignorePause)
 	if (!_conditionSateChanged && _performActionsOnChange) {
 		_onPreventedActionExecution = true;
 	}
-
 	_lastMatched = _matched;
 	_lastCheckTime = std::chrono::high_resolution_clock::now();
 	return _matched;
@@ -314,7 +313,7 @@ bool Macro::RunActionsHelper(
 			break;
 		}
 		if (action->Enabled()) {
-			action->EnableHighlight();
+			action->SetHighlight();
 		}
 	}
 	_done = true;
@@ -349,11 +348,6 @@ void Macro::SetMatchOnChange(bool onChange)
 	_performActionsOnChange = onChange;
 }
 
-void Macro::SetStopActionsIfNotDone(bool stopActionsIfNotDone)
-{
-	_stopActionsIfNotDone = stopActionsIfNotDone;
-}
-
 void Macro::SetPaused(bool pause)
 {
 	if (_paused && !pause) {
@@ -388,16 +382,6 @@ void Macro::Stop()
 	}
 }
 
-MacroInputVariables Macro::GetInputVariables() const
-{
-	return _inputVariables;
-}
-
-void Macro::SetInputVariables(const MacroInputVariables &inputVariables)
-{
-	_inputVariables = inputVariables;
-}
-
 std::vector<TempVariable> Macro::GetTempVars(MacroSegment *filter) const
 {
 	std::vector<TempVariable> res;
@@ -626,8 +610,6 @@ bool Macro::Save(obs_data_t *obj) const
 	}
 	obs_data_set_array(obj, "elseActions", elseActions);
 
-	_inputVariables.Save(obj);
-
 	return true;
 }
 
@@ -766,8 +748,6 @@ bool Macro::Load(obs_data_t *obj)
 	}
 	UpdateElseActionIndices();
 
-	_inputVariables.Load(obj);
-
 	return true;
 }
 
@@ -839,10 +819,10 @@ void Macro::ResetUIHelpers()
 {
 	_onPreventedActionExecution = false;
 	for (auto c : _conditions) {
-		c->GetHighlightAndReset();
+		c->Highlight();
 	}
 	for (auto a : _actions) {
-		a->GetHighlightAndReset();
+		a->Highlight();
 	}
 }
 

lib/macro/macro.hpp

@@ -2,7 +2,6 @@
 #include "macro-action.hpp"
 #include "macro-condition.hpp"
 #include "macro-helpers.hpp"
-#include "macro-input.hpp"
 #include "macro-ref.hpp"
 #include "variable-string.hpp"
 #include "temp-variable.hpp"
@@ -26,44 +25,35 @@ public:
 	Macro(const std::string &name = "", const bool addHotkey = false);
 	virtual ~Macro();
 
-	std::string Name() const { return _name; }
-	void SetName(const std::string &name);
-
-	bool CeckMatch(bool ignorePause = false);
-	bool Matched() const { return _matched; }
-	int64_t MsSinceLastCheck() const;
-	bool ShouldRunActions() const;
+	bool CeckMatch();
 	bool PerformActions(bool match, bool forceParallel = false,
 			    bool ignorePause = false);
-
+	bool Matched() const { return _matched; }
+	bool ShouldRunActions() const;
+	int64_t MsSinceLastCheck() const;
+	std::string Name() const { return _name; }
+	void SetName(const std::string &name);
+	void SetRunInParallel(bool parallel) { _runInParallel = parallel; }
+	bool RunInParallel() const { return _runInParallel; }
 	void SetPaused(bool pause = true);
 	bool Paused() const { return _paused; }
 	bool WasPausedSince(
 		const std::chrono::high_resolution_clock::time_point &) const;
-
-	void Stop();
-	bool GetStop() const { return _stop; }
-	void ResetTimers();
-
 	void SetMatchOnChange(bool onChange);
 	bool MatchOnChange() const { return _performActionsOnChange; }
-
 	void SetSkipExecOnStart(bool skip) { _skipExecOnStart = skip; }
 	bool SkipExecOnStart() const { return _skipExecOnStart; }
-
-	void SetStopActionsIfNotDone(bool stopActionsIfNotDone);
+	void SetStopActionsIfNotDone(bool stopActionsIfNotDone)
+	{
+		_stopActionsIfNotDone = stopActionsIfNotDone;
+	}
 	bool StopActionsIfNotDone() const { return _stopActionsIfNotDone; }
-
 	int RunCount() const { return _runCount; };
 	void ResetRunCount() { _runCount = 0; };
-
+	void ResetTimers();
 	void AddHelperThread(std::thread &&);
-	void SetRunInParallel(bool parallel) { _runInParallel = parallel; }
-	bool RunInParallel() const { return _runInParallel; }
-
-	// Input variables
-	MacroInputVariables GetInputVariables() const;
-	void SetInputVariables(const MacroInputVariables &);
+	bool GetStop() const { return _stop; }
+	void Stop();
 
 	// Temporary variable helpers
 	std::vector<TempVariable> GetTempVars(MacroSegment *filter) const;
@@ -108,21 +98,19 @@ public:
 	bool SwitchesScene() const;
 
 	// UI helpers
-	void SetActionConditionSplitterPosition(const QList<int>);
 	const QList<int> &GetActionConditionSplitterPosition() const;
-	void SetElseActionSplitterPosition(const QList<int>);
+	void SetActionConditionSplitterPosition(const QList<int>);
 	const QList<int> &GetElseActionSplitterPosition() const;
+	void SetElseActionSplitterPosition(const QList<int>);
 	bool HasValidSplitterPositions() const;
 	bool WasExecutedSince(
 		const std::chrono::high_resolution_clock::time_point &) const;
 	bool OnChangePreventedActionsRecently();
 	void ResetUIHelpers();
 
-	// Hotkeys
 	void EnablePauseHotkeys(bool);
 	bool PauseHotkeysEnabled() const;
 
-	// Docks
 	void EnableDock(bool);
 	bool DockEnabled() const { return _registerDock; }
 	void SetDockHasRunButton(bool value);
@@ -194,8 +182,6 @@ private:
 	obs_hotkey_id _unpauseHotkey = OBS_INVALID_HOTKEY_ID;
 	obs_hotkey_id _togglePauseHotkey = OBS_INVALID_HOTKEY_ID;
 
-	MacroInputVariables _inputVariables;
-
 	// UI helpers
 	bool _onPreventedActionExecution = false;
 

lib/queue/action-queue-tab.cpp

@@ -11,16 +11,19 @@
 
 namespace advss {
 
+static bool registerTab();
 static void setupTab(QTabWidget *);
+static bool registerTabDone = registerTab();
 
 static ActionQueueTable *tabWidget = nullptr;
 
-void RegisterActionQueueTab()
+static bool registerTab()
 {
 	AddPluginInitStep([]() {
 		AddSetupTabCallback("actionQueueTab", ActionQueueTable::Create,
 				    setupTab);
 	});
+	return true;
 }
 
 static void setTabVisible(QTabWidget *tabWidget, bool visible)
@@ -67,11 +70,11 @@ static QStringList getCellLabels(ActionQueue *queue, bool addName = true)
 	       << QString::fromStdString(obs_module_text(
 			  queue->IsRunning()
 				  ? "AdvSceneSwitcher.actionQueueTab.yes"
-				  : "AdvSceneSwitcher.actionQueueTab.no"))
+				  : "AdvSceneSwitcher.actionQueueTab.yes"))
 	       << QString::fromStdString(obs_module_text(
 			  queue->RunsOnStartup()
 				  ? "AdvSceneSwitcher.actionQueueTab.yes"
-				  : "AdvSceneSwitcher.actionQueueTab.no"));
+				  : "AdvSceneSwitcher.actionQueueTab.yes"));
 	return result;
 }
 
@@ -220,15 +223,14 @@ static void setupTab(QTabWidget *tab)
 	}
 
 	QWidget::connect(ActionQueueSignalManager::Instance(),
-			 &ActionQueueSignalManager::Rename, tab,
+			 &ActionQueueSignalManager::Rename,
 			 [](const QString &oldName, const QString &newName) {
 				 RenameItemTableRow(tabWidget->Table(), oldName,
 						    newName);
 			 });
 	QWidget::connect(
 		ActionQueueSignalManager::Instance(),
-		&ActionQueueSignalManager::Add, tab,
-		[tab](const QString &name) {
+		&ActionQueueSignalManager::Add, [tab](const QString &name) {
 			AddItemTableRow(
 				tabWidget->Table(),
 				getCellLabels(GetWeakActionQueueByQString(name)
@@ -239,7 +241,7 @@ static void setupTab(QTabWidget *tab)
 			setTabVisible(tab, true);
 		});
 	QWidget::connect(ActionQueueSignalManager::Instance(),
-			 &ActionQueueSignalManager::Remove, tab,
+			 &ActionQueueSignalManager::Remove,
 			 [](const QString &name) {
 				 RemoveItemTableRow(tabWidget->Table(), name);
 				 if (tabWidget->Table()->rowCount() == 0) {

lib/queue/action-queue.cpp

@@ -1,7 +1,6 @@
 #include "action-queue.hpp"
 #include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
-#include "ui-helpers.hpp"
 
 namespace advss {
 
@@ -12,8 +11,6 @@ std::deque<std::shared_ptr<Item>> &GetActionQueues()
 	return queues;
 }
 
-void RegisterActionQueueTab();
-
 void SetupActionQueues()
 {
 	static bool done = false;
@@ -22,7 +19,6 @@ void SetupActionQueues()
 	}
 	AddSaveStep(SaveActionQueues);
 	AddLoadStep(LoadActionQueues);
-	RegisterActionQueueTab();
 	done = true;
 }
 
@@ -380,24 +376,11 @@ static bool queueWithNameExists(const std::string &name)
 	return !GetWeakActionQueueByName(name).expired();
 }
 
-static void signalImportedQueues(void *varsPtr)
-{
-	auto queues = std::unique_ptr<std::vector<std::shared_ptr<Item>>>(
-		static_cast<std::vector<std::shared_ptr<Item>> *>(varsPtr));
-	for (const auto &queue : *queues) {
-		ActionQueueSignalManager::Instance()->Add(
-			QString::fromStdString(queue->Name()));
-	}
-}
-
 void ImportQueues(obs_data_t *data)
 {
 	OBSDataArrayAutoRelease array =
 		obs_data_get_array(data, "actionQueues");
 	size_t count = obs_data_array_count(array);
-
-	auto importedQueues = new std::vector<std::shared_ptr<Item>>;
-
 	for (size_t i = 0; i < count; i++) {
 		OBSDataAutoRelease arrayElement = obs_data_array_item(array, i);
 		auto queue = ActionQueue::Create();
@@ -406,10 +389,7 @@ void ImportQueues(obs_data_t *data)
 			continue;
 		}
 		queues.emplace_back(queue);
-		importedQueues->emplace_back(queue);
 	}
-
-	QeueUITask(signalImportedQueues, importedQueues);
 }
 
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

lib/switcher-data.hpp

@@ -16,7 +16,7 @@
 #include "switch-video.hpp"
 #include "switch-network.hpp"
 
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "duration-control.hpp"
 #include "priority-helper.hpp"
 #include "plugin-state-helpers.hpp"

lib/utils/cursor-shape-changer.cpp

@@ -1,34 +0,0 @@
-#include "cursor-shape-changer.hpp"
-
-#include <QCursor>
-#include <QEvent>
-#include <QGuiApplication>
-
-namespace advss {
-
-CursorShapeChanger::CursorShapeChanger(QObject *parent, Qt::CursorShape shape)
-	: QObject(parent),
-	  _shape(shape)
-{
-}
-
-bool CursorShapeChanger::eventFilter(QObject *o, QEvent *e)
-{
-	if ((e->type() == QEvent::HoverEnter || e->type() == QEvent::Enter) &&
-	    !_overrideActive) {
-		_overrideActive = true;
-		QGuiApplication::setOverrideCursor(QCursor(_shape));
-	} else if (_overrideActive && e->type() == QEvent::Leave) {
-		_overrideActive = false;
-		QGuiApplication::restoreOverrideCursor();
-	}
-
-	return QObject::eventFilter(o, e);
-}
-
-void SetCursorOnWidgetHover(QWidget *widget, Qt::CursorShape shape)
-{
-	widget->installEventFilter(new CursorShapeChanger(widget, shape));
-}
-
-} // namespace advss

lib/utils/cursor-shape-changer.hpp

@@ -1,20 +0,0 @@
-#pragma once
-#include <QWidget>
-
-namespace advss {
-
-class CursorShapeChanger : public QObject {
-public:
-	CursorShapeChanger(QObject *, Qt::CursorShape shape);
-
-protected:
-	bool eventFilter(QObject *o, QEvent *e) override;
-
-private:
-	Qt::CursorShape _shape;
-	std::atomic_bool _overrideActive = {false};
-};
-
-void SetCursorOnWidgetHover(QWidget *widget, Qt::CursorShape shape);
-
-} // namespace advss

lib/utils/help-icon.cpp

@@ -1,19 +0,0 @@
-#include "help-icon.hpp"
-#include "ui-helpers.hpp"
-
-namespace advss {
-
-HelpIcon::HelpIcon(const QString &tooltip, QWidget *parent) : QLabel(parent)
-{
-	auto path = GetThemeTypeName() == "Light"
-			    ? ":/res/images/help.svg"
-			    : ":/res/images/help_light.svg";
-	QIcon icon(path);
-	QPixmap pixmap = icon.pixmap(QSize(16, 16));
-	setPixmap(pixmap);
-	if (!tooltip.isEmpty()) {
-		setToolTip(tooltip);
-	}
-}
-
-} // namespace advss

lib/utils/help-icon.hpp

@@ -1,15 +0,0 @@
-#pragma once
-#include "export-symbol-helper.hpp"
-
-#include <QLabel>
-
-namespace advss {
-
-class ADVSS_EXPORT HelpIcon : public QLabel {
-	Q_OBJECT
-
-public:
-	HelpIcon(const QString &tooltip = "", QWidget *parent = nullptr);
-};
-
-} // namespace advss

lib/utils/item-selection-helpers.hpp

@@ -81,7 +81,6 @@ public:
 			"AdvSceneSwitcher.item.nameNotAvailable",
 		std::string_view configureTooltip = "", QWidget *parent = 0);
 	virtual ~ItemSelection() = default;
-	Item *GetCurrentItem();
 	void SetItem(const std::string &);
 	void ShowRenameContextMenu(bool value);
 
@@ -100,6 +99,8 @@ signals:
 	void ItemRenamed(const QString &oldName, const QString &name);
 
 private:
+	Item *GetCurrentItem();
+
 	FilterComboBox *_selection;
 	QPushButton *_modify;
 	CreateItemFunc _create;

lib/utils/list-controls.cpp

@@ -1,44 +0,0 @@
-#include "list-controls.hpp"
-#include "obs-module-helper.hpp"
-#include "ui-helpers.hpp"
-
-#include <QLayout>
-#include <QToolButton>
-
-namespace advss {
-
-ListControls::ListControls(QWidget *parent, bool reorder) : QToolBar(parent)
-{
-	setObjectName("listControls");
-	setStyleSheet("#listControls { background-color: transparent; }");
-
-	setIconSize({16, 16});
-
-	AddActionHelper("addIconSmall", "AdvSceneSwitcher.listControls.add",
-			[this]() { Add(); });
-	AddActionHelper("removeIconSmall",
-			"AdvSceneSwitcher.listControls.remove",
-			[this]() { Remove(); });
-
-	if (reorder) {
-		addSeparator();
-		AddActionHelper("upArrowIconSmall",
-				"AdvSceneSwitcher.listControls.up",
-				[this]() { Up(); });
-		AddActionHelper("downArrowIconSmall",
-				"AdvSceneSwitcher.listControls.down",
-				[this]() { Down(); });
-	}
-}
-
-void ListControls::AddActionHelper(const char *theme, const char *tooltip,
-				   const std::function<void()> &signal)
-{
-	auto button = new QToolButton(this);
-	button->setToolTip(obs_module_text(tooltip));
-	button->setProperty("themeID", QVariant(QString(theme)));
-	(void)addWidget(button);
-	button->connect(button, &QToolButton::clicked, this, signal);
-}
-
-} // namespace advss

lib/utils/list-controls.hpp

@@ -1,25 +0,0 @@
-#pragma once
-#include "export-symbol-helper.hpp"
-
-#include <QToolBar>
-
-namespace advss {
-
-class ADVSS_EXPORT ListControls final : public QToolBar {
-	Q_OBJECT
-
-public:
-	ListControls(QWidget *parent = nullptr, bool reorder = true);
-
-signals:
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
-
-private:
-	void AddActionHelper(const char *theme, const char *tooltip,
-			     const std::function<void()> &signal);
-};
-
-} // namespace advss

lib/utils/list-editor.cpp

@@ -1,43 +0,0 @@
-#include "list-editor.hpp"
-#include "ui-helpers.hpp"
-
-namespace advss {
-
-ListEditor::ListEditor(QWidget *parent, bool reorder)
-	: QWidget(parent),
-	  _list(new QListWidget()),
-	  _controls(new ListControls(this, reorder)),
-	  _mainLayout(new QVBoxLayout())
-{
-	QWidget::connect(_controls, SIGNAL(Add()), this, SLOT(Add()));
-	QWidget::connect(_controls, SIGNAL(Remove()), this, SLOT(Remove()));
-	QWidget::connect(_controls, SIGNAL(Up()), this, SLOT(Up()));
-	QWidget::connect(_controls, SIGNAL(Down()), this, SLOT(Down()));
-	QWidget::connect(_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
-			 this, SLOT(Clicked(QListWidgetItem *)));
-
-	_mainLayout->setContentsMargins(0, 0, 0, 0);
-	_mainLayout->addWidget(_list);
-	_mainLayout->addWidget(_controls);
-	setLayout(_mainLayout);
-}
-
-void ListEditor::showEvent(QShowEvent *e)
-{
-	QWidget::showEvent(e);
-	// This is necessary as the list viewport might not be updated yet while
-	// the list was hidden.
-	// Thus, previous calls to UpdateListSize() might not have resized the
-	// widget correctly, for example due to not regarding the horizontal
-	// scrollbar yet.
-	UpdateListSize();
-}
-
-void ListEditor::UpdateListSize()
-{
-	SetHeightToContentHeight(_list);
-	adjustSize();
-	updateGeometry();
-}
-
-} // namespace advss

lib/utils/list-editor.hpp

@@ -1,34 +0,0 @@
-#pragma once
-#include "export-symbol-helper.hpp"
-#include "list-controls.hpp"
-
-#include <QListWidget>
-#include <QLayout>
-
-namespace advss {
-
-class ADVSS_EXPORT ListEditor : public QWidget {
-	Q_OBJECT
-
-public:
-	ListEditor(QWidget *parent = nullptr, bool reorder = true);
-
-protected:
-	void showEvent(QShowEvent *);
-
-private slots:
-	virtual void Add() = 0;
-	virtual void Remove() = 0;
-	virtual void Up(){};
-	virtual void Down(){};
-	virtual void Clicked(QListWidgetItem *) {}
-
-protected:
-	void UpdateListSize();
-
-	QListWidget *_list;
-	ListControls *_controls;
-	QVBoxLayout *_mainLayout;
-};
-
-} // namespace advss

lib/utils/regex-config.cpp

@@ -88,10 +88,12 @@ RegexConfig RegexConfig::PartialMatchRegexConfig()
 
 RegexConfigWidget::RegexConfigWidget(QWidget *parent, bool showEnable)
 	: QWidget(parent),
-	  _openSettings(new QToolButton()),
+	  _openSettings(new QPushButton()),
 	  _enable(new QPushButton())
 {
+	_openSettings->setMaximumWidth(22);
 	SetButtonIcon(_openSettings, ":/settings/images/settings/general.svg");
+	_openSettings->setFlat(true);
 	_openSettings->setToolTip(
 		obs_module_text("AdvSceneSwitcher.regex.configure"));
 

lib/utils/regex-config.hpp

@@ -2,13 +2,12 @@
 #include "export-symbol-helper.hpp"
 
 #include <obs-data.h>
+#include <QWidget>
 #include <QCheckBox>
+#include <QPushButton>
 #include <QDialog>
 #include <QDialogButtonBox>
-#include <QPushButton>
 #include <QRegularExpression>
-#include <QToolButton>
-#include <QWidget>
 
 namespace advss {
 
@@ -64,7 +63,7 @@ signals:
 private:
 	void SetVisibility();
 
-	QToolButton *_openSettings;
+	QPushButton *_openSettings;
 	QPushButton *_enable;
 	RegexConfig _config;
 };

lib/utils/resource-table.cpp

@@ -15,16 +15,20 @@ ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
 			     const std::function<void()> &openSettings)
 	: QWidget(parent),
 	  _table(new QTableWidget()),
-	  _add(new QToolButton()),
-	  _remove(new QToolButton()),
+	  _add(new QPushButton()),
+	  _remove(new QPushButton()),
 	  _help(new QLabel(help))
 {
+	_add->setMaximumWidth(22);
 	_add->setProperty("themeID",
 			  QVariant(QString::fromUtf8("addIconSmall")));
+	_add->setFlat(true);
 	_add->setToolTip(addToolTip);
 
+	_remove->setMaximumWidth(22);
 	_remove->setProperty("themeID",
 			     QVariant(QString::fromUtf8("removeIconSmall")));
+	_remove->setFlat(true);
 	_remove->setToolTip(removeToolTip);
 
 	_help->setWordWrap(true);
@@ -77,13 +81,9 @@ void ResourceTable::SetHelpVisible(bool visible) const
 
 void ResourceTable::HighlightAddButton(bool enable)
 {
-	if (_highlightConnection) {
-		_highlightConnection->deleteLater();
-		_highlightConnection = nullptr;
-	}
-
+	_add->disconnect(_highlightConnection);
 	if (enable && HighlightUIElementsEnabled()) {
-		_highlightConnection = HighlightWidget(_add, QColor(Qt::green));
+		_highlightConnection = PulseWidget(_add, QColor(Qt::green));
 	}
 }
 

lib/utils/resource-table.hpp

@@ -2,8 +2,8 @@
 #include "export-symbol-helper.hpp"
 
 #include <QLabel>
+#include <QPushButton>
 #include <QString>
-#include <QToolButton>
 #include <QTableWidget>
 
 class QResizeEvent;
@@ -33,11 +33,11 @@ protected:
 
 private:
 	QTableWidget *_table;
-	QToolButton *_add;
-	QToolButton *_remove;
+	QPushButton *_add;
+	QPushButton *_remove;
 	QLabel *_help;
 
-	QObject *_highlightConnection = nullptr;
+	QMetaObject::Connection _highlightConnection;
 };
 
 EXPORT void AddItemTableRow(QTableWidget *table, const QStringList &cells);

lib/utils/status-control.cpp

@@ -8,7 +8,6 @@
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QMainWindow>
-#include <QPalette>
 #include <QToolBar>
 
 namespace advss {
@@ -16,50 +15,6 @@ namespace advss {
 void OpenSettingsWindow();
 StatusDock *dock = nullptr;
 
-static QString colorToString(const QColor &color)
-{
-	return QString("rgba(") + QString::number(color.red()) + "," +
-	       QString::number(color.green()) + "," +
-	       QString::number(color.blue()) + "," +
-	       QString::number(color.alpha()) + ")";
-}
-
-static QString getDefaultBackgroundColorString()
-{
-	static QString defaultColorString;
-	static bool cacheReady = false;
-
-	if (cacheReady) {
-		return defaultColorString;
-	}
-
-	QWidget tempWidget;
-	const auto defaultColor =
-		tempWidget.palette().brush(QPalette::Window).color();
-	defaultColorString = colorToString(defaultColor);
-
-	cacheReady = true;
-	return defaultColorString;
-}
-
-static QString getDefaultTextColorString()
-{
-	static QString defaultColorString;
-	static bool cacheReady = false;
-
-	if (cacheReady) {
-		return defaultColorString;
-	}
-
-	QLabel tempWidget;
-	const auto defaultColor =
-		tempWidget.palette().brush(QPalette::Text).color();
-	defaultColorString = colorToString(defaultColor);
-
-	cacheReady = true;
-	return defaultColorString;
-}
-
 StatusControl::StatusControl(QWidget *parent, bool noLayout)
 	: QWidget(parent),
 	  _button(new QPushButton("-", this)),
@@ -73,22 +28,30 @@ StatusControl::StatusControl(QWidget *parent, bool noLayout)
 	_statusPrefix->setWordWrap(true);
 	_statusPrefix->setSizePolicy(QSizePolicy::Expanding,
 				     QSizePolicy::Expanding);
+	_status->setStyleSheet("QLabel{ \
+		border-style: outset; \
+		border-width: 2px; \
+		border-radius: 7px; \
+		border-color: rgb(0,0,0,0) \
+		}");
+	_status->setSizePolicy(QSizePolicy::Maximum,
+			       QSizePolicy::MinimumExpanding);
+
 	QWidget::connect(_button, SIGNAL(clicked()), this,
 			 SLOT(ButtonClicked()));
 
 	if (!noLayout) {
+		QHBoxLayout *statusLayout = new QHBoxLayout();
+		statusLayout->addWidget(_statusPrefix);
+		statusLayout->addStretch();
+		statusLayout->addWidget(_status);
+		statusLayout->setStretch(0, 10);
 		_buttonLayout->setContentsMargins(0, 0, 0, 0);
 		_buttonLayout->addWidget(_button);
 		QVBoxLayout *layout = new QVBoxLayout();
-		_statusPrefix->setAlignment(Qt::AlignCenter);
-		_status->setAlignment(Qt::AlignCenter);
-		layout->addWidget(_statusPrefix);
-		layout->addWidget(_status);
+		layout->addLayout(statusLayout);
 		layout->addLayout(_buttonLayout);
 		setLayout(layout);
-	} else {
-		_status->setSizePolicy(QSizePolicy::Maximum,
-				       QSizePolicy::MinimumExpanding);
 	}
 
 	if (PluginIsRunning()) {
@@ -131,10 +94,7 @@ void StatusControl::SetStarted()
 	_button->setText(
 		obs_module_text("AdvSceneSwitcher.generalTab.status.stop"));
 	_status->setText(obs_module_text("AdvSceneSwitcher.status.active"));
-	if (_pulse) {
-		_pulse->deleteLater();
-	}
-	SetStatusStyleSheet(false);
+	_status->disconnect(_pulse);
 	_setToStopped = false;
 }
 
@@ -143,31 +103,13 @@ void StatusControl::SetStopped()
 	_button->setText(
 		obs_module_text("AdvSceneSwitcher.generalTab.status.start"));
 	_status->setText(obs_module_text("AdvSceneSwitcher.status.inactive"));
-	SetStatusStyleSheet(true);
 	if (HighlightUIElementsEnabled()) {
-		_pulse = HighlightWidget(_status, QColor(Qt::red),
-					 QColor(0, 0, 0, 0));
+		_pulse = PulseWidget(_status, QColor(Qt::red),
+				     QColor(0, 0, 0, 0));
 	}
 	_setToStopped = true;
 }
 
-void StatusControl::SetStatusStyleSheet(bool stopped) const
-{
-	auto style = QString("QLabel{ "
-			     "background-color: ");
-	if (stopped) {
-		style += getDefaultBackgroundColorString() + "; ";
-	} else {
-		style += "transparent; ";
-	}
-	style += "border-style: outset; "
-		 "border-width: 2px; "
-		 "border-radius: 7px; "
-		 "border-color: " +
-		 getDefaultTextColorString() + "; }";
-	_status->setStyleSheet(style);
-}
-
 StatusDock::StatusDock(QWidget *parent) : OBSDock(parent)
 {
 	setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));

lib/utils/status-control.hpp

@@ -26,14 +26,13 @@ private slots:
 private:
 	void SetStopped();
 	void SetStarted();
-	void SetStatusStyleSheet(bool stopped) const;
 
 	QPushButton *_button;
 	QHBoxLayout *_buttonLayout;
 	QLabel *_status;
 	QLabel *_statusPrefix;
 	QTimer _timer;
-	QObject *_pulse = nullptr;
+	QMetaObject::Connection _pulse;
 
 	bool _setToStopped = true;
 };

lib/utils/sync-helpers.hpp

@@ -5,15 +5,8 @@
 
 namespace advss {
 
-// Helper used in macro segment edit widgets
-#define GUARD_LOADING_AND_LOCK()       \
-	if (_loading || !_entryData) { \
-		return;                \
-	}                              \
-	auto lock = LockContext();
-
-[[nodiscard]] EXPORT std::mutex *GetMutex();
-[[nodiscard]] EXPORT std::lock_guard<std::mutex> LockContext();
-[[nodiscard]] EXPORT std::unique_lock<std::mutex> *GetLoopLock();
+EXPORT std::mutex *GetMutex();
+EXPORT std::lock_guard<std::mutex> LockContext();
+EXPORT std::unique_lock<std::mutex> *GetLoopLock();
 
 } // namespace advss

lib/utils/tab-helpers.cpp

@@ -161,7 +161,7 @@ void SetTabOrder(QTabWidget *tabWidget)
 
 void SetCurrentTab(QTabWidget *tabWidget)
 {
-	if (lastOpenedTab >= 0 && tabWidget->isTabVisible(lastOpenedTab)) {
+	if (lastOpenedTab >= 0) {
 		tabWidget->setCurrentIndex(lastOpenedTab);
 	}
 }

lib/utils/temp-variable.cpp

@@ -182,10 +182,6 @@ void TempVariableRef::Load(obs_data_t *obj, Macro *macro, const char *name)
 
 void TempVariableRef::PostLoad(int idx, SegmentType type, Macro *macro)
 {
-	if (!macro) {
-		return;
-	}
-
 	std::deque<std::shared_ptr<MacroSegment>> segments;
 	switch (type) {
 	case SegmentType::NONE:
@@ -462,7 +458,7 @@ void AutoUpdateTooltipLabel::enterEvent(QEnterEvent *event)
 void AutoUpdateTooltipLabel::enterEvent(QEvent *event)
 #endif
 {
-	_timer->start(300);
+	_timer->start(1000);
 	QLabel::enterEvent(event);
 }
 

lib/utils/temp-variable.hpp

@@ -65,7 +65,6 @@ public:
 	EXPORT void Load(obs_data_t *, Macro *, const char *name = "tempVar");
 	EXPORT std::optional<const TempVariable> GetTempVariable(Macro *) const;
 	EXPORT bool operator==(const TempVariableRef &other) const;
-	bool HasValidID() const { return !_id.empty(); }
 
 private:
 	enum class SegmentType { NONE, CONDITION, ACTION, ELSEACTION };

lib/utils/ui-helpers.cpp

@@ -13,8 +13,8 @@
 
 namespace advss {
 
-QObject *HighlightWidget(QWidget *widget, QColor startColor, QColor endColor,
-			 bool once)
+QMetaObject::Connection PulseWidget(QWidget *widget, QColor startColor,
+				    QColor endColor, bool once)
 {
 	QGraphicsColorizeEffect *effect = new QGraphicsColorizeEffect(widget);
 	widget->setGraphicsEffect(effect);
@@ -24,22 +24,33 @@ QObject *HighlightWidget(QWidget *widget, QColor startColor, QColor endColor,
 	animation->setEndValue(endColor);
 	animation->setDuration(1000);
 
-	// Clean up the effect when the animation is deleted
-	QWidget::connect(animation, &QPropertyAnimation::destroyed, [widget]() {
-		if (widget) {
-			widget->setGraphicsEffect(nullptr);
-		}
-	});
-
+	QMetaObject::Connection con;
 	if (once) {
+		auto widgetPtr = widget;
+		con = QWidget::connect(
+			animation, &QPropertyAnimation::finished,
+			[widgetPtr]() {
+				if (widgetPtr) {
+					widgetPtr->setGraphicsEffect(nullptr);
+				}
+			});
 		animation->start(QPropertyAnimation::DeleteWhenStopped);
-		return animation;
+	} else {
+		auto widgetPtr = widget;
+		con = QWidget::connect(
+			animation, &QPropertyAnimation::finished,
+			[animation, widgetPtr]() {
+				QTimer *timer = new QTimer(widgetPtr);
+				QWidget::connect(timer, &QTimer::timeout,
+						 [animation] {
+							 animation->start();
+						 });
+				timer->setSingleShot(true);
+				timer->start(1000);
+			});
+		animation->start();
 	}
-
-	QWidget::connect(animation, &QPropertyAnimation::finished,
-			 [animation]() { animation->start(); });
-	animation->start();
-	return animation;
+	return con;
 }
 
 static int getHorizontalScrollBarHeight(QListWidget *list)
@@ -70,7 +81,7 @@ void SetHeightToContentHeight(QListWidget *list)
 	list->setMaximumHeight(height);
 }
 
-void SetButtonIcon(QAbstractButton *button, const char *path)
+void SetButtonIcon(QPushButton *button, const char *path)
 {
 	QIcon icon;
 	icon.addFile(QString::fromUtf8(path), QSize(), QIcon::Normal,
@@ -155,9 +166,4 @@ std::string GetThemeTypeName()
 #endif
 }
 
-void QeueUITask(void (*task)(void *param), void *param)
-{
-	obs_queue_task(OBS_TASK_UI, task, param, false);
-}
-
 } // namespace advss

lib/utils/ui-helpers.hpp

@@ -1,25 +1,23 @@
 #pragma once
 #include "export-symbol-helper.hpp"
 
-#include <QAbstractButton>
 #include <QColor>
 #include <QComboBox>
 #include <QIcon>
 #include <QListWidget>
+#include <QPushButton>
 #include <QString>
 #include <QWidget>
 #include <string>
 
 namespace advss {
 
-// Returns QObject* to QPropertyAnimation object
-// Delete it to stop the animation
-EXPORT QObject *HighlightWidget(QWidget *widget, QColor startColor,
-				QColor endColor = QColor(0, 0, 0, 0),
-				bool once = false);
+EXPORT QMetaObject::Connection PulseWidget(QWidget *widget, QColor startColor,
+					   QColor endColor = QColor(0, 0, 0, 0),
+					   bool once = false);
 
 EXPORT void SetHeightToContentHeight(QListWidget *list);
-EXPORT void SetButtonIcon(QAbstractButton *button, const char *path);
+EXPORT void SetButtonIcon(QPushButton *button, const char *path);
 EXPORT int
 FindIdxInRagne(QComboBox *list, int start, int stop, const std::string &value,
 	       Qt::MatchFlags = Qt::MatchExactly | Qt::MatchCaseSensitive);
@@ -31,6 +29,4 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
 
 EXPORT std::string GetThemeTypeName();
 
-void QeueUITask(void (*task)(void *param), void *param);
-
 } // namespace advss

lib/utils/utility.cpp

@@ -76,15 +76,15 @@ std::string ToString(double value)
 }
 
 void listAddClicked(QListWidget *list, QWidget *newWidget,
-		    QPushButton *addButton, QObject *addHighlight)
+		    QPushButton *addButton,
+		    QMetaObject::Connection *addHighlight)
 {
 	if (!list || !newWidget) {
 		return;
 	}
 
-	if (addHighlight) {
-		addHighlight->deleteLater();
-		addHighlight = nullptr;
+	if (addButton && addHighlight) {
+		addButton->disconnect(*addHighlight);
 	}
 
 	QListWidgetItem *item;

lib/utils/utility.hpp

@@ -24,7 +24,7 @@ std::string ToString(double value);
 
 void listAddClicked(QListWidget *list, QWidget *newWidget,
 		    QPushButton *addButton = nullptr,
-		    QObject *addHighlight = nullptr);
+		    QMetaObject::Connection *addHighlight = nullptr);
 bool listMoveUp(QListWidget *list);
 bool listMoveDown(QListWidget *list);
 

lib/variables/variable-tab.cpp

@@ -154,15 +154,6 @@ static void updateVariableStatus(QTableWidget *table)
 
 		UpdateItemTableRow(table, row,
 				   getCellLabels(variable.get(), false));
-
-		// Special tooltip handling for the "last used" cell
-		const auto lastUsedItem = table->item(row, 4);
-		if (!lastUsedItem) {
-			continue;
-		}
-		const auto lastUsedTooltip =
-			formatLastChangedTooltip(variable.get());
-		lastUsedItem->setToolTip(lastUsedTooltip);
 	}
 }
 
@@ -273,14 +264,14 @@ static void setupTab(QTabWidget *tab)
 	}
 
 	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Rename, tab,
+			 &VariableSignalManager::Rename,
 			 [](const QString &oldName, const QString &newName) {
 				 RenameItemTableRow(tabWidget->Table(), oldName,
 						    newName);
 			 });
 	QWidget::connect(
 		VariableSignalManager::Instance(), &VariableSignalManager::Add,
-		tab, [tab](const QString &name) {
+		[tab](const QString &name) {
 			AddItemTableRow(
 				tabWidget->Table(),
 				getCellLabels(GetVariableByQString(name)));
@@ -289,7 +280,7 @@ static void setupTab(QTabWidget *tab)
 			setTabVisible(tab, true);
 		});
 	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Remove, tab,
+			 &VariableSignalManager::Remove,
 			 [](const QString &name) {
 				 RemoveItemTableRow(tabWidget->Table(), name);
 				 if (tabWidget->Table()->rowCount() == 0) {

lib/variables/variable.cpp

@@ -1,7 +1,6 @@
 #include "variable.hpp"
 #include "math-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "ui-helpers.hpp"
 #include "utility.hpp"
 
 #include <QGridLayout>
@@ -268,53 +267,6 @@ void VariableSelection::SetVariable(const std::weak_ptr<Variable> &variable_)
 	}
 }
 
-VariableSelectionDialog::VariableSelectionDialog(QWidget *parent)
-	: QDialog(parent),
-	  _variableSelection(new VariableSelection(this))
-{
-	setModal(true);
-	setWindowModality(Qt::WindowModality::ApplicationModal);
-	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-	setMinimumWidth(350);
-	setMinimumHeight(70);
-
-	auto buttonbox = new QDialogButtonBox(QDialogButtonBox::Ok |
-					      QDialogButtonBox::Cancel);
-
-	buttonbox->setCenterButtons(true);
-	connect(buttonbox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-	connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-	auto selectionLayout = new QHBoxLayout();
-	selectionLayout->addWidget(new QLabel(
-		obs_module_text("AdvSceneSwitcher.variable.selectionDialog")));
-	selectionLayout->addWidget(_variableSelection);
-	selectionLayout->addStretch();
-	auto layout = new QVBoxLayout();
-	layout->addLayout(selectionLayout);
-	layout->addWidget(buttonbox);
-	setLayout(layout);
-}
-
-QWidget *GetSettingsWindow();
-
-bool VariableSelectionDialog::AskForVariable(QWidget *parent,
-					     std::string &varName)
-{
-	VariableSelectionDialog dialog(GetSettingsWindow());
-	dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
-
-	if (dialog.exec() != DialogCode::Accepted) {
-		return false;
-	}
-	auto item = dialog._variableSelection->GetCurrentItem();
-	if (!item) {
-		return false;
-	}
-	varName = item->Name();
-	return true;
-}
-
 VariableSignalManager::VariableSignalManager(QObject *parent) : QObject(parent)
 {
 }
@@ -423,23 +375,11 @@ void LoadVariables(obs_data_t *obj)
 	obs_data_array_release(variablesArray);
 }
 
-static void signalImportedVariables(void *varsPtr)
-{
-	auto vars = std::unique_ptr<std::vector<std::shared_ptr<Item>>>(
-		static_cast<std::vector<std::shared_ptr<Item>> *>(varsPtr));
-	for (const auto &var : *vars) {
-		VariableSignalManager::Instance()->Add(
-			QString::fromStdString(var->Name()));
-	}
-}
-
 void ImportVariables(obs_data_t *data)
 {
 	obs_data_array_t *array = obs_data_get_array(data, "variables");
 	size_t count = obs_data_array_count(array);
 
-	auto importedVars = new std::vector<std::shared_ptr<Item>>;
-
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *arrayElement = obs_data_array_item(array, i);
 		auto var = Variable::Create();
@@ -451,12 +391,9 @@ void ImportVariables(obs_data_t *data)
 		}
 
 		GetVariables().emplace_back(var);
-		importedVars->emplace_back(var);
 	}
 
 	obs_data_array_release(array);
-
-	QeueUITask(signalImportedVariables, importedVars);
 }
 
 std::chrono::high_resolution_clock::time_point GetLastVariableChangeTime()

lib/variables/variable.hpp

@@ -82,17 +82,6 @@ public:
 	void SetVariable(const std::weak_ptr<Variable> &);
 };
 
-class VariableSelectionDialog : public QDialog {
-	Q_OBJECT
-
-public:
-	VariableSelectionDialog(QWidget *parent);
-	static bool AskForVariable(QWidget *parent, std::string &variableName);
-
-private:
-	VariableSelection *_variableSelection;
-};
-
 class ADVSS_EXPORT VariableSignalManager : public QObject {
 	Q_OBJECT
 public:

plugins/CMakeLists.txt

@@ -31,5 +31,4 @@ install_advss_plugin_dependency(...)
 add_plugin(midi)
 add_plugin(openvr)
 add_plugin(twitch)
-add_plugin(usb)
 add_plugin(video)

plugins/base/CMakeLists.txt

@@ -87,8 +87,6 @@ target_sources(
           macro-condition-file.hpp
           macro-condition-filter.cpp
           macro-condition-filter.hpp
-          macro-condition-folder.cpp
-          macro-condition-folder.hpp
           macro-condition-hotkey.cpp
           macro-condition-hotkey.hpp
           macro-condition-idle.cpp
@@ -166,10 +164,10 @@ target_sources(
           utils/source-properties-button.hpp
           utils/source-settings-helpers.cpp
           utils/source-settings-helpers.hpp
-          utils/source-interact.cpp
-          utils/source-interact.hpp
           utils/source-setting.cpp
           utils/source-setting.hpp
+          utils/string-list.cpp
+          utils/string-list.hpp
           utils/striped-frame.cpp
           utils/striped-frame.hpp
           utils/text-helpers.cpp

plugins/base/macro-action-projector.cpp

@@ -60,13 +60,8 @@ bool MacroActionProjector::PerformAction()
 	}
 
 	if (_fullscreen && _monitor == -1) {
-		blog(LOG_INFO, "refusing to open fullscreen projector "
-			       "with invalid display selection");
-		return true;
-	}
-	if (_fullscreen && MonitorSetupChanged()) {
-		blog(LOG_INFO, "refusing to open fullscreen projector - "
-			       "monitor setup seems to have changed!");
+		blog(LOG_INFO, "refusing to open fullscreen projector"
+			       " with invalid display selection");
 		return true;
 	}
 
@@ -114,6 +109,13 @@ bool MacroActionProjector::Load(obs_data_t *obj)
 	_fullscreen = obs_data_get_bool(obj, "fullscreen");
 	_scene.Load(obj);
 	_source.Load(obj);
+
+	if (MonitorSetupChanged()) {
+		blog(LOG_INFO, "monitor setup seems to have changed! "
+			       "resetting projector action monitor selection!");
+		_monitor = -1;
+	}
+
 	return true;
 }
 
@@ -147,13 +149,10 @@ void MacroActionProjector::SetMonitor(int idx)
 
 int MacroActionProjector::GetMonitor() const
 {
-	if (MonitorSetupChanged()) {
-		return -1;
-	}
 	return _monitor;
 }
 
-bool MacroActionProjector::MonitorSetupChanged() const
+bool MacroActionProjector::MonitorSetupChanged()
 {
 	if (_monitorName.empty()) {
 		return false;
@@ -249,25 +248,41 @@ void MacroActionProjectorEdit::UpdateEntryData()
 
 void MacroActionProjectorEdit::SceneChanged(const SceneSelection &s)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
 void MacroActionProjectorEdit::SourceChanged(const SourceSelection &source)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_source = source;
 }
 
 void MacroActionProjectorEdit::MonitorChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->SetMonitor(value);
 }
 
 void MacroActionProjectorEdit::WindowTypeChanged(int)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_fullscreen =
 		_windowTypes->currentText() ==
 		obs_module_text("AdvSceneSwitcher.action.projector.fullscreen");
@@ -276,7 +291,11 @@ void MacroActionProjectorEdit::WindowTypeChanged(int)
 
 void MacroActionProjectorEdit::TypeChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionProjector::Type>(value);
 	SetWidgetVisibility();
 }

plugins/base/macro-action-projector.hpp

@@ -33,7 +33,7 @@ public:
 	bool _fullscreen = true;
 
 private:
-	bool MonitorSetupChanged() const;
+	bool MonitorSetupChanged();
 
 	int _monitor = -1;
 	// Only used to detect display setup changes
@@ -66,17 +66,17 @@ private slots:
 	void SourceChanged(const SourceSelection &);
 	void MonitorChanged(int value);
 
-private:
-	void SetWidgetVisibility();
-
+protected:
 	QComboBox *_windowTypes;
 	QComboBox *_types;
 	SceneSelectionWidget *_scenes;
 	SourceSelectionWidget *_sources;
 	QHBoxLayout *_monitorSelection;
 	QComboBox *_monitors;
-
 	std::shared_ptr<MacroActionProjector> _entryData;
+
+private:
+	void SetWidgetVisibility();
 	bool _loading = true;
 };
 

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

@@ -2,7 +2,6 @@
 #include "layout-helpers.hpp"
 
 #include <obs-frontend-api.h>
-#include <util/config-file.h>
 
 namespace advss {
 
@@ -13,49 +12,31 @@ bool MacroActionReplayBuffer::_registered = MacroActionFactory::Register(
 	{MacroActionReplayBuffer::Create, MacroActionReplayBufferEdit::Create,
 	 "AdvSceneSwitcher.action.replay"});
 
-static const std::map<MacroActionReplayBuffer::Action, std::string>
-	actionTypes = {
-		{MacroActionReplayBuffer::Action::STOP,
-		 "AdvSceneSwitcher.action.replay.type.stop"},
-		{MacroActionReplayBuffer::Action::START,
-		 "AdvSceneSwitcher.action.replay.type.start"},
-		{MacroActionReplayBuffer::Action::SAVE,
-		 "AdvSceneSwitcher.action.replay.type.save"},
-		{MacroActionReplayBuffer::Action::DURATION,
-		 "AdvSceneSwitcher.action.replay.type.duration"},
+static const std::map<ReplayBufferAction, std::string> actionTypes = {
+	{ReplayBufferAction::STOP, "AdvSceneSwitcher.action.replay.type.stop"},
+	{ReplayBufferAction::START,
+	 "AdvSceneSwitcher.action.replay.type.start"},
+	{ReplayBufferAction::SAVE, "AdvSceneSwitcher.action.replay.type.save"},
 };
 
 bool MacroActionReplayBuffer::PerformAction()
 {
 	switch (_action) {
-	case Action::STOP:
+	case ReplayBufferAction::STOP:
 		if (obs_frontend_replay_buffer_active()) {
 			obs_frontend_replay_buffer_stop();
 		}
 		break;
-	case Action::START:
+	case ReplayBufferAction::START:
 		if (!obs_frontend_replay_buffer_active()) {
 			obs_frontend_replay_buffer_start();
 		}
 		break;
-	case Action::SAVE:
+	case ReplayBufferAction::SAVE:
 		if (obs_frontend_replay_buffer_active()) {
 			obs_frontend_replay_buffer_save();
 		}
 		break;
-	case Action::DURATION: {
-		auto conf = obs_frontend_get_profile_config();
-		auto value = std::to_string(_duration.Seconds());
-		config_set_string(conf, "SimpleOutput", "RecRBTime",
-				  value.c_str());
-		config_set_string(conf, "AdvOut", "RecRBTime", value.c_str());
-
-		if (config_save(conf) != CONFIG_SUCCESS) {
-			blog(LOG_WARNING,
-			     "failed to set replay buffer duration");
-		}
-		break;
-	}
 	default:
 		break;
 	}
@@ -77,15 +58,14 @@ bool MacroActionReplayBuffer::Save(obs_data_t *obj) const
 {
 	MacroAction::Save(obj);
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
-	_duration.Save(obj);
 	return true;
 }
 
 bool MacroActionReplayBuffer::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
-	_action = static_cast<Action>(obs_data_get_int(obj, "action"));
-	_duration.Load(obj);
+	_action = static_cast<ReplayBufferAction>(
+		obs_data_get_int(obj, "action"));
 	return true;
 }
 
@@ -110,24 +90,23 @@ MacroActionReplayBufferEdit::MacroActionReplayBufferEdit(
 	QWidget *parent, std::shared_ptr<MacroActionReplayBuffer> entryData)
 	: QWidget(parent),
 	  _actions(new QComboBox()),
-	  _warning(new QLabel(
-		  obs_module_text("AdvSceneSwitcher.action.replay.saveWarn"))),
-	  _duration(new DurationSelection(this, false, 5.))
+	  _saveWarning(new QLabel(
+		  obs_module_text("AdvSceneSwitcher.action.replay.saveWarn")))
 {
 	populateActionSelection(_actions);
 
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
-	QWidget::connect(_duration, SIGNAL(DurationChanged(const Duration &)),
-			 this, SLOT(DurationChanged(const Duration &)));
 
-	auto layout = new QHBoxLayout;
+	QHBoxLayout *layout = new QHBoxLayout;
+	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
+		{"{{actions}}", _actions},
+	};
 	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.replay.entry"),
-		     layout,
-		     {{"{{actions}}", _actions}, {"{{duration}}", _duration}});
+		     layout, widgetPlaceholders);
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->addLayout(layout);
-	mainLayout->addWidget(_warning);
+	mainLayout->addWidget(_saveWarning);
 	setLayout(mainLayout);
 
 	_entryData = entryData;
@@ -141,41 +120,21 @@ void MacroActionReplayBufferEdit::UpdateEntryData()
 		return;
 	}
 	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
-	_duration->SetDuration(_entryData->_duration);
-	SetWidgetVisiblity();
-}
-
-void MacroActionReplayBufferEdit::SetWidgetVisiblity()
-{
-	_warning->setVisible(_entryData->_action ==
-			     MacroActionReplayBuffer::Action::SAVE);
-	_duration->setVisible(_entryData->_action ==
-			      MacroActionReplayBuffer::Action::DURATION);
-	_warning->setText(obs_module_text(
-		(_entryData->_action == MacroActionReplayBuffer::Action::SAVE)
-			? "AdvSceneSwitcher.action.replay.saveWarn"
-			: "AdvSceneSwitcher.action.replay.durationWarn"));
-	_warning->setVisible(_entryData->_action ==
-				     MacroActionReplayBuffer::Action::SAVE ||
-			     _entryData->_action ==
-				     MacroActionReplayBuffer::Action::DURATION);
-	adjustSize();
-	updateGeometry();
+	_saveWarning->setVisible(_entryData->_action ==
+				 ReplayBufferAction::SAVE);
 }
 
 void MacroActionReplayBufferEdit::ActionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_action =
-		static_cast<MacroActionReplayBuffer::Action>(value);
+	if (_loading || !_entryData) {
+		return;
+	}
 
-	SetWidgetVisiblity();
-}
-
-void MacroActionReplayBufferEdit::DurationChanged(const Duration &duration)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_duration = duration;
+	auto lock = LockContext();
+	_entryData->_action = static_cast<ReplayBufferAction>(value);
+	_saveWarning->setVisible(_entryData->_action ==
+				 ReplayBufferAction::SAVE);
+	adjustSize();
 }
 
 } // namespace advss

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

@@ -6,6 +6,12 @@
 
 namespace advss {
 
+enum class ReplayBufferAction {
+	STOP,
+	START,
+	SAVE,
+};
+
 class MacroActionReplayBuffer : public MacroAction {
 public:
 	MacroActionReplayBuffer(Macro *m) : MacroAction(m) {}
@@ -17,14 +23,7 @@ public:
 	static std::shared_ptr<MacroAction> Create(Macro *m);
 	std::shared_ptr<MacroAction> Copy() const;
 
-	enum class Action {
-		STOP,
-		START,
-		SAVE,
-		DURATION,
-	};
-	Action _action = Action::STOP;
-	Duration _duration;
+	ReplayBufferAction _action = ReplayBufferAction::STOP;
 
 private:
 	static bool _registered;
@@ -50,16 +49,13 @@ public:
 
 private slots:
 	void ActionChanged(int value);
-	void DurationChanged(const Duration &);
+
+protected:
+	QComboBox *_actions;
+	QLabel *_saveWarning;
+	std::shared_ptr<MacroActionReplayBuffer> _entryData;
 
 private:
-	void SetWidgetVisiblity();
-
-	QComboBox *_actions;
-	QLabel *_warning;
-	DurationSelection *_duration;
-
-	std::shared_ptr<MacroActionReplayBuffer> _entryData;
 	bool _loading = true;
 };
 

plugins/base/macro-action-run.cpp

@@ -1,5 +1,6 @@
 #include "macro-action-run.hpp"
 #include "layout-helpers.hpp"
+#include "ui-helpers.hpp"
 
 #include <QProcess>
 #include <QDesktopServices>
@@ -129,10 +130,16 @@ MacroActionRunEdit::MacroActionRunEdit(
 	  _waitLayout(new QHBoxLayout()),
 	  _wait(new QCheckBox()),
 	  _timeout(new DurationSelection(this, true, 0.1)),
-	  _waitHelp(new HelpIcon(obs_module_text(
-		  "AdvSceneSwitcher.action.run.wait.help.tooltip")))
+	  _waitHelp(new QLabel())
 {
+	QString helpIconPath = GetThemeTypeName() == "Light"
+				       ? ":/res/images/help.svg"
+				       : ":/res/images/help_light.svg";
+	QIcon helpIcon(helpIconPath);
+	_waitHelp->setPixmap(helpIcon.pixmap(QSize(16, 16)));
 	_waitHelp->hide();
+	_waitHelp->setToolTip(obs_module_text(
+		"AdvSceneSwitcher.action.run.wait.help.tooltip"));
 
 	QWidget::connect(_procConfig,
 			 SIGNAL(ConfigChanged(const ProcessConfig &)), this,

plugins/base/macro-action-run.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "help-icon.hpp"
 #include "process-config.hpp"
 #include "duration-control.hpp"
 
@@ -61,7 +60,7 @@ private:
 	QHBoxLayout *_waitLayout;
 	QCheckBox *_wait;
 	DurationSelection *_timeout;
-	HelpIcon *_waitHelp;
+	QLabel *_waitHelp;
 
 	std::shared_ptr<MacroActionRun> _entryData;
 	bool _loading = true;

plugins/base/macro-action-sequence.cpp

@@ -197,7 +197,11 @@ MacroActionSequenceEdit::MacroActionSequenceEdit(
 
 	_resetIndex->setMinimum(1);
 
-	(void)_macroList->AddControl(_continueFrom);
+	auto line = new QFrame();
+	line->setFrameShape(QFrame::VLine);
+	line->setFrameShadow(QFrame::Sunken);
+	_macroList->AddControl(line);
+	_macroList->AddControl(_continueFrom);
 
 	QWidget::connect(_macroList, SIGNAL(Added(const std::string &)), this,
 			 SLOT(Add(const std::string &)));

plugins/base/macro-action-source.cpp

@@ -36,8 +36,6 @@ 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::INTERACT,
-	 "AdvSceneSwitcher.action.source.type.interact"},
 };
 
 const static std::map<obs_deinterlace_mode, std::string> deinterlaceModes = {
@@ -144,9 +142,6 @@ bool MacroActionSource::PerformAction()
 	case Action::SETTINGS_BUTTON:
 		PressSourceButton(_button, s);
 		break;
-	case Action::INTERACT:
-		_interaction.SendToSource(s);
-		break;
 	case Action::DEINTERLACE_MODE:
 		obs_source_set_deinterlace_mode(s, _deinterlaceMode);
 		break;
@@ -204,7 +199,6 @@ bool MacroActionSource::Save(obs_data_t *obj) const
 			 static_cast<int>(_deinterlaceMode));
 	obs_data_set_int(obj, "deinterlaceOrder",
 			 static_cast<int>(_deinterlaceOrder));
-	_interaction.Save(obj);
 	return true;
 }
 
@@ -229,7 +223,6 @@ 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"));
-	_interaction.Load(obj);
 	return true;
 }
 
@@ -316,8 +309,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	  _warning(new QLabel(
 		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
 	  _refreshSettingSelection(new QPushButton(
-		  obs_module_text("AdvSceneSwitcher.action.source.refresh"))),
-	  _interaction(new SourceInteractionWidget())
+		  obs_module_text("AdvSceneSwitcher.action.source.refresh")))
 {
 	populateActionSelection(_actions);
 	auto sources = GetSourceNames();
@@ -357,13 +349,6 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 SLOT(SelectionChanged(const SourceSetting &)));
 	QWidget::connect(_refreshSettingSelection, SIGNAL(clicked()), this,
 			 SLOT(RefreshVariableSourceSelectionValue()));
-	QWidget::connect(
-		_interaction,
-		SIGNAL(SettingsChanged(SourceInteractionInstance *)), this,
-		SLOT(InteractionSettingsChanged(SourceInteractionInstance *)));
-	QWidget::connect(_interaction,
-			 SIGNAL(TypeChanged(SourceInteraction::Type)), this,
-			 SLOT(InteractionTypeChanged(SourceInteraction::Type)));
 
 	auto entryLayout = new QHBoxLayout;
 	entryLayout->setContentsMargins(0, 0, 0, 0);
@@ -396,7 +381,6 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	buttonLayout->addWidget(_getSettings);
 	buttonLayout->addStretch();
 	mainLayout->addLayout(buttonLayout);
-	mainLayout->addWidget(_interaction);
 	setLayout(mainLayout);
 
 	_entryData = entryData;
@@ -427,7 +411,6 @@ void MacroActionSourceEdit::UpdateEntryData()
 		static_cast<int>(_entryData->_settingsInputMethod)));
 	_tempVars->SetVariable(_entryData->_tempVar);
 	_manualSettingValue->setPlainText(_entryData->_manualSettingValue);
-	_interaction->SetSourceInteractionSelection(_entryData->_interaction);
 
 	SetWidgetVisibility();
 }
@@ -578,29 +561,6 @@ void MacroActionSourceEdit::ManualSettingsValueChanged()
 	updateGeometry();
 }
 
-void MacroActionSourceEdit::InteractionTypeChanged(SourceInteraction::Type value)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
-	_entryData->_interaction.SetType(value);
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroActionSourceEdit::InteractionSettingsChanged(
-	SourceInteractionInstance *value)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-	auto lock = LockContext();
-	_entryData->_interaction.SetSettings(value);
-}
-
 void MacroActionSourceEdit::RefreshVariableSourceSelectionValue()
 {
 	_sourceSettings->SetSource(_entryData->_source.GetSource());
@@ -657,8 +617,6 @@ void MacroActionSourceEdit::SetWidgetVisibility()
 		_entryData->_source.GetType() ==
 			SourceSelection::Type::VARIABLE);
 
-	_interaction->setVisible(_entryData->_action ==
-				 MacroActionSource::Action::INTERACT);
 	adjustSize();
 	updateGeometry();
 }

plugins/base/macro-action-source.hpp

@@ -1,7 +1,6 @@
 #pragma once
 #include "macro-action-edit.hpp"
 #include "variable-text-edit.hpp"
-#include "source-interact.hpp"
 #include "source-properties-button.hpp"
 #include "source-selection.hpp"
 #include "source-setting.hpp"
@@ -35,7 +34,6 @@ public:
 		OBS_DEINTERLACE_FIELD_ORDER_TOP;
 	TempVariableRef _tempVar;
 	SourceSetting _setting;
-	SourceInteraction _interaction;
 
 	enum class Action {
 		ENABLE,
@@ -48,7 +46,6 @@ public:
 		OPEN_INTERACTION_DIALOG,
 		OPEN_FILTER_DIALOG,
 		OPEN_PROPERTIES_DIALOG,
-		INTERACT,
 	};
 	Action _action = Action::SETTINGS;
 
@@ -95,8 +92,6 @@ private slots:
 	void ManualSettingsValueChanged();
 	void RefreshVariableSourceSelectionValue();
 
-	void InteractionTypeChanged(SourceInteraction::Type value);
-	void InteractionSettingsChanged(SourceInteractionInstance *value);
 signals:
 	void HeaderInfoChanged(const QString &);
 
@@ -117,7 +112,6 @@ private:
 	QComboBox *_deinterlaceOrder;
 	QLabel *_warning;
 	QPushButton *_refreshSettingSelection;
-	SourceInteractionWidget *_interaction;
 
 	std::shared_ptr<MacroActionSource> _entryData;
 	bool _loading = true;