Add option to lock settings dialog with simple password

This is meant as a simple tampering protection.
The settings are not encrypted and the password is stored in plaintext.

.github/actions/build-dependencies/action.yaml

@@ -19,14 +19,9 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.13
-      with:
-        cmake-version: '3.28.x'
-
     - name: Restore cached dependencies
       id: restore-cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ env.DEP_DIR }}
         key: ${{ env.DEP_DIR }}-${{ runner.os }}-${{ inputs.target }}

.github/actions/run-clang-format/action.yaml

@@ -29,6 +29,7 @@ runs:
         eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
         echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
         echo "/home/linuxbrew/.linuxbrew/opt/clang-format@16/bin" >> $GITHUB_PATH
+        brew update
         brew install --quiet zsh
         echo ::endgroup::
 
@@ -52,6 +53,7 @@ runs:
 
         if (( ${changes[(I)(*.c|*.h|*.cpp|*.hpp|*.m|*.mm)]} )) {
           echo ::group::Install clang-format-16
+          brew update
           brew install --quiet obsproject/tools/clang-format@16
           echo ::endgroup::
 

.github/scripts/.Wingetfile

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

.github/scripts/.build-deps.zsh

@@ -394,8 +394,11 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
         popd
 
-        pushd ${advss_dep_path}
         log_info "Prepare openssl ..."
+        rm -rf ${advss_dep_path}/openssl ${advss_dep_path}/openssl_build
+        mkdir ${advss_dep_path}/openssl_build
+        pushd ${advss_dep_path}/openssl_build
+
         rm -rf openssl
         git clone https://github.com/openssl/openssl.git --branch openssl-3.1.2 --depth 1
         mv openssl openssl_x86
@@ -403,25 +406,27 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
         log_info "Building openssl x86 ..."
         export MACOSX_DEPLOYMENT_TARGET=10.9
-        cd openssl_x86
-        ./Configure darwin64-x86_64-cc shared
-        make
+        pushd openssl_x86
+        ./Configure darwin64-x86_64-cc no-shared no-module no-zlib --prefix=${advss_dep_path}
+        make -j$(nproc)
+        popd
 
         log_info "Building openssl arm ..."
         export MACOSX_DEPLOYMENT_TARGET=10.15
-        cd ../openssl_arm
-        ./Configure enable-rc5 zlib darwin64-arm64-cc no-asm
-        make
+        pushd openssl_arm
+        ./Configure enable-rc5 darwin64-arm64-cc no-shared no-module no-asm no-zlib --prefix=${advss_dep_path}
+        make -j$(nproc)
+
+        log_info "Install openssl ..."
+        make install
+        popd
 
         log_info "Combine arm and x86 openssl binaries ..."
-        cd ..
-        mkdir openssl-combined
-        lipo -create openssl_x86/libcrypto.a openssl_arm/libcrypto.a -output openssl-combined/libcrypto.a
-        lipo -create openssl_x86/libssl.a openssl_arm/libssl.a -output openssl-combined/libssl.a
+        lipo -create openssl_x86/libcrypto.a openssl_arm/libcrypto.a -output ${advss_dep_path}/lib/libcrypto.a
+        lipo -create openssl_x86/libssl.a openssl_arm/libssl.a -output ${advss_dep_path}/lib/libssl.a
 
         log_info "Clean up openssl dir ..."
-        mv openssl_x86 openssl
-        rm -rf openssl_arm
+        rm -rf openssl_x86 openssl_arm
         popd
 
         pushd ${project_root}/deps/libusb
@@ -439,14 +444,16 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         mkdir ${project_root}/deps/libusb/out_x86
         ./autogen.sh
         ./configure --host=x86_64-apple-darwin --prefix=${advss_dep_path}
-        make && make install
+        make -j$(nproc)
+        make install
 
         log_info "Configure libusb arm ..."
         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
+        make -j$(nproc)
+        make install
 
         log_info "Building libusb arm ..."
         make clean
@@ -459,7 +466,8 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         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
+        make -j$(nproc)
+        make install
 
         log_info "Combine arm and x86 libusb binaries ..."
         lipo -create ${project_root}/deps/libusb/out_x86/lib/libusb-1.0.0.dylib \
@@ -491,8 +499,8 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
           -DPAHO_BUILD_SHARED=OFF
           -DPAHO_BUILD_STATIC=ON
           -DPAHO_WITH_MQTT_C=ON
-          -DOPENSSL_ROOT_DIR="${advss_dep_path}"
-          -DPAHO_WITH_SSL=OFF # TODO: figure out linking issues with openssl
+          -DPAHO_WITH_SSL=ON
+          -DOPENSSL_USE_STATIC_LIBS=ON
         )
 
         pushd ${mqtt_dir}

.github/scripts/.build.zsh

@@ -253,12 +253,12 @@ ${_usage_host:-}"
       macos-*)
         if (( ${+CI} )) typeset -gx NSUnbufferedIO=YES
 
-        local openssl_lib_dir="${advss_deps_path}/openssl-combined/"
-        local openssl_include_dir="${advss_deps_path}/openssl/include"
-
         cmake_args+=(
-          -DOPENSSL_INCLUDE_DIR="${openssl_include_dir}"
-          -DOPENSSL_LIBRARIES="${openssl_lib_dir}/libcrypto.a;${openssl_lib_dir}/libssl.a"
+          -DCMAKE_PREFIX_PATH="${advss_deps_path}"
+          -DOPENSSL_ROOT_DIR="${advss_deps_path}"
+          -DOPENSSL_INCLUDE_DIR="${advss_deps_path}/include"
+          -DOPENSSL_CRYPTO_LIBRARY="${advss_deps_path}/lib/libcrypto.a"
+          -DOPENSSL_SSL_LIBRARY="${advss_deps_path}/lib/libssl.a"
           --preset ${_preset}
         )
 

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

@@ -234,8 +234,24 @@ function Build {
         "-DCMAKE_PREFIX_PATH:PATH=${OBSDepPath}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${ADVSSDepPath}"
         "-DPAHO_WITH_MQTT_C=ON"
+        "-DPAHO_WITH_SSL=ON"
     )
 
+    # Try to find OpenSSL installed via winget
+    $pf64 = Join-Path $Env:ProgramFiles "OpenSSL-Win64"
+    $pf = Join-Path $Env:ProgramFiles "OpenSSL"
+    $possibleDirs = @($pf64, $pf)
+    $opensslDir = $possibleDirs | Where-Object { Test-Path (Join-Path $_ "include\openssl\ssl.h") } | Select-Object -First 1
+
+    if ($opensslDir) {
+        Write-Host "Detected OpenSSL at: $opensslDir"
+        $MqttCmakeArgs += "-DOPENSSL_ROOT_DIR=$opensslDir"
+        $MqttCmakeArgs += "-DOPENSSL_CRYPTO_LIBRARY=$opensslDir\lib\VC\x64\MD\libcrypto.lib"
+        $MqttCmakeArgs += "-DOPENSSL_SSL_LIBRARY=$opensslDir\lib\VC\x64\MD\libssl.lib"
+    } else {
+        Write-Warning "OpenSSL not found - maybe cmake will find it ..."
+    }
+
     Log-Information "Configuring paho.mqtt.cpp..."
     Invoke-External cmake -S ${MqttPath} -B ${MqttBuildPath} @MqttCmakeArgs
 

.github/scripts/Package-Windows.ps1

@@ -68,14 +68,44 @@ function Package {
 
     Remove-Item @RemoveArgs
 
+    # Build a staging directory with two subfolders:
+    #   recommended/ - new layout, extract to %ProgramData%\obs-studio\
+    #   legacy/      - old layout, extract to the OBS install directory
+    $ReleasePath  = "${ProjectRoot}/release/${Configuration}"
+    $StagingPath  = "${ProjectRoot}/release/zip-staging"
+    $NewBinPath   = "${ReleasePath}/${ProductName}/bin/64bit"
+    $NewDataPath  = "${ReleasePath}/${ProductName}/data"
+
+    Remove-Item -Path $StagingPath -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Force -Path $StagingPath | Out-Null
+    Copy-Item -Path "${ProjectRoot}/build-aux/CI/windows/README.txt" -Destination "${StagingPath}/README.txt"
+
+    if ( Test-Path -Path $NewBinPath ) {
+        $RecBinPath    = "${StagingPath}/recommended/${ProductName}/bin/64bit"
+        $LegacyBinPath = "${StagingPath}/legacy/obs-plugins/64bit"
+        New-Item -ItemType Directory -Force -Path $RecBinPath    | Out-Null
+        New-Item -ItemType Directory -Force -Path $LegacyBinPath | Out-Null
+        Copy-Item -Path "${NewBinPath}/*" -Destination $RecBinPath    -Recurse -Force
+        Copy-Item -Path "${NewBinPath}/*" -Destination $LegacyBinPath -Recurse -Force
+    }
+    if ( Test-Path -Path $NewDataPath ) {
+        $RecDataPath    = "${StagingPath}/recommended/${ProductName}/data"
+        $LegacyDataPath = "${StagingPath}/legacy/data/obs-plugins/${ProductName}"
+        New-Item -ItemType Directory -Force -Path $RecDataPath    | Out-Null
+        New-Item -ItemType Directory -Force -Path $LegacyDataPath | Out-Null
+        Copy-Item -Path "${NewDataPath}/*" -Destination $RecDataPath    -Recurse -Force
+        Copy-Item -Path "${NewDataPath}/*" -Destination $LegacyDataPath -Recurse -Force
+    }
+
     Log-Group "Archiving ${ProductName}..."
     $CompressArgs = @{
-        Path = (Get-ChildItem -Path "${ProjectRoot}/release/${Configuration}" -Exclude "${OutputName}*.*")
+        Path = (Get-ChildItem -Path $StagingPath)
         CompressionLevel = 'Optimal'
         DestinationPath = "${ProjectRoot}/release/${OutputName}.zip"
-        Verbose = ($Env:CI -ne $null)
+        Verbose = ($null -ne $Env:CI)
     }
     Compress-Archive -Force @CompressArgs
+    Remove-Item -Path $StagingPath -Recurse -Force
     Log-Group
 
     if ( ( $BuildInstaller ) ) {
@@ -89,6 +119,7 @@ function Package {
         Log-Information 'Creating InnoSetup installer...'
         Push-Location -Stack BuildTemp
         Ensure-Location -Path "${ProjectRoot}/release"
+        Remove-Item -Path Package -Recurse -Force -ErrorAction SilentlyContinue
         Copy-Item -Path ${Configuration} -Destination Package -Recurse
         Invoke-External iscc ${IsccFile} /O"${ProjectRoot}/release" /F"${OutputName}-Installer"
         Remove-Item -Path Package -Recurse

.github/workflows/build-debian.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: "recursive"
       - name: check_libobs_revision
@@ -50,7 +50,7 @@ jobs:
           mv ../*.deb .
       - name: Publish
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: "obs-scene-switcher.deb"
           path: ${{ github.workspace }}/*.deb

.github/workflows/build-project.yaml

@@ -6,7 +6,7 @@ on:
         description: "Project name detected by parsing build spec file"
         value: ${{ jobs.check-event.outputs.pluginName }}
 env:
-  DEP_DIR: .deps/advss-build-dependencies-2
+  DEP_DIR: .deps/advss-build-dependencies-5
 jobs:
   check-event:
     name: Check GitHub Event Data 🔎
@@ -22,7 +22,7 @@ jobs:
       commitHash: ${{ steps.setup.outputs.commitHash }}
       pluginName: ${{ steps.setup.outputs.pluginName }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Check Event Data ☑️
@@ -81,7 +81,7 @@ jobs:
       run:
         shell: zsh --no-rcs --errexit --pipefail {0}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -111,7 +111,7 @@ jobs:
           sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
           print '::endgroup::'
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: ccache-cache
         with:
           path: ${{ github.workspace }}/.ccache
@@ -163,13 +163,13 @@ jobs:
           codesignPass: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-macos-universal.*
 
       - name: Upload Debug Symbol Artifacts 🪲
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ needs.check-event.outputs.config == 'Release' }}
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}-dSYMs
@@ -183,7 +183,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -202,7 +202,7 @@ jobs:
           echo "pluginName=${product_name}" >> $GITHUB_OUTPUT
           echo "pluginVersion=${git_tag}" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: ccache-cache
         with:
           path: ${{ github.workspace }}/.ccache
@@ -210,13 +210,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-ccache-x86_64-
 
-      - name: Set up CMake 🏗️
-        uses: jwlawson/actions-setup-cmake@v1.13
-        with:
-          cmake-version: '3.24.x'
-
       - name: Set up Homebrew 🍺
-        uses: Homebrew/actions/setup-homebrew@master
+        uses: Homebrew/actions/setup-homebrew@main
 
       - name: Build Plugin 🧱
         uses: ./.github/actions/build-plugin
@@ -238,23 +233,24 @@ jobs:
           config: ${{ needs.check-event.outputs.config }}
 
       - name: Upload Source Tarball 🗜️
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-sources-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-source.*
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*.*
 
       - name: Upload debug symbol artifacts 🪲
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ fromJSON(needs.check-event.outputs.package) }}
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*-dbgsym.ddeb
+          if-no-files-found: ignore
 
   windows-build:
     name: Build for Windows 🪟
@@ -264,7 +260,7 @@ jobs:
       run:
         shell: pwsh
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -311,7 +307,7 @@ jobs:
           package: ${{ fromJSON(needs.check-event.outputs.package) }}
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-windows-x64-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-windows-x64*.*

.github/workflows/check-format.yaml

@@ -5,7 +5,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: clang-format check 🐉
@@ -17,7 +17,7 @@ jobs:
   cmake-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: cmake-format check 🎛️

.github/workflows/locale-check.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check locale files
         run: |

.github/workflows/push.yaml

@@ -59,7 +59,7 @@ jobs:
           esac
 
       - name: Download Build Artifacts 📥
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         if: fromJSON(steps.check.outputs.validTag)
         id: download
 
@@ -106,7 +106,7 @@ jobs:
       - name: Create Release 🛫
         if: fromJSON(steps.check.outputs.validTag)
         id: create_release
-        uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
         with:
           draft: true
           prerelease: ${{ fromJSON(steps.check.outputs.prerelease) }}

BUILDING.md

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

CMakeLists.txt

@@ -34,6 +34,11 @@ include(cmake/common/get_git_revision_description.cmake)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 git_describe(GIT_TAG)
 
+# Helper for OpenSSL
+if(OS_WINDOWS)
+  include(cmake/windows/wingetssl.cmake)
+endif()
+
 if(${GIT_TAG} STREQUAL "GIT-NOTFOUND")
   set(GIT_TAG ${PROJECT_VERSION})
 endif()
@@ -129,6 +134,9 @@ target_sources(
           lib/macro/macro-dock-window.hpp
           lib/macro/macro-edit.cpp
           lib/macro/macro-edit.hpp
+          lib/macro/macro-export-builtin-extensions.cpp
+          lib/macro/macro-export-extensions.cpp
+          lib/macro/macro-export-extensions.hpp
           lib/macro/macro-export-import-dialog.cpp
           lib/macro/macro-export-import-dialog.hpp
           lib/macro/macro-helpers.cpp
@@ -141,6 +149,8 @@ target_sources(
           lib/macro/macro-ref.hpp
           lib/macro/macro-run-button.cpp
           lib/macro/macro-run-button.hpp
+          lib/macro/macro-search.cpp
+          lib/macro/macro-search.hpp
           lib/macro/macro-segment-copy-paste.cpp
           lib/macro/macro-segment-copy-paste.hpp
           lib/macro/macro-segment-list.cpp
@@ -159,6 +169,7 @@ target_sources(
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
           lib/macro/macro-tree.hpp
+          lib/macro/macro-websocket-trigger.cpp
           lib/macro/macro.cpp
           lib/macro/macro.hpp)
 
@@ -177,6 +188,8 @@ target_sources(
           lib/utils/canvas-helpers.hpp
           lib/utils/condition-logic.cpp
           lib/utils/condition-logic.hpp
+          lib/utils/crash-handler.cpp
+          lib/utils/crash-handler.hpp
           lib/utils/curl-helper.cpp
           lib/utils/curl-helper.hpp
           lib/utils/cursor-shape-changer.cpp
@@ -194,6 +207,8 @@ target_sources(
           lib/utils/file-selection.hpp
           lib/utils/filter-combo-box.cpp
           lib/utils/filter-combo-box.hpp
+          lib/utils/first-run-wizard.cpp
+          lib/utils/first-run-wizard.hpp
           lib/utils/help-icon.hpp
           lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
@@ -444,14 +459,29 @@ else()
   endif()
   if(PROCPS2_INCLUDE_DIR)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(libproc2 IMPORTED_TARGET libproc2<4.0.5 QUIET)
-    if(libproc2_FOUND)
-      target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_USE_INFO)
-    endif()
     pkg_check_modules(libproc2 REQUIRED IMPORTED_TARGET libproc2)
     set(PROC_INCLUDE_DIR "${PROCPS2_INCLUDE_DIR}")
     target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_AVAILABLE)
     set(PROCESS_CONDITION_SUPPORTED 1)
+
+    # Check if PIDS_VAL takes 4 arguments (old API, pre-4.0.5) or 3 (new API)
+    include(CheckCSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES "${PROCPS2_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_LIBRARIES proc2)
+    check_c_source_compiles(
+      "
+      #include <libproc2/pids.h>
+      int main(void) {
+        struct pids_stack *s = 0;
+        struct pids_info *i = 0;
+        (void)PIDS_VAL(0, str, s, i);
+        return 0;
+      }
+    "
+      PROCPS2_PIDS_VAL_TAKES_INFO)
+    if(PROCPS2_PIDS_VAL_TAKES_INFO)
+      target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_USE_INFO)
+    endif()
   endif()
   if(NOT DEFINED PROCESS_CONDITION_SUPPORTED)
     message(
@@ -477,7 +507,11 @@ endif()
 # --- End of section ---
 
 add_subdirectory(plugins)
-add_subdirectory(tests)
+
+option(ADVSS_ENABLE_TESTS "Build advanced-scene-switcher unit tests" OFF)
+if(ADVSS_ENABLE_TESTS)
+  add_subdirectory(tests)
+endif()
 
 # --- Install ---
 

CMakePresets.json

@@ -41,7 +41,8 @@
       "description": "Build for macOS 11.0+ (Universal binary) for CI",
       "generator": "Xcode",
       "cacheVariables": {
-        "CMAKE_COMPILE_WARNING_AS_ERROR": true
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ADVSS_ENABLE_TESTS": true
       }
     },
     {
@@ -69,7 +70,8 @@
       "displayName": "Windows x64 CI build",
       "description": "Build for Windows x64 on CI",
       "cacheVariables": {
-        "CMAKE_COMPILE_WARNING_AS_ERROR": true
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ADVSS_ENABLE_TESTS": true
       }
     },
     {
@@ -97,7 +99,8 @@
       "description": "Build for Linux x86_64 on CI",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_COMPILE_WARNING_AS_ERROR": true
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ADVSS_ENABLE_TESTS": true
       }
     },
     {
@@ -125,7 +128,8 @@
       "description": "Build for Linux aarch64 on CI",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_COMPILE_WARNING_AS_ERROR": true
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ADVSS_ENABLE_TESTS": true
       }
     }
   ],

README.md

@@ -14,11 +14,6 @@ On Linux the plugin is available via the **Flatpak** package manager for users w
 flatpak install com.obsproject.Studio.Plugin.SceneSwitcher
 ```
 
-The **Snap** package manager offers an OBS Studio installation which is bundled with the plugin:
-```
-sudo snap install obs-studio
-```
-
 More information can be found [here](https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation).
 
 ## Contributing

build-aux/CI/windows/README.txt

@@ -0,0 +1,37 @@
+Advanced Scene Switcher - Windows Installation
+==============================================
+
+For full installation instructions visit:
+https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation
+
+
+Quick guide
+-----------
+
+This archive contains two installation methods.
+Choose ONE depending on your OBS version.
+
+
+recommended\   (preferred)
+---------------------------------------------
+Extract the CONTENTS of this folder into:
+
+    C:\ProgramData\obs-studio\
+
+Tip: press Win+R and type  %ProgramData%\obs-studio\plugins  to open that folder.
+
+After extracting, the path should look like:
+    C:\ProgramData\obs-studio\plugins\advanced-scene-switcher\bin\64bit\advanced-scene-switcher.dll
+
+
+legacy\   (older OBS versions, portable OBS installs, or if the recommended method does not work)
+---------------------------------------------------------------------------
+Extract the CONTENTS of this folder into your OBS installation directory,
+typically:
+
+    C:\Program Files\obs-studio\
+
+Merge the data\ and obs-plugins\ folders with the existing ones when prompted.
+
+Steam users: right-click OBS in your library -> Manage -> Browse local files,
+then extract the contents of legacy\ into that directory.

cmake/common/advss_helpers.cmake

@@ -2,7 +2,7 @@
 
 if(BUILD_OUT_OF_TREE)
   if(OS_WINDOWS)
-    set(OBS_PLUGIN_DESTINATION "obs-plugins/64bit")
+    set(OBS_PLUGIN_DESTINATION "${CMAKE_PROJECT_NAME}/bin/64bit")
   else()
     set(OBS_PLUGIN_DESTINATION "${CMAKE_INSTALL_LIBDIR}/obs-plugins")
   endif()

cmake/common/buildspec_common.cmake

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

cmake/common/get_git_revision_description.cmake

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

cmake/linux/defaults.cmake

@@ -18,7 +18,9 @@ set(CPACK_PACKAGE_FILE_NAME
     "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_C_LIBRARY_ARCHITECTURE}"
 )
 
-set(CPACK_GENERATOR "DEB")
+set(CPACK_GENERATOR
+    "DEB"
+    CACHE STRING "CPack generator to use")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${PLUGIN_EMAIL}")
 set(CPACK_SET_DESTDIR ON)
@@ -46,6 +48,19 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME
 set(CPACK_ARCHIVE_THREADS 0)
 
 include(CPack)
+# CPack.cmake has a side effect that leaves binary packaging variables in the
+# state intended for source packaging when it finishes. Specifically it sets
+# CPACK_GENERATOR to CPACK_SOURCE_GENERATOR ("TXZ"), sets
+# CPACK_INSTALLED_DIRECTORIES to the source root (which would cause CPackDeb to
+# scan the entire source tree, including ccache object files that lack a Build
+# ID), and clears CPACK_INSTALL_CMAKE_PROJECTS (preventing the cmake install
+# mechanism from being used). In some cmake versions these overrides happen
+# before CPackConfig.cmake is written. Reset all three so that binary DEB
+# packaging works correctly regardless of cmake version.
+set(CPACK_GENERATOR "DEB")
+set(CPACK_INSTALLED_DIRECTORIES "")
+set(CPACK_INSTALL_CMAKE_PROJECTS
+    "${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};ALL;/")
 
 find_package(libobs QUIET)
 

cmake/windows/defaults.cmake

@@ -6,3 +6,9 @@ include_guard(GLOBAL)
 set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE)
 
 include(buildspec)
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX
+      "$ENV{ALLUSERSPROFILE}/obs-studio/plugins"
+      CACHE STRING "Default plugin installation directory" FORCE)
+endif()

cmake/windows/helpers.cmake

@@ -30,13 +30,13 @@ function(set_target_properties_plugin target)
 
   install(
     TARGETS ${target}
-    RUNTIME DESTINATION bin/64bit
-    LIBRARY DESTINATION obs-plugins/64bit)
+    RUNTIME DESTINATION "${target}/bin/64bit"
+    LIBRARY DESTINATION "${target}/bin/64bit")
 
   install(
     FILES "$<TARGET_PDB_FILE:${target}>"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION obs-plugins/64bit
+    DESTINATION "${target}/bin/64bit"
     OPTIONAL)
 
   if(OBS_BUILD_DIR)
@@ -44,11 +44,11 @@ function(set_target_properties_plugin target)
       TARGET ${target}
       POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E make_directory
-              "${OBS_BUILD_DIR}/obs-plugins/64bit"
+              "${OBS_BUILD_DIR}/plugins/${target}/bin/64bit"
       COMMAND
         "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:${target}>"
         "$<$<CONFIG:Debug,RelWithDebInfo,Release>:$<TARGET_PDB_FILE:${target}>>"
-        "${OBS_BUILD_DIR}/obs-plugins/64bit"
+        "${OBS_BUILD_DIR}/plugins/${target}/bin/64bit"
       COMMENT "Copy ${target} to obs-studio directory ${OBS_BUILD_DIR}"
       VERBATIM)
   endif()
@@ -105,7 +105,7 @@ function(target_install_resources target)
 
     install(
       DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
-      DESTINATION data/obs-plugins/${target}
+      DESTINATION "${target}/data"
       USE_SOURCE_PERMISSIONS)
 
     if(OBS_BUILD_DIR)
@@ -113,11 +113,11 @@ function(target_install_resources target)
         TARGET ${target}
         POST_BUILD
         COMMAND "${CMAKE_COMMAND}" -E make_directory
-                "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+                "${OBS_BUILD_DIR}/plugins/${target}/data"
         COMMAND
           "${CMAKE_COMMAND}" -E copy_directory
           "${CMAKE_CURRENT_SOURCE_DIR}/data"
-          "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+          "${OBS_BUILD_DIR}/plugins/${target}/data"
         COMMENT "Copy ${target} resources to data directory"
         VERBATIM)
     endif()
@@ -133,7 +133,7 @@ function(target_add_resource target resource)
 
   install(
     FILES "${resource}"
-    DESTINATION data/obs-plugins/${target}
+    DESTINATION "${target}/data"
     COMPONENT Runtime)
 
   if(OBS_BUILD_DIR)
@@ -141,9 +141,9 @@ function(target_add_resource target resource)
       TARGET ${target}
       POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E make_directory
-              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+              "${OBS_BUILD_DIR}/plugins/${target}/data"
       COMMAND "${CMAKE_COMMAND}" -E copy "${resource}"
-              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+              "${OBS_BUILD_DIR}/plugins/${target}/data"
       COMMENT "Copy ${target} resource ${resource} to library directory"
       VERBATIM)
   endif()

cmake/windows/resources/installer-Windows.iss.in

@@ -2,12 +2,13 @@
 #define MyAppVersion "@CMAKE_PROJECT_VERSION@"
 #define MyAppPublisher "@PLUGIN_AUTHOR@"
 #define MyAppURL "@PLUGIN_WEBSITE@"
+#define MyAppId "@UUID_APP@"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{@UUID_APP@}
+AppId={{{#MyAppId}}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
@@ -20,8 +21,9 @@ OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 DirExistsWarning=no
+UsePreviousAppDir=no
 SetupIconFile=installer.ico
-UninstallDisplayIcon={app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico
+UninstallDisplayIcon={app}\advanced-scene-switcher\data\res\images\logo.ico
 DisableDirPage=no
 
 [Languages]
@@ -51,17 +53,34 @@ begin
   );
 end;
 
-// credit where it's due :
-// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
 function GetDirName(Value: string): string;
-var
-  InstallPath: string;
 begin
-  // initialize default path, which will be returned when the following registry
-  // key queries fail due to missing keys or for some different reason
-  Result := '{autopf}\obs-studio';
-  // query the first registry value; if this succeeds, return the obtained value
-  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
-    Result := InstallPath
+  Result := ExpandConstant('{commonappdata}\obs-studio\plugins');
+end;
+
+// Remove files placed by the legacy installer (obs-plugins/64bit and
+// data/obs-plugins layout) so the plugin is not loaded twice by OBS.
+// We read InstallLocation from our own previous uninstall entry, which is
+// the exact directory the old installer used regardless of OBS install path.
+procedure RemoveLegacyFiles();
+var
+  OldInstallPath: string;
+  UninstallKey: string;
+begin
+  UninstallKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + '{' + '{#MyAppId}' + '}_is1';
+  if not RegQueryStringValue(HKLM, UninstallKey, 'InstallLocation', OldInstallPath) then
+    Exit;
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher.dll');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher.pdb');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-lib.dll');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-lib.pdb');
+  DelTree(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-plugins', True, True, True);
+  DelTree(OldInstallPath + '\data\obs-plugins\advanced-scene-switcher', True, True, True);
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then
+    RemoveLegacyFiles();
 end;
 

cmake/windows/wingetssl.cmake

@@ -0,0 +1,78 @@
+# ---------------------------------------------------------------------------
+# Detects OpenSSL installed via winget or other common Windows locations,
+# without requiring the user to manually set OPENSSL_ROOT_DIR.
+# ---------------------------------------------------------------------------
+
+if(WIN32 AND (NOT OpenSSL_FOUND))
+
+  set(_openssl_roots
+      "$ENV{ProgramFiles}/OpenSSL-Win64" "$ENV{ProgramFiles}/OpenSSL"
+      "$ENV{ProgramW6432}/OpenSSL-Win64")
+
+  set(_openssl_lib_suffixes "lib/VC/x64/MD" "lib/VC/x64/MDd" "lib/VC/x64/MT"
+                            "lib/VC/x64/MTd" "lib")
+
+  # Determine which configuration we're building
+  if(CMAKE_BUILD_TYPE MATCHES "Debug")
+    set(_is_debug TRUE)
+  else()
+    set(_is_debug FALSE)
+  endif()
+
+  # Determine which runtime we use Default to /MD (shared CRT)
+  set(_crt_kind "MD")
+  if(MSVC)
+    if(CMAKE_MSVC_RUNTIME_LIBRARY MATCHES "MultiThreaded")
+      if(CMAKE_MSVC_RUNTIME_LIBRARY MATCHES "Debug")
+        set(_crt_kind "MTd")
+      else()
+        set(_crt_kind "MT")
+      endif()
+    else()
+      if(_is_debug)
+        set(_crt_kind "MDd")
+      else()
+        set(_crt_kind "MD")
+      endif()
+    endif()
+  endif()
+
+  message(STATUS "Looking for OpenSSL built with CRT variant: ${_crt_kind}")
+
+  # Try to find the root and corresponding lib path
+  foreach(_root ${_openssl_roots})
+    if(EXISTS "${_root}/include/openssl/ssl.h")
+      foreach(_suffix ${_openssl_lib_suffixes})
+        if(_suffix MATCHES "${_crt_kind}$"
+           AND EXISTS "${_root}/${_suffix}/libcrypto.lib")
+          set(OPENSSL_ROOT_DIR
+              "${_root}"
+              CACHE PATH "Path to OpenSSL root")
+          set(OPENSSL_CRYPTO_LIBRARY
+              "${_root}/${_suffix}/libcrypto.lib"
+              CACHE FILEPATH "OpenSSL crypto lib")
+          set(OPENSSL_SSL_LIBRARY
+              "${_root}/${_suffix}/libssl.lib"
+              CACHE FILEPATH "OpenSSL ssl lib")
+          set(OPENSSL_INCLUDE_DIR
+              "${_root}/include"
+              CACHE PATH "OpenSSL include dir")
+          set(OpenSSL_FOUND
+              TRUE
+              CACHE BOOL "Whether OpenSSL was found")
+          message(STATUS "Found OpenSSL at: ${_root}/${_suffix}")
+          return()
+        endif()
+      endforeach()
+    endif()
+    if(OpenSSL_FOUND)
+      break()
+    endif()
+  endforeach()
+
+  if(NOT OpenSSL_FOUND)
+    message(WARNING "Could not auto-detect OpenSSL under Program Files. "
+                    "Might have to set OPENSSL_ROOT_DIR manually.")
+  endif()
+
+endif()

data/locale/de-DE.ini

@@ -76,7 +76,6 @@ AdvSceneSwitcher.macroTab.name="Name:"
 AdvSceneSwitcher.macroTab.run="Makro ausführen"
 AdvSceneSwitcher.macroTab.runFail="Ausführen von \"%1\" fehlgeschlagen!\nEntweder ist eine der Aktionen fehlgeschlagen oder das Makro wird bereits ausgeführt.\nSoll die aktuelle Ausführung gestoppt werden?"
 AdvSceneSwitcher.macroTab.runInParallel="Parallel zu anderen Makros ausführen"
-AdvSceneSwitcher.macroTab.onChange="Nur bei Änderung ausführen"
 AdvSceneSwitcher.macroTab.defaultname="Makro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Gruppe %1"
 AdvSceneSwitcher.macroTab.removeGroupPopup.text="Sicher, dass \"%1\" und alle zugehörigen Elemente gelöscht werden?"
@@ -100,7 +99,6 @@ AdvSceneSwitcher.macroList.deleted="gelöscht"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" ist bereits ausgewählt!"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Eintrag ignorieren"
 AdvSceneSwitcher.logic.and="Und"
 AdvSceneSwitcher.logic.or="Oder"
 AdvSceneSwitcher.logic.andNot="Und nicht"
@@ -146,11 +144,7 @@ AdvSceneSwitcher.condition.file="Datei"
 AdvSceneSwitcher.condition.file.type.match="entspricht"
 AdvSceneSwitcher.condition.file.type.contentChange="Inhalt geändert"
 AdvSceneSwitcher.condition.file.type.dateChange="Änderungsdatum geändert"
-AdvSceneSwitcher.condition.file.remote="Entfernte Datei"
-AdvSceneSwitcher.condition.file.local="Lokale Datei"
-AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
+AdvSceneSwitcher.condition.file.layout="{{filePath}}{{conditions}}{{regex}}"
 AdvSceneSwitcher.condition.media="Medien"
 AdvSceneSwitcher.condition.media.source="Quelle"
 AdvSceneSwitcher.condition.media.anyOnScene="Beliebige Medienquelle in"
@@ -216,8 +210,8 @@ AdvSceneSwitcher.condition.record.state.start="Aufnahme läuft"
 AdvSceneSwitcher.condition.record.state.pause="Aufnahme pausiert"
 AdvSceneSwitcher.condition.record.state.stop="Aufnahme gestoppt"
 AdvSceneSwitcher.condition.process="Prozess"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}läuft{{focused}}und ist fokusiert"
-AdvSceneSwitcher.condition.process.entry.focus="Aktueller Vordergrundprozess: {{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}läuft{{focused}}und ist fokusiert"
+AdvSceneSwitcher.condition.process.layout.focus="Aktueller Vordergrundprozess: {{focusProcess}}"
 AdvSceneSwitcher.condition.idle="Leerlauf"
 AdvSceneSwitcher.condition.idle.entry="Keine Tastatur- oder Mauseingaben für {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Plugin-Status"
@@ -291,14 +285,14 @@ AdvSceneSwitcher.condition.replay.state.started="Replay Buffer gestartet"
 AdvSceneSwitcher.condition.replay.state.saved="Replay Buffer gespeichert"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Datum"
-AdvSceneSwitcher.condition.date.anyDay="Beliebiger Tag"
-AdvSceneSwitcher.condition.date.monday="Montag"
-AdvSceneSwitcher.condition.date.tuesday="Dienstag"
-AdvSceneSwitcher.condition.date.wednesday="Mittwoch"
-AdvSceneSwitcher.condition.date.thursday="Donnerstag"
-AdvSceneSwitcher.condition.date.friday="Freitag"
-AdvSceneSwitcher.condition.date.saturday="Samstag"
-AdvSceneSwitcher.condition.date.sunday="Sonntag"
+AdvSceneSwitcher.day.any="Beliebiger Tag"
+AdvSceneSwitcher.day.monday="Montag"
+AdvSceneSwitcher.day.tuesday="Dienstag"
+AdvSceneSwitcher.day.wednesday="Mittwoch"
+AdvSceneSwitcher.day.thursday="Donnerstag"
+AdvSceneSwitcher.day.friday="Freitag"
+AdvSceneSwitcher.day.saturday="Samstag"
+AdvSceneSwitcher.day.sunday="Sonntag"
 AdvSceneSwitcher.condition.date.state.at="Am"
 AdvSceneSwitcher.condition.date.state.after="Nach"
 AdvSceneSwitcher.condition.date.state.before="Vor"
@@ -309,12 +303,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="Wenn diese Option nicht aktiviert is
 AdvSceneSwitcher.condition.date.ignoreTime="Wenn diese Option nicht aktiviert ist, wird die Zeitkomponente ignoriert"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Erweiterte Einstellungen anzeigen"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Einfache Einstellungen anzeigen"
-AdvSceneSwitcher.condition.date.entry.simple="Am {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
-AdvSceneSwitcher.condition.date.entry.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Nächster Treffer bei: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
+AdvSceneSwitcher.condition.date.layout.simple.day="Am{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
+AdvSceneSwitcher.condition.date.layout.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Nächster Treffer bei: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
 AdvSceneSwitcher.condition.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Transformation erhalten"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="entspricht Transformation"
@@ -412,7 +407,6 @@ AdvSceneSwitcher.action.recording.type.unpause="Aufnahme nicht mehr pausieren"
 AdvSceneSwitcher.action.recording.type.split="Aufnahme-Datei teilen"
 AdvSceneSwitcher.action.recording.pause.hint="Bitte beachten, dass je nach Aufnahmeeinstellung die Aufnahme möglicherweise nicht unterbrochen werden kann"
 AdvSceneSwitcher.action.recording.split.hint="Vergewissern, dass die automatische Dateiaufteilung in den OBS-Einstellungen aktiviert ist!"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Replay Buffer"
 AdvSceneSwitcher.action.replay.saveWarn="Warnung: Ein zu häufiges Speichern kann dazu führen, dass der Replay Buffer nicht gespeichert wird!"
 AdvSceneSwitcher.action.replay.type.stop="Replay Buffer stoppen"
@@ -421,7 +415,6 @@ AdvSceneSwitcher.action.replay.type.save="Replay Buffer speichern"
 AdvSceneSwitcher.action.streaming="Stream"
 AdvSceneSwitcher.action.streaming.type.stop="Stream stoppen"
 AdvSceneSwitcher.action.streaming.type.start="Stream starten"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="Ausführen"
 AdvSceneSwitcher.action.sceneVisibility="Sichtbarkeit von Szenenelementen"
 AdvSceneSwitcher.action.sceneVisibility.type.show="Anzeigen"
@@ -429,7 +422,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Verstecken"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Umschalten"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Quelle"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Beliebig"
-AdvSceneSwitcher.action.sceneVisibility.entry="Auf{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Auf{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Aktivieren"
 AdvSceneSwitcher.action.filter.type.disable="Deaktivieren"
@@ -457,7 +450,7 @@ AdvSceneSwitcher.action.macro="Makro"
 AdvSceneSwitcher.action.macro.type.pause="Pausieren"
 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.runActions="Aktionen ausführen"
 AdvSceneSwitcher.action.macro.type.stop="Aktionen stoppen"
 AdvSceneSwitcher.action.pluginState="Plugin-Status"
 AdvSceneSwitcher.action.pluginState.type.stop="Erweiterten Automatischen Szenenwechsler stoppen"
@@ -505,9 +498,9 @@ AdvSceneSwitcher.action.transition.type.scene="Szenenübergang"
 AdvSceneSwitcher.action.transition.type.sceneOverride="Szenenübergang überschreiben"
 AdvSceneSwitcher.action.transition.type.sourceShow="Übergang der Quelle anzeigen"
 AdvSceneSwitcher.action.transition.type.sourceHide="Übergang der Quelle verstecken"
-AdvSceneSwitcher.action.transition.entry.line1="Anpassen {{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Übergangstyp festlegen auf {{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Übergangsdauer festlegen auf {{duration}}Sekunden"
+AdvSceneSwitcher.action.transition.layout.type="Anpassen {{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Übergangstyp festlegen auf {{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Übergangsdauer festlegen auf {{duration}}Sekunden"
 AdvSceneSwitcher.action.timer="Timer"
 AdvSceneSwitcher.action.timer.type.pause="Pausieren"
 AdvSceneSwitcher.action.timer.type.continue="Fortsetzen"
@@ -834,8 +827,6 @@ AdvSceneSwitcher.status.inactive="Inaktiv"
 AdvSceneSwitcher.running="Plugin läuft"
 AdvSceneSwitcher.stopped="Plugin gestoppt"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Dies scheint das erste Mal zu sein, dass der Erweiterte Szenenwechsler gestartet wurde.<br>Bitte schaue ins <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> für eine Liste von Anleitungen und Beispielen.<br>Nicht zögern und Fragen im <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">Thread</span></a> des Plugins im OBS-Forum stellen!!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Die Entwicklung für dieses Tab wurde gestoppt!\nBitte stattdessen zur Verwendung des Makros-Tab übergehen.\nDieser Hinweis kann im Allgemein-Tab deaktiviert werden."
 
 AdvSceneSwitcher.unit.milliseconds="Millisekunden"

data/locale/en-US.ini

@@ -40,10 +40,20 @@ AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Show system t
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Disable UI hints"
 AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable="Disable filtering by typing in drop down menus"
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="Display warning if plugins cannot be loaded"
+AdvSceneSwitcher.generalTab.generalBehavior.suppressCrashRecoveryDialog="Do not ask to keep the plugin stopped after an unclean shutdown"
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>Loading of the following plugin libraries was unsuccessful, which could result in some Advanced Scene Switcher functions not being available:%1Check the OBS logs for details.<br>This message can be disabled on the General tab.</body></html>"
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="The plugin installation seems to be corrupted and might crash!\nPlease make sure the plugin was installed correctly!"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can be represented via macros"
-AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache="Disable macro widget caching"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs="Always show all feature tabs"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip="Show tabs that are normally hidden until first used in a macro (e.g. Action Queues, Variables, Twitch, Websockets)."
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock="Lock settings dialog with password"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title="Settings Locked"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel="Enter password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword="Wrong password!"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel="New password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel="Confirm password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch="Passwords do not match!"
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -74,6 +84,7 @@ AdvSceneSwitcher.generalTab.setTransitionBy="When changing transitions:"
 AdvSceneSwitcher.generalTab.transitionOverride="Set transition overrides"
 AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Change active transition type"
 AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
+AdvSceneSwitcher.generalTab.uiBehavior="UI settings"
 
 # Variables Tab
 AdvSceneSwitcher.variableTab.title="Variables"
@@ -91,6 +102,12 @@ AdvSceneSwitcher.variableTab.lastUsed.text.never="Never"
 AdvSceneSwitcher.variableTab.lastChanged.header="Last changed"
 AdvSceneSwitcher.variableTab.lastChanged.text.none="No change since launch"
 AdvSceneSwitcher.variableTab.lastChanged.tooltip="Times changed: %1\n\nPrevious value: %2"
+AdvSceneSwitcher.variableTab.search.placeholder="Search ..."
+AdvSceneSwitcher.variableTab.search.all="All columns"
+AdvSceneSwitcher.variableTab.search.name="Name column"
+AdvSceneSwitcher.variableTab.search.value="Value column"
+AdvSceneSwitcher.variableTab.addDock="Add dock"
+AdvSceneSwitcher.variableTab.clear="Clear"
 
 # Action Queue Tab
 AdvSceneSwitcher.actionQueueTab.title="Action Queues"
@@ -151,6 +168,8 @@ AdvSceneSwitcher.macroTab.title="Macro"
 AdvSceneSwitcher.macroTab.macros="Macros"
 AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
+AdvSceneSwitcher.macroTab.macroLastExecutedTooltip="Was last executed %1 seconds ago."
+AdvSceneSwitcher.macroTab.macroNotYetExecutedTooltip="Was not yet executed."
 AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define macro conditions.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new condition."
 AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
 AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
@@ -166,7 +185,12 @@ AdvSceneSwitcher.macroTab.run.tooltip="Run all macro actions regardless of condi
 AdvSceneSwitcher.macroTab.runElse="Run macro (else)"
 AdvSceneSwitcher.macroTab.runFail="Running \"%1\" failed!\nEither one of the actions failed or the macro is running already.\nDo you want to stop it?"
 AdvSceneSwitcher.macroTab.runInParallel="Run macro in parallel to other macros"
-AdvSceneSwitcher.macroTab.onChange="Perform actions only on condition change"
+AdvSceneSwitcher.macroTab.actionTriggerMode.label="Perform actions:"
+AdvSceneSwitcher.macroTab.actionTriggerMode.tooltip="Controls when the actions of this macro are performed.\n\n\"Always\" - actions are performed every time the conditions are met.\n\"Macro result changed\" - actions are only performed when the macro transitions between matching and not matching.\n\"Any condition changed\" - actions are only performed when any individual condition changes its result.\n\"Any condition triggered\" - actions are only performed when any individual condition changes from false to true."
+AdvSceneSwitcher.macroTab.actionTriggerMode.always="always"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onOverallChange="only when result changes"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionChange="only when any condition changes"
+AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionTriggered="only when any condition becomes true"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Group %1"
 AdvSceneSwitcher.macroTab.macroNameExists="The name \"%1\" is already used by a macro."
@@ -185,6 +209,13 @@ AdvSceneSwitcher.macroTab.remove="Remove"
 AdvSceneSwitcher.macroTab.export="Export"
 AdvSceneSwitcher.macroTab.export.info="Paste the string below into the import dialog to import the selected macros:"
 AdvSceneSwitcher.macroTab.export.usePlainText="Use plain text"
+AdvSceneSwitcher.macroTab.export.additionalContent="Export Additional Content"
+AdvSceneSwitcher.macroTab.export.variables="Variables"
+AdvSceneSwitcher.macroTab.export.actionQueues="Action Queues"
+AdvSceneSwitcher.macroTab.export.httpServers="HTTP Servers"
+AdvSceneSwitcher.macroTab.export.macroScheduleEntries="Macro Schedule"
+AdvSceneSwitcher.macroTab.export.twitchConnections="Twitch Connections"
+AdvSceneSwitcher.macroTab.export.websocketConnections="Websocket Connections"
 AdvSceneSwitcher.macroTab.import="Import"
 AdvSceneSwitcher.macroTab.import.info="Paste the export string into the below text box to import macros:"
 AdvSceneSwitcher.macroTab.import.invalid="Invalid import data provided!"
@@ -270,6 +301,13 @@ AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton="Move selected action up in
 AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton="Move selected action down in the else section"
 AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton="Move selected action to the bottom in the else section"
 AdvSceneSwitcher.macroTab.tooltip.openMacroSettingsButton="Open macro settings"
+AdvSceneSwitcher.macroTab.search.placeholder="Search ..."
+AdvSceneSwitcher.macroTab.search.showSettings="Show search settings"
+AdvSceneSwitcher.macroTab.search.name="Name"
+AdvSceneSwitcher.macroTab.search.allSegments="Segment type"
+AdvSceneSwitcher.macroTab.search.conditions="Condition type"
+AdvSceneSwitcher.macroTab.search.actions="Action type"
+AdvSceneSwitcher.macroTab.search.label="Segment label"
 
 AdvSceneSwitcher.macroDock.pause="Pause"
 AdvSceneSwitcher.macroDock.unpause="Unpause"
@@ -282,7 +320,6 @@ AdvSceneSwitcher.macroList.deleted="deleted"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" is alreay selected!"
 
 # Macro Logic
-AdvSceneSwitcher.logic.none="Ignore entry"
 AdvSceneSwitcher.logic.and="And"
 AdvSceneSwitcher.logic.or="Or"
 AdvSceneSwitcher.logic.andNot="And not"
@@ -345,11 +382,7 @@ AdvSceneSwitcher.condition.file.type.dateChange="modification date changed"
 AdvSceneSwitcher.condition.file.type.exists="exists"
 AdvSceneSwitcher.condition.file.type.isFile="is a file"
 AdvSceneSwitcher.condition.file.type.isFolder="is a folder"
-AdvSceneSwitcher.condition.file.remote="Remote file"
-AdvSceneSwitcher.condition.file.local="Local file"
-AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
+AdvSceneSwitcher.condition.file.layout="{{filePath}}{{conditions}}{{regex}}"
 AdvSceneSwitcher.condition.media="Media"
 AdvSceneSwitcher.condition.media.checkType.state="State matches"
 AdvSceneSwitcher.condition.media.checkType.time="Time restriction matches"
@@ -464,8 +497,9 @@ AdvSceneSwitcher.condition.record.state.stop="Recording stopped"
 AdvSceneSwitcher.condition.record.state.duration="Recording duration is longer than"
 AdvSceneSwitcher.condition.record.entry="{{condition}}{{duration}}"
 AdvSceneSwitcher.condition.process="Process"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}is running{{focused}}and is focused"
-AdvSceneSwitcher.condition.process.entry.focus="Current foreground process:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}is running{{focused}}and is focused"
+AdvSceneSwitcher.condition.process.layout.focus="Current foreground process:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout.path="{{checkPath}}Match binary path:{{path}}{{pathRegex}}"
 AdvSceneSwitcher.condition.idle="Idle"
 AdvSceneSwitcher.condition.idle.entry="No keyboard or mouse inputs for{{duration}}"
 AdvSceneSwitcher.condition.pluginState="Plugin state"
@@ -571,14 +605,6 @@ AdvSceneSwitcher.condition.replay.state.started="Replay buffer started"
 AdvSceneSwitcher.condition.replay.state.saved="Replay buffer saved"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.condition.date.anyDay="Any day"
-AdvSceneSwitcher.condition.date.monday="Monday"
-AdvSceneSwitcher.condition.date.tuesday="Tuesday"
-AdvSceneSwitcher.condition.date.wednesday="Wednesday"
-AdvSceneSwitcher.condition.date.thursday="Thursday"
-AdvSceneSwitcher.condition.date.friday="Friday"
-AdvSceneSwitcher.condition.date.saturday="Saturday"
-AdvSceneSwitcher.condition.date.sunday="Sunday"
 AdvSceneSwitcher.condition.date.state.at="At"
 AdvSceneSwitcher.condition.date.state.after="After"
 AdvSceneSwitcher.condition.date.state.before="Before"
@@ -589,12 +615,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="If unchecked the date component will
 AdvSceneSwitcher.condition.date.ignoreTime="If unchecked the time component will be ignored"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Show advanced settings"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Show simple settings"
-AdvSceneSwitcher.condition.date.entry.simple="On{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Repeat every{{duration}}on date match"
-AdvSceneSwitcher.condition.date.entry.pattern="Current date \"{{currentDate}}\" matches pattern{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Next match at: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}On repeat update selected date to repeat date"
+AdvSceneSwitcher.condition.date.layout.simple.day="On{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Repeat every{{duration}}on date match"
+AdvSceneSwitcher.condition.date.layout.pattern="Current date \"{{currentDate}}\" matches pattern{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Next match at: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}On repeat update selected date to repeat date"
 AdvSceneSwitcher.condition.sceneTransform="Scene item transform"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="Get current value"
@@ -660,6 +687,34 @@ AdvSceneSwitcher.condition.websocket.type.event="Scene Switcher Event"
 AdvSceneSwitcher.condition.websocket.useRegex="Use regular expressions"
 AdvSceneSwitcher.condition.websocket.entry.request="{{type}}was received:"
 AdvSceneSwitcher.condition.websocket.entry.event="{{type}}was received from{{connection}}:"
+AdvSceneSwitcher.condition.http="HTTP"
+AdvSceneSwitcher.condition.http.layout="Receive{{method}}request on{{server}}"
+AdvSceneSwitcher.condition.http.layout.path="Path:{{path}}{{regex}}"
+AdvSceneSwitcher.condition.http.layout.body="Body:{{body}}{{regex}}"
+AdvSceneSwitcher.condition.http.method.any="any"
+AdvSceneSwitcher.condition.http.method.get="GET"
+AdvSceneSwitcher.condition.http.method.post="POST"
+AdvSceneSwitcher.condition.http.method.put="PUT"
+AdvSceneSwitcher.condition.http.method.patch="PATCH"
+AdvSceneSwitcher.condition.http.method.delete="DELETE"
+AdvSceneSwitcher.httpServer.select="Select HTTP server"
+AdvSceneSwitcher.httpServer.add="Add HTTP server"
+AdvSceneSwitcher.httpServer.configure="Configure HTTP server"
+AdvSceneSwitcher.httpServer.invalid="Invalid HTTP server"
+AdvSceneSwitcher.httpServer.name="Name:"
+AdvSceneSwitcher.httpServer.port="Port:"
+AdvSceneSwitcher.httpServer.startOnLoad="Start on load"
+AdvSceneSwitcher.httpServer.status.listening="Listening"
+AdvSceneSwitcher.httpServer.status.stopped="Stopped"
+AdvSceneSwitcher.httpServerTab.title="HTTP Servers"
+AdvSceneSwitcher.httpServerTab.help="No HTTP servers configured.\nAdd one to receive incoming HTTP requests in conditions."
+AdvSceneSwitcher.httpServerTab.addButton.tooltip="Add HTTP server"
+AdvSceneSwitcher.httpServerTab.removeButton.tooltip="Remove HTTP server"
+AdvSceneSwitcher.httpServerTab.name.header="Name"
+AdvSceneSwitcher.httpServerTab.port.header="Port"
+AdvSceneSwitcher.httpServerTab.status.header="Status"
+AdvSceneSwitcher.httpServerTab.removeSingle.text="Are you sure you want to remove \"%1\"?"
+AdvSceneSwitcher.httpServerTab.removeMultiple.text="Are you sure you want to remove %1 HTTP servers?"
 AdvSceneSwitcher.condition.temporaryVariable="Macro property"
 AdvSceneSwitcher.condition.variable="Variable"
 AdvSceneSwitcher.condition.variable.type.compare="equals"
@@ -814,6 +869,7 @@ AdvSceneSwitcher.condition.streamDeck.stopListen="Stop listening"
 AdvSceneSwitcher.condition.streamDeck.pluginDownload="<html><head/><body><p>The Stream Deck plugin can be found <a href=\"https://github.com/WarmUpTill/advanced-scene-switcher-streamdeck-plugin/releases\"><span style=\" text-decoration: underline; color:#268bd2;\">here on GitHub</span></a>.</p></body></html>"
 AdvSceneSwitcher.condition.gameCapture="Game capture"
 AdvSceneSwitcher.condition.gameCapture.entry="{{sources}}hooked a game."
+
 AdvSceneSwitcher.condition.screenshot="Screenshot"
 AdvSceneSwitcher.condition.screenshot.entry="A screenshot was taken"
 AdvSceneSwitcher.condition.mqtt="MQTT"
@@ -863,6 +919,15 @@ AdvSceneSwitcher.action.audio.fade.rate="{{fade}}Fade{{fadeTypes}}{{rate}}per se
 AdvSceneSwitcher.action.audio.fade.wait="Wait for fade to complete."
 AdvSceneSwitcher.action.audio.fade.abort="Abort already active fade."
 AdvSceneSwitcher.action.audio.entry="{{actions}}{{audioSources}}{{volume}}{{volumeDB}}{{percentDBToggle}}{{syncOffset}}{{monitorTypes}}{{track}}"
+AdvSceneSwitcher.action.playAudio="Play Audio File"
+AdvSceneSwitcher.action.playAudio.file.browse="Browse for audio file"
+AdvSceneSwitcher.action.playAudio.layout.volume="Volume{{volumeDB}}"
+AdvSceneSwitcher.action.playAudio.layout.monitor="Monitoring{{monitorTypes}}"
+AdvSceneSwitcher.action.playAudio.wait="Wait for playback to complete"
+AdvSceneSwitcher.action.playAudio.monitorUnavailable="Audio monitoring not available"
+AdvSceneSwitcher.action.playAudio.tracks="Tracks"
+AdvSceneSwitcher.action.playAudio.layout.startOffset="{{useStartOffset}}Start at{{startOffset}}"
+AdvSceneSwitcher.action.playAudio.layout.playbackDuration="{{useDuration}}Play for{{playbackDuration}}(0 = until end)"
 AdvSceneSwitcher.action.recording="Recording"
 AdvSceneSwitcher.action.recording.type.stop="Stop recording"
 AdvSceneSwitcher.action.recording.type.start="Start recording"
@@ -871,9 +936,10 @@ AdvSceneSwitcher.action.recording.type.unpause="Unpause recording"
 AdvSceneSwitcher.action.recording.type.split="Split recording file"
 AdvSceneSwitcher.action.recording.type.changeOutputFolder="Change output folder"
 AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="Change filename formatting"
+AdvSceneSwitcher.action.recording.type.addChapter="Add chapter"
 AdvSceneSwitcher.action.recording.pause.hint="Note that depending on your recording settings you might not be able to pause recording"
 AdvSceneSwitcher.action.recording.split.hint="Make sure to enable automatic file splitting in the OBS settings first!"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
+AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{chapterName}}{{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!"
@@ -890,7 +956,8 @@ AdvSceneSwitcher.action.streaming.type.server="Set server URL"
 AdvSceneSwitcher.action.streaming.type.streamKey="Set stream key"
 AdvSceneSwitcher.action.streaming.type.username="Set username"
 AdvSceneSwitcher.action.streaming.type.password="Set password"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
+AdvSceneSwitcher.action.streaming.getCurrentValue="Get current value"
+AdvSceneSwitcher.action.streaming.layout="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}{{getCurrentValue}}"
 AdvSceneSwitcher.action.run="Run"
 AdvSceneSwitcher.action.run.wait.entry="{{wait}}Wait for process exit or at most {{timeout}}{{waitHelp}}"
 AdvSceneSwitcher.action.run.wait.help.tooltip="Note that macro properties won't work if you leave this unticked, as the process spawns detached from the rest of logic and there's no control over it."
@@ -900,7 +967,9 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Hide"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Toggle"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
-AdvSceneSwitcher.action.sceneVisibility.entry="On{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="On{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout.transition="{{updateTransition}}Set transition to{{transitions}}"
+AdvSceneSwitcher.action.sceneVisibility.layout.duration="{{updateDuration}}Set transition duration to{{duration}}seconds"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Enable"
 AdvSceneSwitcher.action.filter.type.disable="Disable"
@@ -928,6 +997,11 @@ AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field orde
 AdvSceneSwitcher.action.source.type.openInteractionDialog="Open interaction dialog"
 AdvSceneSwitcher.action.source.type.openFilterDialog="Open filter dialog"
 AdvSceneSwitcher.action.source.type.openPropertiesDialog="Open properties dialog"
+AdvSceneSwitcher.action.source.type.closeInteractionDialog="Close interaction dialog"
+AdvSceneSwitcher.action.source.type.closeFilterDialog="Close filter dialog"
+AdvSceneSwitcher.action.source.type.closePropertiesDialog="Close properties dialog"
+AdvSceneSwitcher.action.source.type.getSetting="Get setting value"
+AdvSceneSwitcher.action.source.type.getSettings="Get settings JSON"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}{{refresh}}"
 AdvSceneSwitcher.action.source.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -949,6 +1023,50 @@ AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro prope
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
 AdvSceneSwitcher.action.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
+AdvSceneSwitcher.action.source.dialog.accept="Accept changes"
+AdvSceneSwitcher.action.sourceInteraction="Source Interaction"
+AdvSceneSwitcher.action.sourceInteraction.source="Source"
+AdvSceneSwitcher.action.sourceInteraction.noSelection="Select a step to edit it"
+AdvSceneSwitcher.action.sourceInteraction.record="Record interaction ..."
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseMove="Mouse move (%1, %2)"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseUp="up"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseDown="down"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseClick="Mouse %1 %2 (%3, %4)"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseClickCount=" x%1"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.mouseWheel="Mouse wheel (%1, %2) dx=%3 dy=%4"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.keyUp="up"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.keyDown="down"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.keyPress="Key %1"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.keyPressWithText="Key %1 '%2'"
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.typeText="Type \"%1\""
+AdvSceneSwitcher.action.sourceInteraction.step.listEntry.wait="Wait %1 ms"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.type="Type"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.mouseMove="Mouse move"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.mouseClick="Mouse click"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.mouseWheel="Mouse wheel"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.keyPress="Key press"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.typeText="Type text"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.wait="Wait"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.x="X"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.y="Y"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.button="Button"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.mouseUp="Mouse up"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.clickCount="Click count"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.wheelDx="Delta X"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.wheelDy="Delta Y"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.vkey="Virtual key"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.keyUp="Key up"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.text="Text"
+AdvSceneSwitcher.action.sourceInteraction.step.edit.waitMs="Duration (ms)"
+AdvSceneSwitcher.action.sourceInteraction.button.left="Left"
+AdvSceneSwitcher.action.sourceInteraction.button.middle="Middle"
+AdvSceneSwitcher.action.sourceInteraction.button.right="Right"
+AdvSceneSwitcher.action.sourceInteraction.record.title="Record Source Interactions"
+AdvSceneSwitcher.action.sourceInteraction.record.start="Start recording"
+AdvSceneSwitcher.action.sourceInteraction.record.stop="Stop recording"
+AdvSceneSwitcher.action.sourceInteraction.record.accept="Accept"
+AdvSceneSwitcher.action.sourceInteraction.record.placeholder="Start recording and interact with the source to capture steps"
+AdvSceneSwitcher.action.sourceInteraction.record.invalidSource="No valid source is selected.\nPlease select a source that supports interaction before recording."
 AdvSceneSwitcher.action.media="Media"
 AdvSceneSwitcher.action.media.type.play="Play"
 AdvSceneSwitcher.action.media.type.pause="Pause"
@@ -968,12 +1086,12 @@ AdvSceneSwitcher.action.macro.type.pause="Pause"
 AdvSceneSwitcher.action.macro.type.unpause="Unpause"
 AdvSceneSwitcher.action.macro.type.togglePause="Toggle pause"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reset counter"
-AdvSceneSwitcher.action.macro.type.run="Run macro"
+AdvSceneSwitcher.action.macro.type.runActions="Run macro actions"
 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.updateConditionMatchState="Check conditions now, even if macro is paused"
+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.\nAdditionally, paused macros are assumed to not match their conditions.\nCheck this option to force a fresh condition evaluation before running this action, regardless of whether the macro is paused."
 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"
@@ -983,13 +1101,22 @@ 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.type.getInfo="Get macro info"
+AdvSceneSwitcher.action.macro.type.runMacro="Run macro"
+AdvSceneSwitcher.action.macro.type.runMacro.noConditionsWarning="Warning: The selected macro has no conditions!"
+AdvSceneSwitcher.action.macro.type.runMacro.help="Unlike \"Run macro actions\", this option will immediately re-evaluate the conditions of the selected macro and then run either its actions or else-actions depending on the result."
 AdvSceneSwitcher.action.macro.type.nestedMacro="Nested macro"
+AdvSceneSwitcher.action.macro.actionSelectionType.index="at index"
+AdvSceneSwitcher.action.macro.actionSelectionType.label="with label"
+AdvSceneSwitcher.action.macro.actionSelectionType.id="of action type"
 AdvSceneSwitcher.action.macro.type.nestedMacro.conditionHelp="This section allows you to define macro conditions.\n\nClick the plus button below to add a new condition."
 AdvSceneSwitcher.action.macro.type.nestedMacro.actionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nClick the plus button below to add a new action."
 AdvSceneSwitcher.action.macro.type.nestedMacro.elseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nClick the plus button below to add a new action."
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}of{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}of{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.actionState="{{actions}}{{actionSelectionType}}{{actionIndex}}{{label}}{{regex}}{{actionTypes}}in{{actionSections}}section of{{macros}}"
+AdvSceneSwitcher.action.macro.layout.runMacro="{{actions}}{{runMacroHelp}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin state"
 AdvSceneSwitcher.action.pluginState.type.stop="Stop the Advanced Scene Switcher plugin"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Change the no-match behaviour:"
@@ -1061,13 +1188,16 @@ AdvSceneSwitcher.action.studioMode.type.enable="Enable studio mode"
 AdvSceneSwitcher.action.studioMode.type.disable="Disable studio mode"
 AdvSceneSwitcher.action.studioMode.entry="{{actions}}{{scenes}}"
 AdvSceneSwitcher.action.transition="Transition"
-AdvSceneSwitcher.action.transition.type.scene="scene transition"
-AdvSceneSwitcher.action.transition.type.sceneOverride="scene transition override"
-AdvSceneSwitcher.action.transition.type.sourceShow="source show transition"
-AdvSceneSwitcher.action.transition.type.sourceHide="source hide transition"
-AdvSceneSwitcher.action.transition.entry.line1="Modify{{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Set transition type to{{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Set transition duration to{{duration}}seconds"
+AdvSceneSwitcher.action.transition.type.scene="Modify scene transition"
+AdvSceneSwitcher.action.transition.type.sceneOverride="Modify scene transition override"
+AdvSceneSwitcher.action.transition.type.sourceShow="Modify source show transition"
+AdvSceneSwitcher.action.transition.type.sourceHide="Modify source hide transition"
+AdvSceneSwitcher.action.transition.type.tbar="Modify T-Bar position"
+AdvSceneSwitcher.action.transition.type.releaseTbar="Release T-Bar"
+AdvSceneSwitcher.action.transition.layout.type="{{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Set transition type to{{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Set transition duration to{{duration}}seconds"
+AdvSceneSwitcher.action.transition.layout.tbar="Set T-Bar position to{{tbarPosition}}"
 AdvSceneSwitcher.action.timer="Timer"
 AdvSceneSwitcher.action.timer.type.pause="Pause"
 AdvSceneSwitcher.action.timer.type.continue="Continue"
@@ -1141,6 +1271,7 @@ AdvSceneSwitcher.action.http.entry.line2="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.variable="Variable"
 AdvSceneSwitcher.action.variable.type.set="Set to value"
 AdvSceneSwitcher.action.variable.type.append="Append"
+AdvSceneSwitcher.action.variable.type.copy="Copy variable"
 AdvSceneSwitcher.action.variable.type.appendVar="Append variable"
 AdvSceneSwitcher.action.variable.type.increment="Increment"
 AdvSceneSwitcher.action.variable.type.decrement="Decrement"
@@ -1167,6 +1298,8 @@ AdvSceneSwitcher.action.variable.type.swapValues="Swap variable values"
 AdvSceneSwitcher.action.variable.type.trim="Trim whitespace"
 AdvSceneSwitcher.action.variable.type.changeCase="Change case"
 AdvSceneSwitcher.action.variable.type.randomNumber="Generate random number"
+AdvSceneSwitcher.action.variable.type.randomListValue="Select random value"
+AdvSceneSwitcher.action.variable.type.allowRepeat="Allow repeat values"
 AdvSceneSwitcher.action.variable.case.type.lowerCase="lowercase"
 AdvSceneSwitcher.action.variable.case.type.upperCase="UPPERCASE"
 AdvSceneSwitcher.action.variable.case.type.capitalized="Capitalized"
@@ -1189,8 +1322,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="Current value:"
 AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}{{caseType}}{{jsonQuery}}{{jsonQueryHelp}}{{jsonIndex}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}of{{variables}}to length{{stringLength}}by adding{{paddingCharSelection}}to the{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}of{{variables}}to length{{stringLength}}by removing characters from the{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Use custom prompt{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Fill with placeholder{{inputPlaceholder}}"
@@ -1224,21 +1357,52 @@ AdvSceneSwitcher.action.twitch.type.channel.info.category.set="Set stream catego
 AdvSceneSwitcher.action.twitch.type.channel.info.tags.set="Set stream tags"
 AdvSceneSwitcher.action.twitch.type.channel.info.language.set="Set stream language"
 AdvSceneSwitcher.action.twitch.type.raid.start="Start raid"
+AdvSceneSwitcher.action.twitch.type.raid.end="Cancel raid"
+AdvSceneSwitcher.action.twitch.type.shoutout.send="Send shoutout"
+AdvSceneSwitcher.action.twitch.type.shieldMode.start="Enable shield mode"
+AdvSceneSwitcher.action.twitch.type.shieldMode.end="Disable shield mode"
 AdvSceneSwitcher.action.twitch.type.commercial.start="Start commercial"
+AdvSceneSwitcher.action.twitch.type.commercial.snooze="Snooze next ad"
 AdvSceneSwitcher.action.twitch.type.marker.create="Create stream marker"
 AdvSceneSwitcher.action.twitch.type.clip.create="Create stream clip"
 AdvSceneSwitcher.action.twitch.type.chat.announcement.send="Send chat announcement"
 AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Enable chat's emote-only mode"
 AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Disable chat's emote-only mode"
+AdvSceneSwitcher.action.twitch.type.chat.followerOnly.enable="Enable chat's follower-only mode"
+AdvSceneSwitcher.action.twitch.type.chat.followerOnly.disable="Disable chat's follower-only mode"
+AdvSceneSwitcher.action.twitch.type.chat.subscriberOnly.enable="Enable chat's subscriber-only mode"
+AdvSceneSwitcher.action.twitch.type.chat.subscriberOnly.disable="Disable chat's subscriber-only mode"
+AdvSceneSwitcher.action.twitch.type.chat.slowMode.enable="Enable chat's slow mode"
+AdvSceneSwitcher.action.twitch.type.chat.slowMode.disable="Disable chat's slow mode"
+AdvSceneSwitcher.action.twitch.type.chat.nonModeratorDelay.enable="Enable chat's non-moderator message delay"
+AdvSceneSwitcher.action.twitch.type.chat.nonModeratorDelay.disable="Disable chat's non-moderator message delay"
+AdvSceneSwitcher.action.twitch.type.chat.uniqueMode.enable="Enable chat's unique message mode"
+AdvSceneSwitcher.action.twitch.type.chat.uniqueMode.disable="Disable chat's unique message mode"
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Send chat message"
 AdvSceneSwitcher.action.twitch.type.user.getInfo="Get user information"
+AdvSceneSwitcher.action.twitch.type.user.ban="Ban user"
+AdvSceneSwitcher.action.twitch.type.user.unban="Unban user"
+AdvSceneSwitcher.action.twitch.type.user.block="Block user"
+AdvSceneSwitcher.action.twitch.type.user.unblock="Unblock user"
+AdvSceneSwitcher.action.twitch.type.user.moderator.add="Add user as moderator"
+AdvSceneSwitcher.action.twitch.type.user.moderator.delete="Remove user as moderator"
+AdvSceneSwitcher.action.twitch.type.user.vip.add="Add user as VIP"
+AdvSceneSwitcher.action.twitch.type.user.vip.delete="Remove user as VIP"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="Get channel points reward information"
+AdvSceneSwitcher.action.twitch.type.channel.getInfo="Get channel information"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="Toggle reward name / variable selection control"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Cannot select category without selecting a Twitch account first!"
-AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="Using account{{account}}{{actions}}on{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="Using account{{account}}{{actions}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="Using account{{account}}{{actions}}for channel{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{nonModDelayDuration}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.layout.chat="Using account{{account}}{{actions}}on{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.channel.getInfo="Using account{{account}}{{actions}}of{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row1="Using account{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row2="for{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row1="Using account{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row2="on channel{{channel}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row1="Using account{{account}}{{actions}}timeout{{duration}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row2="on channel{{channel}}for{{userInfoQueryType}}{{userLogin}}{{userId}}reason{{banReason}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row1="Using account{{account}}{{actions}}for channel{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row2="{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="Enter title"
 AdvSceneSwitcher.action.twitch.marker.description="Describe marker"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Add a slight delay before capturing the clip"
@@ -1259,6 +1423,8 @@ AdvSceneSwitcher.action.twitch.tags.duplicate.info="This tag is already in the l
 AdvSceneSwitcher.action.twitch.tags.limit="Tag Limit Reached"
 AdvSceneSwitcher.action.twitch.tags.limit.info="You can only have up to %1 tags."
 AdvSceneSwitcher.action.twitch.type.channel.info.contentClassification.set="Set content classification labels"
+AdvSceneSwitcher.action.twitch.type.channel.info.brandedContent.enable="Enable branded content"
+AdvSceneSwitcher.action.twitch.type.channel.info.brandedContent.disable="Disable branded content"
 AdvSceneSwitcher.action.twitch.contentClassification.debatedSocialIssuesAndPolitics="Discussions or debates about politics or sensitive social issues such as elections, civic integrity, military conflict, and civil rights."
 AdvSceneSwitcher.action.twitch.contentClassification.drugsIntoxication="Excessive tobacco glorification or promotion, any marijuana consumption/use, legal drug and alcohol induced intoxication, discussions of illegal drugs."
 AdvSceneSwitcher.action.twitch.contentClassification.sexualThemes="Content that focuses on sexualized activities, sexual topics, or experiences."
@@ -1363,6 +1529,9 @@ AdvSceneSwitcher.hotkey.macro.segment.remove="Remove selected macro segment"
 AdvSceneSwitcher.askBackup="Detected a new version of the Advanced Scene Switcher.\nShould a backup of the old settings be created?"
 AdvSceneSwitcher.askForMacro="Select macro{{macroSelection}}"
 
+AdvSceneSwitcher.crashDetected="OBS did not shut down cleanly (for example, due to a crash or freeze).\n\nThe Advanced Scene Switcher plugin would normally start automatically.\nWould you like to keep it stopped for now?"
+AdvSceneSwitcher.crashDetected.suppressCheckbox="Do not show this dialog again"
+
 AdvSceneSwitcher.close="Close"
 AdvSceneSwitcher.browse="Browse"
 
@@ -1514,6 +1683,13 @@ AdvSceneSwitcher.mqttConnection.name="Name:"
 AdvSceneSwitcher.mqttConnection.address="Address:"
 AdvSceneSwitcher.mqttConnection.username="Username:"
 AdvSceneSwitcher.mqttConnection.password="Password:"
+AdvSceneSwitcher.mqttConnection.trustStore="Trust store:"
+AdvSceneSwitcher.mqttConnection.trustStore.help="The file in PEM format containing the public digital certificates trusted by the client."
+AdvSceneSwitcher.mqttConnection.keyStore="Key store:"
+AdvSceneSwitcher.mqttConnection.keyStore.help="The file in PEM format containing the public certificate chain of the client.\nIt may also include the client's private key."
+AdvSceneSwitcher.mqttConnection.privateKey="Private key:"
+AdvSceneSwitcher.mqttConnection.privateKey.help="If not included in the key store, this is the file in PEM format containing the client's private key."
+AdvSceneSwitcher.mqttConnection.verifyServerCert="Verify server certificate"
 AdvSceneSwitcher.mqttConnection.reconnect="Reconnect automatically:"
 AdvSceneSwitcher.mqttConnection.reconnectDelay="Automatically reconnect after:"
 AdvSceneSwitcher.mqttConnection.connectOnStart="Connect on startup:"
@@ -1585,7 +1761,11 @@ AdvSceneSwitcher.twitchToken.moderator.chat.settings.manage="Manage channel's ch
 AdvSceneSwitcher.twitchToken.user.whispers.manage="Manage user's whispers."
 AdvSceneSwitcher.twitchToken.chat.read="View live stream chat messages."
 AdvSceneSwitcher.twitchToken.chat.edit="Send live stream chat messages."
-AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages. (Recommended)"
+AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages."
+AdvSceneSwitcher.twitchToken.validateTimestamps.tooltip="Verifies that incoming Twitch messages have valid timestamps to prevent replayed or spoofed messages.\nDisabling this won’t affect normal functionality, and you can try turning it off if you experience issues with the Twitch connection."
+AdvSceneSwitcher.twitchToken.warnIfInvalid="Display warning if the token expired or is invalid."
+AdvSceneSwitcher.twitchToken.warnIfInvalid.doNotShowAgain="Don't show again for this connection"
+AdvSceneSwitcher.twitchToken.warnIfInvalid.message="The Twitch connection \"%1\" is invalid.\nOpen connection settings or ignore?"
 
 AdvSceneSwitcher.twitch.selection.channel.open="Open channel"
 AdvSceneSwitcher.twitch.selection.channel.open.tooltip.details="Open channel in external application handling the HTTPS protocol."
@@ -1620,6 +1800,7 @@ AdvSceneSwitcher.script.language.lua="LUA"
 AdvSceneSwitcher.script.language.select="--select language--"
 AdvSceneSwitcher.script.language.layout="Script language:{{language}}"
 AdvSceneSwitcher.script.file.open="Open"
+AdvSceneSwitcher.script.file.select="Select Script File"
 AdvSceneSwitcher.script.file.open.failed="Could not open script file!"
 AdvSceneSwitcher.script.file.warning.notFound="Warning: The given file path was not found!"
 AdvSceneSwitcher.script.file.warning.openFail="Warning: Could not open the script file!"
@@ -1628,6 +1809,10 @@ AdvSceneSwitcher.script.file.layout="Script file:{{path}}{{open}}"
 
 AdvSceneSwitcher.tempVar.select="--select value--"
 AdvSceneSwitcher.tempVar.selectionInfo.lastValues="Last values:"
+AdvSceneSwitcher.tempVar.outputMappings="Save outputs to variables:"
+AdvSceneSwitcher.tempVar.outputMappings.add="+ Add output mapping"
+AdvSceneSwitcher.tempVar.outputMappings.toggle="Assign outputs to variables"
+AdvSceneSwitcher.tempVar.outputMappings.remove="Remove output mapping"
 
 AdvSceneSwitcher.tempVar.twitch.broadcaster_user_id="Twitch broadcaster user ID"
 AdvSceneSwitcher.tempVar.twitch.broadcaster_user_id.description="The numerical Twitch user ID of the broadcaster."
@@ -2109,8 +2294,18 @@ AdvSceneSwitcher.tempVar.scene.position="Position in scenes list"
 
 AdvSceneSwitcher.tempVar.window.window="Window title"
 AdvSceneSwitcher.tempVar.window.window.description="The window title of the matching window."
+AdvSceneSwitcher.tempVar.window.windowX="Window X position"
+AdvSceneSwitcher.tempVar.window.windowX.description="The X position (left edge) of the matching window in screen coordinates."
+AdvSceneSwitcher.tempVar.window.windowY="Window Y position"
+AdvSceneSwitcher.tempVar.window.windowY.description="The Y position (top edge) of the matching window in screen coordinates."
+AdvSceneSwitcher.tempVar.window.windowWidth="Window width"
+AdvSceneSwitcher.tempVar.window.windowWidth.description="The width of the matching window in pixels."
+AdvSceneSwitcher.tempVar.window.windowHeight="Window height"
+AdvSceneSwitcher.tempVar.window.windowHeight.description="The height of the matching window in pixels."
 AdvSceneSwitcher.tempVar.window.windowClass="Window class"
 AdvSceneSwitcher.tempVar.window.windowClass.description="The window class of the matching window."
+AdvSceneSwitcher.tempVar.window.windowText="Window text"
+AdvSceneSwitcher.tempVar.window.windowText.description="Text contained within the window (won't work on all window types)."
 
 AdvSceneSwitcher.tempVar.timer.seconds="Seconds"
 AdvSceneSwitcher.tempVar.timer.minutes="Minutes"
@@ -2135,8 +2330,21 @@ AdvSceneSwitcher.tempVar.macro.runCount="Run count"
 AdvSceneSwitcher.tempVar.macro.runCount.description="The number of times a macro was executed."
 AdvSceneSwitcher.tempVar.macro.matchedCount="Matched count"
 AdvSceneSwitcher.tempVar.macro.matchedCount.description="The number of macros of which the condition state was true."
+AdvSceneSwitcher.tempVar.macro.info.conditionCount="Condition count"
+AdvSceneSwitcher.tempVar.macro.info.conditionCount.description="The number of conditions in the macro."
+AdvSceneSwitcher.tempVar.macro.info.actionCount="Action count"
+AdvSceneSwitcher.tempVar.macro.info.actionCount.description="The number of actions in the macro."
+AdvSceneSwitcher.tempVar.macro.info.elseActionCount="Else-action count"
+AdvSceneSwitcher.tempVar.macro.info.elseActionCount.description="The number of else-actions in the macro."
+AdvSceneSwitcher.tempVar.macro.info.paused="Paused"
+AdvSceneSwitcher.tempVar.macro.info.paused.description="Whether the macro is currently paused. Value is \"true\" or \"false\"."
+AdvSceneSwitcher.tempVar.macro.info.runCount="Run count"
+AdvSceneSwitcher.tempVar.macro.info.runCount.description="The number of times the macro has been executed."
+AdvSceneSwitcher.tempVar.macro.info.secondsSinceLastRun="Seconds since last run"
+AdvSceneSwitcher.tempVar.macro.info.secondsSinceLastRun.description="The number of seconds elapsed since the macro was last executed. Value is -1 if the macro has never been executed."
 
 AdvSceneSwitcher.tempVar.process.name="Process name"
+AdvSceneSwitcher.tempVar.process.path="Process path"
 
 AdvSceneSwitcher.tempVar.run.process.id="Process ID"
 AdvSceneSwitcher.tempVar.run.process.id.description="PID of the process assigned by the system."
@@ -2152,9 +2360,21 @@ AdvSceneSwitcher.tempVar.run.process.none.description="When not waiting for the
 
 AdvSceneSwitcher.tempVar.recording.durationSeconds="Recording duration"
 AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording duration in seconds.\nThis value does not change while the recording is paused and will be reset to zero if the recording is stopped."
+AdvSceneSwitcher.tempVar.recording.lastSavePath="Last save path"
+AdvSceneSwitcher.tempVar.recording.lastSavePath.description="The file path of the last saved recording."
 
+AdvSceneSwitcher.tempVar.video.similarity="Similarity Rating"
+AdvSceneSwitcher.tempVar.video.similarity.description="Values range from 0 to 1, where 0 means dissimilar and 1 means highly similar."
 AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
 AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."
+AdvSceneSwitcher.tempVar.video.matchX="Match X coordinate"
+AdvSceneSwitcher.tempVar.video.matchX.description="The X coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchY="Match Y coordinate"
+AdvSceneSwitcher.tempVar.video.matchY.description="The Y coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchWidth="Match width"
+AdvSceneSwitcher.tempVar.video.matchWidth.description="The width of the matched pattern in pixels."
+AdvSceneSwitcher.tempVar.video.matchHeight="Match height"
+AdvSceneSwitcher.tempVar.video.matchHeight.description="The height of the matched pattern in pixels."
 AdvSceneSwitcher.tempVar.video.objectCount="Object count"
 AdvSceneSwitcher.tempVar.video.objectCount.description="The number of objects the given model has identified in a given video input frame."
 AdvSceneSwitcher.tempVar.video.brightness="Average brightness"
@@ -2163,6 +2383,8 @@ AdvSceneSwitcher.tempVar.video.text="OCR text"
 AdvSceneSwitcher.tempVar.video.text.description="The text detected in a given video input frame."
 AdvSceneSwitcher.tempVar.video.color="Average color"
 AdvSceneSwitcher.tempVar.video.color.description="The average RGB color in a given video input frame in HexArgb format."
+AdvSceneSwitcher.tempVar.video.dominantColor="Dominant color"
+AdvSceneSwitcher.tempVar.video.dominantColor.description="The most dominant RGB color in a given video input frame in HexArgb format.\nDetermined using k-means clustering, which groups similar colors and returns the center of the largest group.\nDue to the nature of the algorithm the result may vary slightly between evaluations."
 
 AdvSceneSwitcher.tempVar.websocket.message="Received websocket message"
 AdvSceneSwitcher.tempVar.websocket.message.description="The received websocket message, which matched the given pattern"
@@ -2292,15 +2514,31 @@ AdvSceneSwitcher.tempVar.gameCapture.executable="Executable"
 AdvSceneSwitcher.tempVar.gameCapture.executable.description="Executable name of the application captured by the source."
 
 AdvSceneSwitcher.tempVar.http.status="Status code"
-AdvSceneSwitcher.tempVar.http.body="Message body"
 AdvSceneSwitcher.tempVar.http.error="Error"
 AdvSceneSwitcher.tempVar.http.error.description="Empty when no error occurred.\nOther possible values:\n\n * Could not establish connection\n * Failed to bind IP address\n * Failed to read connection\n * Failed to write connection\n * Maximum redirect count exceeded\n * Connection handling canceled\n * SSL connection failed\n * SSL certificate loading failed\n * SSL server verification failed\n * Unsupported HTTP multipart boundary characters\n * Compression failed\n * Connection timed out\n * Proxy connection failed\n * Unknown"
+AdvSceneSwitcher.tempVar.http.method="Method"
+AdvSceneSwitcher.tempVar.http.method.description="Received HTTP request method"
+AdvSceneSwitcher.tempVar.http.path="Request path"
+AdvSceneSwitcher.tempVar.http.path.description="Received HTTP request path"
+AdvSceneSwitcher.tempVar.http.body="Message body"
+AdvSceneSwitcher.tempVar.http.body.description="Received HTTP request body"
 
 AdvSceneSwitcher.tempVar.mqtt.message="Message"
 
 AdvSceneSwitcher.tempVar.cursor.x="Cursor position (X)"
 AdvSceneSwitcher.tempVar.cursor.y="Cursor position (Y)"
 
+AdvSceneSwitcher.tempVar.replay.lastSavePath="Last save path"
+AdvSceneSwitcher.tempVar.replay.lastSavePath.description="The file path of the last replay buffer saved."
+
+AdvSceneSwitcher.tempVar.sequence.macro="Macro"
+AdvSceneSwitcher.tempVar.sequence.macro.description="The name of the macro executed by the \"Sequence\" action.\nIf no macro was executed the returned value is the empty string."
+AdvSceneSwitcher.tempVar.sequence.nextMacro="Next Macro"
+AdvSceneSwitcher.tempVar.sequence.nextMacro.description="The name of the macro which will be executed next after the index was set.\nIf no macro will be executed the returned value is the empty string."
+
+AdvSceneSwitcher.tempVar.random.macro="Macro"
+AdvSceneSwitcher.tempVar.random.macro.description="The name of the macro executed by the \"Random\" action.\nIf no macro was executed the returned value is the empty string."
+
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectCanvas="--select canvas--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"
@@ -2330,6 +2568,9 @@ AdvSceneSwitcher.selectDisplay="--select display--"
 AdvSceneSwitcher.invaildEntriesWillNotBeSaved="invalid entries will not be saved"
 AdvSceneSwitcher.selectWindowTip="Use \"OBS\" to specify OBS window\nUse \"Task Switching\"to specify ALT + TAB"
 
+AdvSceneSwitcher.keepSourceActive="Keep source active"
+AdvSceneSwitcher.keepSourceActive.help="When a source is not visible in the active scene it becomes inactive, which can cause it to stop producing output (e.g. video frames or game capture hooks).\nEnabling this option forces the source to remain active at all times, ensuring it continues to produce output even when not displayed.\n\nNote: Keeping a source permanently active may increase CPU and GPU usage, as the source continues to run even when not shown."
+
 AdvSceneSwitcher.settings.suffix.type.invalid=" (Invalid)"
 AdvSceneSwitcher.settings.suffix.type.bool=" (Bool)"
 AdvSceneSwitcher.settings.suffix.type.int=" (Int)"
@@ -2390,8 +2631,6 @@ AdvSceneSwitcher.status.inactive="Inactive"
 AdvSceneSwitcher.running="Plugin running"
 AdvSceneSwitcher.stopped="Plugin stopped"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>This seems to be the first time the Advanced Scene Switcher was started.<br>Please have a look at the <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> for a list of guides and examples.<br>Do not hesitate to ask questions in the plugin's <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">thread</span></a> on the OBS forums!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Development for this tab stopped!\nPlease consider transitioning to using Macros instead.\nThis hint can be disabled on the General tab."
 
 AdvSceneSwitcher.unit.milliseconds="milliseconds"
@@ -2421,6 +2660,47 @@ AdvSceneSwitcher.clearBufferOnMatch="Clear message buffer when matching message
 AdvSceneSwitcher.script.settings="Settings"
 AdvSceneSwitcher.script.timeout="Script timeout:{{timeout}}"
 
+AdvSceneSwitcher.day.monday="Monday"
+AdvSceneSwitcher.day.tuesday="Tuesday"
+AdvSceneSwitcher.day.wednesday="Wednesday"
+AdvSceneSwitcher.day.thursday="Thursday"
+AdvSceneSwitcher.day.friday="Friday"
+AdvSceneSwitcher.day.saturday="Saturday"
+AdvSceneSwitcher.day.sunday="Sunday"
+AdvSceneSwitcher.day.none="No day"
+AdvSceneSwitcher.day.any="Any day"
+
+# First run wizard
+FirstRunWizard.windowTitle="Advanced Scene Switcher - Setup Wizard"
+
+FirstRunWizard.welcome.title="Welcome to Advanced Scene Switcher"
+FirstRunWizard.welcome.subtitle="Let's create your first automation in a few easy steps."
+FirstRunWizard.welcome.body="<p>Advanced Scene Switcher lets you build <b>Macros</b> - rules of the form:</p><blockquote><i>When [condition] -> perform [action]</i></blockquote><p>This wizard creates a macro that <b>switches to a chosen OBS scene whenever a specific window comes into focus</b>.</p><p>You can skip at any time. Re-open this wizard later from the <b>General</b> tab inside the Advanced Scene Switcher dialog.</p>"
+
+FirstRunWizard.scene.title="Choose a Target Scene"
+FirstRunWizard.scene.subtitle="Which OBS scene should become active when your chosen window comes into focus?"
+FirstRunWizard.scene.label="Switch to scene:"
+
+FirstRunWizard.window.title="Choose a Trigger Window"
+FirstRunWizard.window.subtitle="Enter the title of the window that should trigger the scene switch. Partial matches are fine - \"Firefox\" will match any Firefox window."
+FirstRunWizard.window.label="Window title contains:"
+FirstRunWizard.window.placeholder="e.g. \"Firefox\", \"Visual Studio Code\""
+FirstRunWizard.window.autoDetect="Auto-detect focused window"
+FirstRunWizard.window.autoDetectTooltip="Click, then switch to the target window. The title will be captured automatically after 3 seconds."
+FirstRunWizard.window.autoDetectCountdown="Detecting in %1 s - focus your window now..."
+FirstRunWizard.window.hint="<small>Tip: a short partial title is more robust than the full title, which often changes when you switch tabs.</small>"
+
+FirstRunWizard.review.title="Review Your Macro"
+FirstRunWizard.review.subtitle="Click Back to make changes, or Finish to create the macro."
+FirstRunWizard.review.summary="<b>Macro name:</b> Window -> %1<br><br><b>Condition:</b> Focused window title contains <i>\"%2\"</i> (case-insensitive)<br><br><b>Action:</b> Switch to scene <i>\"%1\"</i>"
+FirstRunWizard.review.errorTitle="Macro Creation Failed"
+FirstRunWizard.review.errorBody="The macro could not be created automatically.\n\nYou can create it manually on the Macros tab:\n  Condition: Window -> contains \"%1\"\n  Action:    Switch scene -> \"%2\""
+
+FirstRunWizard.done.title="You're all set!"
+FirstRunWizard.done.subtitle="Your first macro has been created and is now active."
+FirstRunWizard.done.body="<p>You can view and edit it on the <b>Macros</b> tab of the Advanced Scene Switcher dialog.</p><p>To learn more:</p><ul><li><a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\">Plugin wiki</a></li><li><a href=\"https://obsproject.com/forum/resources/automatic-scene-switching.395/\">OBS forum thread</a></li></ul>"
+
+FirstRunWizard.openButton="Open Setup Wizard..."
 # This secion is copied from the OBS locale files
 
 # OBS commonly shared locale
@@ -2458,6 +2738,64 @@ Basic.Settings.Video.FPSCommon="Common FPS Values"
 Basic.Settings.Video.FPSInteger="Integer FPS Value"
 Basic.Settings.Video.FPSFraction="Fractional FPS Value"
 
+# Calendar widget
+AdvSceneSwitcher.calendar.today="Today"
+AdvSceneSwitcher.calendar.month="Month"
+AdvSceneSwitcher.calendar.week="Week"
+AdvSceneSwitcher.calendar.day="Day"
+AdvSceneSwitcher.calendar.moreEvents="+%1 more"
+
+# Macro Schedule tab
+AdvSceneSwitcher.macroScheduleTab.title="Macro Schedule"
+AdvSceneSwitcher.macroScheduleTab.help="No scheduled entries.\nClick '+' to schedule a macro."
+AdvSceneSwitcher.macroScheduleTab.add="Add"
+AdvSceneSwitcher.macroScheduleTab.add.tooltip="Add schedule entry"
+AdvSceneSwitcher.macroScheduleTab.edit="Edit"
+AdvSceneSwitcher.macroScheduleTab.remove="Remove"
+AdvSceneSwitcher.macroScheduleTab.remove.tooltip="Remove schedule entry"
+AdvSceneSwitcher.macroScheduleTab.enable="Enable"
+AdvSceneSwitcher.macroScheduleTab.disable="Disable"
+AdvSceneSwitcher.macroScheduleTab.showAll="Show All"
+AdvSceneSwitcher.macroScheduleTab.column.name="Name"
+AdvSceneSwitcher.macroScheduleTab.column.macro="Macro"
+AdvSceneSwitcher.macroScheduleTab.column.schedule="Schedule"
+AdvSceneSwitcher.macroScheduleTab.column.nextTrigger="Next Trigger"
+AdvSceneSwitcher.macroScheduleTab.column.status="Status"
+AdvSceneSwitcher.macroScheduleTab.remove.confirm="Are you sure you want to remove \"%1\"?"
+AdvSceneSwitcher.macroScheduleTab.remove.confirmMultiple="Are you sure you want to remove %1 entries?"
+AdvSceneSwitcher.macroScheduleTab.status.active="Active"
+AdvSceneSwitcher.macroScheduleTab.status.disabled="Disabled"
+AdvSceneSwitcher.macroScheduleTab.status.expired="Expired"
+
+# Macro Schedule entry dialog
+AdvSceneSwitcher.macroScheduleEntry.dialog.title.add="Add Schedule Entry"
+AdvSceneSwitcher.macroScheduleEntry.dialog.title.edit="Edit Schedule Entry"
+AdvSceneSwitcher.macroScheduleEntry.name="Name (optional):"
+AdvSceneSwitcher.macroScheduleEntry.name.placeholder="e.g. Daily stream start"
+AdvSceneSwitcher.macroScheduleEntry.macro="Macro:"
+AdvSceneSwitcher.macroScheduleEntry.startDateTime="Start:"
+AdvSceneSwitcher.macroScheduleEntry.endDate="End date:"
+AdvSceneSwitcher.macroScheduleEntry.endDate.help="Controls how far the entry spans visually in the calendar and optionally triggers an action when the date is reached."
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.none="No action"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.disableEntry="Disable schedule entry"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.pauseMacro="Pause macro"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.stopMacro="Stop macro"
+AdvSceneSwitcher.macroScheduleEntry.repeat="Repeat"
+AdvSceneSwitcher.macroScheduleEntry.repeat.once="Once"
+AdvSceneSwitcher.macroScheduleEntry.repeat.every="Every %1"
+AdvSceneSwitcher.macroScheduleEntry.repeat.interval="Repeat interval:"
+AdvSceneSwitcher.macroScheduleEntry.noMacro="(no macro)"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd="End repeat:"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.never="Never"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.afterNTimes="After"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.afterNTimes.suffix="occurrence(s)"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.untilDate="Until"
+AdvSceneSwitcher.macroScheduleEntry.color="Color:"
+AdvSceneSwitcher.macroScheduleEntry.color.dialog="Pick entry color"
+AdvSceneSwitcher.macroScheduleEntry.checkConditions="Check macro conditions before running"
+AdvSceneSwitcher.macroScheduleEntry.runElseActionsOnConditionFailure="Run else actions if conditions are not met"
+AdvSceneSwitcher.macroScheduleEntry.enabled="Enabled"
+
 # Legacy tabs below - please don't waste your time adding translations for these :)
 # Transition Tab
 AdvSceneSwitcher.transitionTab.title="Transition"

data/locale/es-ES.ini

@@ -72,7 +72,6 @@ AdvSceneSwitcher.macroTab.add="Agregar nueva macro"
 AdvSceneSwitcher.macroTab.name="Nombre:"
 AdvSceneSwitcher.macroTab.run="Ejecutar macro"
 AdvSceneSwitcher.macroTab.runInParallel="Ejecutar macro en paralelo a otras macros"
-AdvSceneSwitcher.macroTab.onChange="Realizar acciones solo en el cambio de condición"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.copy="Crear copia"
 AdvSceneSwitcher.macroTab.expandAll="Expandir todo"
@@ -84,7 +83,6 @@ AdvSceneSwitcher.macroTab.highlightTrueConditions="Resaltar condiciones de la ma
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Resaltar acciones realizadas recientemente de la macro seleccionada actualmente"
 
 ; Lógica de macros
-AdvSceneSwitcher.logic.none="Omitir entrada"
 AdvSceneSwitcher.logic.and="Y"
 AdvSceneSwitcher.logic.or="O"
 AdvSceneSwitcher.logic.andNot="Y no"
@@ -118,9 +116,7 @@ AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Durante la tra
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="Durante la transición, verifique la escena de origen de la transición"
 AdvSceneSwitcher.condition.window="Ventana"
 AdvSceneSwitcher.condition.file="Archivo"
-AdvSceneSwitcher.condition.file.entry.line1="Contenido de{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
+AdvSceneSwitcher.condition.file.layout="Contenido de{{filePath}}{{conditions}}{{regex}}"
 AdvSceneSwitcher.condition.media="Medios"
 AdvSceneSwitcher.condition.media.anyOnScene="Cualquier fuente multimedia activada"
 AdvSceneSwitcher.condition.media.allOnScene="Todas las fuentes de medios activadas"
@@ -176,7 +172,7 @@ AdvSceneSwitcher.condition.record.state.start="Grabación en ejecución"
 AdvSceneSwitcher.condition.record.state.pause="Grabación en pausa"
 AdvSceneSwitcher.condition.record.state.stop="Grabación detenida"
 AdvSceneSwitcher.condition.process="Proceso"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}se está ejecutando{{focused}}y está enfocado"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}se está ejecutando{{focused}}y está enfocado"
 AdvSceneSwitcher.condition.idle="Inactivo"
 AdvSceneSwitcher.condition.idle.entry="No hay entradas de teclado o ratón durante {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Estado del complemento"
@@ -241,14 +237,14 @@ AdvSceneSwitcher.condition.replay.state.started="Búfer de reproducción iniciad
 AdvSceneSwitcher.condition.replay.state.saved="Búfer de reproducción guardado"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Fecha"
-AdvSceneSwitcher.condition.date.anyDay="Cualquier día"
-AdvSceneSwitcher.condition.date.monday="Lunes"
-AdvSceneSwitcher.condition.date.tuesday="Martes"
-AdvSceneSwitcher.condition.date.wednesday="Miércoles"
-AdvSceneSwitcher.condition.date.thursday="Jueves"
-AdvSceneSwitcher.condition.date.friday="Viernes"
-AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.condition.date.sunday="Domingo"
+AdvSceneSwitcher.day.any="Cualquier día"
+AdvSceneSwitcher.day.monday="Lunes"
+AdvSceneSwitcher.day.tuesday="Martes"
+AdvSceneSwitcher.day.wednesday="Miércoles"
+AdvSceneSwitcher.day.thursday="Jueves"
+AdvSceneSwitcher.day.friday="Viernes"
+AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.day.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="A las"
 AdvSceneSwitcher.condition.date.state.after="Después"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -258,11 +254,12 @@ AdvSceneSwitcher.condition.date.ignoreDate="Si no se marca, se ignorará el comp
 AdvSceneSwitcher.condition.date.ignoreTime="Si no se marca, se ignorará el componente de tiempo"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Mostrar configuración avanzada"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Mostrar configuración simple"
-AdvSceneSwitcher.condition.date.entry.simple="El {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} Repetir cada {{duration}} en la coincidencia de fechas"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima coincidencia en: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
+AdvSceneSwitcher.condition.date.layout.simple.day="El{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} Repetir cada {{duration}} en la coincidencia de fechas"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Próxima coincidencia en: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
 AdvSceneSwitcher.condition.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtener transformación"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="coincide con la transformación"
@@ -334,7 +331,6 @@ AdvSceneSwitcher.action.recording.type.start="Iniciar grabación"
 AdvSceneSwitcher.action.recording.type.pause="Pausar grabación"
 AdvSceneSwitcher.action.recording.type.unpause="Reanudar grabación"
 AdvSceneSwitcher.action.recording.pause.hint="Tenga en cuenta que, dependiendo de la configuración de grabación, es posible que no pueda pausar la grabación"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Búfer de reproducción"
 AdvSceneSwitcher.action.replay.saveWarn="Advertencia: ¡Guardar con demasiada frecuencia puede hacer que el búfer de reproducción no se guarde realmente!"
 AdvSceneSwitcher.action.replay.type.stop="Detener el búfer de reproducción"
@@ -343,14 +339,13 @@ AdvSceneSwitcher.action.replay.type.save="Guardar búfer de reproducción"
 AdvSceneSwitcher.action.streaming="Transmisión"
 AdvSceneSwitcher.action.streaming.type.stop="Detener transmisión"
 AdvSceneSwitcher.action.streaming.type.start="Iniciar transmisión"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="Ejecutar"
 AdvSceneSwitcher.action.sceneVisibility="Visibilidad del elemento de escena"
 AdvSceneSwitcher.action.sceneVisibility.type.show="Mostrar"
 AdvSceneSwitcher.action.sceneVisibility.type.hide="Ocultar"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Fuente"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Cualquiera"
-AdvSceneSwitcher.action.sceneVisibility.entry="En{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="En{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Deshabilitar"
@@ -375,7 +370,7 @@ AdvSceneSwitcher.action.macro="Macro"
 AdvSceneSwitcher.action.macro.type.pause="Pausa"
 AdvSceneSwitcher.action.macro.type.unpause="Reanudar"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reiniciar contador"
-AdvSceneSwitcher.action.macro.type.run="Ejecutar"
+AdvSceneSwitcher.action.macro.type.runActions="Ejecutar"
 AdvSceneSwitcher.action.macro.type.stop="Detener"
 AdvSceneSwitcher.action.pluginState="Estado del complemento"
 AdvSceneSwitcher.action.pluginState.type.stop="Detener el complemento Advanced Scene Switcher"
@@ -423,9 +418,9 @@ AdvSceneSwitcher.action.transition.type.scene="transición de escena"
 AdvSceneSwitcher.action.transition.type.sceneOverride="anulación de transición de escena"
 AdvSceneSwitcher.action.transition.type.sourceShow="transición del programa de origen"
 AdvSceneSwitcher.action.transition.type.sourceHide="fuente ocultar transición"
-AdvSceneSwitcher.action.transition.entry.line1="Modificar {{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Establecer el tipo de transición en {{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Establecer la duración de la transición en {{duration}}segundos"
+AdvSceneSwitcher.action.transition.layout.type="Modificar {{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Establecer el tipo de transición en {{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Establecer la duración de la transición en {{duration}}segundos"
 AdvSceneSwitcher.action.timer="Temporizador"
 AdvSceneSwitcher.action.timer.type.pause="Pausa"
 AdvSceneSwitcher.action.timer.type.continue="Continuar"
@@ -680,8 +675,6 @@ AdvSceneSwitcher.status.inactive="Inactivo"
 AdvSceneSwitcher.running="Iniciar complemento"
 AdvSceneSwitcher.stopped="Complemento de detención"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Esta parece ser la primera vez que se inicia el conmutador de escena avanzado.<br>Por favor, eche un vistazo a <a href=\"https:/ /github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> para obtener una lista de guías y ejemplos.<br>No dude en hacer preguntas en el complemento <a href=\"https://obsproject.com /forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">hilo</span></a> en los foros de OBS!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="¡Se detuvo el desarrollo de esta pestaña!\nConsidere cambiar a macros en su lugar.\nEsta sugerencia se puede desactivar en la pestaña General".
 
 AdvSceneSwitcher.unit.milliseconds="milisegundos"

data/locale/fr-FR.ini

@@ -78,7 +78,6 @@ AdvSceneSwitcher.macroTab.add="Ajouter une nouvelle macro"
 AdvSceneSwitcher.macroTab.name="Nom :"
 AdvSceneSwitcher.macroTab.run="Exécuter la macro"
 AdvSceneSwitcher.macroTab.runInParallel="Exécuter la macro en parallèle avec d'autres macros"
-AdvSceneSwitcher.macroTab.onChange="Exécuter des actions uniquement en cas de changement de condition"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Groupe %1"
 AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text="Êtes-vous sûr de vouloir supprimer \"%1\" ?"
@@ -132,7 +131,6 @@ AdvSceneSwitcher.macroList.deleted="supprimé"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" est déjà sélectionné !"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Ignorer l'entrée"
 AdvSceneSwitcher.logic.and="Et"
 AdvSceneSwitcher.logic.or="Ou"
 AdvSceneSwitcher.logic.andNot="Et pas"
@@ -188,8 +186,6 @@ AdvSceneSwitcher.condition.file="Fichier"
 AdvSceneSwitcher.condition.file.type.match="correspond à"
 AdvSceneSwitcher.condition.file.type.contentChange="a changé de contenu"
 AdvSceneSwitcher.condition.file.type.dateChange="a changé de date de modification"
-AdvSceneSwitcher.condition.file.remote="Fichier distant"
-AdvSceneSwitcher.condition.file.local="Fichier local"
 AdvSceneSwitcher.condition.media="Média"
 AdvSceneSwitcher.condition.media.source="Source"
 AdvSceneSwitcher.condition.media.anyOnScene="Toute source média sur la scène"
@@ -282,8 +278,8 @@ AdvSceneSwitcher.condition.record.state.start="Enregistrement en cours"
 AdvSceneSwitcher.condition.record.state.pause="Enregistrement en pause"
 AdvSceneSwitcher.condition.record.state.stop="Arrêt de l'enregistrement"
 AdvSceneSwitcher.condition.process="Processus"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}en cours d'exécution{{focused}}et est au premier plan"
-AdvSceneSwitcher.condition.process.entry.focus="Processus au premier plan actuel :{{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}en cours d'exécution{{focused}}et est au premier plan"
+AdvSceneSwitcher.condition.process.layout.focus="Processus au premier plan actuel :{{focusProcess}}"
 AdvSceneSwitcher.condition.idle="Inactif"
 AdvSceneSwitcher.condition.idle.entry="Aucune entrée de clavier ou de souris pendant{{duration}}"
 AdvSceneSwitcher.condition.pluginState="État du plugin"
@@ -356,14 +352,14 @@ AdvSceneSwitcher.condition.replay.state.stopped="Tampon de répétition arrêté
 AdvSceneSwitcher.condition.replay.state.started="Tampon de répétition démarré"
 AdvSceneSwitcher.condition.replay.state.saved="Tampon de répétition enregistré"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.condition.date.anyDay="N'importe quel jour"
-AdvSceneSwitcher.condition.date.monday="Lundi"
-AdvSceneSwitcher.condition.date.tuesday="Mardi"
-AdvSceneSwitcher.condition.date.wednesday="Mercredi"
-AdvSceneSwitcher.condition.date.thursday="Jeudi"
-AdvSceneSwitcher.condition.date.friday="Vendredi"
-AdvSceneSwitcher.condition.date.saturday="Samedi"
-AdvSceneSwitcher.condition.date.sunday="Dimanche"
+AdvSceneSwitcher.day.any="N'importe quel jour"
+AdvSceneSwitcher.day.monday="Lundi"
+AdvSceneSwitcher.day.tuesday="Mardi"
+AdvSceneSwitcher.day.wednesday="Mercredi"
+AdvSceneSwitcher.day.thursday="Jeudi"
+AdvSceneSwitcher.day.friday="Vendredi"
+AdvSceneSwitcher.day.saturday="Samedi"
+AdvSceneSwitcher.day.sunday="Dimanche"
 AdvSceneSwitcher.condition.date.state.at="À"
 AdvSceneSwitcher.condition.date.state.after="Après"
 AdvSceneSwitcher.condition.date.state.before="Avant"
@@ -374,11 +370,12 @@ AdvSceneSwitcher.condition.date.ignoreDate="Si non cochée, la composante date s
 AdvSceneSwitcher.condition.date.ignoreTime="Si non cochée, la composante heure sera ignorée"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Afficher les paramètres avancés"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Afficher les paramètres simples"
-AdvSceneSwitcher.condition.date.entry.simple="Le{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Répéter toutes les{{duration}}lorsque la date correspond"
-AdvSceneSwitcher.condition.date.entry.pattern="La date actuelle \"{{currentDate}}\" correspond au motif{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Prochaine correspondance à : %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
+AdvSceneSwitcher.condition.date.layout.simple.day="Le{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Répéter toutes les{{duration}}lorsque la date correspond"
+AdvSceneSwitcher.condition.date.layout.pattern="La date actuelle \"{{currentDate}}\" correspond au motif{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Prochaine correspondance à : %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
 AdvSceneSwitcher.condition.sceneTransform="Transformation de l'élément de la scène"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtenir la transformation"
 AdvSceneSwitcher.condition.sceneTransform.condition.match="correspond à la transformation"
@@ -510,7 +507,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Masquer"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Basculer"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="N'importe"
-AdvSceneSwitcher.action.sceneVisibility.entry="Sur{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Sur{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtre"
 AdvSceneSwitcher.action.filter.type.enable="Activer"
 AdvSceneSwitcher.action.filter.type.disable="Désactiver"
@@ -553,7 +550,7 @@ AdvSceneSwitcher.action.macro="Macro"
 AdvSceneSwitcher.action.macro.type.pause="Pause"
 AdvSceneSwitcher.action.macro.type.unpause="Reprendre"
 AdvSceneSwitcher.action.macro.type.resetCounter="Réinitialiser le compteur"
-AdvSceneSwitcher.action.macro.type.run="Exécuter les actions"
+AdvSceneSwitcher.action.macro.type.runActions="Exécuter les actions"
 AdvSceneSwitcher.action.macro.type.stop="Arrêter les actions"
 AdvSceneSwitcher.action.macro.type.disableAction="Désactiver l'action"
 AdvSceneSwitcher.action.macro.type.enableAction="Activer l'action"
@@ -622,9 +619,9 @@ AdvSceneSwitcher.action.transition.type.scene="Transition de scène"
 AdvSceneSwitcher.action.transition.type.sceneOverride="Remplacement de la transition de scène"
 AdvSceneSwitcher.action.transition.type.sourceShow="Transition d'affichage de la source"
 AdvSceneSwitcher.action.transition.type.sourceHide="Transition de masquage de la source"
-AdvSceneSwitcher.action.transition.entry.line1="Modifier{{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Définir le type de transition sur{{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Définir la durée de la transition à{{duration}}secondes"
+AdvSceneSwitcher.action.transition.layout.type="Modifier{{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Définir le type de transition sur{{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Définir la durée de la transition à{{duration}}secondes"
 AdvSceneSwitcher.action.timer="Minuterie"
 AdvSceneSwitcher.action.timer.type.pause="Mettre en pause"
 AdvSceneSwitcher.action.timer.type.continue="Continuer"
@@ -701,8 +698,8 @@ AdvSceneSwitcher.action.variable.invalidSelection="Sélection invalide !"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="La récupération de valeurs de variables à partir d'actions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="La récupération de valeurs de variables à partir de conditions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valeur actuelle :"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Utiliser un message personnalisé{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Remplir avec un indicateur de position{{inputPlaceholder}}"
 AdvSceneSwitcher.action.projector="Projecteur"
@@ -1122,8 +1119,6 @@ AdvSceneSwitcher.status.inactive="Inactif"
 AdvSceneSwitcher.running="Plugin en cours d'exécution"
 AdvSceneSwitcher.stopped="Plugin arrêté"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Il semble que ce soit la première fois que l'Advanced Scene Switcher est démarré.<br>Veuillez consulter le <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> pour obtenir une liste de guides et d'exemples.<br>N'hésitez pas à poser des questions dans le <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">fil de discussion</span></a> du plugin sur les forums OBS !</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Le développement de cet onglet est terminé !\nVeuillez envisager de passer à l'utilisation des Macros à la place.\nCette astuce peut être désactivée dans l'onglet Général."
 
 AdvSceneSwitcher.unit.milliseconds="millisecondes"

data/locale/ja-JP.ini

@@ -42,7 +42,6 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="プラグイ
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>次のプラグイン ライブラリの読み込みに失敗したため、一部の高機能シーンスイッチャーが利用できなくなる可能性があります:%1詳細については、OBS ログを確認してください。<br>このメッセージは、[全般] タブで無効にすることができます。 </body></html>"
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="プラグインが正しくインストールできておらずクラッシュする可能性があります！\nプラグインが正しくインストールされているか確認してください！"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="旧来型マクロ設定のタブを非表示にする（廃止予定タブ）"
-AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache="マクロウィジェットのキャッシングを無効にする"
 AdvSceneSwitcher.generalTab.matchBehavior="マッチした場合の動作（廃止予定の設定項目）"
 AdvSceneSwitcher.generalTab.priority="優先順位"
 AdvSceneSwitcher.generalTab.priority.description="切り替え方法の優先順位（優先順位が高いものが上）"
@@ -165,7 +164,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="条件に関係なくすべてのマク
 AdvSceneSwitcher.macroTab.runElse="マクロ実行（else）"
 AdvSceneSwitcher.macroTab.runFail="\"%1\" の実行に失敗しました!\nいずれかのアクションが失敗したか、マクロがすでに実行されています。\n停止しますか？"
 AdvSceneSwitcher.macroTab.runInParallel="他のマクロと並行してマクロを実行する"
-AdvSceneSwitcher.macroTab.onChange="条件変更時のみアクションを実行"
 AdvSceneSwitcher.macroTab.defaultname="マクロ %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="グループ %1"
 AdvSceneSwitcher.macroTab.macroNameExists="名前 \"%1\" は既にマクロで使用されています。"
@@ -277,7 +275,6 @@ AdvSceneSwitcher.macroList.deleted="削除"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" はすでに選択されています!"
 
 # Macro Logic
-AdvSceneSwitcher.logic.none="入力無視"
 ; AdvSceneSwitcher.logic.and="And"
 ; AdvSceneSwitcher.logic.or="Or"
 ; AdvSceneSwitcher.logic.andNot="And not"
@@ -333,14 +330,6 @@ AdvSceneSwitcher.condition.window.entry.text="{{checkText}}ウィンドウにテ
 AdvSceneSwitcher.condition.window.entry.text.note="このオプションは、ウィンドウに表示されているすべてのテキストに対して機能するとは限りません。\nその場合は、代わりにビデオ条件 OCR チェックの使用を検討してください。"
 AdvSceneSwitcher.condition.window.entry.currentFocus="現在のフォーカスウィンドウ:{{focusWindow}}"
 AdvSceneSwitcher.condition.file="ファイル"
-; AdvSceneSwitcher.condition.file.type.match="matches"
-AdvSceneSwitcher.condition.file.type.contentChange="内容変更しました"
-AdvSceneSwitcher.condition.file.type.dateChange="更新日変更"
-AdvSceneSwitcher.condition.file.remote="リモートファイル"
-AdvSceneSwitcher.condition.file.local="ローカルファイル"
-; AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-; AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-; AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
 ; AdvSceneSwitcher.condition.media="Media"
 AdvSceneSwitcher.condition.media.checkType.state="状態が一致"
 AdvSceneSwitcher.condition.media.checkType.time="時間が一致"
@@ -455,8 +444,8 @@ AdvSceneSwitcher.condition.stream.service.tooltip="現在のサービス名: %1"
 AdvSceneSwitcher.condition.record.state.duration="録音時間が長くなっています。"
 ; AdvSceneSwitcher.condition.record.entry="{{condition}}{{duration}}"
 AdvSceneSwitcher.condition.process="プロセス"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}が実行中{{focused}}に集中しています"
-AdvSceneSwitcher.condition.process.entry.focus="現在のフォアグラウンドプロセス:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}が実行中{{focused}}に集中しています"
+AdvSceneSwitcher.condition.process.layout.focus="現在のフォアグラウンドプロセス:{{focusProcess}}"
 AdvSceneSwitcher.condition.idle="アイドル"
 AdvSceneSwitcher.condition.idle.entry="{{duration}}の間、キーボードまたはマウスの入力がありません"
 AdvSceneSwitcher.condition.pluginState="プラグインの状態"
@@ -556,14 +545,14 @@ AdvSceneSwitcher.condition.replay.state.started="リプレイバッファを開
 AdvSceneSwitcher.condition.replay.state.saved="リプレイバッファを保存"
 ; AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="日付条件"
-AdvSceneSwitcher.condition.date.anyDay="いつでも"
-AdvSceneSwitcher.condition.date.monday="月曜日"
-AdvSceneSwitcher.condition.date.tuesday="火曜日"
-AdvSceneSwitcher.condition.date.wednesday="水曜日"
-AdvSceneSwitcher.condition.date.thursday="木曜日"
-AdvSceneSwitcher.condition.date.friday="金曜日"
-AdvSceneSwitcher.condition.date.saturday="土曜日"
-AdvSceneSwitcher.condition.date.sunday="日曜日"
+AdvSceneSwitcher.day.any="いつでも"
+AdvSceneSwitcher.day.monday="月曜日"
+AdvSceneSwitcher.day.tuesday="火曜日"
+AdvSceneSwitcher.day.wednesday="水曜日"
+AdvSceneSwitcher.day.thursday="木曜日"
+AdvSceneSwitcher.day.friday="金曜日"
+AdvSceneSwitcher.day.saturday="土曜日"
+AdvSceneSwitcher.day.sunday="日曜日"
 ; AdvSceneSwitcher.condition.date.state.at="At"
 AdvSceneSwitcher.condition.date.state.after="アフター"
 AdvSceneSwitcher.condition.date.state.before="前"
@@ -574,12 +563,9 @@ AdvSceneSwitcher.condition.date.ignoreDate="チェックを外すと日付部分
 AdvSceneSwitcher.condition.date.ignoreTime="チェックを外すと時間要素は無視されます"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="詳細設定を表示"
 AdvSceneSwitcher.condition.date.showSimpleSettings="簡単設定を表示"
-; AdvSceneSwitcher.condition.date.entry.simple="On{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-; AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}日付の一致ごとに{{duration}}繰り返します"
-AdvSceneSwitcher.condition.date.entry.pattern="現在の日付「{{currentDate}}」はパターン{{pattern}}と一致します"
-; AdvSceneSwitcher.condition.date.entry.nextMatchDate="Next match at: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}繰り返しの場合、選択した日付を繰り返しの日付に更新します"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}日付の一致ごとに{{duration}}繰り返します"
+AdvSceneSwitcher.condition.date.layout.pattern="現在の日付「{{currentDate}}」はパターン{{pattern}}と一致します"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}繰り返しの場合、選択した日付を繰り返しの日付に更新します"
 ; AdvSceneSwitcher.condition.sceneTransform="Scene item transform"
 ; AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="現在の値を取得"
@@ -871,7 +857,6 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="非表示"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="切り替え"
 ; AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 ; AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
-; AdvSceneSwitcher.action.sceneVisibility.entry="On{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="フィルタ"
 AdvSceneSwitcher.action.filter.type.enable="有効にする"
 AdvSceneSwitcher.action.filter.type.disable="無効化"
@@ -937,7 +922,7 @@ AdvSceneSwitcher.action.macro.type.pause="一時停止"
 AdvSceneSwitcher.action.macro.type.unpause="一時停止解除"
 AdvSceneSwitcher.action.macro.type.togglePause="一時停止を切り替え"
 AdvSceneSwitcher.action.macro.type.resetCounter="カウンターリセット"
-AdvSceneSwitcher.action.macro.type.run="マクロを実行"
+AdvSceneSwitcher.action.macro.type.runActions="マクロを実行"
 AdvSceneSwitcher.action.macro.type.run.conditions.ignore="条件の状態を考慮しない"
 AdvSceneSwitcher.action.macro.type.run.conditions.true="条件が true と評価された場合のみ"
 AdvSceneSwitcher.action.macro.type.run.conditions.false="条件が false と評価された場合のみ"
@@ -1026,9 +1011,9 @@ AdvSceneSwitcher.action.transition="トランジション"
 ; AdvSceneSwitcher.action.transition.type.sceneOverride="シーントランジションオーバーライド"
 ; AdvSceneSwitcher.action.transition.type.sourceShow="ソース表示トランジション"
 ; AdvSceneSwitcher.action.transition.type.sourceHide="ソース非表示トランジション"
-; AdvSceneSwitcher.action.transition.entry.line1="{{type}}{{scenes}}{{sources}} の変更"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}トランジションタイプを{{transitions}}に設定します"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}移行時間を {{duration}} 秒に設定します"
+; AdvSceneSwitcher.action.transition.layout.type="{{type}}{{scenes}}{{sources}} の変更"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}トランジションタイプを{{transitions}}に設定します"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}移行時間を {{duration}} 秒に設定します"
 AdvSceneSwitcher.action.timer="タイマー"
 AdvSceneSwitcher.action.timer.type.pause="一時停止"
 AdvSceneSwitcher.action.timer.type.continue="続行"
@@ -1150,8 +1135,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="現在値："
 ; AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{paddingCharSelection}}を{{direction}}に追加します。"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{direction}}から文字を削除します。"
-AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:"
+AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:{{subStringRegex}}"
 ; AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}カスタム プロンプトを使用する{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}プレースホルダーを入力{{inputPlaceholder}}"
@@ -1194,10 +1179,17 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="ユーザー情報を取得"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="チャンネルポイントリワード情報を取得"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="リワード名/変数選択コントロールの切り替え"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Twitchアカウントを選択しないとカテゴリを選択できません！"
-; AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{account}}{{actions}}を使用"
+; AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
+AdvSceneSwitcher.action.twitch.layout.channel.getInfo="チャンネル{{channel}}でアカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row1="アカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row2="{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row1="アカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row2="チャンネル{{channel}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row1="アカウント{{account}}{{actions}}を使用 タイムアウト{{duration}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row2="チャンネル{{channel}}{{userInfoQueryType}}{{userLogin}}{{userId}} 理由{{banReason}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row1="チャンネル{{channel}}でアカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row2="{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="タイトルを入力"
 AdvSceneSwitcher.action.twitch.marker.description="マーカーの説明"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="クリップをキャプチャする前にわずかな遅延を追加します"
@@ -2257,8 +2249,6 @@ AdvSceneSwitcher.status.inactive="停止中"
 AdvSceneSwitcher.running="プラグイン実行中"
 AdvSceneSwitcher.stopped="プラグイン停止しました"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>高機能シーンスイッチャーが初めて起動したようです。<br>ガイドと使用例については <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> をご覧ください。<br>質問は <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">OBSフォーラムのプラグインのスレッド</span></a> で遠慮なくどうぞ！</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="このタブの開発は停止しました！\n代わりにマクロの使用に移行することを検討してください。\nこのヒントは [全般] タブで無効にすることができます。"
 
 AdvSceneSwitcher.unit.milliseconds="ミリ秒"

data/locale/pt-BR.ini

@@ -147,7 +147,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="Execute todas as ações da macro indepen
 AdvSceneSwitcher.macroTab.runElse="Executar macro (alternativa)"
 AdvSceneSwitcher.macroTab.runFail="Falha ao executar \"%1\"!\nUma das ações falhou ou a macro já está em execução.\nDeseja interrompê-la?"
 AdvSceneSwitcher.macroTab.runInParallel="Executar macro em paralelo com outras macros"
-AdvSceneSwitcher.macroTab.onChange="Executar ações apenas quando houver mudança na condição"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Grupo %1"
 AdvSceneSwitcher.macroTab.macroNameExists="O nome \"%1\" já está em uso por uma macro."
@@ -240,7 +239,6 @@ AdvSceneSwitcher.macroList.deleted="excluída"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" já está selecionada!"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Ignorar entrada"
 AdvSceneSwitcher.logic.and="E"
 AdvSceneSwitcher.logic.or="Ou"
 AdvSceneSwitcher.logic.andNot="E não"
@@ -296,11 +294,6 @@ AdvSceneSwitcher.condition.file="Arquivo"
 AdvSceneSwitcher.condition.file.type.match="corresponde"
 AdvSceneSwitcher.condition.file.type.contentChange="conteúdo mudou"
 AdvSceneSwitcher.condition.file.type.dateChange="data de modificação mudou"
-AdvSceneSwitcher.condition.file.remote="Arquivo remoto"
-AdvSceneSwitcher.condition.file.local="Arquivo local"
-AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
 AdvSceneSwitcher.condition.media="Mídia"
 AdvSceneSwitcher.condition.media.checkType.state="Estado corresponde"
 AdvSceneSwitcher.condition.media.checkType.time="Restrição de tempo corresponde"
@@ -401,8 +394,8 @@ AdvSceneSwitcher.condition.record.state.stop="Gravação parada"
 AdvSceneSwitcher.condition.record.state.duration="Duração da gravação é maior que"
 AdvSceneSwitcher.condition.record.entry="{{condition}}{{duration}}"
 AdvSceneSwitcher.condition.process="Processo"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}está em execução{{focused}}e está em foco"
-AdvSceneSwitcher.condition.process.entry.focus="Processo atual em primeiro plano:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}está em execução{{focused}}e está em foco"
+AdvSceneSwitcher.condition.process.layout.focus="Processo atual em primeiro plano:{{focusProcess}}"
 AdvSceneSwitcher.condition.idle="Inativo"
 AdvSceneSwitcher.condition.idle.entry="Sem entradas de teclado ou mouse por {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Estado do plugin"
@@ -502,14 +495,14 @@ AdvSceneSwitcher.condition.replay.state.started="Buffer de replay iniciado"
 AdvSceneSwitcher.condition.replay.state.saved="Buffer de replay salvo"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Data"
-AdvSceneSwitcher.condition.date.anyDay="Qualquer dia"
-AdvSceneSwitcher.condition.date.monday="Segunda-feira"
-AdvSceneSwitcher.condition.date.tuesday="Terça-feira"
-AdvSceneSwitcher.condition.date.wednesday="Quarta-feira"
-AdvSceneSwitcher.condition.date.thursday="Quinta-feira"
-AdvSceneSwitcher.condition.date.friday="Sexta-feira"
-AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.condition.date.sunday="Domingo"
+AdvSceneSwitcher.day.any="Qualquer dia"
+AdvSceneSwitcher.day.monday="Segunda-feira"
+AdvSceneSwitcher.day.tuesday="Terça-feira"
+AdvSceneSwitcher.day.wednesday="Quarta-feira"
+AdvSceneSwitcher.day.thursday="Quinta-feira"
+AdvSceneSwitcher.day.friday="Sexta-feira"
+AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.day.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="Às"
 AdvSceneSwitcher.condition.date.state.after="Após"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -520,12 +513,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="Se desmarcado, o componente de data
 AdvSceneSwitcher.condition.date.ignoreTime="Se desmarcado, o componente de tempo será ignorado"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="Mostrar configurações avançadas"
 AdvSceneSwitcher.condition.date.showSimpleSettings="Mostrar configurações simples"
-AdvSceneSwitcher.condition.date.entry.simple="Em{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Repetir a cada{{duration}}em correspondência de data"
-AdvSceneSwitcher.condition.date.entry.pattern="Data atual \"{{currentDate}}\" corresponde ao padrão{{pattern}}"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima correspondência em: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}Ao repetir, atualize a data selecionada para a data de repetição"
+AdvSceneSwitcher.condition.date.layout.simple.day="Em{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}Repetir a cada{{duration}}em correspondência de data"
+AdvSceneSwitcher.condition.date.layout.pattern="Data atual \"{{currentDate}}\" corresponde ao padrão{{pattern}}"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="Próxima correspondência em: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}Ao repetir, atualize a data selecionada para a data de repetição"
 AdvSceneSwitcher.condition.sceneTransform="Transformação do item de cena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obter transformação"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="Obter valor atual"
@@ -754,7 +748,6 @@ AdvSceneSwitcher.action.recording.type.changeOutputFolder="Alterar pasta de saí
 AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="Alterar formatação do nome do arquivo"
 AdvSceneSwitcher.action.recording.pause.hint="Observe que dependendo das suas configurações de gravação, você pode não conseguir pausar a gravação"
 AdvSceneSwitcher.action.recording.split.hint="Certifique-se de habilitar a divisão automática de arquivos nas configurações do OBS primeiro!"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Buffer de replay"
 AdvSceneSwitcher.action.replay.saveWarn="Aviso: Salvar com muita frequência pode resultar em o buffer de replay não ser realmente salvo!"
 AdvSceneSwitcher.action.replay.durationWarn="Aviso: Alterar o tempo máximo de replay só se aplicará na próxima vez que o buffer de replay for iniciado!"
@@ -771,7 +764,6 @@ AdvSceneSwitcher.action.streaming.type.server="Definir URL do servidor"
 AdvSceneSwitcher.action.streaming.type.streamKey="Definir chave de transmissão"
 AdvSceneSwitcher.action.streaming.type.username="Definir nome de usuário"
 AdvSceneSwitcher.action.streaming.type.password="Definir senha"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="Executar"
 AdvSceneSwitcher.action.run.wait.entry="{{wait}}Aguardar a saída do processo ou no máximo {{timeout}}{{waitHelp}}"
 AdvSceneSwitcher.action.run.wait.help.tooltip="Observe que as propriedades da macro não funcionarão se você deixar isso desmarcado, pois o processo é iniciado de forma independente do restante da lógica e não há controle sobre ele."
@@ -781,7 +773,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Ocultar"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Alternar"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Fonte"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Qualquer"
-AdvSceneSwitcher.action.sceneVisibility.entry="Em{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Em{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Desabilitar"
@@ -846,7 +838,7 @@ AdvSceneSwitcher.action.macro="Macro"
 AdvSceneSwitcher.action.macro.type.pause="Pausar"
 AdvSceneSwitcher.action.macro.type.unpause="Retomar"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reiniciar contador"
-AdvSceneSwitcher.action.macro.type.run="Executar macro"
+AdvSceneSwitcher.action.macro.type.runActions="Executar macro"
 AdvSceneSwitcher.action.macro.type.run.conditions.ignore="Não considerar o estado da condição"
 AdvSceneSwitcher.action.macro.type.run.conditions.true="Apenas se as condições forem verdadeiras"
 AdvSceneSwitcher.action.macro.type.run.conditions.false="Apenas se as condições forem falsas"
@@ -861,9 +853,9 @@ AdvSceneSwitcher.action.macro.type.stop="Parar ações"
 AdvSceneSwitcher.action.macro.type.disableAction="Desabilitar ação"
 AdvSceneSwitcher.action.macro.type.enableAction="Habilitar ação"
 AdvSceneSwitcher.action.macro.type.toggleAction="Alternar ação"
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}de{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}de{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado do plugin"
 AdvSceneSwitcher.action.pluginState.type.stop="Parar o plugin Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Alterar o comportamento em caso de não correspondência:"
@@ -933,9 +925,9 @@ AdvSceneSwitcher.action.transition.type.scene="transição de cena"
 AdvSceneSwitcher.action.transition.type.sceneOverride="substituição de transição de cena"
 AdvSceneSwitcher.action.transition.type.sourceShow="transição de exibição de fonte"
 AdvSceneSwitcher.action.transition.type.sourceHide="transição de ocultação de fonte"
-AdvSceneSwitcher.action.transition.entry.line1="Modificar{{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Definir tipo de transição para{{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Definir duração da transição para{{duration}}segundos"
+AdvSceneSwitcher.action.transition.layout.type="Modificar{{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Definir tipo de transição para{{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Definir duração da transição para{{duration}}segundos"
 AdvSceneSwitcher.action.timer="Temporizador"
 AdvSceneSwitcher.action.timer.type.pause="Pausar"
 AdvSceneSwitcher.action.timer.type.continue="Continuar"
@@ -1030,8 +1022,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Obter valores de va
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valor atual:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}de{{variables}}para comprimento{{stringLength}}adicionando{{paddingCharSelection}}ao{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}de{{variables}}para comprimento{{stringLength}}removendo caracteres da{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Usar prompt personalizado{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Preencher com placeholder{{inputPlaceholder}}"
@@ -1065,8 +1057,8 @@ AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Habilitar modo apenas
 AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Desabilitar modo apenas emotes no chat"
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Enviar mensagem de chat"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Não é possível selecionar categoria sem selecionar uma conta Twitch primeiro!"
-AdvSceneSwitcher.action.twitch.entry.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="Usando conta{{account}}{{actions}}em{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}{{nonModDelayDuration}}"
+AdvSceneSwitcher.action.twitch.layout.chat="Usando conta{{account}}{{actions}}em{{channel}}"
 AdvSceneSwitcher.action.twitch.title.title="Digite o título"
 AdvSceneSwitcher.action.twitch.marker.description="Descreva o marcador"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Adicionar um leve atraso antes de capturar o clipe"
@@ -1871,8 +1863,6 @@ AdvSceneSwitcher.status.inactive="Inativo"
 AdvSceneSwitcher.running="Plugin em execução"
 AdvSceneSwitcher.stopped="Plugin parado"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Parece que esta é a primeira vez que o Advanced Scene Switcher está sendo iniciado.<br>Por favor, consulte o <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> para uma lista de guias e exemplos.<br>Não hesite em fazer perguntas no <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">tópico</span></a> do plugin nos fóruns do OBS!</p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="Desenvolvimento para esta aba interrompido!\nPor favor, considere a transição para o uso de Macros em vez disso.\nEsta dica pode ser desativada na aba Geral."
 
 AdvSceneSwitcher.unit.milliseconds="milissegundos"

data/locale/ru-RU.ini

@@ -70,7 +70,6 @@ AdvSceneSwitcher.macroTab.name="Имя:"
 AdvSceneSwitcher.macroTab.defaultname="Макрос %1"
 AdvSceneSwitcher.macroTab.copy="Создать копию"
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Игнорировать вход"
 AdvSceneSwitcher.logic.and="И"
 AdvSceneSwitcher.logic.or="Или"
 AdvSceneSwitcher.logic.andNot="И не"
@@ -85,8 +84,6 @@ AdvSceneSwitcher.condition.scene.type.current="Текущий"
 AdvSceneSwitcher.condition.scene.type.previous="Предыдущий"
 AdvSceneSwitcher.condition.window="Окно"
 AdvSceneSwitcher.condition.file="Файл"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
 AdvSceneSwitcher.condition.media="Медиа"
 AdvSceneSwitcher.condition.video="Видео"
 AdvSceneSwitcher.condition.video.condition.match="точно соответствует"
@@ -105,7 +102,7 @@ AdvSceneSwitcher.condition.record.state.start="Запись запущена"
 AdvSceneSwitcher.condition.record.state.pause="Запись приостановлена"
 AdvSceneSwitcher.condition.record.state.stop="Запись остановлена"
 AdvSceneSwitcher.condition.process="Процесс"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}запущен{{focused}}и сфокусирован"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}запущен{{focused}}и сфокусирован"
 AdvSceneSwitcher.condition.idle="Простой"
 AdvSceneSwitcher.condition.idle.entry="Не было ни клавиатуры, ни мыши в течении{{duration}}"
 AdvSceneSwitcher.condition.pluginState="Состояние плагина"
@@ -130,7 +127,6 @@ AdvSceneSwitcher.action.recording.type.start="Начать запись"
 AdvSceneSwitcher.action.recording.type.pause="Пауза записи"
 AdvSceneSwitcher.action.recording.type.unpause="Снять запись с паузы"
 AdvSceneSwitcher.action.recording.pause.hint="Обратите внимание, что в зависимости от настроек записи вы можете не иметь возможности приостановить запись"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.stop="Остановить буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.start="Начать воспроизведение буфера"
@@ -138,7 +134,6 @@ AdvSceneSwitcher.action.replay.type.save="Сохранить буфер восп
 AdvSceneSwitcher.action.streaming="Потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.stop="Остановить потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.start="Начать потоковое вещание"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="Запустить"
 
 

data/locale/tr-TR.ini

@@ -72,14 +72,12 @@ AdvSceneSwitcher.macroTab.add="Yeni Makro ekle"
 AdvSceneSwitcher.macroTab.name="İsim:"
 AdvSceneSwitcher.macroTab.run="Makro Çalıştırma"
 AdvSceneSwitcher.macroTab.runInParallel="Makroyu diğer makrolara paralel olarak çalıştırın"
-AdvSceneSwitcher.macroTab.onChange="Eylemleri yalnızca koşul değişikliğinde gerçekleştirin"
 AdvSceneSwitcher.macroTab.defaultname="Makro %1"
 AdvSceneSwitcher.macroTab.copy="Kopya oluştur"
 AdvSceneSwitcher.macroTab.expandAll="Hepsini Genişlet"
 AdvSceneSwitcher.macroTab.collapseAll="Hepsini Küçült"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Girişi yoksay"
 AdvSceneSwitcher.logic.and="Ve"
 AdvSceneSwitcher.logic.or="Ya da"
 AdvSceneSwitcher.logic.andNot="ve değil"
@@ -108,9 +106,7 @@ AdvSceneSwitcher.condition.scene.type.notChanged="Sahne değişmedi"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Geçiş hedefi sahnesi için geçiş kontrolü sırasında"
 AdvSceneSwitcher.condition.window="Pencere"
 AdvSceneSwitcher.condition.file="Dosya"
-AdvSceneSwitcher.condition.file.entry.line1="İçerik{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
+AdvSceneSwitcher.condition.file.layout="İçerik{{filePath}}{{conditions}}{{regex}}"
 AdvSceneSwitcher.condition.media="Medya"
 AdvSceneSwitcher.condition.media.anyOnScene="Herhangi bir medya kaynağı"
 AdvSceneSwitcher.condition.media.allOnScene="Tüm medya kaynakları "
@@ -153,7 +149,7 @@ AdvSceneSwitcher.condition.record.state.start="Kayıt Çalışıyor"
 AdvSceneSwitcher.condition.record.state.pause="Kayıt durakladı"
 AdvSceneSwitcher.condition.record.state.stop="Kayıt durdu"
 AdvSceneSwitcher.condition.process="İşlem"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}çalışıyor{{focused}}ve odaklandı"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}çalışıyor{{focused}}ve odaklandı"
 AdvSceneSwitcher.condition.idle="Boşta"
 AdvSceneSwitcher.condition.idle.entry="...için klavye veya fare girişi yok {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Eklenti durumu"
@@ -266,7 +262,6 @@ AdvSceneSwitcher.action.recording.type.start="Kayıt Başlat"
 AdvSceneSwitcher.action.recording.type.pause="Kayıt Duraklat"
 AdvSceneSwitcher.action.recording.type.unpause="Kayıt Duraklatma"
 AdvSceneSwitcher.action.recording.pause.hint="Kayıt ayarlarınıza bağlı olarak kaydı duraklatamayabileceğinizi unutmayın."
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 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"
@@ -274,14 +269,13 @@ AdvSceneSwitcher.action.replay.type.save="Tekrar arabelleğini kaydet"
 AdvSceneSwitcher.action.streaming="Yayın"
 AdvSceneSwitcher.action.streaming.type.stop="Yayın durdur"
 AdvSceneSwitcher.action.streaming.type.start="Yayın başlat"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="Çalıştır"
 AdvSceneSwitcher.action.sceneVisibility="Sahne öğesi görünürlüğü"
 AdvSceneSwitcher.action.sceneVisibility.type.show="Göster"
 AdvSceneSwitcher.action.sceneVisibility.type.hide="Gizle"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Kayıt"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Herhangi"
-AdvSceneSwitcher.action.sceneVisibility.entry="Açık{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="Açık{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtrele"
 AdvSceneSwitcher.action.filter.type.enable="Etkin"
 AdvSceneSwitcher.action.filter.type.disable="Etkisiz"
@@ -305,7 +299,7 @@ AdvSceneSwitcher.action.macro="Makro"
 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.type.runActions="Çalıştır"
 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:"
@@ -342,8 +336,8 @@ AdvSceneSwitcher.action.file.type.write="Yaz"
 AdvSceneSwitcher.action.file.type.append="Ekle"
 AdvSceneSwitcher.action.file.entry="{{actions}}  {{filePath}}:"
 AdvSceneSwitcher.action.transition="Geçiş"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Geçiş türünü ayarla {{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Geçiş süresini şuna ayarla: {{duration}}saniyeler"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Geçiş türünü ayarla {{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Geçiş süresini şuna ayarla: {{duration}}saniyeler"
 AdvSceneSwitcher.action.timer="Zamanlayıcı"
 AdvSceneSwitcher.action.timer.type.pause="Duraklat"
 AdvSceneSwitcher.action.timer.type.continue="Devam et"
@@ -587,8 +581,6 @@ AdvSceneSwitcher.status.inactive="İnaktif"
 AdvSceneSwitcher.running="Eklenti çalışıyor"
 AdvSceneSwitcher.stopped="Eklenti durdu"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Gelişmiş Sahne Değiştirici ilk kez başlatılıyor gibi görünüyor.<br>Lütfen <a href=\"https://github.com/ adresine bir göz atın. WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> için kılavuzlar ve örnekler listesi.<br>Yapmayın. eklentinin <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:# sayfasında soru sormaktan çekinmeyin OBS forumlarında 268bd2;\">konu</span></a>!</p></body></html>"
-
 AdvSceneSwitcher.unit.milliseconds="millisaniye"
 AdvSceneSwitcher.unit.seconds="saniye"
 AdvSceneSwitcher.unit.minutes="dakika"

data/locale/zh-CN.ini

@@ -151,7 +151,6 @@ AdvSceneSwitcher.macroTab.run.tooltip="无论条件如何，都运行所有宏
 AdvSceneSwitcher.macroTab.runElse="运行宏（不满足条件）"
 AdvSceneSwitcher.macroTab.runFail="运行 \"%1\" 失败!\n要么其中一个操作失败，要么宏已在运行中.\n你想停止它吗?"
 AdvSceneSwitcher.macroTab.runInParallel="与其他宏并行运行宏"
-AdvSceneSwitcher.macroTab.onChange="仅在条件结果发生变化时执行操作(条件结果不变时只执行一次操作)"
 AdvSceneSwitcher.macroTab.defaultname="宏 %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="分组 %1"
 AdvSceneSwitcher.macroTab.macroNameExists="名称 \"%1\" 已被宏使用."
@@ -260,7 +259,6 @@ AdvSceneSwitcher.macroList.deleted="删除"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" 已选择！"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="忽略条件"
 AdvSceneSwitcher.logic.and="且"
 AdvSceneSwitcher.logic.or="或"
 AdvSceneSwitcher.logic.andNot="且不"
@@ -319,11 +317,7 @@ AdvSceneSwitcher.condition.file="文件"
 AdvSceneSwitcher.condition.file.type.match="内容匹配"
 AdvSceneSwitcher.condition.file.type.contentChange="内容发生改变"
 AdvSceneSwitcher.condition.file.type.dateChange="修改日期发生改变"
-AdvSceneSwitcher.condition.file.remote="网络文件"
-AdvSceneSwitcher.condition.file.local="本地文件"
-AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
-AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
-AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFileContent}}"
+AdvSceneSwitcher.condition.file.layout="{{filePath}}{{conditions}}{{regex}}"
 AdvSceneSwitcher.condition.media="媒体"
 AdvSceneSwitcher.condition.media.checkType.state="状态匹配"
 AdvSceneSwitcher.condition.media.checkType.time="时间限制匹配"
@@ -429,8 +423,8 @@ AdvSceneSwitcher.condition.record.state.stop="录制停止"
 AdvSceneSwitcher.condition.record.state.duration="录制时间长于"
 AdvSceneSwitcher.condition.record.entry="{{condition}}{{duration}}"
 AdvSceneSwitcher.condition.process="进程"
-AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}为正在运行中{{focused}}且为焦点"
-AdvSceneSwitcher.condition.process.entry.focus="当前焦点进程: {{focusProcess}}"
+AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}为正在运行中{{focused}}且为焦点"
+AdvSceneSwitcher.condition.process.layout.focus="当前焦点进程: {{focusProcess}}"
 AdvSceneSwitcher.condition.idle="闲置检测"
 AdvSceneSwitcher.condition.idle.entry="{{duration}}内没有键盘或鼠标输入"
 AdvSceneSwitcher.condition.pluginState="插件状态"
@@ -530,14 +524,14 @@ AdvSceneSwitcher.condition.replay.state.started="回放缓存已启动"
 AdvSceneSwitcher.condition.replay.state.saved="已保存回放缓存"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="日期"
-AdvSceneSwitcher.condition.date.anyDay="每一天"
-AdvSceneSwitcher.condition.date.monday="周一"
-AdvSceneSwitcher.condition.date.tuesday="周二"
-AdvSceneSwitcher.condition.date.wednesday="周三"
-AdvSceneSwitcher.condition.date.thursday="周四"
-AdvSceneSwitcher.condition.date.friday="周五"
-AdvSceneSwitcher.condition.date.saturday="周六"
-AdvSceneSwitcher.condition.date.sunday="周日"
+AdvSceneSwitcher.day.any="每一天"
+AdvSceneSwitcher.day.monday="周一"
+AdvSceneSwitcher.day.tuesday="周二"
+AdvSceneSwitcher.day.wednesday="周三"
+AdvSceneSwitcher.day.thursday="周四"
+AdvSceneSwitcher.day.friday="周五"
+AdvSceneSwitcher.day.saturday="周六"
+AdvSceneSwitcher.day.sunday="周日"
 AdvSceneSwitcher.condition.date.state.at="现在"
 AdvSceneSwitcher.condition.date.state.after="之后"
 AdvSceneSwitcher.condition.date.state.before="之前"
@@ -548,12 +542,13 @@ AdvSceneSwitcher.condition.date.ignoreDate="如果未选中，日期组件将被
 AdvSceneSwitcher.condition.date.ignoreTime="如果未选中，时间组件将被忽略"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="显示高级设置"
 AdvSceneSwitcher.condition.date.showSimpleSettings="显示简单设置"
-AdvSceneSwitcher.condition.date.entry.simple="{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} 每 {{duration}} 重复一次时间/日期匹配"
-AdvSceneSwitcher.condition.date.entry.pattern="当前日期 \"{{currentDate}}\" 与 {{pattern}} 模式匹配 , 例子:2025 03 18 24 00 00 = .... .. .. .. .. .. ，难崩，我测试了一段时间才明白"
-AdvSceneSwitcher.condition.date.entry.nextMatchDate="下一次匹配 在: %1"
-AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} 在重复时将选定日期更新为重复日期"
+AdvSceneSwitcher.condition.date.layout.simple.day="{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.layout.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
+AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} 每 {{duration}} 重复一次时间/日期匹配"
+AdvSceneSwitcher.condition.date.layout.pattern="当前日期 \"{{currentDate}}\" 与 {{pattern}} 模式匹配 , 例子:2025 03 18 24 00 00 = .... .. .. .. .. .. ，难崩，我测试了一段时间才明白"
+AdvSceneSwitcher.condition.date.layout.nextMatchDate="下一次匹配 在: %1"
+AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}} 在重复时将选定日期更新为重复日期"
 AdvSceneSwitcher.condition.sceneTransform="场景项目变换"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="获取变换"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="获取当前值"
@@ -813,7 +808,6 @@ AdvSceneSwitcher.action.recording.type.changeOutputFolder="更改输出文件夹
 AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="改变文件名的格式"
 AdvSceneSwitcher.action.recording.pause.hint="请注意，根据您的录制设置，您可能无法暂停录制"
 AdvSceneSwitcher.action.recording.split.hint="注意，请先确保在OBS设置中启用自动分割文件!"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="回放缓存"
 AdvSceneSwitcher.action.replay.saveWarn="警告：保存过于频繁可能会导致回放缓存实际上未保存!"
 AdvSceneSwitcher.action.replay.durationWarn="警告：更改回放缓存时长上限，仅适用于下次回放缓存开启时!"
@@ -830,7 +824,6 @@ AdvSceneSwitcher.action.streaming.type.server="设置服务器"
 AdvSceneSwitcher.action.streaming.type.streamKey="设置推流码"
 AdvSceneSwitcher.action.streaming.type.username="设置用户名"
 AdvSceneSwitcher.action.streaming.type.password="设置密码"
-AdvSceneSwitcher.action.streaming.entry="{{actions}}{{keyFrameInterval}}{{stringValue}}{{showPassword}}"
 AdvSceneSwitcher.action.run="运行"
 AdvSceneSwitcher.action.run.wait.entry="{{wait}}进程退出或最多等待{{timeout}}{{waitHelp}}"
 AdvSceneSwitcher.action.run.wait.help.tooltip="请注意，如果不勾选此选项，宏属性将不起作用，因为进程的启动会脱离逻辑的其他部分，因此无法对其进行控制."
@@ -840,7 +833,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="隐藏"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="切换可见性"
 AdvSceneSwitcher.action.sceneVisibility.type.source="源"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="任何"
-AdvSceneSwitcher.action.sceneVisibility.entry="{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.layout="{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="滤镜"
 AdvSceneSwitcher.action.filter.type.enable="开启"
 AdvSceneSwitcher.action.filter.type.disable="关闭"
@@ -905,7 +898,7 @@ AdvSceneSwitcher.action.macro="宏"
 AdvSceneSwitcher.action.macro.type.pause="停用"
 AdvSceneSwitcher.action.macro.type.unpause="启用"
 AdvSceneSwitcher.action.macro.type.resetCounter="重置计数器"
-AdvSceneSwitcher.action.macro.type.run="运行宏"
+AdvSceneSwitcher.action.macro.type.runActions="运行宏"
 AdvSceneSwitcher.action.macro.type.run.conditions.ignore="忽略条件结果"
 AdvSceneSwitcher.action.macro.type.run.conditions.true="仅当条件结果为真时"
 AdvSceneSwitcher.action.macro.type.run.conditions.false="仅当条件结果为假时"
@@ -920,9 +913,9 @@ AdvSceneSwitcher.action.macro.type.stop="停止操作"
 AdvSceneSwitcher.action.macro.type.disableAction="停用操作"
 AdvSceneSwitcher.action.macro.type.enableAction="启用操作"
 AdvSceneSwitcher.action.macro.type.toggleAction="切换操作开关"
-AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}{{macros}}"
-AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}{{macros}}"
+AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="插件状态"
 AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
 AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项时:"
@@ -994,9 +987,9 @@ AdvSceneSwitcher.action.transition.type.scene="场景转场动画"
 AdvSceneSwitcher.action.transition.type.sceneOverride="覆盖场景转场动画"
 AdvSceneSwitcher.action.transition.type.sourceShow="显示源转场动画"
 AdvSceneSwitcher.action.transition.type.sourceHide="隐藏源转场动画"
-AdvSceneSwitcher.action.transition.entry.line1="更改 {{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}将转场动画类型设置为 {{transitions}}"
-AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}将转场动画时长设置为 {{duration}}秒"
+AdvSceneSwitcher.action.transition.layout.type="更改 {{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}将转场动画类型设置为 {{transitions}}"
+AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}将转场动画时长设置为 {{duration}}秒"
 AdvSceneSwitcher.action.timer="计时器"
 AdvSceneSwitcher.action.timer.type.pause="暂停"
 AdvSceneSwitcher.action.timer.type.continue="继续"
@@ -1100,8 +1093,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="不支持从 %1 条
 AdvSceneSwitcher.action.variable.currentSegmentValue="当前值:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}于{{variables}}的{{direction}}起，内容为{{paddingCharSelection}}将其变量值长度增加至{{stringLength}}."
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}于{{variables}}的{{direction}}起，将变量长度缩减至{{stringLength}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="截取字符串开始位置:{{subStringStart}} 截取字符串长度:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="使用正则表达式为 {{regexMatchIdx}} 匹配的值:"
+AdvSceneSwitcher.action.variable.layout.substringIndex="截取字符串开始位置:{{subStringStart}} 截取字符串长度:{{subStringSize}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="使用正则表达式为 {{regexMatchIdx}} 匹配的值:{{subStringRegex}}"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}使用自定义提示{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}用占位符填充{{inputPlaceholder}}"
@@ -1139,10 +1132,17 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="获取用户信息"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="获取频道积分奖励信息"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="切换奖励名称/变量选择控制"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="在未选择 Twitch 帐户的情况下无法选择类别!"
-AdvSceneSwitcher.action.twitch.entry.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.entry.chat="使用账户{{account}}{{actions}}{{channel}}"
-AdvSceneSwitcher.action.twitch.entry.user.getInfo="使用账户{{account}}{{actions}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.entry.reward.getInfo="使用账户{{account}}{{actions}} 频道{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.layout.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}{{nonModDelayDuration}}"
+AdvSceneSwitcher.action.twitch.layout.chat="使用账户{{account}}{{actions}}{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.channel.getInfo="使用账户{{account}}{{actions}}频道{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row1="使用账户{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.user.getInfo.row2="{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row1="使用账户{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.user.moderation.row2="频道{{channel}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row1="使用账户{{account}}{{actions}}超时{{duration}}"
+AdvSceneSwitcher.action.twitch.layout.user.ban.row2="频道{{channel}}{{userInfoQueryType}}{{userLogin}}{{userId}}原因{{banReason}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row1="使用账户{{account}}{{actions}} 频道{{channel}}"
+AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row2="{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="输入标题"
 AdvSceneSwitcher.action.twitch.marker.description="标记描述"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="在捕捉视频片段前稍加延迟"
@@ -2115,8 +2115,6 @@ AdvSceneSwitcher.status.inactive="已停止"
 AdvSceneSwitcher.running="插件正在运行"
 AdvSceneSwitcher.stopped="插件已停止"
 
-AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>这似乎是您第一次启动高级场景切换器.<br>请看一下 <a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> 查看指南和示例列表.<br>如果有问题，在在OBS论坛插件帖子内提问 <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:#268bd2;\">thread</span></a></p></body></html>"
-
 AdvSceneSwitcher.deprecatedTabWarning="此选项卡的开发已停止！请考虑转换为使用宏来代替。\n可以在“常规”选项卡上禁用此提示."
 
 AdvSceneSwitcher.unit.milliseconds="毫秒"

data/res/images/DarkVariable.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#fefefe" xmlns="http://www.w3.org/2000/svg"
+	 width="800px" height="800px" viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<path d="M42.6,17.8c2.4,0,7.2-2,7.2-8.4c0-6.4-4.6-6.8-6.1-6.8c-2.8,0-5.6,2-8.1,6.3c-2.5,4.4-5.3,9.1-5.3,9.1
+	l-0.1,0c-0.6-3.1-1.1-5.6-1.3-6.7c-0.5-2.7-3.6-8.4-9.9-8.4c-6.4,0-12.2,3.7-12.2,3.7l0,0C5.8,7.3,5.1,8.5,5.1,9.9
+	c0,2.1,1.7,3.9,3.9,3.9c0.6,0,1.2-0.2,1.7-0.4l0,0c0,0,4.8-2.7,5.9,0c0.3,0.8,0.6,1.7,0.9,2.7c1.2,4.2,2.4,9.1,3.3,13.5l-4.2,6
+	c0,0-4.7-1.7-7.1-1.7s-7.2,2-7.2,8.4s4.6,6.8,6.1,6.8c2.8,0,5.6-2,8.1-6.3c2.5-4.4,5.3-9.1,5.3-9.1c0.8,4,1.5,7.1,1.9,8.5
+	c1.6,4.5,5.3,7.2,10.1,7.2c0,0,5,0,10.9-3.3c1.4-0.6,2.4-2,2.4-3.6c0-2.1-1.7-3.9-3.9-3.9c-0.6,0-1.2,0.2-1.7,0.4l0,0
+	c0,0-4.2,2.4-5.6,0.5c-1-2-1.9-4.6-2.6-7.8c-0.6-2.8-1.3-6.2-2-9.5l4.3-6.2C35.5,16.1,40.2,17.8,42.6,17.8z"/>
+</svg>

data/res/images/LightVariable.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#202020" xmlns="http://www.w3.org/2000/svg"
+	 width="800px" height="800px" viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<path d="M42.6,17.8c2.4,0,7.2-2,7.2-8.4c0-6.4-4.6-6.8-6.1-6.8c-2.8,0-5.6,2-8.1,6.3c-2.5,4.4-5.3,9.1-5.3,9.1
+	l-0.1,0c-0.6-3.1-1.1-5.6-1.3-6.7c-0.5-2.7-3.6-8.4-9.9-8.4c-6.4,0-12.2,3.7-12.2,3.7l0,0C5.8,7.3,5.1,8.5,5.1,9.9
+	c0,2.1,1.7,3.9,3.9,3.9c0.6,0,1.2-0.2,1.7-0.4l0,0c0,0,4.8-2.7,5.9,0c0.3,0.8,0.6,1.7,0.9,2.7c1.2,4.2,2.4,9.1,3.3,13.5l-4.2,6
+	c0,0-4.7-1.7-7.1-1.7s-7.2,2-7.2,8.4s4.6,6.8,6.1,6.8c2.8,0,5.6-2,8.1-6.3c2.5-4.4,5.3-9.1,5.3-9.1c0.8,4,1.5,7.1,1.9,8.5
+	c1.6,4.5,5.3,7.2,10.1,7.2c0,0,5,0,10.9-3.3c1.4-0.6,2.4-2,2.4-3.6c0-2.1-1.7-3.9-3.9-3.9c-0.6,0-1.2,0.2-1.7,0.4l0,0
+	c0,0-4.2,2.4-5.6,0.5c-1-2-1.9-4.6-2.6-7.8c-0.6-2.8-1.3-6.2-2-9.5l4.3-6.2C35.5,16.1,40.2,17.8,42.6,17.8z"/>
+</svg>

forms/advanced-scene-switcher.ui

@@ -68,365 +68,162 @@
             <x>0</x>
             <y>0</y>
             <width>962</width>
-            <height>1057</height>
+            <height>1190</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_31">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_2">
-               <item>
-                <widget class="QGroupBox" name="statusBox">
-                 <property name="title">
-                  <string>AdvSceneSwitcher.generalTab.status</string>
-                 </property>
-                 <layout class="QGridLayout" name="gridLayout_4">
-                  <item row="0" column="0">
-                   <layout class="QGridLayout" name="statusLayout">
-                    <item row="4" column="1">
-                     <widget class="QComboBox" name="autoStartEvent"/>
-                    </item>
-                    <item row="4" column="0">
-                     <widget class="QLabel" name="label_10">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="0">
-                     <layout class="QVBoxLayout" name="verticalLayout_33">
-                      <item>
-                       <widget class="QLabel" name="label_4">
-                        <property name="text">
-                         <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <widget class="QLabel" name="checkIntervalTooLowWarning">
-                        <property name="text">
-                         <string/>
-                        </property>
-                       </widget>
-                      </item>
-                     </layout>
-                    </item>
-                    <item row="3" column="1">
-                     <widget class="QComboBox" name="startupBehavior"/>
-                    </item>
-                    <item row="1" column="1">
-                     <widget class="QWidget" name="placeholder3" native="true"/>
-                    </item>
-                    <item row="1" column="0">
-                     <widget class="QWidget" name="placeholder" native="true"/>
-                    </item>
-                    <item row="3" column="0">
-                     <widget class="QLabel" name="label_64">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="2" column="1">
-                     <widget class="QWidget" name="placeholder2" native="true"/>
-                    </item>
-                    <item row="6" column="0">
-                     <widget class="QLabel" name="label_13">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="1">
-                     <widget class="QSpinBox" name="checkInterval">
-                      <property name="minimumSize">
-                       <size>
-                        <width>100</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <property name="suffix">
-                       <string notr="true">ms</string>
-                      </property>
-                      <property name="minimum">
-                       <number>10</number>
-                      </property>
-                      <property name="maximum">
-                       <number>20000</number>
-                      </property>
-                      <property name="value">
-                       <number>300</number>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="5" column="0">
-                     <widget class="QCheckBox" name="autoStartSceneEnable">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="5" column="1">
-                     <layout class="QHBoxLayout" name="autoStartSceneLayout">
-                      <item>
-                       <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
-                      </item>
-                      <item>
-                       <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
-                      </item>
-                      <item>
-                       <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
-                      </item>
-                     </layout>
-                    </item>
-                   </layout>
+            <widget class="QGroupBox" name="statusBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.status</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_4">
+              <item row="0" column="0">
+               <layout class="QGridLayout" name="statusLayout">
+                <item row="4" column="1">
+                 <widget class="QComboBox" name="autoStartEvent"/>
+                </item>
+                <item row="4" column="0">
+                 <widget class="QLabel" name="label_10">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <layout class="QVBoxLayout" name="verticalLayout_33">
+                  <item>
+                   <widget class="QLabel" name="label_4">
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="checkIntervalTooLowWarning">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
                   </item>
                  </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QGroupBox" name="generalSettingsBox">
-                 <property name="title">
-                  <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="verticalLayout_32">
+                </item>
+                <item row="3" column="1">
+                 <widget class="QComboBox" name="startupBehavior"/>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QWidget" name="placeholder3" native="true"/>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QWidget" name="placeholder" native="true"/>
+                </item>
+                <item row="3" column="0">
+                 <widget class="QLabel" name="label_64">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="1">
+                 <widget class="QWidget" name="placeholder2" native="true"/>
+                </item>
+                <item row="6" column="0">
+                 <widget class="QLabel" name="label_13">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QSpinBox" name="checkInterval">
+                  <property name="minimumSize">
+                   <size>
+                    <width>100</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="suffix">
+                   <string notr="true">ms</string>
+                  </property>
+                  <property name="minimum">
+                   <number>10</number>
+                  </property>
+                  <property name="maximum">
+                   <number>20000</number>
+                  </property>
+                  <property name="value">
+                   <number>300</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="5" column="0">
+                 <widget class="QCheckBox" name="autoStartSceneEnable">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="5" column="1">
+                 <layout class="QHBoxLayout" name="autoStartSceneLayout">
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_52">
-                    <item>
-                     <widget class="QLabel" name="label_21">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QComboBox" name="logLevel"/>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_49">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_50">
-                    <item>
-                     <widget class="QCheckBox" name="saveWindowGeo">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_55">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_2">
-                    <item>
-                     <widget class="QCheckBox" name="showTrayNotifications">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_2">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_48">
-                    <item>
-                     <widget class="QCheckBox" name="uiHintsDisable">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_52">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_11">
-                    <item>
-                     <widget class="QCheckBox" name="disableComboBoxFilter">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_13">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_12">
-                    <item>
-                     <widget class="QCheckBox" name="disableMacroWidgetCache">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_26">
-                    <item>
-                     <widget class="QCheckBox" name="warnPluginLoadFailure">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_19">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_24">
-                    <item>
-                     <widget class="QCheckBox" name="hideLegacyTabs">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_16">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
+                   <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
                   </item>
                  </layout>
-                </widget>
-               </item>
-               <item>
-                <layout class="QVBoxLayout" name="verticalLayout_18">
-                 <item>
-                  <widget class="QGroupBox" name="saveLoadBox">
-                   <property name="title">
-                    <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
-                   </property>
-                   <layout class="QVBoxLayout" name="verticalLayout_17">
-                    <item>
-                     <widget class="QPushButton" name="exportSettings">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QPushButton" name="importSettings">
-                      <property name="text">
-                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-            </layout>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="groupBox_6">
+            <widget class="QGroupBox" name="saveLoadBox">
              <property name="title">
-              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
+              <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_37">
+             <layout class="QVBoxLayout" name="verticalLayout_17">
               <item>
-               <layout class="QHBoxLayout" name="cooldownLayout">
+               <widget class="QPushButton" name="exportSettings">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="importSettings">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="generalSettingsBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_32">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_52">
                 <item>
-                 <widget class="QCheckBox" name="enableCooldown">
+                 <widget class="QLabel" name="label_21">
                   <property name="text">
-                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
+                 <widget class="QComboBox" name="logLevel"/>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_21">
+                 <spacer name="horizontalSpacer_49">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -441,80 +238,86 @@
                </layout>
               </item>
               <item>
-               <layout class="QGridLayout" name="gridLayout">
-                <item row="0" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_43">
-                  <item>
-                   <widget class="QRadioButton" name="noMatchDontSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
-                    </property>
-                    <property name="checked">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="2" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_45">
-                  <item>
-                   <widget class="QRadioButton" name="noMatchRandomSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="1" column="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QRadioButton" name="noMatchSwitch">
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene">
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="1" column="1">
-                 <layout class="QHBoxLayout" name="noMatchLayout">
-                  <item>
-                   <widget class="QLabel" name="label_2">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
+               <widget class="QCheckBox" name="showTrayNotifications">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="warnPluginLoadFailure">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="suppressCrashRecoveryDialog">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.suppressCrashRecoveryDialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="settingsLock">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.settingsLock</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.uiBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_2">
+              <item>
+               <widget class="QCheckBox" name="saveWindowGeo">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="alwaysShowMacroSearch">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="alwaysShowFeatureTabs">
+                <property name="toolTip">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip</string>
+                </property>
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="disableComboBoxFilter">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="uiHintsDisable">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="hideLegacyTabs">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
+                </property>
+               </widget>
               </item>
              </layout>
             </widget>
@@ -562,6 +365,109 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="matchBehaviorBox">
+             <property name="title">
+              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_37">
+              <item>
+               <layout class="QHBoxLayout" name="cooldownLayout">
+                <item>
+                 <widget class="QCheckBox" name="enableCooldown">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_21">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QGridLayout" name="gridLayout">
+                <item row="0" column="2">
+                 <widget class="QRadioButton" name="noMatchDontSwitch">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="2">
+                 <widget class="QRadioButton" name="noMatchRandomSwitch">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="2">
+                 <layout class="QHBoxLayout" name="horizontalLayout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QRadioButton" name="noMatchSwitch">
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene" native="true"/>
+                  </item>
+                 </layout>
+                </item>
+                <item row="1" column="1">
+                 <layout class="QHBoxLayout" name="noMatchLayout">
+                  <item>
+                   <widget class="QLabel" name="label_2">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="priorityBox">
              <property name="title">
@@ -576,15 +482,7 @@
                </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_10">
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_41">
-                  <item>
-                   <widget class="QListWidget" name="priorityList"/>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
+               <widget class="QListWidget" name="priorityList"/>
               </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_32">
@@ -681,6 +579,13 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="openSetupWizard">
+             <property name="text">
+              <string>FirstRunWizard.openButton</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -706,7 +611,7 @@
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <widget class="QGroupBox" name="groupBox_5">
+         <widget class="QGroupBox" name="macroListBox">
           <property name="title">
            <string>AdvSceneSwitcher.macroTab.macros</string>
           </property>
@@ -721,6 +626,55 @@
              </property>
             </widget>
            </item>
+           <item>
+            <layout class="QHBoxLayout" name="macroSearchLayout">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLineEdit" name="macroSearchText">
+               <property name="placeholderText">
+                <string>AdvSceneSwitcher.macroTab.search.placeholder</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="macroSearchClear">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.variableTab.clear</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="macroSearchType"/>
+             </item>
+             <item>
+              <widget class="advss::RegexConfigWidget" name="macroSearchRegex" native="true"/>
+             </item>
+             <item>
+              <widget class="QPushButton" name="macroSearchShowSettings">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.search.showSettings</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
            <item>
             <widget class="advss::MacroTree" name="macros">
              <property name="showDropIndicator" stdset="0">
@@ -853,25 +807,19 @@
               </widget>
              </item>
              <item>
-              <widget class="QCheckBox" name="runMacroOnChange">
-               <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
+              <widget class="QLabel" name="label_18">
                <property name="text">
-                <string/>
+                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.label</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_18">
+              <widget class="QComboBox" name="actionTriggerMode">
                <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
-               <property name="text">
-                <string>AdvSceneSwitcher.macroTab.onChange</string>
-               </property>
-               <property name="wordWrap">
-                <bool>true</bool>
+                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.tooltip</string>
                </property>
               </widget>
              </item>
@@ -4164,12 +4112,7 @@
   <tabstop>autoStartSceneName</tabstop>
   <tabstop>autoStartSceneNameRegex</tabstop>
   <tabstop>logLevel</tabstop>
-  <tabstop>saveWindowGeo</tabstop>
-  <tabstop>showTrayNotifications</tabstop>
-  <tabstop>uiHintsDisable</tabstop>
-  <tabstop>disableComboBoxFilter</tabstop>
   <tabstop>warnPluginLoadFailure</tabstop>
-  <tabstop>hideLegacyTabs</tabstop>
   <tabstop>exportSettings</tabstop>
   <tabstop>importSettings</tabstop>
   <tabstop>noMatchDontSwitch</tabstop>
@@ -4190,7 +4133,7 @@
   <tabstop>macroName</tabstop>
   <tabstop>runMacro</tabstop>
   <tabstop>runMacroInParallel</tabstop>
-  <tabstop>runMacroOnChange</tabstop>
+  <tabstop>actionTriggerMode</tabstop>
   <tabstop>macroSettings</tabstop>
   <tabstop>macroEdit</tabstop>
   <tabstop>sceneGroups</tabstop>

lib/advanced-scene-switcher.cpp

@@ -1,5 +1,6 @@
 #include "advanced-scene-switcher.hpp"
 #include "backup.hpp"
+#include "crash-handler.hpp"
 #include "log-helper.hpp"
 #include "macro-helpers.hpp"
 #include "obs-module-helper.hpp"
@@ -18,8 +19,10 @@
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
+#include <QInputDialog>
 #include <QLibrary>
 #include <QMainWindow>
+#include <QMessageBox>
 #include <QTextStream>
 #include <regex>
 
@@ -40,9 +43,12 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 {
 	switcher->settingsWindowOpened = true;
 	ui->setupUi(this);
-	std::lock_guard<std::mutex> lock(switcher->m);
-	switcher->Prune();
-	LoadUI();
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		switcher->Prune();
+		LoadUI();
+	}
+	CheckFirstTimeSetup();
 }
 
 AdvSceneSwitcher::~AdvSceneSwitcher()
@@ -138,7 +144,6 @@ void AdvSceneSwitcher::LoadUI()
 	SetTabOrder(ui->tabWidget);
 	SetCurrentTab(ui->tabWidget);
 	RestoreWindowGeo();
-	CheckFirstTimeSetup();
 
 	loading = false;
 }
@@ -191,25 +196,21 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
 
 		switcher->m.lock();
 		if (switcher->VersionChanged(data, g_GIT_SHA1)) {
-			auto json = obs_data_get_json(data);
-			static QString jsonQString = json ? json : "";
-			std::thread t([]() {
-				obs_queue_task(
-					OBS_TASK_UI,
-					[](void *) {
-						AskForBackup(jsonQString);
-					},
-					nullptr, false);
-			});
-			t.detach();
+			AskForBackup(data);
 		}
 
 		switcher->LoadSettings(data);
 		switcher->m.unlock();
 
-		if (!switcher->stop) {
-			switcher->Start();
+		if (switcher->stop) {
+			return;
 		}
+
+		if (ShouldSkipPluginStartOnUncleanShutdown()) {
+			return;
+		}
+
+		switcher->Start();
 	}
 }
 
@@ -325,8 +326,7 @@ void SwitcherData::SetPreconditions()
 {
 	// Window title
 	lastTitle = currentTitle;
-	std::string title;
-	GetCurrentWindowTitle(title);
+	auto title = GetCurrentWindowTitle();
 	for (auto &window : ignoreWindowsSwitches) {
 		bool equals = (title == window);
 		bool matches = false;
@@ -346,7 +346,7 @@ void SwitcherData::SetPreconditions()
 	currentTitle = title;
 
 	// Process name
-	GetForegroundProcessName(currentForegroundProcess);
+	currentForegroundProcess = GetForegroundProcessName();
 
 	// Macro
 	InvalidateMacroTempVarValues();
@@ -421,7 +421,7 @@ bool SwitcherData::CheckForMatch(OBSWeakSource &scene,
 
 static void ResetMacros()
 {
-	for (auto &m : GetMacros()) {
+	for (auto &m : GetTopLevelMacros()) {
 		ResetMacroRunCount(m.get());
 		ResetMacroConditionTimers(m.get());
 	}
@@ -510,6 +510,8 @@ bool SwitcherData::AnySceneTransitionStarted()
  ******************************************************************************/
 extern "C" EXPORT void FreeSceneSwitcher()
 {
+	switcher->Stop();
+
 	PlatformCleanup();
 	RunPluginCleanupSteps();
 
@@ -631,13 +633,20 @@ static void handleSceneCollectionCleanup()
 		return;
 	}
 
+	// OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP is also called on
+	// shutdown.
+	// Here we also don't want to clear the settings.
+	if (switcher->obsIsShuttingDown) {
+		return;
+	}
+
 	SaveSceneSwitcher(nullptr, false, nullptr);
 }
 
 // Note to future self:
 // be careful using switcher->m here as there is potential for deadlocks when using
 // frontend functions such as obs_frontend_set_current_scene()
-static void OBSEvent(enum obs_frontend_event event, void *switcher)
+static void OBSEvent(enum obs_frontend_event event, void *)
 {
 	if (!switcher) {
 		return;
@@ -711,19 +720,54 @@ static void LoadPlugins()
 	}
 }
 
+static bool settingsPasswordIsCorrect(QWidget *parent)
+{
+	bool ok;
+	QString input = QInputDialog::getText(
+		parent,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel"),
+		QLineEdit::Password, QString(), &ok);
+
+	if (!ok) {
+		return false;
+	}
+
+	if (input.toStdString() == switcher->settingsLockPassword) {
+		return true;
+	}
+
+	QMessageBox::warning(
+		parent,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword"));
+	return false;
+}
+
 void OpenSettingsWindow()
 {
 	if (switcher->settingsWindowOpened) {
 		AdvSceneSwitcher::window->show();
 		AdvSceneSwitcher::window->raise();
 		AdvSceneSwitcher::window->activateWindow();
-	} else {
-		AdvSceneSwitcher::window =
-			new AdvSceneSwitcher(static_cast<QMainWindow *>(
-				obs_frontend_get_main_window()));
-		AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
-		AdvSceneSwitcher::window->show();
+		return;
 	}
+
+	auto parent =
+		static_cast<QMainWindow *>(obs_frontend_get_main_window());
+	if (switcher->settingsLockEnabled &&
+	    !switcher->settingsLockPassword.empty() &&
+	    !settingsPasswordIsCorrect(parent)) {
+		return;
+	}
+
+	AdvSceneSwitcher::window = new AdvSceneSwitcher(parent);
+	AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
+	AdvSceneSwitcher::window->show();
 }
 
 void AdvSceneSwitcher::HighlightMacroSettingsButton(bool enable)
@@ -771,8 +815,6 @@ void HighlightMacroSettingsButton(bool enable)
 		enable);
 }
 
-void SetupActionQueues();
-
 extern "C" EXPORT void InitSceneSwitcher(obs_module_t *module,
 					 translateFunc translate)
 {
@@ -784,12 +826,11 @@ extern "C" EXPORT void InitSceneSwitcher(obs_module_t *module,
 	PlatformInit();
 	LoadPlugins();
 	SetupDock();
-	SetupActionQueues();
 
 	RunPluginInitSteps();
 
 	obs_frontend_add_save_callback(SaveSceneSwitcher, nullptr);
-	obs_frontend_add_event_callback(OBSEvent, switcher);
+	obs_frontend_add_event_callback(OBSEvent, nullptr);
 
 	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
 		obs_module_text("AdvSceneSwitcher.pluginName"));

lib/advanced-scene-switcher.hpp

@@ -65,12 +65,14 @@ public slots:
 	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
 	void on_disableComboBoxFilter_stateChanged(int state);
-	void on_disableMacroWidgetCache_stateChanged(int state);
 	void on_warnPluginLoadFailure_stateChanged(int state);
+	void on_suppressCrashRecoveryDialog_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
+	void on_settingsLock_stateChanged(int state);
 	void on_priorityUp_clicked();
 	void on_priorityDown_clicked();
 	void on_threadPriority_currentTextChanged(const QString &text);
+	void on_openSetupWizard_clicked();
 
 	/* --- End of legacy tab section --- */
 
@@ -108,7 +110,7 @@ public slots:
 	void on_macroDown_clicked() const;
 	void on_macroName_editingFinished();
 	void on_runMacroInParallel_stateChanged(int value) const;
-	void on_runMacroOnChange_stateChanged(int value) const;
+	void on_actionTriggerMode_currentIndexChanged(int index) const;
 	void MacroSelectionChanged();
 	void ShowMacroContextMenu(const QPoint &);
 	void CopyMacro();

lib/general.cpp

@@ -1,23 +1,26 @@
 #include "advanced-scene-switcher.hpp"
+#include "crash-handler.hpp"
 #include "file-selection.hpp"
 #include "filter-combo-box.hpp"
+#include "first-run-wizard.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
+#include "macro-search.hpp"
 #include "macro-settings.hpp"
 #include "path-helpers.hpp"
-#include "selection-helpers.hpp"
 #include "source-helpers.hpp"
 #include "splitter-helpers.hpp"
 #include "status-control.hpp"
 #include "switcher-data.hpp"
 #include "tab-helpers.hpp"
 #include "ui-helpers.hpp"
-#include "utility.hpp"
 #include "variable.hpp"
 #include "version.h"
 
 #include <obs-frontend-api.h>
 #include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
 
 namespace advss {
 
@@ -185,16 +188,6 @@ void AdvSceneSwitcher::on_disableComboBoxFilter_stateChanged(int state)
 	FilterComboBox::SetFilterBehaviourEnabled(!state);
 }
 
-void AdvSceneSwitcher::on_disableMacroWidgetCache_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	switcher->disableMacroWidgetCache = state;
-	MacroSegmentList::SetCachingEnabled(!state);
-}
-
 void AdvSceneSwitcher::on_warnPluginLoadFailure_stateChanged(int state)
 {
 	if (loading) {
@@ -204,6 +197,15 @@ void AdvSceneSwitcher::on_warnPluginLoadFailure_stateChanged(int state)
 	switcher->warnPluginLoadFailure = state;
 }
 
+void AdvSceneSwitcher::on_suppressCrashRecoveryDialog_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	SetSuppressCrashDialog(state);
+}
+
 static bool isLegacyTab(const QString &name)
 {
 	return name == obs_module_text(
@@ -243,6 +245,64 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 	ui->priorityBox->setVisible(!switcher->hideLegacyTabs);
 }
 
+void AdvSceneSwitcher::on_settingsLock_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	if (!state) {
+		switcher->settingsLockEnabled = false;
+		switcher->settingsLockPassword = "";
+		return;
+	}
+
+	bool ok;
+	QString newPassword = QInputDialog::getText(
+		this,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel"),
+		QLineEdit::Password, QString(), &ok);
+
+	const auto disablePassword = [this]() {
+		QSignalBlocker blocker(ui->settingsLock);
+		ui->settingsLock->setChecked(false);
+		ui->settingsLock->setCheckState(Qt::Unchecked);
+		switcher->settingsLockEnabled = false;
+		switcher->settingsLockPassword = "";
+	};
+
+	if (!ok || newPassword.isEmpty()) {
+		disablePassword();
+		return;
+	}
+
+	QString confirm = QInputDialog::getText(
+		this,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel"),
+		QLineEdit::Password, QString(), &ok);
+	if (!ok || newPassword != confirm) {
+		if (ok) {
+			QMessageBox::warning(
+				this,
+				obs_module_text(
+					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+				obs_module_text(
+					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch"));
+		}
+		disablePassword();
+		return;
+	}
+
+	switcher->settingsLockEnabled = true;
+	switcher->settingsLockPassword = newPassword.toStdString();
+}
+
 void AdvSceneSwitcher::SetDeprecationWarnings()
 {
 	QString toolTip =
@@ -370,14 +430,50 @@ void AdvSceneSwitcher::RestoreWindowGeo()
 	}
 }
 
+static void renameMacroIfNecessary(const std::shared_ptr<Macro> &macro)
+{
+	if (!GetMacroByName(macro->Name().c_str())) {
+		return;
+	}
+
+	auto name = macro->Name();
+	int i = 2;
+	while (GetMacroByName((name + " " + std::to_string(i)).c_str())) {
+		i++;
+	}
+
+	macro->SetName(name + " " + std::to_string(i));
+}
+
 void AdvSceneSwitcher::CheckFirstTimeSetup()
 {
-	if (switcher->firstBoot && !switcher->disableHints) {
-		switcher->firstBoot = false;
-		DisplayMessage(
-			obs_module_text("AdvSceneSwitcher.firstBootMessage"));
-		switcher->Start();
+	if (!IsFirstRun() || !GetTopLevelMacros().empty()) {
+		return;
 	}
+
+	bool wasSkipped = false;
+	auto macro = FirstRunWizard::ShowWizard(this, &wasSkipped);
+	if (macro) {
+		renameMacroIfNecessary(macro);
+		QTimer::singleShot(0, this,
+				   [this, macro]() { ui->macros->Add(macro); });
+	}
+	if (wasSkipped) {
+		ui->alwaysShowFeatureTabs->setChecked(true);
+	}
+	switcher->Start();
+}
+
+void AdvSceneSwitcher::on_openSetupWizard_clicked()
+{
+	auto macro = FirstRunWizard::ShowWizard(this);
+	if (!macro) {
+		return;
+	}
+
+	renameMacroIfNecessary(macro);
+	ui->macros->Add(macro);
+	ui->tabWidget->setCurrentWidget(ui->macroTab);
 }
 
 void AdvSceneSwitcher::on_tabWidget_currentChanged(int)
@@ -436,7 +532,6 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	// Needs to be loaded before any entries which might rely on scene group
 	// selections to be available.
 	loadSceneGroups(obj);
-	LoadVariables(obj);
 
 	RunLoadSteps(obj);
 
@@ -459,7 +554,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
 
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
 
 	// Reset on startup and scene collection change
 	ResetLastOpenedTab();
@@ -475,7 +570,6 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 	saveSceneGroups(obj);
 	SaveMacros(obj);
 	SaveGlobalMacroSettings(obj);
-	SaveVariables(obj);
 	saveWindowTitleSwitches(obj);
 	saveScreenRegionSwitches(obj);
 	savePauseSwitches(obj);
@@ -531,10 +625,11 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	obs_data_set_bool(obj, "disableHints", disableHints);
 	obs_data_set_bool(obj, "disableFilterComboboxFilter",
 			  disableFilterComboboxFilter);
-	obs_data_set_bool(obj, "disableMacroWidgetCache",
-			  disableMacroWidgetCache);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);
+	obs_data_set_bool(obj, "settingsLockEnabled", settingsLockEnabled);
+	obs_data_set_string(obj, "settingsLockPassword",
+			    settingsLockPassword.c_str());
 
 	SaveFunctionPriorities(obj, functionNamesByPriority);
 
@@ -602,12 +697,12 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	disableHints = obs_data_get_bool(obj, "disableHints");
 	disableFilterComboboxFilter =
 		obs_data_get_bool(obj, "disableFilterComboboxFilter");
-	disableMacroWidgetCache =
-		obs_data_get_bool(obj, "disableMacroWidgetCache");
 	obs_data_set_default_bool(obj, "warnPluginLoadFailure", true);
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
 	hideLegacyTabs = obs_data_get_bool(obj, "hideLegacyTabs");
+	settingsLockEnabled = obs_data_get_bool(obj, "settingsLockEnabled");
+	settingsLockPassword = obs_data_get_string(obj, "settingsLockPassword");
 
 	SetDefaultFunctionPriorities(obj);
 	LoadFunctionPriorities(obj, functionNamesByPriority);
@@ -927,11 +1022,10 @@ void AdvSceneSwitcher::SetupGeneralTab()
 		switcher->disableFilterComboboxFilter);
 	FilterComboBox::SetFilterBehaviourEnabled(
 		!switcher->disableFilterComboboxFilter);
-	ui->disableMacroWidgetCache->setChecked(
-		switcher->disableMacroWidgetCache);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
+	ui->suppressCrashRecoveryDialog->setChecked(GetSuppressCrashDialog());
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);
+	ui->settingsLock->setChecked(switcher->settingsLockEnabled);
 
 	populatePriorityFunctionList(ui->priorityList);
 	populateThreadPriorityList(ui->threadPriority);
@@ -1013,6 +1107,19 @@ void AdvSceneSwitcher::SetupGeneralTab()
 			switcher->CheckAutoStart();
 		});
 
+	ui->alwaysShowMacroSearch->setChecked(
+		GetMacroSearchSettings().showAlways);
+
+	connect(ui->alwaysShowMacroSearch, &QCheckBox::stateChanged, this,
+		[this](int enabled) {
+			GetMacroSearchSettings().showAlways = enabled;
+
+			if (loading) {
+				return;
+			}
+			CheckMacroSearchVisibility();
+		});
+
 	// Set up status control
 	auto statusControl = new StatusControl(this, true);
 	ui->statusLayout->addWidget(statusControl->StatusPrefixLabel(), 1, 0);
@@ -1032,6 +1139,8 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	setTabOrder(ui->importSettings, ui->cooldownTime);
 	setTabOrder(ui->cooldownTime, ui->noMatchDontSwitch);
 
+	SetupShowAllTabsCheckBox(ui->alwaysShowFeatureTabs, ui->tabWidget);
+
 	MinimizeSizeOfColumn(ui->statusLayout, 0);
 	setWindowTitle(windowTitle() + " - " + g_GIT_TAG);
 }

lib/legacy/switch-executable.cpp

@@ -92,12 +92,11 @@ bool SwitcherData::checkExeSwitch(OBSWeakSource &scene,
 	}
 
 	std::string title = switcher->currentTitle;
-	QStringList runningProcesses;
 	bool ignored = false;
 	bool match = false;
 
 	// Check for match
-	GetProcessList(runningProcesses);
+	const auto runningProcesses = GetProcessList();
 	for (ExecutableSwitch &s : executableSwitches) {
 		if (!s.initialized()) {
 			continue;

lib/legacy/switch-window.cpp

@@ -178,47 +178,19 @@ void AdvSceneSwitcher::on_ignoreWindows_currentRowChanged(int idx)
 	}
 }
 
-void checkWindowTitleSwitchDirect(WindowSwitch &s,
-				  std::string &currentWindowTitle, bool &match,
-				  OBSWeakSource &scene,
-				  OBSWeakSource &transition)
+static bool windowInfoMatchesSwitch(const WindowInfo &info,
+				    const WindowSwitch &s)
 {
-	bool focus = (!s.focus || s.window == currentWindowTitle);
-	bool fullscreen = (!s.fullscreen || IsFullscreen(s.window));
-	bool max = (!s.maximized || IsMaximized(s.window));
-
-	if (focus && fullscreen && max) {
-		match = true;
-		scene = s.getScene();
-		transition = s.transition;
+	if (s.focus && !info.focused) {
+		return false;
 	}
-}
-
-void checkWindowTitleSwitchRegex(WindowSwitch &s,
-				 std::string &currentWindowTitle,
-				 std::vector<std::string> windowList,
-				 bool &match, OBSWeakSource &scene,
-				 OBSWeakSource &transition)
-{
-	for (auto &window : windowList) {
-		try {
-			std::regex expr(s.window);
-			if (!std::regex_match(window, expr)) {
-				continue;
-			}
-		} catch (const std::regex_error &) {
-		}
-
-		bool focus = (!s.focus || window == currentWindowTitle);
-		bool fullscreen = (!s.fullscreen || IsFullscreen(window));
-		bool max = (!s.maximized || IsMaximized(window));
-
-		if (focus && fullscreen && max) {
-			match = true;
-			scene = s.getScene();
-			transition = s.transition;
-		}
+	if (s.fullscreen && !info.fullscreen) {
+		return false;
 	}
+	if (s.maximized && !info.maximized) {
+		return false;
+	}
+	return true;
 }
 
 bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
@@ -228,24 +200,37 @@ bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
 		return false;
 	}
 
-	std::string currentWindowTitle = switcher->currentTitle;
 	bool match = false;
-	std::vector<std::string> windowList;
-	GetWindowList(windowList);
+
+	WindowQueryOptions options;
+	options.focus = true;
+	options.fullscreen = true;
+	options.maximized = true;
+	const auto windows = GetWindows(options);
 
 	for (WindowSwitch &s : windowSwitches) {
 		if (!s.initialized()) {
 			continue;
 		}
 
-		if (std::find(windowList.begin(), windowList.end(), s.window) !=
-		    windowList.end()) {
-			checkWindowTitleSwitchDirect(s, currentWindowTitle,
-						     match, scene, transition);
-		} else {
-			checkWindowTitleSwitchRegex(s, currentWindowTitle,
-						    windowList, match, scene,
-						    transition);
+		for (const auto &info : windows) {
+			bool titleMatch = false;
+			try {
+				std::regex expr(s.window);
+				titleMatch = info.title == s.window ||
+					     std::regex_match(info.title, expr);
+			} catch (const std::regex_error &) {
+				titleMatch = info.title == s.window;
+			}
+
+			if (!titleMatch || !windowInfoMatchesSwitch(info, s)) {
+				continue;
+			}
+
+			match = true;
+			scene = s.getScene();
+			transition = s.transition;
+			break;
 		}
 
 		if (match) {

lib/linux/advanced-scene-switcher-nix.cpp

@@ -32,6 +32,9 @@
 #endif
 #include <fstream>
 #include <sstream>
+#include <climits>
+#include <dirent.h>
+#include <unistd.h>
 #include "kwin-helpers.h"
 
 namespace advss {
@@ -233,28 +236,65 @@ std::string getWindowName(Window window)
 	return windowTitle;
 }
 
-void GetWindowList(std::vector<std::string> &windows)
+std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
 {
-	windows.resize(0);
-	for (auto window : getTopLevelWindows()) {
-		auto name = getWindowName(window);
-		if (name.empty()) {
-			continue;
-		}
-		windows.emplace_back(name);
-	}
-}
+	const std::string foregroundTitle = GetCurrentWindowTitle();
+	const auto topLevel = getTopLevelWindows();
+	auto display = disp();
 
-void GetWindowList(QStringList &windows)
-{
-	windows.clear();
-	for (auto window : getTopLevelWindows()) {
+	std::vector<WindowInfo> result;
+	result.reserve(topLevel.size());
+
+	for (auto window : topLevel) {
 		auto name = getWindowName(window);
 		if (name.empty()) {
 			continue;
 		}
-		windows << QString::fromStdString(name);
+
+		WindowInfo info;
+		info.title = name;
+
+		if (options.focus) {
+			info.focused = (name == foregroundTitle);
+		}
+
+		if (options.fullscreen || options.maximized) {
+			QStringList states = getStates(window);
+			if (options.fullscreen) {
+				info.fullscreen = states.contains(
+					"_NET_WM_STATE_FULLSCREEN");
+			}
+			if (options.maximized) {
+				info.maximized =
+					states.contains(
+						"_NET_WM_STATE_MAXIMIZED_VERT") &&
+					states.contains(
+						"_NET_WM_STATE_MAXIMIZED_HORZ");
+			}
+		}
+
+		if (options.geometry && display) {
+			XWindowAttributes attrs;
+			if (XGetWindowAttributes(display, window, &attrs)) {
+				int x = 0;
+				int y = 0;
+				Window child;
+				XTranslateCoordinates(
+					display, window,
+					DefaultRootWindow(display), 0, 0, &x,
+					&y, &child);
+				info.x = x;
+				info.y = y;
+				info.width = attrs.width;
+				info.height = attrs.height;
+			}
+		}
+
+		// windowClass and text not implemented on Linux
+		result.emplace_back(std::move(info));
 	}
+
+	return result;
 }
 
 int getActiveWindow(Window *&window)
@@ -278,91 +318,24 @@ int getActiveWindow(Window *&window)
 				  &bytes, (uint8_t **)&window);
 }
 
-void GetCurrentWindowTitle(std::string &title)
+std::string GetCurrentWindowTitle()
 {
 	if (KWin) {
-		title = FocusNotifier::getActiveWindowTitle();
-		return;
+		return FocusNotifier::getActiveWindowTitle();
 	}
 
 	Window *data = 0;
 	if (getActiveWindow(data) != Success || !data) {
-		return;
+		return {};
 	}
 	if (!data[0]) {
 		XFree(data);
-		return;
+		return {};
 	}
 
 	auto name = getWindowName(data[0]);
 	XFree(data);
-
-	if (name.empty()) {
-		return;
-	}
-	title = name;
-}
-
-bool windowStatesAreSet(const std::string &windowTitle,
-			std::vector<QString> &expectedStates)
-{
-	if (!ewmhIsSupported()) {
-		return false;
-	}
-
-	std::vector<Window> windows = getTopLevelWindows();
-	for (auto &window : windows) {
-		auto name = getWindowName(window);
-		if (name.empty()) {
-			continue;
-		}
-
-		bool equals = windowTitle == name;
-		bool matches = QString::fromStdString(name).contains(
-			QRegularExpression(
-				QString::fromStdString(windowTitle)));
-
-		if (!(equals || matches)) {
-			continue;
-		}
-
-		QStringList states = getStates(window);
-		if (states.isEmpty()) {
-			if (expectedStates.empty()) {
-				return true;
-			}
-			return false;
-		}
-
-		for (const auto &state : expectedStates) {
-			if (!states.contains(state)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	return false;
-}
-
-bool IsMaximized(const std::string &title)
-{
-	std::vector<QString> states;
-	states.emplace_back("_NET_WM_STATE_MAXIMIZED_VERT");
-	states.emplace_back("_NET_WM_STATE_MAXIMIZED_HORZ");
-	return windowStatesAreSet(title, states);
-}
-
-bool IsFullscreen(const std::string &title)
-{
-	std::vector<QString> states;
-	states.emplace_back("_NET_WM_STATE_FULLSCREEN");
-	return windowStatesAreSet(title, states);
-}
-
-std::optional<std::string> GetTextInWindow(const std::string &)
-{
-	// Not implemented
-	return {};
+	return name;
 }
 
 static void getProcessListProcps(QStringList &processes)
@@ -409,16 +382,17 @@ static void getProcessListProcps2(QStringList &processes)
 #endif
 }
 
-void GetProcessList(QStringList &processes)
+QStringList GetProcessList()
 {
-	processes.clear();
+	QStringList processes;
 	if (libprocpsSupported) {
 		getProcessListProcps(processes);
-		return;
+		return processes;
 	}
 	if (libprocps2Supported) {
 		getProcessListProcps2(processes);
 	}
+	return processes;
 }
 
 long getForegroundProcessPid()
@@ -469,24 +443,83 @@ std::string getProcNameFromPid(long pid)
 	return name;
 }
 
-void GetForegroundProcessName(QString &proc)
+std::string GetForegroundProcessName()
 {
-	std::string temp;
-	GetForegroundProcessName(temp);
-	proc = QString::fromStdString(temp);
+	auto pid = getForegroundProcessPid();
+	return getProcNameFromPid(pid);
 }
 
-void GetForegroundProcessName(std::string &proc)
+static std::string getProcessPathFromPid(long pid)
+{
+	std::string linkPath = "/proc/" + std::to_string(pid) + "/exe";
+	char buf[PATH_MAX];
+	ssize_t len = readlink(linkPath.c_str(), buf, sizeof(buf) - 1);
+	if (len <= 0) {
+		return {};
+	}
+	buf[len] = '\0';
+	return buf;
+}
+
+std::string GetForegroundProcessPath()
 {
-	proc.resize(0);
 	auto pid = getForegroundProcessPid();
-	proc = getProcNameFromPid(pid);
+	if (pid <= 0) {
+		return {};
+	}
+	return getProcessPathFromPid(pid);
+}
+
+QStringList GetProcessPathsFromName(const QString &name)
+{
+	QStringList paths;
+	const std::string nameStr = name.toStdString();
+	DIR *procDir = opendir("/proc");
+	if (!procDir) {
+		return paths;
+	}
+
+	struct dirent *entry;
+	while ((entry = readdir(procDir)) != nullptr) {
+		bool isPid = (entry->d_name[0] != '\0');
+		for (const char *c = entry->d_name; *c; c++) {
+			if (!isdigit(*c)) {
+				isPid = false;
+				break;
+			}
+		}
+		if (!isPid) {
+			continue;
+		}
+
+		std::string pid = entry->d_name;
+		std::string commPath = "/proc/" + pid + "/comm";
+		std::ifstream commFile(commPath);
+		if (!commFile) {
+			continue;
+		}
+		std::string comm;
+		std::getline(commFile, comm);
+		if (comm != nameStr) {
+			continue;
+		}
+
+		std::string path = getProcessPathFromPid(std::stol(pid));
+		if (path.empty()) {
+			continue;
+		}
+		QString qPath = QString::fromStdString(path);
+		if (!paths.contains(qPath)) {
+			paths.append(qPath);
+		}
+	}
+	closedir(procDir);
+	return paths;
 }
 
 bool IsInFocus(const QString &executable)
 {
-	std::string current;
-	GetForegroundProcessName(current);
+	const auto current = GetForegroundProcessName();
 
 	// True if executable switch equals current window
 	bool equals = (executable.toStdString() == current);

lib/macro/macro-action-edit.cpp

@@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list)
 }
 
 MacroActionEdit::MacroActionEdit(QWidget *parent,
-				 std::shared_ptr<MacroAction> *entryData,
-				 const std::string &id)
+				 std::shared_ptr<MacroAction> *entryData)
 	: MacroSegmentEdit(parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
@@ -50,10 +49,12 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	_section->AddHeaderWidget(_enable);
 	_section->AddHeaderWidget(_actionSelection);
 	_section->AddHeaderWidget(_headerInfo);
+	_section->AddHeaderWidget(_varMappingToggle);
 
 	auto actionLayout = new QVBoxLayout;
 	actionLayout->setContentsMargins({7, 7, 7, 7});
 	actionLayout->addWidget(_section);
+	actionLayout->addWidget(_outputMappings);
 	_contentLayout->addLayout(actionLayout);
 
 	auto mainLayout = new QHBoxLayout;
@@ -62,7 +63,6 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	mainLayout->addWidget(_frame);
 	setLayout(mainLayout);
 
-	_entryData = entryData;
 	SetupWidgets(true);
 
 	actionStateTimer->start(300);
@@ -91,7 +91,10 @@ void MacroActionEdit::SetupWidgets(bool basicSetup)
 	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
+	QWidget::connect(widget, SIGNAL(ShowVariableMappings(bool)), this,
+			 SLOT(ShowVariableMappings(bool)));
 	_section->SetContent(widget, (*_entryData)->GetCollapsed());
+	SetupVarMappings((*_entryData).get());
 	SetFocusPolicyOfWidgets();
 
 	_allWidgetsAreSetup = true;
@@ -117,12 +120,15 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 		*_entryData = MacroActionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 	}
 	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
+	QWidget::connect(widget, SIGNAL(ShowVariableMappings(bool)), this,
+			 SLOT(ShowVariableMappings(bool)));
 	_section->SetContent(widget);
+	SetupVarMappings((*_entryData).get());
 	SetFocusPolicyOfWidgets();
 }
 

lib/macro/macro-action-edit.hpp

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

lib/macro/macro-action-macro.cpp

@@ -2,6 +2,9 @@
 #include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
+#include "macro-action-factory.hpp"
+
+#include <chrono>
 
 namespace advss {
 
@@ -12,6 +15,74 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
 	{MacroActionMacro::Create, MacroActionMacroEdit::Create,
 	 "AdvSceneSwitcher.action.macro"});
 
+void MacroActionMacro::AdjustActionState(Macro *macro) const
+{
+	const auto &macroActions = _useElseSection ? macro->ElseActions()
+						   : macro->Actions();
+
+	std::vector<std::shared_ptr<MacroAction>> actionsToModify;
+	switch (_actionSelectionType) {
+	case SelectionType::INDEX: {
+		const bool isValidAction =
+			(_useElseSection &&
+			 IsValidElseActionIndex(macro, _actionIndex - 1)) ||
+			(!_useElseSection &&
+			 IsValidActionIndex(macro, _actionIndex - 1));
+
+		if (isValidAction) {
+			actionsToModify.emplace_back(
+				macroActions.at(_actionIndex - 1));
+		}
+		break;
+	}
+	case SelectionType::LABEL:
+		for (const auto &action : macroActions) {
+			if (!action->GetUseCustomLabel()) {
+				continue;
+			}
+
+			const auto label = action->GetCustomLabel();
+
+			if (_regex.Enabled()) {
+				if (_regex.Matches(label, _label)) {
+					actionsToModify.emplace_back(action);
+				}
+				continue;
+			}
+
+			if (label == std::string(_label)) {
+				actionsToModify.emplace_back(action);
+			}
+		}
+		break;
+	case SelectionType::ID:
+		for (const auto &action : macroActions) {
+			if (action->GetId() == _actionId) {
+				actionsToModify.emplace_back(action);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	for (const auto &action : actionsToModify) {
+		switch (_action) {
+		case Action::DISABLE_ACTION:
+			action->SetEnabled(false);
+			break;
+		case Action::ENABLE_ACTION:
+			action->SetEnabled(true);
+			break;
+		case Action::TOGGLE_ACTION:
+			action->SetEnabled(!action->Enabled());
+			break;
+		default:
+			break;
+		}
+	}
+}
+
 bool MacroActionMacro::PerformAction()
 {
 	if (_action == Action::NESTED_MACRO) {
@@ -24,47 +95,85 @@ bool MacroActionMacro::PerformAction()
 		return true;
 	}
 
-	switch (_action) {
-	case Action::PAUSE:
-		macro->SetPaused();
-		break;
-	case Action::UNPAUSE:
-		macro->SetPaused(false);
-		break;
-	case Action::TOGGLE_PAUSE:
-		macro->SetPaused(!macro->Paused());
-		break;
-	case Action::RESET_COUNTER:
-		macro->ResetRunCount();
-		break;
-	case Action::RUN_ACTIONS:
-		RunActions(macro.get());
-		break;
-	case Action::STOP:
-		macro->Stop();
-		break;
-	case Action::DISABLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			macro->Actions().at(_actionIndex - 1)->SetEnabled(false);
+	const auto performActionForMacro = [this](Macro *macro) {
+		switch (_action) {
+		case Action::PAUSE:
+			macro->SetPaused();
+			break;
+		case Action::UNPAUSE:
+			macro->SetPaused(false);
+			break;
+		case Action::TOGGLE_PAUSE:
+			macro->SetPaused(!macro->Paused());
+			break;
+		case Action::RESET_COUNTER:
+			macro->ResetRunCount();
+			break;
+		case Action::RUN_ACTIONS:
+			RunActions(macro);
+			break;
+		case Action::STOP:
+			macro->Stop();
+			break;
+		case Action::DISABLE_ACTION:
+		case Action::ENABLE_ACTION:
+		case Action::TOGGLE_ACTION:
+			AdjustActionState(macro);
+			break;
+		case Action::RUN_MACRO: {
+			if (_runOptions.skipWhenPaused && macro->Paused()) {
+				break;
+			}
+			const bool conditionsMatched =
+				macro->CheckConditions(true);
+			macro->PerformActions(conditionsMatched, false, true);
+			break;
 		}
-		break;
-	case Action::ENABLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			macro->Actions().at(_actionIndex - 1)->SetEnabled(true);
+		case Action::GET_INFO: {
+			SetTempVarValue(
+				"conditionCount",
+				std::to_string(macro->Conditions().size()));
+			SetTempVarValue(
+				"actionCount",
+				std::to_string(macro->Actions().size()));
+			SetTempVarValue(
+				"elseActionCount",
+				std::to_string(macro->ElseActions().size()));
+			SetTempVarValue("paused",
+					macro->Paused() ? "true" : "false");
+			SetTempVarValue("runCount",
+					std::to_string(macro->RunCount()));
+			const auto lastRun = macro->GetLastExecutionTime();
+			const bool hasRun =
+				lastRun.time_since_epoch().count() != 0;
+			const auto secondsSinceLastRun =
+				hasRun ? std::chrono::duration_cast<
+						 std::chrono::seconds>(
+						 std::chrono::
+							 high_resolution_clock::
+								 now() -
+						 lastRun)
+						 .count()
+				       : -1;
+			SetTempVarValue("secondsSinceLastRun",
+					std::to_string(secondsSinceLastRun));
+			break;
 		}
-		break;
-	case Action::TOGGLE_ACTION:
-		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-					     false)) {
-			auto action = macro->Actions().at(_actionIndex - 1);
-			action->SetEnabled(!action->Enabled());
+		default:
+			break;
 		}
-		break;
-	default:
-		break;
+	};
+
+	if (!IsGroupMacro(macro.get())) {
+		performActionForMacro(macro.get());
+		return true;
 	}
+
+	auto macros = GetGroupMacroEntries(macro.get());
+	for (const auto &macro : macros) {
+		performActionForMacro(macro.get());
+	}
+
 	return true;
 }
 
@@ -107,6 +216,12 @@ void MacroActionMacro::LogAction() const
 	case Action::NESTED_MACRO:
 		ablog(LOG_INFO, "run nested macro");
 		break;
+	case Action::GET_INFO:
+		ablog(LOG_INFO, "get info for \"%s\"", macro->Name().c_str());
+		break;
+	case Action::RUN_MACRO:
+		ablog(LOG_INFO, "run macro \"%s\"", macro->Name().c_str());
+		break;
 	default:
 		break;
 	}
@@ -115,9 +230,14 @@ void MacroActionMacro::LogAction() const
 bool MacroActionMacro::Save(obs_data_t *obj) const
 {
 	MacroAction::Save(obj);
-	_macro.Save(obj);
-	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
+	_macro.Save(obj);
+	obs_data_set_int(obj, "actionSelectionType",
+			 static_cast<int>(_actionSelectionType));
+	_actionIndex.Save(obj, "actionIndex");
+	_label.Save(obj, "label");
+	obs_data_set_string(obj, "actionId", _actionId.c_str());
+	_regex.Save(obj);
 	_runOptions.Save(obj);
 	OBSDataAutoRelease nestedMacroData = obs_data_create();
 	_nestedMacro->Save(nestedMacroData);
@@ -129,10 +249,15 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 bool MacroActionMacro::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
+	SetAction(static_cast<MacroActionMacro::Action>(
+		obs_data_get_int(obj, "action")));
 	_macro.Load(obj);
+	_actionSelectionType = static_cast<SelectionType>(
+		obs_data_get_int(obj, "actionSelectionType"));
 	_actionIndex.Load(obj, "actionIndex");
-	_action = static_cast<MacroActionMacro::Action>(
-		obs_data_get_int(obj, "action"));
+	_label.Load(obj, "label");
+	_actionId = obs_data_get_string(obj, "actionId");
+	_regex.Load(obj);
 	_runOptions.Load(obj);
 
 	if (obs_data_has_user_value(obj, "nestedMacro")) {
@@ -183,6 +308,7 @@ std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
 void MacroActionMacro::ResolveVariablesToFixedValues()
 {
 	_actionIndex.ResolveVariables();
+	_label.ResolveVariables();
 }
 
 static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
@@ -224,6 +350,56 @@ void MacroActionMacro::RunActions(Macro *actionMacro) const
 	}
 }
 
+void MacroActionMacro::SetAction(Action action)
+{
+	_action = action;
+	SetupTempVars();
+}
+
+void MacroActionMacro::SetupTempVars()
+{
+	MacroAction::SetupTempVars();
+
+	if (_action != Action::GET_INFO) {
+		return;
+	}
+
+	AddTempvar(
+		"conditionCount",
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.conditionCount"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.conditionCount.description"));
+	AddTempvar(
+		"actionCount",
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.actionCount"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.actionCount.description"));
+	AddTempvar(
+		"elseActionCount",
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.elseActionCount"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.elseActionCount.description"));
+	AddTempvar(
+		"paused",
+		obs_module_text("AdvSceneSwitcher.tempVar.macro.info.paused"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.paused.description"));
+	AddTempvar(
+		"runCount",
+		obs_module_text("AdvSceneSwitcher.tempVar.macro.info.runCount"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.runCount.description"));
+	AddTempvar(
+		"secondsSinceLastRun",
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.secondsSinceLastRun"),
+		obs_module_text(
+			"AdvSceneSwitcher.tempVar.macro.info.secondsSinceLastRun.description"));
+}
+
 static void populateActionSelection(QComboBox *list)
 {
 	static const std::vector<std::pair<MacroActionMacro::Action, std::string>>
@@ -239,7 +415,9 @@ static void populateActionSelection(QComboBox *list)
 			{MacroActionMacro::Action::NESTED_MACRO,
 			 "AdvSceneSwitcher.action.macro.type.nestedMacro"},
 			{MacroActionMacro::Action::RUN_ACTIONS,
-			 "AdvSceneSwitcher.action.macro.type.run"},
+			 "AdvSceneSwitcher.action.macro.type.runActions"},
+			{MacroActionMacro::Action::RUN_MACRO,
+			 "AdvSceneSwitcher.action.macro.type.runMacro"},
 			{MacroActionMacro::Action::STOP,
 			 "AdvSceneSwitcher.action.macro.type.stop"},
 			{MacroActionMacro::Action::DISABLE_ACTION,
@@ -248,6 +426,8 @@ static void populateActionSelection(QComboBox *list)
 			 "AdvSceneSwitcher.action.macro.type.enableAction"},
 			{MacroActionMacro::Action::TOGGLE_ACTION,
 			 "AdvSceneSwitcher.action.macro.type.toggleAction"},
+			{MacroActionMacro::Action::GET_INFO,
+			 "AdvSceneSwitcher.action.macro.type.getInfo"},
 		};
 
 	for (const auto &[value, name] : actions) {
@@ -266,7 +446,7 @@ static void populateConditionBehaviorSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
 }
 
-static void populateActionTypeSelection(QComboBox *list)
+static void populateActionSectionSelection(QComboBox *list)
 {
 	list->addItem(obs_module_text(
 		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
@@ -274,21 +454,53 @@ static void populateActionTypeSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }
 
+static void populateActionTypes(QComboBox *list)
+{
+	for (const auto &[id, info] : MacroActionFactory::GetActionTypes()) {
+		list->addItem(obs_module_text(info._name.c_str()),
+			      QString::fromStdString(id));
+	}
+}
+
+static void populateActionSelectionTypes(QComboBox *list)
+{
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.index"),
+		static_cast<int>(MacroActionMacro::SelectionType::INDEX));
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.label"),
+		static_cast<int>(MacroActionMacro::SelectionType::LABEL));
+	list->addItem(
+		obs_module_text(
+			"AdvSceneSwitcher.action.macro.actionSelectionType.id"),
+		static_cast<int>(MacroActionMacro::SelectionType::ID));
+}
+
 MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget *parent, std::shared_ptr<MacroActionMacro> entryData)
 	: ResizableWidget(parent),
+	  _actions(new QComboBox()),
 	  _macros(new MacroSelection(parent)),
+	  _actionSelectionType(new QComboBox(this)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _actions(new QComboBox()),
+	  _label(new VariableLineEdit(this)),
+	  _actionTypes(new FilterComboBox(this)),
+	  _regex(new RegexConfigWidget(this)),
 	  _conditionMacros(new MacroSelection(parent)),
 	  _conditionBehaviors(new QComboBox()),
 	  _reevaluateConditionState(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
 				  "updateConditionMatchState"))),
-	  _actionTypes(new QComboBox()),
+	  _actionSections(new QComboBox(this)),
 	  _skipWhenPaused(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
+	  _noConditionsWarning(new QLabel(obs_module_text(
+		  "AdvSceneSwitcher.action.macro.type.runMacro.noConditionsWarning"))),
+	  _runMacroHelp(new HelpIcon(obs_module_text(
+		  "AdvSceneSwitcher.action.macro.type.runMacro.help"))),
 	  _setInputs(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.action.macro.type.run.setInputs"))),
 	  _inputs(new MacroInputEdit()),
@@ -305,24 +517,36 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 {
 	populateActionSelection(_actions);
 	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionTypeSelection(_actionTypes);
+	populateActionSectionSelection(_actionSections);
+	populateActionSelectionTypes(_actionSelectionType);
+	populateActionTypes(_actionTypes);
 
 	_conditionMacros->HideSelectedMacro();
+	_conditionMacros->HideGroups();
 
 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
+	QWidget::connect(_actionSelectionType, SIGNAL(currentIndexChanged(int)),
+			 this, SLOT(ActionSelectionTypeChanged(int)));
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
+	QWidget::connect(_label, SIGNAL(editingFinished()), this,
+			 SLOT(LabelChanged()));
+	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(ActionTypeChanged(int)));
+	QWidget::connect(_regex,
+			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
+			 SLOT(RegexChanged(const RegexConfig &)));
 	QWidget::connect(_conditionMacros,
 			 SIGNAL(currentTextChanged(const QString &)), this,
 			 SLOT(ConditionMacroChanged(const QString &)));
 	QWidget::connect(_conditionBehaviors, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(ConditionBehaviorChanged(int)));
-	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ActionTypeChanged(int)));
+	QWidget::connect(_actionSections, SIGNAL(currentIndexChanged(int)),
+			 this, SLOT(ActionSectionChanged(int)));
 	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
 			 SLOT(SkipWhenPausedChanged(int)));
 	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
@@ -350,6 +574,7 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	layout->addLayout(_setInputsLayout);
 	layout->addWidget(_inputs);
 	layout->addWidget(_skipWhenPaused);
+	layout->addWidget(_noConditionsWarning);
 	layout->addWidget(_nestedMacro);
 	setLayout(layout);
 	_entryData = entryData;
@@ -375,17 +600,24 @@ void MacroActionMacroEdit::UpdateEntryData()
 	if (!_entryData) {
 		return;
 	}
+
 	_actions->setCurrentIndex(
-		_actions->findData(static_cast<int>(_entryData->_action)));
+		_actions->findData(static_cast<int>(_entryData->GetAction())));
+	_actionSelectionType->setCurrentIndex(_actionSelectionType->findData(
+		static_cast<int>(_entryData->_actionSelectionType)));
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
+	_label->setText(_entryData->_label);
+	_actionTypes->setCurrentIndex(_actionTypes->findData(
+		QString::fromStdString(_entryData->_actionId)));
+	_regex->SetRegexConfig(_entryData->_regex);
 	_macros->SetCurrentMacro(_entryData->_macro);
 	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
 	_conditionBehaviors->setCurrentIndex(
 		static_cast<int>(_entryData->_runOptions.logic));
 	_reevaluateConditionState->setChecked(
 		_entryData->_runOptions.reevaluateConditionState);
-	_actionTypes->setCurrentIndex(
+	_actionSections->setCurrentIndex(
 		_entryData->_runOptions.runElseActions ? 1 : 0);
 	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
 	_setInputs->setChecked(_entryData->_runOptions.setInputs);
@@ -419,8 +651,17 @@ void MacroActionMacroEdit::MacroChanged(const QString &text)
 void MacroActionMacroEdit::ActionChanged(int idx)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_action = static_cast<MacroActionMacro::Action>(
-		_actions->itemData(idx).toInt());
+	_entryData->SetAction(static_cast<MacroActionMacro::Action>(
+		_actions->itemData(idx).toInt()));
+	SetWidgetVisibility();
+}
+
+void MacroActionMacroEdit::ActionSelectionTypeChanged(int idx)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_actionSelectionType =
+		static_cast<MacroActionMacro::SelectionType>(
+			_actionSelectionType->itemData(idx).toInt());
 	SetWidgetVisibility();
 }
 
@@ -430,6 +671,25 @@ void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 	_entryData->_actionIndex = value;
 }
 
+void MacroActionMacroEdit::LabelChanged()
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_label = _label->text().toStdString();
+}
+
+void MacroActionMacroEdit::ActionTypeChanged(int idx)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_actionId =
+		_actionTypes->itemData(idx).toString().toStdString();
+}
+
+void MacroActionMacroEdit::RegexChanged(const RegexConfig &regex)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_regex = regex;
+}
+
 void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
 {
 	GUARD_LOADING_AND_LOCK();
@@ -451,10 +711,13 @@ void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
 	SetWidgetVisibility();
 }
 
-void MacroActionMacroEdit::ActionTypeChanged(int value)
+void MacroActionMacroEdit::ActionSectionChanged(int useElse)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = value;
+	_entryData->_runOptions.runElseActions = useElse;
+	_entryData->_useElseSection = useElse;
+	_actionIndex->SetType(useElse ? MacroSegmentSelection::Type::ELSE_ACTION
+				      : MacroSegmentSelection::Type::ACTION);
 }
 
 void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
@@ -481,9 +744,14 @@ void MacroActionMacroEdit::InputsChanged(const StringList &inputs)
 void MacroActionMacroEdit::SetWidgetVisibility()
 {
 	_entryLayout->removeWidget(_actions);
+	_entryLayout->removeWidget(_runMacroHelp);
 	_entryLayout->removeWidget(_actionIndex);
 	_entryLayout->removeWidget(_macros);
+	_entryLayout->removeWidget(_actionSections);
+	_entryLayout->removeWidget(_label);
+	_entryLayout->removeWidget(_regex);
 	_entryLayout->removeWidget(_actionTypes);
+	_entryLayout->removeWidget(_actionSelectionType);
 	_conditionLayout->removeWidget(_conditionBehaviors);
 	_conditionLayout->removeWidget(_conditionMacros);
 
@@ -492,21 +760,47 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 
 	const std::unordered_map<std::string, QWidget *> placeholders = {
 		{"{{actions}}", _actions},
+		{"{{runMacroHelp}}", _runMacroHelp},
 		{"{{actionIndex}}", _actionIndex},
 		{"{{macros}}", _macros},
-		{"{{actionTypes}}", _actionTypes},
+		{"{{actionSections}}", _actionSections},
 		{"{{conditionBehaviors}}", _conditionBehaviors},
 		{"{{conditionMacros}}", _conditionMacros},
+		{"{{actionSelectionType}}", _actionSelectionType},
+		{"{{label}}", _label},
+		{"{{regex}}", _regex},
+		{"{{actionTypes}}", _actionTypes},
 
 	};
 
-	PlaceWidgets(
-		obs_module_text(
-			_entryData->_action ==
-					MacroActionMacro::Action::RUN_ACTIONS
-				? "AdvSceneSwitcher.action.macro.entry.run"
-				: "AdvSceneSwitcher.action.macro.entry.other"),
-		_entryLayout, placeholders);
+	const auto action = _entryData->GetAction();
+	const char *layoutText = "";
+	switch (action) {
+	case MacroActionMacro::Action::PAUSE:
+	case MacroActionMacro::Action::UNPAUSE:
+	case MacroActionMacro::Action::TOGGLE_PAUSE:
+	case MacroActionMacro::Action::RESET_COUNTER:
+	case MacroActionMacro::Action::STOP:
+	case MacroActionMacro::Action::NESTED_MACRO:
+	case MacroActionMacro::Action::GET_INFO:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.other";
+		break;
+	case MacroActionMacro::Action::RUN_MACRO:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.runMacro";
+		break;
+	case MacroActionMacro::Action::RUN_ACTIONS:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.run";
+		break;
+	case MacroActionMacro::Action::DISABLE_ACTION:
+	case MacroActionMacro::Action::ENABLE_ACTION:
+	case MacroActionMacro::Action::TOGGLE_ACTION:
+		layoutText = "AdvSceneSwitcher.action.macro.layout.actionState";
+		break;
+	default:
+		break;
+	}
+
+	PlaceWidgets(obs_module_text(layoutText), _entryLayout, placeholders);
 
 	if (_entryData->_runOptions.logic ==
 	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
@@ -515,56 +809,75 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	} else {
 		PlaceWidgets(
 			obs_module_text(
-				"AdvSceneSwitcher.action.macro.entry.run.condition"),
+				"AdvSceneSwitcher.action.macro.layout.run.condition"),
 			_conditionLayout, placeholders);
 	}
 
-	if (_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS ||
-	    _entryData->_action == MacroActionMacro::Action::STOP) {
+	if (action == MacroActionMacro::Action::RUN_ACTIONS ||
+	    action == MacroActionMacro::Action::STOP ||
+	    action == MacroActionMacro::Action::RUN_MACRO) {
 		_macros->HideSelectedMacro();
 	} else {
 		_macros->ShowAllMacros();
 	}
 
+	const auto actionSelectionType = _entryData->_actionSelectionType;
 	const bool isModifyingActionState =
-		_entryData->_action ==
-			MacroActionMacro::Action::DISABLE_ACTION ||
-		_entryData->_action ==
-			MacroActionMacro::Action::ENABLE_ACTION ||
-		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
-	_actionIndex->setVisible(isModifyingActionState);
+		action == MacroActionMacro::Action::DISABLE_ACTION ||
+		action == MacroActionMacro::Action::ENABLE_ACTION ||
+		action == MacroActionMacro::Action::TOGGLE_ACTION;
+	_actionSelectionType->setVisible(isModifyingActionState);
+	_actionIndex->setVisible(
+		isModifyingActionState &&
+		actionSelectionType == MacroActionMacro::SelectionType::INDEX);
+	_label->setVisible(isModifyingActionState &&
+			   actionSelectionType ==
+				   MacroActionMacro::SelectionType::LABEL);
+	_regex->setVisible(isModifyingActionState &&
+			   actionSelectionType ==
+				   MacroActionMacro::SelectionType::LABEL);
+	_actionTypes->setVisible(isModifyingActionState &&
+				 actionSelectionType ==
+					 MacroActionMacro::SelectionType::ID);
 
 	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
+			 action == MacroActionMacro::Action::RUN_ACTIONS);
 	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
+		action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.logic !=
 			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
 	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
 	SetLayoutVisible(_reevaluateConditionStateLayout,
 			 needsAdditionalConditionWidgets);
 	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
-	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN_ACTIONS &&
+			 action == MacroActionMacro::Action::RUN_ACTIONS);
+	_inputs->setVisible(action == MacroActionMacro::Action::RUN_ACTIONS &&
 			    _entryData->_runOptions.setInputs);
 	HighlightMacroSettingsButton(
-		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
+		action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.setInputs &&
 		!_inputs->HasInputsToSet());
-	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN_ACTIONS);
-	_skipWhenPaused->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN_ACTIONS);
+	_actionSections->setVisible(
+		action == MacroActionMacro::Action::RUN_ACTIONS ||
+		isModifyingActionState);
+	_skipWhenPaused->setVisible(
+		action == MacroActionMacro::Action::RUN_ACTIONS ||
+		action == MacroActionMacro::Action::RUN_MACRO);
 
-	_nestedMacro->setVisible(_entryData->_action ==
+	if (action == MacroActionMacro::Action::RUN_MACRO) {
+		auto macro = _entryData->_macro.GetMacro();
+		_noConditionsWarning->setVisible(!macro ||
+						 macro->Conditions().empty());
+	} else {
+		_noConditionsWarning->setVisible(false);
+	}
+	_runMacroHelp->setVisible(action ==
+				  MacroActionMacro::Action::RUN_MACRO);
+
+	_nestedMacro->setVisible(action ==
 				 MacroActionMacro::Action::NESTED_MACRO);
-	_macros->setVisible(_entryData->_action !=
-			    MacroActionMacro::Action::NESTED_MACRO);
-	SetResizingEnabled(_entryData->_action ==
-			   MacroActionMacro::Action::NESTED_MACRO);
+	_macros->setVisible(action != MacroActionMacro::Action::NESTED_MACRO);
+	SetResizingEnabled(action == MacroActionMacro::Action::NESTED_MACRO);
 
 	if (_nestedMacro->IsEmpty()) {
 		_nestedMacro->ShowAllMacroSections();

lib/macro/macro-action-macro.hpp

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

lib/macro/macro-action-variable.cpp

@@ -1,4 +1,5 @@
 #include "macro-action-variable.hpp"
+#include "help-icon.hpp"
 #include "json-helpers.hpp"
 #include "layout-helpers.hpp"
 #include "macro-condition-edit.hpp"
@@ -16,6 +17,15 @@ namespace advss {
 
 const std::string MacroActionVariable::id = "variable";
 
+std::vector<TempVariableRef> MacroActionVariable::GetTempVarRefs() const
+{
+	auto refs = MacroSegment::GetTempVarRefs();
+	if (_tempVar.HasValidID()) {
+		refs.push_back(_tempVar);
+	}
+	return refs;
+}
+
 bool MacroActionVariable::_registered = MacroActionFactory::Register(
 	MacroActionVariable::id,
 	{MacroActionVariable::Create, MacroActionVariableEdit::Create,
@@ -218,6 +228,43 @@ void MacroActionVariable::GenerateRandomNumber(Variable *var)
 	}
 }
 
+void MacroActionVariable::PickRandomValue(Variable *var)
+{
+	static std::random_device rd;
+	static std::mt19937 gen(rd());
+	static const uint8_t maxIter = 255;
+
+	if (_randomValues.isEmpty()) {
+		return;
+	}
+
+	if (_randomValues.size() == 1) {
+		const auto &value = _randomValues.at(0);
+		var->SetValue(value);
+		_lastRandomValue = value;
+	}
+
+	std::uniform_int_distribution<int> dis(0, _randomValues.size() - 1);
+	StringVariable value = _randomValues.at(dis(gen));
+
+	uint8_t iter = 0;
+	for (; !_allowRepeatValues && iter < maxIter &&
+	       _lastRandomValue.has_value() &&
+	       std::string(value) == _lastRandomValue.value();
+	     iter++) {
+		value = _randomValues.at(dis(gen));
+	}
+
+	if (iter == maxIter) {
+		blog(LOG_INFO,
+		     "giving up picking non-repeat random value after %d tries",
+		     maxIter);
+	}
+
+	var->SetValue(value);
+	_lastRandomValue = value;
+}
+
 struct AskForInputParams {
 	AskForInputParams(const QString &prompt_, const QString &placeholder_)
 		: prompt(prompt_),
@@ -285,6 +332,14 @@ bool MacroActionVariable::PerformAction()
 	case Action::APPEND:
 		apppend(*var, _strValue);
 		break;
+	case Action::COPY_VAR: {
+		auto var2 = _variable2.lock();
+		if (!var2) {
+			return true;
+		}
+		var->SetValue(var2->Value());
+		break;
+	}
 	case Action::APPEND_VAR: {
 		auto var2 = _variable2.lock();
 		if (!var2) {
@@ -449,6 +504,9 @@ bool MacroActionVariable::PerformAction()
 	case Action::RANDOM_NUMBER:
 		GenerateRandomNumber(var.get());
 		return true;
+	case Action::RANDOM_LIST_VALUE:
+		PickRandomValue(var.get());
+		return true;
 	}
 
 	return true;
@@ -489,6 +547,8 @@ bool MacroActionVariable::Save(obs_data_t *obj) const
 	_randomNumberStart.Save(obj, "randomNumberStart");
 	_randomNumberEnd.Save(obj, "randomNumberEnd");
 	obs_data_set_bool(obj, "generateInteger", _generateInteger);
+	_randomValues.Save(obj, "randomValues", "value");
+	obs_data_set_bool(obj, "allowRepeatValues", _allowRepeatValues);
 	_jsonQuery.Save(obj, "jsonQuery");
 	_jsonIndex.Save(obj, "jsonIndex");
 
@@ -547,6 +607,8 @@ bool MacroActionVariable::Load(obs_data_t *obj)
 	_randomNumberStart.Load(obj, "randomNumberStart");
 	_randomNumberEnd.Load(obj, "randomNumberEnd");
 	_generateInteger = obs_data_get_bool(obj, "generateInteger");
+	_randomValues.Load(obj, "randomValues", "value");
+	_allowRepeatValues = obs_data_get_bool(obj, "allowRepeatValues");
 	_jsonQuery.Load(obj, "jsonQuery");
 	_jsonIndex.Load(obj, "jsonIndex");
 
@@ -669,6 +731,8 @@ static inline void populateActionSelection(QComboBox *list)
 		actions = {
 			{MacroActionVariable::Action::SET_VALUE,
 			 "AdvSceneSwitcher.action.variable.type.set"},
+			{MacroActionVariable::Action::COPY_VAR,
+			 "AdvSceneSwitcher.action.variable.type.copy"},
 			{MacroActionVariable::Action::APPEND,
 			 "AdvSceneSwitcher.action.variable.type.append"},
 			{MacroActionVariable::Action::PAD,
@@ -713,6 +777,8 @@ static inline void populateActionSelection(QComboBox *list)
 			 "AdvSceneSwitcher.action.variable.type.roundToInt"},
 			{MacroActionVariable::Action::RANDOM_NUMBER,
 			 "AdvSceneSwitcher.action.variable.type.randomNumber"},
+			{MacroActionVariable::Action::RANDOM_LIST_VALUE,
+			 "AdvSceneSwitcher.action.variable.type.randomListValue"},
 			{true, ""}, // Separator
 
 			{MacroActionVariable::Action::USER_INPUT,
@@ -790,11 +856,10 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _segmentValueStatus(new QLabel()),
 	  _segmentValue(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _substringLayout(new QVBoxLayout()),
-	  _subStringIndexEntryLayout(new QHBoxLayout()),
-	  _subStringRegexEntryLayout(new QHBoxLayout()),
+	  _subStringControlsLayout(new QHBoxLayout()),
 	  _subStringStart(new VariableSpinBox(this)),
 	  _subStringSize(new VariableSpinBox(this)),
-	  _substringRegex(new RegexConfigWidget(parent)),
+	  _subStringRegex(new RegexConfigWidget(parent)),
 	  _regexPattern(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _regexMatchIdx(new VariableSpinBox(this)),
 	  _findReplaceLayout(new QHBoxLayout()),
@@ -826,9 +891,18 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		  obs_module_text(
 			  "AdvSceneSwitcher.action.variable.generateInteger"),
 		  this)),
-	  _randomLayout(new QVBoxLayout()),
+	  _randomNumberLayout(new QVBoxLayout()),
+	  _randomValues(new StringListEdit(this)),
+	  _allowRepeatValues(new QCheckBox(
+		  obs_module_text(
+			  "AdvSceneSwitcher.action.variable.type.allowRepeat"),
+		  this)),
+	  _randomValueLayout(new QVBoxLayout()),
 	  _jsonQuery(new VariableLineEdit(this)),
-	  _jsonQueryHelp(new QLabel(this)),
+	  _jsonQueryHelp(new HelpIcon(
+		  obs_module_text(
+			  "AdvSceneSwitcher.action.variable.type.queryJson.info"),
+		  this)),
 	  _jsonIndex(new VariableSpinBox(this)),
 	  _entryLayout(new QHBoxLayout())
 {
@@ -859,14 +933,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_randomNumberStart->setMaximum(9999999999);
 	_randomNumberEnd->setMinimum(-9999999999);
 	_randomNumberEnd->setMaximum(9999999999);
-	const QString path = GetThemeTypeName() == "Light"
-				     ? ":/res/images/help.svg"
-				     : ":/res/images/help_light.svg";
-	const QIcon icon(path);
-	const QPixmap pixmap = icon.pixmap(QSize(16, 16));
-	_jsonQueryHelp->setPixmap(pixmap);
-	_jsonQueryHelp->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.action.variable.type.queryJson.info"));
+	_randomValues->SetMaxStringSize(99999999);
 	_jsonIndex->setMaximum(999);
 
 	QWidget::connect(_variables, SIGNAL(SelectionChanged(const QString &)),
@@ -895,7 +962,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		_subStringSize,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(SubStringSizeChanged(const NumberVariable<int> &)));
-	QWidget::connect(_substringRegex,
+	QWidget::connect(_subStringRegex,
 			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
 			 SLOT(SubStringRegexChanged(const RegexConfig &)));
 	QWidget::connect(_regexPattern, SIGNAL(textChanged()), this,
@@ -955,6 +1022,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		SLOT(RandomNumberEndChanged(const NumberVariable<double> &)));
 	QWidget::connect(_generateInteger, SIGNAL(stateChanged(int)), this,
 			 SLOT(GenerateIntegerChanged(int)));
+	QWidget::connect(_randomValues,
+			 SIGNAL(StringListChanged(const StringList &)), this,
+			 SLOT(RandomValueListChanged(const StringList &)));
+	QWidget::connect(_allowRepeatValues, SIGNAL(stateChanged(int)), this,
+			 SLOT(AllowRepeatValuesChanged(int)));
 	QWidget::connect(_jsonQuery, SIGNAL(editingFinished()), this,
 			 SLOT(JsonQueryChanged()));
 	QWidget::connect(
@@ -969,9 +1041,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{strValue}}", _strValue},
 		{"{{numValue}}", _numValue},
 		{"{{segmentIndex}}", _segmentIdx},
-		{"{{subStringStart}}", _subStringStart},
-		{"{{subStringSize}}", _subStringSize},
-		{"{{regexMatchIdx}}", _regexMatchIdx},
 		{"{{findRegex}}", _findRegex},
 		{"{{findStr}}", _findStr},
 		{"{{replaceStr}}", _replaceStr},
@@ -1003,12 +1072,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	PlaceWidgets(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.substringIndex"),
-		_subStringIndexEntryLayout, widgetPlaceholders);
-
-	PlaceWidgets(
-		obs_module_text(
-			"AdvSceneSwitcher.action.variable.layout.substringRegex"),
-		_subStringRegexEntryLayout, widgetPlaceholders);
+		_subStringControlsLayout, widgetPlaceholders);
 
 	PlaceWidgets(
 		obs_module_text(
@@ -1029,15 +1093,17 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.randomNumber"),
 		randomLayout, widgetPlaceholders);
-	_randomLayout->addLayout(randomLayout);
-	_randomLayout->addWidget(_generateInteger);
+	_randomNumberLayout->addLayout(randomLayout);
+	_randomNumberLayout->addWidget(_generateInteger);
+
+	_randomValueLayout->addWidget(_randomValues);
+	_randomValueLayout->addWidget(_allowRepeatValues);
 
 	auto regexConfigLayout = new QHBoxLayout;
-	regexConfigLayout->addWidget(_substringRegex);
+	regexConfigLayout->addWidget(_subStringRegex);
 	regexConfigLayout->addStretch();
 
-	_substringLayout->addLayout(_subStringIndexEntryLayout);
-	_substringLayout->addLayout(_subStringRegexEntryLayout);
+	_substringLayout->addLayout(_subStringControlsLayout);
 	_substringLayout->addWidget(_regexPattern);
 	_substringLayout->addLayout(regexConfigLayout);
 
@@ -1050,7 +1116,8 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	layout->addWidget(_mathExpressionResult);
 	layout->addLayout(_promptLayout);
 	layout->addLayout(_placeholderLayout);
-	layout->addLayout(_randomLayout);
+	layout->addLayout(_randomNumberLayout);
+	layout->addLayout(_randomValueLayout);
 	setLayout(layout);
 
 	_entryData = entryData;
@@ -1084,7 +1151,7 @@ void MacroActionVariableEdit::UpdateEntryData()
 			: MacroSegmentSelection::Type::ACTION);
 	_subStringStart->SetValue(_entryData->_subStringStart);
 	_subStringSize->SetValue(_entryData->_subStringSize);
-	_substringRegex->SetRegexConfig(_entryData->_subStringRegex);
+	_subStringRegex->SetRegexConfig(_entryData->_subStringRegex);
 	_findRegex->SetRegexConfig(_entryData->_findRegex);
 	_regexPattern->setPlainText(
 		QString::fromStdString(_entryData->_regexPattern));
@@ -1109,6 +1176,8 @@ void MacroActionVariableEdit::UpdateEntryData()
 	_randomNumberStart->SetValue(_entryData->_randomNumberStart);
 	_randomNumberEnd->SetValue(_entryData->_randomNumberEnd);
 	_generateInteger->setChecked(_entryData->_generateInteger);
+	_allowRepeatValues->setChecked(_entryData->_allowRepeatValues);
+	_randomValues->SetStringList(_entryData->_randomValues);
 	_jsonQuery->setText(_entryData->_jsonQuery);
 	_jsonIndex->SetValue(_entryData->_jsonIndex);
 
@@ -1390,6 +1459,7 @@ void MacroActionVariableEdit::SelectionChanged(const TempVariableRef &var)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_tempVar = var;
+	IncrementTempVarInUseGeneration();
 	SetWidgetVisibility();
 }
 
@@ -1451,6 +1521,18 @@ void MacroActionVariableEdit::GenerateIntegerChanged(int value)
 	_entryData->_generateInteger = value;
 }
 
+void MacroActionVariableEdit::RandomValueListChanged(const StringList &values)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_randomValues = values;
+}
+
+void MacroActionVariableEdit::AllowRepeatValuesChanged(int value)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_allowRepeatValues = value;
+}
+
 void MacroActionVariableEdit::JsonQueryChanged()
 {
 	GUARD_LOADING_AND_LOCK();
@@ -1489,8 +1571,20 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		{"{{jsonQuery}}", _jsonQuery},
 		{"{{jsonQueryHelp}}", _jsonQueryHelp},
 		{"{{jsonIndex}}", _jsonIndex},
+		{"{{subStringRegex}}", _subStringRegex},
+		{"{{subStringStart}}", _subStringStart},
+		{"{{subStringSize}}", _subStringSize},
+		{"{{regexMatchIdx}}", _regexMatchIdx},
 	};
 
+	for (const auto &[_, widget] : widgetPlaceholders) {
+		_entryLayout->removeWidget(widget);
+		_subStringControlsLayout->removeWidget(widget);
+	}
+
+	ClearLayout(_entryLayout);
+	ClearLayout(_subStringControlsLayout);
+
 	const char *layoutString = "";
 	if (_entryData->_action == MacroActionVariable::Action::PAD) {
 		layoutString = obs_module_text(
@@ -1504,11 +1598,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			"AdvSceneSwitcher.action.variable.layout.other");
 	}
 
-	for (const auto &[_, widget] : widgetPlaceholders) {
-		_entryLayout->removeWidget(widget);
-	}
-
-	ClearLayout(_entryLayout);
 	PlaceWidgets(layoutString, _entryLayout, widgetPlaceholders);
 
 	if (_entryData->_action == MacroActionVariable::Action::SET_VALUE ||
@@ -1525,6 +1614,7 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 	}
 
 	_variables2->setVisible(
+		_entryData->_action == MacroActionVariable::Action::COPY_VAR ||
 		_entryData->_action ==
 			MacroActionVariable::Action::APPEND_VAR ||
 		_entryData->_action ==
@@ -1554,15 +1644,25 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			MacroActionVariable::Action::SET_ACTION_VALUE ||
 		_entryData->_action ==
 			MacroActionVariable::Action::SET_CONDITION_VALUE);
+
+	bool showRegex = _entryData->_subStringRegex.Enabled();
+	layoutString =
+		showRegex
+			? "AdvSceneSwitcher.action.variable.layout.substringRegex"
+			: "AdvSceneSwitcher.action.variable.layout.substringIndex";
+	PlaceWidgets(obs_module_text(layoutString), _subStringControlsLayout,
+		     widgetPlaceholders);
+	_subStringStart->setVisible(!showRegex);
+	_subStringSize->setVisible(!showRegex);
+	_regexMatchIdx->setVisible(showRegex);
+
 	SetLayoutVisible(_substringLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::SUBSTRING);
-	if (_entryData->_action == MacroActionVariable::Action::SUBSTRING) {
-		bool showRegex = _entryData->_subStringRegex.Enabled();
-		SetLayoutVisible(_subStringIndexEntryLayout, !showRegex);
-		SetLayoutVisible(_subStringRegexEntryLayout, showRegex);
-		_regexPattern->setVisible(showRegex);
-	}
+	_regexPattern->setVisible(
+		showRegex &&
+		_entryData->_action == MacroActionVariable::Action::SUBSTRING);
+
 	SetLayoutVisible(_findReplaceLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::FIND_AND_REPLACE);
@@ -1627,9 +1727,13 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 					  MacroActionVariable::Action::PAD);
 	_caseType->setVisible(_entryData->_action ==
 			      MacroActionVariable::Action::CHANGE_CASE);
-	SetLayoutVisible(_randomLayout,
+	SetLayoutVisible(_randomNumberLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::RANDOM_NUMBER);
+	SetLayoutVisible(
+		_randomValueLayout,
+		_entryData->_action ==
+			MacroActionVariable::Action::RANDOM_LIST_VALUE);
 	_jsonQuery->setVisible(_entryData->_action ==
 			       MacroActionVariable::Action::QUERY_JSON);
 	_jsonQueryHelp->setVisible(_entryData->_action ==

lib/macro/macro-action-variable.hpp

@@ -6,6 +6,7 @@
 #include "resizing-text-edit.hpp"
 #include "scene-selection.hpp"
 #include "single-char-selection.hpp"
+#include "string-list.hpp"
 #include "variable-line-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "variable-spinbox.hpp"
@@ -22,6 +23,7 @@ public:
 	bool PostLoad();
 	std::string GetShortDesc() const;
 	std::string GetId() const { return id; };
+	std::vector<TempVariableRef> GetTempVarRefs() const;
 	static std::shared_ptr<MacroAction> Create(Macro *m);
 	std::shared_ptr<MacroAction> Copy() const;
 	void SetSegmentIndexValue(int);
@@ -55,6 +57,8 @@ public:
 		RANDOM_NUMBER,
 		QUERY_JSON,
 		ARRAY_JSON,
+		COPY_VAR,
+		RANDOM_LIST_VALUE,
 	};
 
 	Action _action = Action::SET_VALUE;
@@ -106,6 +110,10 @@ public:
 	DoubleVariable _randomNumberEnd = 100;
 	bool _generateInteger = true;
 
+	StringList _randomValues = {"value1", "value2", "value3"};
+	bool _allowRepeatValues = true;
+	std::optional<std::string> _lastRandomValue;
+
 	StringVariable _jsonQuery = "$.some.nested.value";
 	IntVariable _jsonIndex = 0;
 
@@ -118,6 +126,7 @@ private:
 	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
 	void GenerateRandomNumber(Variable *);
+	void PickRandomValue(Variable *);
 
 	std::weak_ptr<MacroSegment> _macroSegment;
 	int _segmentIdxLoadValue = -1;
@@ -174,6 +183,8 @@ private slots:
 	void RandomNumberStartChanged(const NumberVariable<double> &);
 	void RandomNumberEndChanged(const NumberVariable<double> &);
 	void GenerateIntegerChanged(int);
+	void RandomValueListChanged(const StringList &);
+	void AllowRepeatValuesChanged(int);
 	void JsonQueryChanged();
 	void JsonIndexChanged(const NumberVariable<int> &);
 
@@ -193,11 +204,10 @@ private:
 	QLabel *_segmentValueStatus;
 	ResizingPlainTextEdit *_segmentValue;
 	QVBoxLayout *_substringLayout;
-	QHBoxLayout *_subStringIndexEntryLayout;
-	QHBoxLayout *_subStringRegexEntryLayout;
+	QHBoxLayout *_subStringControlsLayout;
 	VariableSpinBox *_subStringStart;
 	VariableSpinBox *_subStringSize;
-	RegexConfigWidget *_substringRegex;
+	RegexConfigWidget *_subStringRegex;
 	ResizingPlainTextEdit *_regexPattern;
 	VariableSpinBox *_regexMatchIdx;
 	QHBoxLayout *_findReplaceLayout;
@@ -224,7 +234,10 @@ private:
 	VariableDoubleSpinBox *_randomNumberStart;
 	VariableDoubleSpinBox *_randomNumberEnd;
 	QCheckBox *_generateInteger;
-	QVBoxLayout *_randomLayout;
+	QVBoxLayout *_randomNumberLayout;
+	StringListEdit *_randomValues;
+	QCheckBox *_allowRepeatValues;
+	QVBoxLayout *_randomValueLayout;
 	VariableLineEdit *_jsonQuery;
 	QLabel *_jsonQueryHelp;
 	VariableSpinBox *_jsonIndex;

lib/macro/macro-condition-edit.cpp

@@ -1,10 +1,12 @@
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "macro-signals.hpp"
 #include "macro-settings.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "section.hpp"
+#include "switch-button.hpp"
 #include "ui-helpers.hpp"
 #include "utility.hpp"
 
@@ -100,14 +102,17 @@ void DurationModifierEdit::Collapse(bool collapse)
 
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	const std::string &id, bool isRootCondition)
+	bool isRootCondition)
 	: MacroSegmentEdit(parent),
+	  _enable(new SwitchButton()),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
 	  _dur(new DurationModifierEdit()),
 	  _entryData(entryData),
 	  _isRoot(isRootCondition)
 {
+	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
+			 SLOT(ConditionEnableChanged(bool)));
 	QWidget::connect(_logicSelection, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(LogicSelectionChanged(int)));
 	QWidget::connect(_conditionSelection,
@@ -122,14 +127,17 @@ MacroConditionEdit::MacroConditionEdit(
 	Logic::PopulateLogicTypeSelection(_logicSelection, isRootCondition);
 	populateConditionSelection(_conditionSelection);
 
+	_section->AddHeaderWidget(_enable);
 	_section->AddHeaderWidget(_logicSelection);
 	_section->AddHeaderWidget(_conditionSelection);
 	_section->AddHeaderWidget(_headerInfo);
 	_section->AddHeaderWidget(_dur);
+	_section->AddHeaderWidget(_varMappingToggle);
 
 	QVBoxLayout *conditionLayout = new QVBoxLayout;
 	conditionLayout->setContentsMargins({7, 7, 7, 7});
 	conditionLayout->addWidget(_section);
+	conditionLayout->addWidget(_outputMappings);
 	_contentLayout->addLayout(conditionLayout);
 
 	QHBoxLayout *mainLayout = new QHBoxLayout;
@@ -152,8 +160,17 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 	const auto logic = static_cast<Logic::Type>(
 		_logicSelection->itemData(idx).toInt());
 	(*_entryData)->SetLogicType(logic);
+}
 
-	SetEnableAppearance(logic != Logic::Type::NONE);
+void MacroConditionEdit::ConditionEnableChanged(bool value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
+	(*_entryData)->SetEnabled(value);
+	SetDisableEffect(!value);
 }
 
 bool MacroConditionEdit::IsRootNode() const
@@ -166,7 +183,9 @@ void MacroConditionEdit::SetLogicSelection()
 	const auto logic = (*_entryData)->GetLogicType();
 	_logicSelection->setCurrentIndex(
 		_logicSelection->findData(static_cast<int>(logic)));
-	SetEnableAppearance(logic != Logic::Type::NONE);
+	const bool enabled = (*_entryData)->Enabled();
+	_enable->setChecked(enabled);
+	SetEnableAppearance(enabled);
 }
 
 void MacroConditionEdit::SetRootNode(bool root)
@@ -204,7 +223,10 @@ void MacroConditionEdit::SetupWidgets(bool basicSetup)
 		MacroConditionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
+	QWidget::connect(widget, SIGNAL(ShowVariableMappings(bool)), this,
+			 SLOT(ShowVariableMappings(bool)));
 	_section->SetContent(widget, (*_entryData)->GetCollapsed());
+	SetupVarMappings((*_entryData).get());
 	SetFocusPolicyOfWidgets();
 
 	_allWidgetsAreSetup = true;
@@ -234,20 +256,28 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 	{
 		auto lock = LockContext();
 		auto logic = (*_entryData)->GetLogicType();
+		const bool enabled = (*_entryData)->Enabled();
 		_entryData->reset();
 		*_entryData = MacroConditionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->SetLogicType(logic);
+		(*_entryData)->SetEnabled(enabled);
 		(*_entryData)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 	}
 	auto widget =
 		MacroConditionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
+	QWidget::connect(widget, SIGNAL(ShowVariableMappings(bool)), this,
+			 SLOT(ShowVariableMappings(bool)));
 	_section->SetContent(widget);
+	SetupVarMappings((*_entryData).get());
 	_dur->setVisible(MacroConditionFactory::UsesDurationModifier(id));
 	SetFocusPolicyOfWidgets();
+
+	emit MacroSignalManager::Instance()->ConditionTypeCreated(
+		QString::fromStdString(id));
 }
 
 void MacroConditionEdit::DurationChanged(const Duration &seconds)

lib/macro/macro-condition-edit.hpp

@@ -8,6 +8,8 @@
 
 namespace advss {
 
+class SwitchButton;
+
 class DurationModifierEdit : public QWidget {
 	Q_OBJECT
 public:
@@ -34,11 +36,9 @@ class MacroConditionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 
 public:
-	MacroConditionEdit(
-		QWidget *parent = nullptr,
-		std::shared_ptr<MacroCondition> * = nullptr,
-		const std::string &id = MacroCondition::GetDefaultID().data(),
-		bool root = true);
+	MacroConditionEdit(QWidget *parent = nullptr,
+			   std::shared_ptr<MacroCondition> * = nullptr,
+			   bool root = true);
 	bool IsRootNode() const;
 	void SetRootNode(bool);
 	void SetupWidgets(bool basicSetup = false);
@@ -49,11 +49,13 @@ private slots:
 	void ConditionSelectionChanged(const QString &text);
 	void DurationChanged(const Duration &value);
 	void DurationModifierChanged(DurationModifier::Type m);
+	void ConditionEnableChanged(bool);
 
 private:
 	void SetLogicSelection();
 	std::shared_ptr<MacroSegment> Data() const;
 
+	SwitchButton *_enable;
 	QComboBox *_logicSelection;
 	FilterComboBox *_conditionSelection;
 	DurationModifierEdit *_dur;

lib/macro/macro-condition-macro.cpp

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

lib/macro/macro-condition-tempvar.cpp

@@ -6,6 +6,15 @@ namespace advss {
 
 const std::string MacroConditionTempVar::id = "temp_var";
 
+std::vector<TempVariableRef> MacroConditionTempVar::GetTempVarRefs() const
+{
+	auto refs = MacroSegment::GetTempVarRefs();
+	if (_tempVar.HasValidID()) {
+		refs.push_back(_tempVar);
+	}
+	return refs;
+}
+
 bool MacroConditionTempVar::_registered = MacroConditionFactory::Register(
 	MacroConditionTempVar::id,
 	{MacroConditionTempVar::Create, MacroConditionTempVarEdit::Create,
@@ -266,6 +275,7 @@ void MacroConditionTempVarEdit::VariableChanged(const TempVariableRef &var)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_tempVar = var;
+	IncrementTempVarInUseGeneration();
 }
 
 void MacroConditionTempVarEdit::Variable2Changed(const QString &text)

lib/macro/macro-condition-tempvar.hpp

@@ -20,6 +20,7 @@ public:
 	bool Load(obs_data_t *obj);
 	std::string GetShortDesc() const;
 	std::string GetId() const { return id; };
+	std::vector<TempVariableRef> GetTempVarRefs() const;
 	static std::shared_ptr<MacroCondition> Create(Macro *m)
 	{
 		return std::make_shared<MacroConditionTempVar>(m);

lib/macro/macro-condition.cpp

@@ -7,6 +7,17 @@ MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
 {
 }
 
+bool MacroCondition::EvaluateCondition()
+{
+	bool newValue = CheckCondition();
+	_changed = _previousValue.has_value() && (*_previousValue != newValue);
+	const bool negate = _logic.IsNegationType(GetLogicType());
+	_risingEdge = _changed &&
+		      ((!negate && newValue) || (negate && !newValue));
+	_previousValue = newValue;
+	return newValue;
+}
+
 bool MacroCondition::Save(obs_data_t *obj) const
 {
 	MacroSegment::Save(obj);
@@ -20,6 +31,10 @@ bool MacroCondition::Load(obs_data_t *obj)
 {
 	MacroSegment::Load(obj);
 	_logic.Load(obj, "logic");
+	if (_logic.GetType() == Logic::Type::NONE) {
+		SetEnabled(false);
+		_logic.SetType(Logic::Type::AND);
+	}
 	_durationModifier.Load(obj);
 	return true;
 }
@@ -39,7 +54,8 @@ void MacroCondition::ValidateLogicSelection(bool isRootCondition,
 		return;
 	}
 
-	_logic.SetType(Logic::Type::NONE);
+	_logic.SetType(Logic::Type::AND);
+	SetEnabled(false);
 	blog(LOG_WARNING,
 	     "setting invalid logic selection to 'ignore' for macro %s",
 	     context);

lib/macro/macro-condition.hpp

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

lib/macro/macro-dock.cpp

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

lib/macro/macro-edit.cpp

@@ -366,7 +366,7 @@ static void runSegmentHighlightChecksHelper(MacroSegmentList *list)
 		// highlight its segments if required
 		auto macroAction = dynamic_cast<MacroActionMacro *>(data.get());
 		if (macroAction &&
-		    macroAction->_action ==
+		    macroAction->GetAction() ==
 			    MacroActionMacro::Action::NESTED_MACRO) {
 			continue;
 		}
@@ -418,8 +418,7 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx)
 	ui->actionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
-						    actions[afterIdx]->GetId());
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 		ui->actionsList->Add(newEntry);
 	}
 
@@ -444,8 +443,7 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx)
 	ui->elseActionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
-						    actions[afterIdx]->GetId());
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 		ui->elseActionsList->Add(newEntry);
 	}
 
@@ -472,8 +470,7 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
 
 	for (; afterIdx < conditions.size(); afterIdx++) {
 		auto newEntry = new MacroConditionEdit(
-			this, &conditions[afterIdx],
-			conditions[afterIdx]->GetId(), root);
+			this, &conditions[afterIdx], root);
 		ui->conditionsList->Add(newEntry);
 		root = false;
 	}
@@ -1080,16 +1077,20 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 			macro->Actions().at(idx)->Load(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		macro->UpdateActionIndices();
 		ui->actionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->Actions()[idx], id));
+			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
 		SetActionData(*macro);
 	}
 	HighlightAction(idx);
 	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
+
+	QTimer::singleShot(0, this, [this]() {
+		ui->actionsList->ensureWidgetVisible(
+			ui->actionsList->WidgetAt(currentActionIdx));
+	});
 }
 
 void MacroEdit::AddMacroAction(int idx)
@@ -1117,6 +1118,9 @@ void MacroEdit::AddMacroAction(int idx)
 		macro->Actions().at(idx - 1)->Save(data);
 	}
 	AddMacroAction(macro.get(), idx, id, data);
+	if (idx < (int)macro->Actions().size()) {
+		macro->Actions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::on_actionAdd_clicked()
@@ -1383,16 +1387,21 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		macro->UpdateElseActionIndices();
 		ui->elseActionsList->Insert(
-			idx, new MacroActionEdit(
-				     this, &macro->ElseActions()[idx], id));
+			idx,
+			new MacroActionEdit(this, &macro->ElseActions()[idx]));
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
 	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
+
+	QTimer::singleShot(0, this, [this]() {
+		ui->elseActionsList->ensureWidgetVisible(
+			ui->elseActionsList->WidgetAt(currentElseActionIdx));
+	});
 }
 
 void MacroEdit::AddMacroElseAction(int idx)
@@ -1420,6 +1429,9 @@ void MacroEdit::AddMacroElseAction(int idx)
 		macro->ElseActions().at(idx - 1)->Save(data);
 	}
 	AddMacroElseAction(macro.get(), idx, id, data);
+	if (idx < (int)macro->ElseActions().size()) {
+		macro->ElseActions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::RemoveMacroElseAction(int idx)
@@ -1564,6 +1576,9 @@ void MacroEdit::AddMacroCondition(int idx)
 		macro->Conditions().at(idx - 1)->Save(data);
 	}
 	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
+	if (idx < (int)macro->Conditions().size()) {
+		macro->Conditions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
@@ -1583,18 +1598,23 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 			macro->Conditions().at(idx)->Load(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		(*cond)->SetLogicType(logic);
 		macro->UpdateConditionIndices();
 		ui->conditionsList->Insert(
 			idx,
 			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       id, idx == 0));
+					       idx == 0));
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);
 	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
+
+	QTimer::singleShot(0, this, [this]() {
+		ui->conditionsList->ensureWidgetVisible(
+			ui->conditionsList->WidgetAt(currentConditionIdx));
+	});
 }
 
 void MacroEdit::on_conditionAdd_clicked()

lib/macro/macro-edit.hpp

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

lib/macro/macro-export-builtin-extensions.cpp

@@ -0,0 +1,89 @@
+#include "macro-export-extensions.hpp"
+
+#include "action-queue.hpp"
+#include "variable.hpp"
+
+#include <obs.hpp>
+
+namespace advss {
+
+static bool setup();
+static bool setupDone = setup();
+
+static bool setup()
+{
+	// --- Variables ---
+	AddMacroExportExtension(
+		{"AdvSceneSwitcher.macroTab.export.variables", "variables",
+		 [](obs_data_t *data, const QStringList &selectedIds) {
+			 if (selectedIds.isEmpty()) {
+				 SaveVariables(data);
+				 return;
+			 }
+			 OBSDataArrayAutoRelease array =
+				 obs_data_array_create();
+			 for (const auto &v : GetVariables()) {
+				 const QString name =
+					 QString::fromStdString(v->Name());
+				 if (!selectedIds.contains(name)) {
+					 continue;
+				 }
+				 OBSDataAutoRelease item = obs_data_create();
+				 v->Save(item);
+				 obs_data_array_push_back(array, item);
+			 }
+			 obs_data_set_array(data, "variables", array);
+		 },
+		 [](obs_data_t *data, const QStringList &) {
+			 ImportVariables(data);
+		 },
+		 []() -> QList<QPair<QString, QString>> {
+			 QList<QPair<QString, QString>> items;
+			 for (const auto &v : GetVariables()) {
+				 const QString name =
+					 QString::fromStdString(v->Name());
+				 items.append({name, name});
+			 }
+			 return items;
+		 }});
+
+	// --- Action Queues ---
+	AddMacroExportExtension(
+		{"AdvSceneSwitcher.macroTab.export.actionQueues",
+		 "actionQueues",
+		 [](obs_data_t *data, const QStringList &selectedIds) {
+			 if (selectedIds.isEmpty()) {
+				 SaveActionQueues(data);
+				 return;
+			 }
+			 OBSDataArrayAutoRelease array =
+				 obs_data_array_create();
+			 for (const auto &q : GetActionQueues()) {
+				 const QString name =
+					 QString::fromStdString(q->Name());
+				 if (!selectedIds.contains(name)) {
+					 continue;
+				 }
+				 OBSDataAutoRelease item = obs_data_create();
+				 q->Save(item);
+				 obs_data_array_push_back(array, item);
+			 }
+			 obs_data_set_array(data, "actionQueues", array);
+		 },
+		 [](obs_data_t *data, const QStringList &) {
+			 ImportQueues(data);
+		 },
+		 []() -> QList<QPair<QString, QString>> {
+			 QList<QPair<QString, QString>> items;
+			 for (const auto &q : GetActionQueues()) {
+				 const QString name =
+					 QString::fromStdString(q->Name());
+				 items.append({name, name});
+			 }
+			 return items;
+		 }});
+
+	return true;
+}
+
+} // namespace advss

lib/macro/macro-export-extensions.cpp

@@ -0,0 +1,17 @@
+#include "macro-export-extensions.hpp"
+
+namespace advss {
+
+static std::vector<MacroExportExtension> extensions;
+
+void AddMacroExportExtension(const MacroExportExtension &ext)
+{
+	extensions.emplace_back(ext);
+}
+
+const std::vector<MacroExportExtension> &GetMacroExportExtensions()
+{
+	return extensions;
+}
+
+} // namespace advss

lib/macro/macro-export-extensions.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "export-symbol-helper.hpp"
+
+#include <functional>
+#include <obs-data.h>
+#include <QList>
+#include <QPair>
+#include <QString>
+#include <vector>
+
+namespace advss {
+
+struct MacroExportExtension {
+	const char *displayNameKey;
+	const char *jsonKey;
+
+	// Export callback.
+	// Write content into 'data'.  'selectedIds' contains the item IDs the
+	// user explicitly checked; if empty (no per-item widget provided) save
+	// everything.
+	std::function<void(obs_data_t *data, const QStringList &selectedIds)>
+		save;
+
+	// Import callback.
+	// Read content from 'data'.  'selectedIds' contains the item IDs the
+	// user explicitly checked; if empty import every item found in 'data'.
+	std::function<void(obs_data_t *data, const QStringList &selectedIds)>
+		load;
+
+	// Optional: enumerate items available for export as (id, displayName)
+	// pairs.  When nullptr the extension appears as a single all-or-nothing
+	// checkbox in the export dialog.
+	std::function<QList<QPair<QString, QString>>()> getExportItems =
+		nullptr;
+};
+
+EXPORT void AddMacroExportExtension(const MacroExportExtension &ext);
+const std::vector<MacroExportExtension> &GetMacroExportExtensions();
+
+} // namespace advss

lib/macro/macro-export-import-dialog.cpp

@@ -1,22 +1,160 @@
 #include "macro-export-import-dialog.hpp"
+#include "macro-export-extensions.hpp"
 #include "obs-module-helper.hpp"
 
 #include <obs.hpp>
-#include <QLayout>
-#include <QLabel>
 #include <QDialogButtonBox>
+#include <QLabel>
+#include <QLayout>
+#include <algorithm>
+#include <numeric>
 
 namespace advss {
 
 static bool usePlainText = false;
 
-MacroExportImportDialog::MacroExportImportDialog(Type type)
+// ---------------------------------------------------------------------------
+// Compress / decompress helpers
+// ---------------------------------------------------------------------------
+
+static QString compressMacroString(const QString &input)
+{
+	QByteArray inputData = input.toUtf8();
+	auto compressedData = qCompress(inputData);
+	QByteArray encodedData = compressedData.toBase64();
+	return QString::fromUtf8(encodedData);
+}
+
+static QString decompressMacroString(const QString &input)
+{
+	QByteArray encodedData = input.toUtf8();
+	QByteArray compressedData = QByteArray::fromBase64(encodedData);
+	auto outputData = qUncompress(compressedData);
+	return QString::fromUtf8(outputData);
+}
+
+static bool isValidData(const QString &json)
+{
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(json.toStdString().c_str());
+	return !!data;
+}
+
+// ---------------------------------------------------------------------------
+// Extension section
+// ---------------------------------------------------------------------------
+
+Section *MacroExportImportDialog::BuildExtensionSection()
+{
+	auto outerSection = new Section(300, this);
+	outerSection->AddHeaderWidget(new QLabel(obs_module_text(
+		"AdvSceneSwitcher.macroTab.export.additionalContent")));
+
+	auto outerContent = new QWidget();
+	auto outerLayout = new QVBoxLayout(outerContent);
+	outerLayout->setContentsMargins(4, 4, 4, 4);
+	outerLayout->setSpacing(4);
+
+	const auto &extensions = GetMacroExportExtensions();
+
+	// Build a sorted index list (alphabetical by translated display name).
+	std::vector<int> order(extensions.size());
+	std::iota(order.begin(), order.end(), 0);
+	std::sort(order.begin(), order.end(), [&](int a, int b) {
+		return QString::localeAwareCompare(
+			       obs_module_text(extensions[a].displayNameKey),
+			       obs_module_text(extensions[b].displayNameKey)) <
+		       0;
+	});
+
+	for (int extIdx : order) {
+		const auto &ext = extensions[extIdx];
+		ExtensionUI ui;
+
+		// Simple all-or-nothing checkbox (no sub-items).
+		if (!ext.getExportItems) {
+			ui.mainCheck = new QCheckBox(
+				obs_module_text(ext.displayNameKey),
+				outerContent);
+			ui.mainCheck->setChecked(false);
+			connect(ui.mainCheck, &QCheckBox::stateChanged, this,
+				&MacroExportImportDialog::UpdateExportString);
+			outerLayout->addWidget(ui.mainCheck);
+			_extensionUIs.append(std::move(ui));
+			continue;
+		}
+
+		// Extensions with per-item selection get their own inner
+		// Section: the main checkbox sits in the header (next to the
+		// toggle arrow) and the per-item checkboxes live in the
+		// collapsible content area.
+		const auto items = ext.getExportItems();
+		if (items.isEmpty()) {
+			continue;
+		}
+
+		auto innerSection = new Section(200, outerContent);
+
+		ui.mainCheck =
+			new QCheckBox(obs_module_text(ext.displayNameKey));
+		ui.mainCheck->setChecked(false);
+		innerSection->AddHeaderWidget(ui.mainCheck);
+
+		auto subWidget = new QWidget();
+		auto subLayout = new QVBoxLayout(subWidget);
+		subLayout->setContentsMargins(4, 2, 4, 2);
+		subLayout->setSpacing(2);
+
+		for (const auto &[id, displayName] : items) {
+			auto cb = new QCheckBox(displayName, subWidget);
+			cb->setChecked(false);
+			subLayout->addWidget(cb);
+			ui.itemChecks.append({id, cb});
+			connect(cb, &QCheckBox::stateChanged, this,
+				&MacroExportImportDialog::UpdateExportString);
+		}
+
+		// Main checkbox toggles all sub-items.
+		// Capture uiIdx (position in _extensionUIs after append).
+		const int uiIdx = _extensionUIs.size();
+		connect(ui.mainCheck, &QCheckBox::stateChanged, this,
+			[this, uiIdx](int state) {
+				if (state == Qt::PartiallyChecked)
+					return;
+				const bool checked = (state == Qt::Checked);
+				if (uiIdx < _extensionUIs.size()) {
+					for (auto &[id, cb] :
+					     _extensionUIs[uiIdx].itemChecks) {
+						QSignalBlocker b(cb);
+						cb->setChecked(checked);
+					}
+				}
+				UpdateExportString();
+			});
+
+		innerSection->SetContent(subWidget, false);
+		outerLayout->addWidget(innerSection);
+		_extensionUIs.append(std::move(ui));
+	}
+
+	outerSection->SetContent(outerContent, true);
+	return outerSection;
+}
+
+// ---------------------------------------------------------------------------
+// Constructor
+// ---------------------------------------------------------------------------
+
+MacroExportImportDialog::MacroExportImportDialog(Type type,
+						 const QString &baseJson)
 	: QDialog(nullptr),
+	  _baseJson(baseJson),
 	  _importExportString(new QPlainTextEdit(this)),
 	  _usePlainText(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.export.usePlainText")))
 {
 	_importExportString->setReadOnly(type == Type::EXPORT_MACRO);
+
 	auto label = new QLabel(obs_module_text(
 		type == Type::EXPORT_MACRO
 			? "AdvSceneSwitcher.macroTab.export.info"
@@ -39,7 +177,12 @@ MacroExportImportDialog::MacroExportImportDialog(Type type)
 	connect(_usePlainText, &QCheckBox::stateChanged, this,
 		&MacroExportImportDialog::UsePlainTextChanged);
 
-	auto layout = new QVBoxLayout;
+	auto layout = new QVBoxLayout(this);
+
+	if (type == Type::EXPORT_MACRO && !GetMacroExportExtensions().empty()) {
+		layout->addWidget(BuildExtensionSection());
+	}
+
 	layout->addWidget(label);
 	layout->addWidget(_importExportString);
 	layout->addWidget(_usePlainText);
@@ -47,32 +190,57 @@ MacroExportImportDialog::MacroExportImportDialog(Type type)
 	setLayout(layout);
 
 	setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
+
+	if (type == Type::EXPORT_MACRO) {
+		RefreshExportText();
+	}
 }
 
-QString compressMacroString(const QString &input)
+// ---------------------------------------------------------------------------
+// Export string helpers
+// ---------------------------------------------------------------------------
+
+QString MacroExportImportDialog::BuildExportJson() const
 {
-	QByteArray inputData = input.toUtf8();
-	auto compressedData = qCompress(inputData);
-	QByteArray encodedData = compressedData.toBase64();
-	return QString::fromUtf8(encodedData);
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(_baseJson.toStdString().c_str());
+	if (!data) {
+		return _baseJson;
+	}
+
+	const auto &extensions = GetMacroExportExtensions();
+	for (int i = 0;
+	     i < (int)extensions.size() && i < (int)_extensionUIs.size(); ++i) {
+		if (!_extensionUIs[i].mainCheck->isChecked()) {
+			continue;
+		}
+
+		QStringList selectedIds;
+		for (const auto &[id, cb] : _extensionUIs[i].itemChecks) {
+			if (cb->isChecked()) {
+				selectedIds << id;
+			}
+		}
+		extensions[i].save(data, selectedIds);
+	}
+
+	const char *json = obs_data_get_json(data);
+	return json ? QString::fromUtf8(json) : QString{};
 }
 
-QString decompressMacroString(const QString &input)
+void MacroExportImportDialog::RefreshExportText()
 {
-	QByteArray encodedData = input.toUtf8();
-	QByteArray compressedData = QByteArray::fromBase64(encodedData);
-	auto outputData = qUncompress(compressedData);
-	return QString::fromUtf8(outputData);
+	const QString json = BuildExportJson();
+	if (usePlainText) {
+		_importExportString->setPlainText(json);
+	} else {
+		_importExportString->setPlainText(compressMacroString(json));
+	}
 }
 
-void MacroExportImportDialog::ExportMacros(const QString &json)
+void MacroExportImportDialog::UpdateExportString()
 {
-	MacroExportImportDialog dialog(
-		MacroExportImportDialog::Type::EXPORT_MACRO);
-	dialog._importExportString->setPlainText(compressMacroString(json));
-	dialog.adjustSize();
-	dialog.updateGeometry();
-	dialog.exec();
+	RefreshExportText();
 }
 
 void MacroExportImportDialog::UsePlainTextChanged(int value)
@@ -90,26 +258,45 @@ void MacroExportImportDialog::UsePlainTextChanged(int value)
 	usePlainText = value;
 }
 
-static bool isValidData(const QString &json)
+// ---------------------------------------------------------------------------
+// Static entry points
+// ---------------------------------------------------------------------------
+
+void MacroExportImportDialog::ExportMacros(obs_data_t *macroData)
 {
-	OBSDataAutoRelease data =
-		obs_data_create_from_json(json.toStdString().c_str());
-	return !!data;
+	const char *rawJson = obs_data_get_json(macroData);
+	const QString baseJson = rawJson ? QString::fromUtf8(rawJson)
+					 : QString{};
+
+	MacroExportImportDialog dialog(Type::EXPORT_MACRO, baseJson);
+	dialog.adjustSize();
+	dialog.updateGeometry();
+	dialog.exec();
 }
 
 bool MacroExportImportDialog::ImportMacros(QString &json)
 {
-	MacroExportImportDialog dialog(
-		MacroExportImportDialog::Type::IMPORT_MACRO);
-	if (dialog.exec() == QDialog::Accepted) {
-		json = decompressMacroString(
-			dialog._importExportString->toPlainText());
-		if (!isValidData(json)) { // Fallback to support raw json format
-			json = dialog._importExportString->toPlainText();
-		}
-		return true;
+	MacroExportImportDialog dialog(Type::IMPORT_MACRO);
+	if (dialog.exec() != QDialog::Accepted) {
+		return false;
 	}
-	return false;
+
+	json = decompressMacroString(dialog._importExportString->toPlainText());
+	if (!isValidData(json)) {
+		// Fallback: support raw (uncompressed) JSON pasted directly.
+		json = dialog._importExportString->toPlainText();
+	}
+
+	// Invoke all extension load callbacks.
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(json.toStdString().c_str());
+	if (data) {
+		for (const auto &ext : GetMacroExportExtensions()) {
+			ext.load(data, {});
+		}
+	}
+
+	return true;
 }
 
 } // namespace advss

lib/macro/macro-export-import-dialog.hpp

@@ -1,25 +1,47 @@
 #pragma once
+
+#include "section.hpp"
+
 #include <QCheckBox>
 #include <QDialog>
+#include <QList>
 #include <QPlainTextEdit>
 
+#include <obs-data.h>
+
 namespace advss {
 
 class MacroExportImportDialog : public QDialog {
 	Q_OBJECT
 public:
 	enum class Type { EXPORT_MACRO, IMPORT_MACRO };
-	MacroExportImportDialog(Type type);
 
-	static void ExportMacros(const QString &json);
+	static void ExportMacros(obs_data_t *macroData);
 	static bool ImportMacros(QString &json);
 
 private slots:
 	void UsePlainTextChanged(int);
+	void UpdateExportString();
 
 private:
+	explicit MacroExportImportDialog(Type type,
+					 const QString &baseJson = {});
+
+	// Per-extension widgets
+	struct ExtensionUI {
+		QCheckBox *mainCheck = nullptr;
+		// (itemId, checkbox) pairs - empty when no per-item selection.
+		QList<QPair<QString, QCheckBox *>> itemChecks;
+	};
+
+	Section *BuildExtensionSection();
+	QString BuildExportJson() const;
+	void RefreshExportText();
+
+	QString _baseJson;
 	QPlainTextEdit *_importExportString;
 	QCheckBox *_usePlainText;
+	QList<ExtensionUI> _extensionUIs;
 };
 
 } // namespace advss

lib/macro/macro-helpers.cpp

@@ -1,5 +1,6 @@
 #include "macro-helpers.hpp"
 #include "macro.hpp"
+#include "macro-action-macro.hpp"
 #include "plugin-state-helpers.hpp"
 
 namespace advss {
@@ -8,6 +9,87 @@ static std::atomic_bool abortMacroWait = {false};
 static std::atomic_bool macroSceneSwitched = {false};
 static std::atomic_int shutdownConditionCount = {0};
 
+static void appendNestedMacros(std::deque<std::shared_ptr<Macro>> &macros,
+			       Macro *macro)
+{
+	if (!macro) {
+		return;
+	}
+
+	const auto iterate = [&macros](const std::deque<
+				       std::shared_ptr<MacroAction>> &actions) {
+		for (const auto &action : actions) {
+			const auto nestedMacroAction =
+				dynamic_cast<MacroActionMacro *>(action.get());
+			if (!nestedMacroAction) {
+				continue;
+			}
+
+			macros.push_back(nestedMacroAction->_nestedMacro);
+			appendNestedMacros(
+				macros, nestedMacroAction->_nestedMacro.get());
+		}
+	};
+
+	iterate(macro->Actions());
+	iterate(macro->ElseActions());
+}
+
+std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros()
+{
+	static std::deque<std::shared_ptr<Macro>> macros;
+	return macros;
+}
+
+std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros()
+{
+	static std::deque<std::shared_ptr<Macro>> tempMacros;
+	return tempMacros;
+}
+
+std::deque<std::shared_ptr<Macro>> GetAllMacros()
+{
+	auto macros = GetTopLevelMacros();
+	for (const auto &topLevelMacro : macros) {
+		appendNestedMacros(macros, topLevelMacro.get());
+	}
+
+	const auto &tempMacros = GetTemporaryMacros();
+	macros.insert(macros.end(), tempMacros.begin(), tempMacros.end());
+	for (const auto &tempMacro : tempMacros) {
+		appendNestedMacros(macros, tempMacro.get());
+	}
+
+	return macros;
+}
+
+Macro *GetMacroByName(const char *name)
+{
+	for (const auto &m : GetTopLevelMacros()) {
+		if (m->Name() == name) {
+			return m.get();
+		}
+	}
+
+	return nullptr;
+}
+
+Macro *GetMacroByQString(const QString &name)
+{
+	return GetMacroByName(name.toUtf8().constData());
+}
+
+std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
+{
+	for (const auto &m : GetTopLevelMacros()) {
+		if (m->Name() == name) {
+			return m;
+		}
+	}
+
+	return {};
+}
+
 std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *macro)
 {
@@ -17,6 +99,15 @@ GetMacroActions(Macro *macro)
 	return macro->Actions();
 }
 
+std::optional<std::deque<std::shared_ptr<MacroAction>>>
+GetMacroElseActions(Macro *macro)
+{
+	if (!macro) {
+		return {};
+	}
+	return macro->ElseActions();
+}
+
 std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *macro)
 {
@@ -26,9 +117,32 @@ GetMacroConditions(Macro *macro)
 	return macro->Conditions();
 }
 
-std::string_view GetSceneSwitchActionId()
+bool IsGroupMacro(Macro *macro)
 {
-	return MacroAction::GetDefaultID();
+	return macro && macro->IsGroup();
+}
+
+std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *macro)
+{
+	if (!macro || !macro->IsGroup()) {
+		return {};
+	}
+
+	std::vector<std::shared_ptr<Macro>> entries;
+	entries.reserve(macro->GroupSize());
+
+	const auto &macros = GetTopLevelMacros();
+	for (auto it = macros.begin(); it < macros.end(); it++) {
+		if ((*it)->Name() != macro->Name()) {
+			continue;
+		}
+		for (uint32_t i = 1; i <= macro->GroupSize(); i++) {
+			entries.emplace_back(*std::next(it, i));
+		}
+		break;
+	}
+
+	return entries;
 }
 
 std::condition_variable &GetMacroWaitCV()
@@ -100,6 +214,20 @@ bool MacroIsPaused(const Macro *macro)
 	return macro ? macro->Paused() : true;
 }
 
+void SetMacroPaused(Macro *macro, bool paused)
+{
+	if (macro) {
+		macro->SetPaused(paused);
+	}
+}
+
+void StopMacro(Macro *macro)
+{
+	if (macro) {
+		macro->Stop();
+	}
+}
+
 bool MacroWasPausedSince(
 	const Macro *macro,
 	const std::chrono::high_resolution_clock::time_point &time)
@@ -123,9 +251,20 @@ void AddMacroHelperThread(Macro *macro, std::thread &&newThread)
 	macro->AddHelperThread(std::move(newThread));
 }
 
-bool RunMacroActions(Macro *macro)
+bool RunMacroActions(Macro *macro, bool forceParallel, bool ignorePause)
 {
-	return macro && macro->PerformActions(true);
+	return macro && macro->PerformActions(true, forceParallel, ignorePause);
+}
+
+bool RunMacroElseActions(Macro *macro, bool forceParallel, bool ignorePause)
+{
+	return macro &&
+	       macro->PerformActions(false, forceParallel, ignorePause);
+}
+
+bool CheckMacroConditions(Macro *macro, bool ignorePause)
+{
+	return macro && macro->CheckConditions(ignorePause);
 }
 
 void ResetMacroConditionTimers(Macro *macro)
@@ -144,20 +283,42 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }
 
-bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
+bool IsValidActionIndex(const Macro *m, const int idx)
 {
 	if (!m || idx < 0) {
 		return false;
 	}
-	if (isCondition) {
-		if (idx >= (int)m->Conditions().size()) {
-			return false;
-		}
-	} else {
-		if (idx >= (int)m->Actions().size()) {
-			return false;
-		}
+
+	if (idx >= (int)m->Actions().size()) {
+		return false;
 	}
+
+	return true;
+}
+
+bool IsValidElseActionIndex(const Macro *m, const int idx)
+{
+	if (!m || idx < 0) {
+		return false;
+	}
+
+	if (idx >= (int)m->ElseActions().size()) {
+		return false;
+	}
+
+	return true;
+}
+
+bool IsValidConditionIndex(const Macro *m, const int idx)
+{
+	if (!m || idx < 0) {
+		return false;
+	}
+
+	if (idx >= (int)m->Conditions().size()) {
+		return false;
+	}
+
 	return true;
 }
 

lib/macro/macro-helpers.hpp

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

lib/macro/macro-ref.cpp

@@ -1,6 +1,8 @@
 #include "macro-ref.hpp"
 #include "macro.hpp"
 
+#include "plugin-state-helpers.hpp"
+
 namespace advss {
 
 MacroRef::MacroRef(std::string name)
@@ -19,6 +21,7 @@ void MacroRef::Load(obs_data_t *obj)
 	auto name = obs_data_get_string(obj, "macro");
 	_postLoadName = name;
 	_macro = GetWeakMacroByName(name);
+	AddPostLoadStep([this]() { MacroRef::PostLoad(); });
 }
 
 void MacroRef::PostLoad()

lib/macro/macro-search.cpp

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

lib/macro/macro-search.hpp

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

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

@@ -72,15 +72,24 @@ void MacroEdit::PasteMacroSegment()
 		}
 		AddMacroCondition(macro.get(), macro->Conditions().size(),
 				  copyInfo.segment->GetId(), data.Get(), logic);
+		if (!macro->Conditions().empty()) {
+			macro->Conditions().back()->FixupVarMappingRefs();
+		}
 		break;
 	}
 	case MacroSegmentCopyInfo::Type::ACTION:
 		AddMacroAction(macro.get(), macro->Actions().size(),
 			       copyInfo.segment->GetId(), data.Get());
+		if (!macro->Actions().empty()) {
+			macro->Actions().back()->FixupVarMappingRefs();
+		}
 		break;
 	case MacroSegmentCopyInfo::Type::ELSE:
 		AddMacroElseAction(macro.get(), macro->ElseActions().size(),
 				   copyInfo.segment->GetId(), data.Get());
+		if (!macro->ElseActions().empty()) {
+			macro->ElseActions().back()->FixupVarMappingRefs();
+		}
 		break;
 	default:
 		break;

lib/macro/macro-segment-selection.cpp

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

lib/macro/macro-segment-selection.hpp

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

lib/macro/macro-segment.cpp

@@ -1,8 +1,10 @@
 #include "macro-segment.hpp"
 #include "macro.hpp"
 #include "mouse-wheel-guard.hpp"
+#include "path-helpers.hpp"
 #include "section.hpp"
 #include "ui-helpers.hpp"
+#include "variable.hpp"
 
 #include <QApplication>
 #include <QEvent>
@@ -13,20 +15,101 @@
 
 namespace advss {
 
+std::vector<TempVariableRef> MacroSegment::GetTempVarRefs() const
+{
+	std::vector<TempVariableRef> refs;
+	for (const auto &mapping : _varMappings) {
+		if (mapping.tempVar.HasValidID()) {
+			refs.push_back(mapping.tempVar);
+		}
+	}
+	return refs;
+}
+
+void MacroSegment::ApplyVarMappings()
+{
+	auto macro = GetMacro();
+	for (const auto &mapping : _varMappings) {
+		auto var = mapping.variable.lock();
+		if (!var) {
+			continue;
+		}
+		const auto tempVar = mapping.tempVar.GetTempVariable(macro);
+		if (!tempVar) {
+			continue;
+		}
+		const auto value = tempVar->Value();
+		if (!value) {
+			continue;
+		}
+		var->SetValue(*value);
+	}
+}
+
+const std::vector<VarMapping> &MacroSegment::GetVarMappings() const
+{
+	return _varMappings;
+}
+
+void MacroSegment::SetVarMappings(const std::vector<VarMapping> &mappings)
+{
+	_varMappings = mappings;
+	IncrementTempVarInUseGeneration();
+}
+
+void MacroSegment::FixupVarMappingRefs()
+{
+	for (auto &mapping : _varMappings) {
+		if (!mapping.tempVar.HasValidID()) {
+			continue;
+		}
+		for (const auto &var : _tempVariables) {
+			if (var.ID() == mapping.tempVar.GetID()) {
+				mapping.tempVar = var.GetRef();
+				break;
+			}
+		}
+	}
+	NotifyUIAboutTempVarChange(this);
+}
+
+std::vector<TempVariable> MacroSegment::GetOwnTempVars() const
+{
+	return _tempVariables;
+}
+
 MacroSegment::MacroSegment(Macro *m, bool supportsVariableValue)
 	: _macro(m),
 	  _supportsVariableValue(supportsVariableValue)
 {
 }
 
+void MacroSegment::SetVarMappingExpanded(bool expanded)
+{
+	_varMappingExpanded = expanded;
+}
+
 bool MacroSegment::Save(obs_data_t *obj) const
 {
 	OBSDataAutoRelease data = obs_data_create();
 	obs_data_set_bool(data, "collapsed", _collapsed);
+	obs_data_set_bool(data, "varMappingExpanded", _varMappingExpanded);
 	obs_data_set_bool(data, "useCustomLabel", _useCustomLabel);
 	obs_data_set_string(data, "customLabel", _customLabel.c_str());
 	obs_data_set_bool(data, "enabled", _enabled);
-	obs_data_set_int(data, "version", 1);
+	obs_data_set_int(data, "version", 2);
+
+	OBSDataArrayAutoRelease mappingsArray = obs_data_array_create();
+	for (const auto &mapping : _varMappings) {
+		OBSDataAutoRelease item = obs_data_create();
+		mapping.tempVar.Save(item, GetMacro(), "tempVar");
+		obs_data_set_string(
+			item, "variable",
+			GetWeakVariableName(mapping.variable).c_str());
+		obs_data_array_push_back(mappingsArray, item);
+	}
+	obs_data_set_array(data, "varMappings", mappingsArray);
+
 	obs_data_set_obj(obj, "segmentSettings", data);
 	return true;
 }
@@ -35,6 +118,7 @@ bool MacroSegment::Load(obs_data_t *obj)
 {
 	OBSDataAutoRelease data = obs_data_get_obj(obj, "segmentSettings");
 	_collapsed = obs_data_get_bool(data, "collapsed");
+	_varMappingExpanded = obs_data_get_bool(data, "varMappingExpanded");
 	_useCustomLabel = obs_data_get_bool(data, "useCustomLabel");
 	_customLabel = obs_data_get_string(data, "customLabel");
 	obs_data_set_default_bool(data, "enabled", true);
@@ -45,6 +129,26 @@ bool MacroSegment::Load(obs_data_t *obj)
 		_enabled = obs_data_get_bool(obj, "enabled");
 	}
 
+	// Reset the previously unused "enabled" value for conditions to "true"
+	if (obs_data_get_int(data, "version") < 2 &&
+	    obs_data_has_user_value(obj, "logic")) {
+		_enabled = true;
+	}
+
+	_varMappings.clear();
+	OBSDataArrayAutoRelease mappingsArray =
+		obs_data_get_array(data, "varMappings");
+	const size_t count = obs_data_array_count(mappingsArray);
+	_varMappings.reserve(count);
+	for (size_t i = 0; i < count; i++) {
+		OBSDataAutoRelease item = obs_data_array_item(mappingsArray, i);
+		VarMapping mapping;
+		mapping.variable = GetWeakVariableByName(
+			obs_data_get_string(item, "variable"));
+		_varMappings.push_back(std::move(mapping));
+		_varMappings.back().tempVar.Load(item, GetMacro(), "tempVar");
+	}
+
 	ClearAvailableTempvars();
 	return true;
 }
@@ -152,6 +256,16 @@ void MacroSegment::AddTempvar(const std::string &id, const std::string &name,
 	NotifyUIAboutTempVarChange(this);
 }
 
+bool MacroSegment::IsTempVarInUse(const std::string &id) const
+{
+	for (const auto &var : _tempVariables) {
+		if (var.ID() == id) {
+			return var.IsInUse();
+		}
+	}
+	return false;
+}
+
 void MacroSegment::SetTempVarValue(const std::string &id,
 				   const std::string &value)
 {
@@ -211,11 +325,38 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 	  _headerInfo(new QLabel()),
 	  _frame(new QWidget),
 	  _contentLayout(new QVBoxLayout),
+	  _outputMappings(new TempVarOutputMappingsWidget(this)),
+	  _varMappingToggle(new QPushButton(this)),
 	  _noBorderframe(new QFrame),
 	  _borderFrame(new QFrame),
 	  _dropLineAbove(new QFrame),
 	  _dropLineBelow(new QFrame)
 {
+	const auto iconPath = QString::fromStdString(GetDataFilePath(
+		"res/images/" + GetThemeTypeName() + "Variable.svg"));
+	_varMappingToggle->setIcon(QIcon(iconPath));
+	_varMappingToggle->setMaximumWidth(22);
+	_varMappingToggle->setFlat(true);
+	_varMappingToggle->setCheckable(true);
+	_varMappingToggle->setVisible(false);
+	_varMappingToggle->setToolTip(obs_module_text(
+		"AdvSceneSwitcher.tempVar.outputMappings.toggle"));
+
+	QWidget::connect(_varMappingToggle, &QPushButton::toggled,
+			 _outputMappings,
+			 &TempVarOutputMappingsWidget::SetPanelExpanded);
+	QWidget::connect(_varMappingToggle, &QPushButton::toggled, this,
+			 [this](bool checked) {
+				 if (Data()) {
+					 Data()->SetVarMappingExpanded(checked);
+				 }
+			 });
+	QWidget::connect(_outputMappings,
+			 &TempVarOutputMappingsWidget::ExpandableChanged,
+			 _varMappingToggle, &QPushButton::setVisible);
+	QWidget::connect(_section, &Section::Collapsed, _outputMappings,
+			 &TempVarOutputMappingsWidget::SetSectionCollapsed);
+
 	_dropLineAbove->setLineWidth(3);
 	_dropLineAbove->setFixedHeight(11);
 	_dropLineBelow->setLineWidth(3);
@@ -277,6 +418,21 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 	_headerInfo->installEventFilter(this);
 }
 
+void MacroSegmentEdit::SetupVarMappings(MacroSegment *segment)
+{
+	_outputMappings->SetSegment(segment);
+	_varMappingToggle->setChecked(segment &&
+				      segment->GetVarMappingExpanded());
+}
+
+void MacroSegmentEdit::ShowVariableMappings(bool show)
+{
+	_varMappingToggle->setChecked(show);
+	if (Data()) {
+		Data()->SetVarMappingExpanded(show);
+	}
+}
+
 bool MacroSegmentEdit::eventFilter(QObject *obj, QEvent *ev)
 {
 	if (obj == _headerInfo && ev->type() == QEvent::MouseMove) {

lib/macro/macro-segment.hpp

@@ -9,15 +9,23 @@
 
 #include <QWidget>
 #include <QFrame>
+#include <QPushButton>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <obs-data.h>
+#include <memory>
 
 class QLabel;
 
 namespace advss {
 
 class Macro;
+class Variable;
+
+struct VarMapping {
+	TempVariableRef tempVar;
+	std::weak_ptr<Variable> variable;
+};
 
 class EXPORT MacroSegment : public Lockable {
 public:
@@ -28,12 +36,15 @@ public:
 	int GetIndex() const { return _idx; }
 	void SetCollapsed(bool collapsed) { _collapsed = collapsed; }
 	bool GetCollapsed() const { return _collapsed; }
+	void SetVarMappingExpanded(bool expanded);
+	bool GetVarMappingExpanded() const { return _varMappingExpanded; }
 	void SetUseCustomLabel(bool enable) { _useCustomLabel = enable; }
 	bool GetUseCustomLabel() const { return _useCustomLabel; }
 	void SetCustomLabel(const std::string &label) { _customLabel = label; }
 	std::string GetCustomLabel() const { return _customLabel; }
 	virtual bool Save(obs_data_t *obj) const = 0;
 	virtual bool Load(obs_data_t *obj) = 0;
+	virtual std::vector<TempVariableRef> GetTempVarRefs() const;
 	virtual bool PostLoad();
 	virtual std::string GetShortDesc() const;
 	virtual std::string GetId() const = 0;
@@ -42,6 +53,11 @@ public:
 	void SetEnabled(bool);
 	bool Enabled() const;
 	virtual std::string GetVariableValue() const;
+	void ApplyVarMappings();
+	const std::vector<VarMapping> &GetVarMappings() const;
+	void SetVarMappings(const std::vector<VarMapping> &mappings);
+	std::vector<TempVariable> GetOwnTempVars() const;
+	void FixupVarMappingRefs();
 
 protected:
 	friend bool SupportsVariableValue(MacroSegment *);
@@ -54,6 +70,7 @@ protected:
 	void AddTempvar(const std::string &id, const std::string &name,
 			const std::string &description = "");
 
+	bool IsTempVarInUse(const std::string &id) const;
 	void SetTempVarValue(const std::string &id, const std::string &value);
 
 	template<typename T, typename = std::enable_if_t<
@@ -64,6 +81,14 @@ protected:
 					  : std::string("false"));
 	}
 
+	template<typename F, typename = std::enable_if_t<std::is_invocable_v<F>>>
+	void SetTempVarValue(const std::string &id, F &&valueProvider)
+	{
+		if (IsTempVarInUse(id)) {
+			SetTempVarValue(id, valueProvider());
+		}
+	}
+
 private:
 	void ClearAvailableTempvars();
 	std::optional<const TempVariable>
@@ -77,6 +102,7 @@ private:
 	// UI helper
 	bool _highlight = false;
 	bool _collapsed = false;
+	bool _varMappingExpanded = false;
 	bool _enabled = true;
 
 	// Custom header labels
@@ -89,6 +115,7 @@ private:
 	int _variableRefs = 0;
 	std::string _variableValue;
 	std::vector<TempVariable> _tempVariables;
+	std::vector<VarMapping> _varMappings;
 
 	friend class Macro;
 };
@@ -108,8 +135,11 @@ public:
 	virtual std::shared_ptr<MacroSegment> Data() const = 0;
 	virtual void SetupWidgets(bool basicSetup = false) = 0;
 
+	void SetupVarMappings(MacroSegment *segment);
+
 public slots:
 	void HeaderInfoChanged(const QString &);
+	void ShowVariableMappings(bool show);
 
 protected slots:
 	void Collapsed(bool) const;
@@ -124,6 +154,8 @@ protected:
 	QLabel *_headerInfo;
 	QWidget *_frame;
 	QVBoxLayout *_contentLayout;
+	TempVarOutputMappingsWidget *_outputMappings;
+	QPushButton *_varMappingToggle;
 	bool _allWidgetsAreSetup = false;
 
 private:

lib/macro/macro-selection.cpp

@@ -14,10 +14,7 @@ MacroSelection::MacroSelection(QWidget *parent)
 	: FilterComboBox(parent,
 			 obs_module_text("AdvSceneSwitcher.selectMacro"))
 {
-	for (const auto &m : GetMacros()) {
-		if (m->IsGroup()) {
-			continue;
-		}
+	for (const auto &m : GetTopLevelMacros()) {
 		addItem(QString::fromStdString(m->Name()));
 	}
 
@@ -54,6 +51,7 @@ void MacroSelection::HideSelectedMacro()
 		return;
 	}
 
+#ifndef UNIT_TEST
 	const auto m = ssWindow->ui->macros->GetCurrentMacro();
 	if (!m) {
 		return;
@@ -64,6 +62,23 @@ void MacroSelection::HideSelectedMacro()
 	}
 
 	qobject_cast<QListView *>(view())->setRowHidden(idx, true);
+#endif // !UNIT_TEST
+}
+
+void MacroSelection::HideGroups()
+{
+	for (const auto &macro : GetTopLevelMacros()) {
+		if (!macro->IsGroup()) {
+			continue;
+		}
+
+		int idx = findText(QString::fromStdString(macro->Name()));
+		if (idx == -1) {
+			continue;
+		}
+
+		qobject_cast<QListView *>(view())->setRowHidden(idx, true);
+	}
 }
 
 void MacroSelection::ShowAllMacros()

lib/macro/macro-selection.hpp

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

lib/macro/macro-signals.hpp

@@ -18,6 +18,7 @@ signals:
 	void Remove(const QString &);
 	void SegmentOrderChanged();
 	void HighlightChanged(bool value);
+	void ConditionTypeCreated(const QString &typeId);
 
 private:
 	MacroSignalManager(QObject *parent = nullptr);

lib/macro/macro-tab.cpp

@@ -1,9 +1,9 @@
 #include "advanced-scene-switcher.hpp"
-#include "action-queue.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
 #include "macro-settings.hpp"
+#include "macro-search.hpp"
 #include "macro-signals.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
@@ -24,6 +24,8 @@ namespace advss {
 
 static QObject *addPulse = nullptr;
 static QTimer onChangeHighlightTimer;
+static std::chrono::high_resolution_clock::time_point
+	lastOnChangeHighlightCheckTime{};
 
 static void disableAddButtonHighlight()
 {
@@ -146,20 +148,7 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 static void addGroupSubitems(std::vector<std::shared_ptr<Macro>> &macros,
 			     const std::shared_ptr<Macro> &group)
 {
-	std::vector<std::shared_ptr<Macro>> subitems;
-	subitems.reserve(group->GroupSize());
-
-	// Find all subitems
-	auto allMacros = GetMacros();
-	for (auto it = allMacros.begin(); it < allMacros.end(); it++) {
-		if ((*it)->Name() != group->Name()) {
-			continue;
-		}
-		for (uint32_t i = 1; i <= group->GroupSize(); i++) {
-			subitems.emplace_back(*std::next(it, i));
-		}
-		break;
-	}
+	auto subitems = GetGroupMacroEntries(group.get());
 
 	// Remove subitems which were already selected to avoid duplicates
 	for (const auto &subitem : subitems) {
@@ -207,7 +196,7 @@ void AdvSceneSwitcher::RemoveMacro(std::shared_ptr<Macro> &macro)
 	// Don't cache widgets for about to be deleted macros
 	MacroSegmentList::SetCachingEnabled(false);
 	ui->macros->Remove(macro);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
+	MacroSegmentList::SetCachingEnabled(true);
 
 	MacroSignalManager::Instance()->Remove(name);
 }
@@ -326,13 +315,9 @@ void AdvSceneSwitcher::ExportMacros() const
 		obs_data_array_push_back(macroArray, obj);
 	}
 	obs_data_set_array(data, "macros", macroArray);
-	SaveVariables(data);
-	SaveActionQueues(data);
 	obs_data_set_string(data, "version", g_GIT_TAG);
-	auto json = obs_data_get_json(data);
-	QString exportString(json);
 
-	MacroExportImportDialog::ExportMacros(exportString);
+	MacroExportImportDialog::ExportMacros(data);
 }
 
 bool AdvSceneSwitcher::ResolveMacroImportNameConflict(
@@ -394,8 +379,6 @@ void AdvSceneSwitcher::ImportMacros()
 		ImportMacros();
 		return;
 	}
-	ImportVariables(data);
-	ImportQueues(data);
 
 	auto version = obs_data_get_string(data, "version");
 	if (strcmp(version, g_GIT_TAG) != 0) {
@@ -410,13 +393,17 @@ void AdvSceneSwitcher::ImportMacros()
 	int groupSize = 0;
 	std::shared_ptr<Macro> group;
 	std::vector<std::shared_ptr<Macro>> importedMacros;
+	auto &tempMacros = GetTemporaryMacros();
 
 	auto lock = LockContext();
 	for (size_t i = 0; i < count; i++) {
+		tempMacros.clear();
+
 		OBSDataAutoRelease array_obj = obs_data_array_item(array, i);
 		auto macro = std::make_shared<Macro>();
+		tempMacros.emplace_back(macro);
 		macro->Load(array_obj);
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 
 		if (macroNameExists(macro->Name()) &&
 		    !ResolveMacroImportNameConflict(macro)) {
@@ -425,7 +412,7 @@ void AdvSceneSwitcher::ImportMacros()
 		}
 
 		importedMacros.emplace_back(macro);
-		GetMacros().emplace_back(macro);
+		GetTopLevelMacros().emplace_back(macro);
 		if (groupSize > 0 && !macro->IsGroup()) {
 			Macro::PrepareMoveToGroup(group, macro);
 			groupSize--;
@@ -444,9 +431,10 @@ void AdvSceneSwitcher::ImportMacros()
 	for (const auto &macro : importedMacros) {
 		macro->PostLoad();
 	}
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
+	tempMacros.clear();
 
-	ui->macros->Reset(GetMacros(),
+	ui->macros->Reset(GetTopLevelMacros(),
 			  GetGlobalMacroSettings()._highlightExecuted);
 	disableAddButtonHighlight();
 }
@@ -479,14 +467,17 @@ void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value) const
 	macro->SetRunInParallel(value);
 }
 
-void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value) const
+void AdvSceneSwitcher::on_actionTriggerMode_currentIndexChanged(int index) const
 {
 	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
+
 	auto lock = LockContext();
-	macro->SetMatchOnChange(value);
+	const auto mode = static_cast<Macro::ActionTriggerMode>(
+		ui->actionTriggerMode->itemData(index).toInt());
+	macro->SetActionTriggerMode(mode);
 }
 
 void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) const
@@ -494,7 +485,7 @@ void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) const
 	ui->macroName->setDisabled(disable);
 	ui->runMacro->setDisabled(disable);
 	ui->runMacroInParallel->setDisabled(disable);
-	ui->runMacroOnChange->setDisabled(disable);
+	ui->actionTriggerMode->setDisabled(disable);
 	ui->macroEdit->SetControlsDisabled(disable);
 }
 
@@ -524,10 +515,12 @@ void AdvSceneSwitcher::MacroSelectionChanged()
 	{
 		const QSignalBlocker b1(ui->macroName);
 		const QSignalBlocker b2(ui->runMacroInParallel);
-		const QSignalBlocker b3(ui->runMacroOnChange);
+		const QSignalBlocker b3(ui->actionTriggerMode);
 		ui->macroName->setText(macro->Name().c_str());
 		ui->runMacroInParallel->setChecked(macro->RunInParallel());
-		ui->runMacroOnChange->setChecked(macro->MatchOnChange());
+		ui->actionTriggerMode->setCurrentIndex(
+			ui->actionTriggerMode->findData(static_cast<int>(
+				macro->GetActionTriggerMode())));
 	}
 
 	macro->ResetUIHelpers();
@@ -557,10 +550,18 @@ void AdvSceneSwitcher::HighlightOnChange() const
 		return;
 	}
 
-	if (macro->OnChangePreventedActionsRecently()) {
-		HighlightWidget(ui->runMacroOnChange, Qt::yellow,
+	if (macro->Paused()) {
+		return;
+	}
+
+	if (macro->ActionTriggerModePreventedActionsSince(
+		    lastOnChangeHighlightCheckTime)) {
+		HighlightWidget(ui->actionTriggerMode, Qt::yellow,
 				Qt::transparent, true);
 	}
+
+	lastOnChangeHighlightCheckTime =
+		std::chrono::high_resolution_clock::now();
 }
 
 void AdvSceneSwitcher::on_macroSettings_clicked()
@@ -610,17 +611,20 @@ setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
 	auto toolbar = new QToolBar();
 	toolbar->setIconSize({16, 16});
 
-	QAction *lastSeperator = nullptr;
+	QAction *lastSeparator = nullptr;
 
 	for (const auto &widgetGroup : widgetGroups) {
 		for (const auto &widget : widgetGroup) {
+			if (!widget) {
+				continue;
+			}
 			toolbar->addWidget(widget);
 		}
-		lastSeperator = toolbar->addSeparator();
+		lastSeparator = toolbar->addSeparator();
 	}
 
-	if (lastSeperator) {
-		toolbar->removeAction(lastSeperator);
+	if (lastSeparator) {
+		toolbar->removeAction(lastSeparator);
 	}
 
 	// Prevent "extension" button from showing up
@@ -633,7 +637,9 @@ void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macros->installEventFilter(this);
 
-	if (GetMacros().size() == 0 && !switcher->disableHints) {
+	auto &macros = GetTopLevelMacros();
+
+	if (macros.size() == 0 && !switcher->disableHints) {
 		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
 	}
 
@@ -641,8 +647,7 @@ void AdvSceneSwitcher::SetupMacroTab()
 					   {ui->macroUp, ui->macroDown}});
 	ui->macroControlLayout->addWidget(macroControls);
 
-	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+	ui->macros->Reset(macros, GetGlobalMacroSettings()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
 		SLOT(MacroSelectionChanged()));
 	ui->runMacro->SetMacroTree(ui->macros);
@@ -655,21 +660,55 @@ void AdvSceneSwitcher::SetupMacroTab()
 	ui->macroPriorityWarning->setVisible(
 		switcher->functionNamesByPriority[0] != macro_func);
 
+	lastOnChangeHighlightCheckTime =
+		std::chrono::high_resolution_clock::now();
 	onChangeHighlightTimer.setInterval(1500);
 	connect(&onChangeHighlightTimer, SIGNAL(timeout()), this,
 		SLOT(HighlightOnChange()));
 	onChangeHighlightTimer.start();
 
-	// Reserve more space for macro edit area than for the macro list
-	ui->macroListMacroEditSplitter->setStretchFactor(0, 1);
-	ui->macroListMacroEditSplitter->setStretchFactor(1, 4);
+	SetupMacroSearchWidgets(ui->macroSearchLayout, ui->macroSearchText,
+				ui->macroSearchClear, ui->macroSearchType,
+				ui->macroSearchRegex,
+				ui->macroSearchShowSettings,
+				[this]() { ui->macros->RefreshFilter(); });
 
-	if (switcher->saveWindowGeo) {
-		if (shouldRestoreSplitter(
-			    switcher->macroListMacroEditSplitterPosition)) {
+	static const std::vector<
+		std::pair<Macro::ActionTriggerMode, const char *>>
+		actionTriggerModes = {
+			{Macro::ActionTriggerMode::ALWAYS,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.always"},
+			{Macro::ActionTriggerMode::MACRO_RESULT_CHANGED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onOverallChange"},
+			{Macro::ActionTriggerMode::ANY_CONDITION_CHANGED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionChange"},
+			{Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED,
+			 "AdvSceneSwitcher.macroTab.actionTriggerMode.onAnyConditionTriggered"},
+		};
+
+	for (const auto &[mode, name] : actionTriggerModes) {
+		ui->actionTriggerMode->addItem(obs_module_text(name),
+					       static_cast<int>(mode));
+	}
+
+	ui->macroListBox->setSizePolicy(QSizePolicy::Ignored,
+					QSizePolicy::Preferred);
+	ui->macroListBox->setMinimumWidth(0);
+	ui->macroEditGroup->setSizePolicy(QSizePolicy::Ignored,
+					  QSizePolicy::Preferred);
+	ui->macroEditGroup->setMinimumWidth(0);
+
+	if (shouldRestoreSplitter(
+		    switcher->macroListMacroEditSplitterPosition)) {
+		ui->macroListMacroEditSplitter->setSizes(
+			switcher->macroListMacroEditSplitterPosition);
+	} else {
+		QTimer::singleShot(0, this, [this]() {
+			const auto totalWidth =
+				ui->macroListMacroEditSplitter->width();
 			ui->macroListMacroEditSplitter->setSizes(
-				switcher->macroListMacroEditSplitterPosition);
-		}
+				{totalWidth / 5, totalWidth * 4 / 5});
+		});
 	}
 }
 
@@ -752,7 +791,7 @@ void AdvSceneSwitcher::CopyMacro()
 	newMacro->Load(data);
 	newMacro->PostLoad();
 	newMacro->SetName(name);
-	RunPostLoadSteps();
+	RunAndClearPostLoadSteps();
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);

lib/macro/macro-tree.cpp

@@ -1,21 +1,21 @@
 #include "macro-tree.hpp"
 #include "macro.hpp"
+#include "macro-search.hpp"
 #include "macro-signals.hpp"
 #include "path-helpers.hpp"
 #include "sync-helpers.hpp"
 #include "ui-helpers.hpp"
-#include "utility.hpp"
 
 #include <obs.h>
 #include <string>
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpacerItem>
-#include <QPushButton>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QStylePainter>
+#include <QToolTip>
 
 Q_DECLARE_METATYPE(std::shared_ptr<advss::Macro>);
 
@@ -61,12 +61,11 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,
 
 	_boxLayout = new QHBoxLayout();
 	_boxLayout->setContentsMargins(0, 0, 0, 0);
-	_boxLayout->addWidget(_running);
 	if (isGroup) {
 		_boxLayout->addWidget(_iconLabel);
 		_boxLayout->addSpacing(2);
-		_running->hide();
 	}
+	_boxLayout->addWidget(_running);
 	_boxLayout->addWidget(_label);
 #ifdef __APPLE__
 	/* Hack: Fixes a bug where scrollbars would be above the lock icon */
@@ -76,29 +75,138 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,
 	Update(true);
 	setLayout(_boxLayout);
 
-	auto setRunning = [this](bool val) {
-		_macro->SetPaused(!val);
-	};
-	connect(_running, &QAbstractButton::clicked, setRunning);
+	connect(_running, SIGNAL(clicked(bool)), this,
+		SLOT(RunningClicked(bool)));
 	connect(MacroSignalManager::Instance(), SIGNAL(HighlightChanged(bool)),
 		this, SLOT(EnableHighlight(bool)));
 	connect(MacroSignalManager::Instance(),
 		SIGNAL(Rename(const QString &, const QString &)), this,
 		SLOT(MacroRenamed(const QString &, const QString &)));
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(HighlightIfExecuted()));
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdatePaused()));
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdateRunning()));
+
+	UpdateRunning();
 	_timer.start(1500);
 }
 
+bool MacroTreeItem::event(QEvent *event)
+{
+	if (event->type() != QEvent::ToolTip) {
+		return QFrame::event(event);
+	}
+
+	if (_macro->IsGroup()) {
+		return true;
+	}
+
+	QString text;
+	if (!_macro->WasExecutedSince({})) {
+		text = obs_module_text(
+			"AdvSceneSwitcher.macroTab.macroNotYetExecutedTooltip");
+	} else {
+		const QString formatStr = obs_module_text(
+			"AdvSceneSwitcher.macroTab.macroLastExecutedTooltip");
+		const auto secondsSinceLastRun =
+			std::chrono::duration_cast<std::chrono::seconds>(
+				std::chrono::high_resolution_clock::now() -
+				_macro->GetLastExecutionTime());
+		text = formatStr.arg(secondsSinceLastRun.count());
+	}
+
+	auto helpEvent = static_cast<QHelpEvent *>(event);
+	QToolTip::showText(helpEvent->globalPos(), text, this);
+	return true;
+}
+
 void MacroTreeItem::EnableHighlight(bool enable)
 {
 	_highlight = enable;
 }
 
-void MacroTreeItem::UpdatePaused()
+void MacroTreeItem::RunningClicked(bool running)
+{
+	const auto updateWidget = [this](Macro *macro) {
+		if (!macro) {
+			return;
+		}
+
+		const auto &macros = GetTopLevelMacros();
+
+		bool found = false;
+		int idx = 0;
+		for (const auto &m : macros) {
+			if (m.get() == macro) {
+				found = true;
+				break;
+			}
+			idx++;
+		}
+
+		if (!found) {
+			return;
+		}
+
+		const auto widget = _tree->GetItemWidget(idx);
+		if (widget) {
+			widget->UpdateRunning();
+		}
+	};
+
+	if (!_macro->IsGroup()) {
+		_macro->SetPaused(!running);
+		if (!_macro->IsSubitem()) {
+			return;
+		}
+
+		const auto group = _macro->Parent();
+		updateWidget(group.get());
+		return;
+	}
+
+	const auto macros = GetGroupMacroEntries(_macro.get());
+	for (const auto &macro : macros) {
+		macro->SetPaused(!running);
+	}
+
+	// Update backend values before updating UI to prevent flickering in
+	// running state of the group
+	for (const auto &macro : macros) {
+		updateWidget(macro.get());
+	}
+	UpdateRunning();
+}
+
+void MacroTreeItem::UpdateRunning()
 {
 	const QSignalBlocker blocker(_running);
-	_running->setChecked(!_macro->Paused());
+
+	if (!_macro->IsGroup()) {
+		_running->setChecked(!_macro->Paused());
+		return;
+	}
+
+	const auto macros = GetGroupMacroEntries(_macro.get());
+	bool allRunning = true;
+	bool allPaused = true;
+	for (const auto &macro : macros) {
+		if (macro->Paused()) {
+			allRunning = false;
+		} else {
+			allPaused = false;
+		}
+	}
+
+	if (allRunning) {
+		_running->setCheckState(Qt::Checked);
+		return;
+	}
+
+	if (allPaused) {
+		_running->setCheckState(Qt::Unchecked);
+		return;
+	}
+
+	_running->setCheckState(Qt::PartiallyChecked);
 }
 
 void MacroTreeItem::HighlightIfExecuted()
@@ -107,10 +215,20 @@ void MacroTreeItem::HighlightIfExecuted()
 		return;
 	}
 
+	bool wasHighlighted = false;
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    _macro->WasExecutedSince(_lastHighlightCheckTime)) {
 		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		wasHighlighted = true;
 	}
+
+	if (!wasHighlighted &&
+	    _lastHighlightCheckTime.time_since_epoch().count() != 0 &&
+	    _macro->ActionTriggerModePreventedActionsSince(
+		    _lastHighlightCheckTime)) {
+		HighlightWidget(this, Qt::yellow, QColor(0, 0, 0, 0), true);
+	}
+
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }
 
@@ -187,7 +305,7 @@ void MacroTreeItem::Update(bool force)
 		_expand->blockSignals(true);
 		_expand->setChecked(_macro->IsCollapsed());
 		_expand->blockSignals(false);
-		connect(_expand, &QPushButton::toggled, this,
+		connect(_expand, &QCheckBox::toggled, this,
 			&MacroTreeItem::ExpandClicked);
 	} else {
 		_spacer = new QSpacerItem(3, 1);
@@ -213,7 +331,6 @@ void MacroTreeModel::Reset(std::deque<std::shared_ptr<Macro>> &newItems)
 	_macros = newItems;
 	endResetModel();
 
-	UpdateGroupState(false);
 	_mt->ResetWidgets();
 }
 
@@ -458,9 +575,6 @@ void MacroTreeModel::Remove(std::shared_ptr<Macro> item)
 
 	_mt->selectionModel()->clear();
 
-	if (isGroup) {
-		UpdateGroupState(true);
-	}
 	assert(IsInValidState());
 }
 
@@ -549,7 +663,6 @@ MacroTreeModel::MacroTreeModel(MacroTree *st_,
 	  _mt(st_),
 	  _macros(macros)
 {
-	UpdateGroupState(false);
 }
 
 int MacroTreeModel::rowCount(const QModelIndex &parent) const
@@ -703,7 +816,6 @@ void MacroTreeModel::GroupSelectedItems(QModelIndexList &indices)
 		offset++;
 	}
 
-	_hasGroups = true;
 	_mt->selectionModel()->clear();
 
 	Reset(_macros);
@@ -761,29 +873,12 @@ void MacroTreeModel::CollapseGroup(std::shared_ptr<Macro> item)
 	assert(IsInValidState());
 }
 
-void MacroTreeModel::UpdateGroupState(bool update)
-{
-	bool nowHasGroups = false;
-	for (auto &item : _macros) {
-		if (item->IsGroup()) {
-			nowHasGroups = true;
-			break;
-		}
-	}
-
-	if (nowHasGroups != _hasGroups) {
-		_hasGroups = nowHasGroups;
-		if (update) {
-			_mt->UpdateWidgets(true);
-		}
-	}
-}
-
 void MacroTree::Reset(std::deque<std::shared_ptr<Macro>> &macros,
 		      bool highlight)
 {
 	_highlight = highlight;
-	MacroTreeModel *mtm = new MacroTreeModel(this, macros);
+
+	auto mtm = new MacroTreeModel(this, macros);
 	setModel(mtm);
 	GetModel()->Reset(macros);
 	connect(selectionModel(),
@@ -840,7 +935,6 @@ MacroTree::MacroTree(QWidget *parent_) : QListView(parent_)
 void MacroTree::ResetWidgets()
 {
 	MacroTreeModel *mtm = GetModel();
-	mtm->UpdateGroupState(false);
 	int modelIdx = 0;
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		QModelIndex index = mtm->createIndex(modelIdx, 0, nullptr);
@@ -869,7 +963,7 @@ void MacroTree::UpdateWidgets(bool force)
 
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		std::shared_ptr<Macro> item = mtm->_macros[i];
-		MacroTreeItem *widget = GetItemWidget(i);
+		auto widget = GetItemWidget(i);
 
 		if (!widget) {
 			UpdateWidget(mtm->createIndex(i, 0, nullptr), item);
@@ -1184,7 +1278,7 @@ bool MacroTree::SelectionEmpty() const
 
 bool MacroTree::GroupsExist() const
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (macro->IsGroup()) {
 			return true;
 		}
@@ -1204,6 +1298,12 @@ void MacroTree::CollapseGroup(std::shared_ptr<Macro> item) const
 	mtm->CollapseGroup(item);
 }
 
+void MacroTree::RefreshFilter()
+{
+	UpdateWidgets();
+	doItemsLayout();
+}
+
 void MacroTree::MoveItemBefore(const std::shared_ptr<Macro> &item,
 			       const std::shared_ptr<Macro> &after) const
 {
@@ -1218,7 +1318,7 @@ void MacroTree::MoveItemAfter(const std::shared_ptr<Macro> &item,
 
 MacroTreeModel *MacroTree::GetModel() const
 {
-	return reinterpret_cast<MacroTreeModel *>(model());
+	return qobject_cast<MacroTreeModel *>(model());
 }
 
 void MacroTree::Remove(std::shared_ptr<Macro> item) const
@@ -1306,7 +1406,7 @@ void MacroTree::UngroupSelectedGroups()
 
 void MacroTree::ExpandAll()
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}
@@ -1316,7 +1416,7 @@ void MacroTree::ExpandAll()
 
 void MacroTree::CollapseAll()
 {
-	for (const auto &macro : GetMacros()) {
+	for (const auto &macro : GetTopLevelMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}
@@ -1333,8 +1433,8 @@ void MacroTree::SelectionChangedHelper(const QItemSelection &,
 
 inline MacroTreeItem *MacroTree::GetItemWidget(int idx) const
 {
-	QWidget *widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
-	return reinterpret_cast<MacroTreeItem *>(widget);
+	auto widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
+	return qobject_cast<MacroTreeItem *>(widget);
 }
 
 void MacroTree::paintEvent(QPaintEvent *event)
@@ -1361,14 +1461,25 @@ MacroTreeDelegate::MacroTreeDelegate(QObject *parent)
 QSize MacroTreeDelegate::sizeHint(const QStyleOptionViewItem &option,
 				  const QModelIndex &index) const
 {
-	MacroTree *tree = qobject_cast<MacroTree *>(parent());
-	QWidget *item = tree->indexWidget(index);
+	auto tree = qobject_cast<MacroTree *>(parent());
+	auto widget = tree->indexWidget(index);
 
-	if (!item) {
+	if (!widget) {
 		return QStyledItemDelegate::sizeHint(option, index);
 	}
 
-	return QSize(item->sizeHint());
+	auto name = index.data(Qt::AccessibleTextRole).toString();
+	auto macro = GetMacroByQString(name);
+
+	if (!macro) {
+		return QStyledItemDelegate::sizeHint(option, index);
+	}
+
+	if (MacroMatchesSearchFilter(macro)) {
+		return QSize(widget->sizeHint());
+	}
+
+	return QSize(0, 0);
 }
 
 } // namespace advss

lib/macro/macro-tree.hpp

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

lib/macro/macro-websocket-trigger.cpp

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

lib/macro/macro.cpp

@@ -17,7 +17,16 @@
 
 namespace advss {
 
-static std::deque<std::shared_ptr<Macro>> macros;
+static bool setup()
+{
+	AddPluginCleanupStep([]() {
+		GetTopLevelMacros().clear();
+		GetTemporaryMacros().clear();
+	});
+	return true;
+}
+
+static bool setupDone = setup();
 
 Macro::Macro(const std::string &name) : _dockSettings(this)
 {
@@ -59,6 +68,7 @@ Macro::CreateGroup(const std::string &name,
 
 void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 {
+	auto &macros = GetTopLevelMacros();
 	auto it = std::find(macros.begin(), macros.end(), group);
 	if (it == macros.end()) {
 		return;
@@ -75,6 +85,7 @@ void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 
 void Macro::PrepareMoveToGroup(Macro *group, std::shared_ptr<Macro> item)
 {
+	auto &macros = GetTopLevelMacros();
 	for (const auto &m : macros) {
 		if (m.get() == group) {
 			PrepareMoveToGroup(m, item);
@@ -111,18 +122,18 @@ static bool checkCondition(const std::shared_ptr<MacroCondition> &condition)
 	const auto startTime = std::chrono::high_resolution_clock::now();
 	bool conditionMatched = false;
 	condition->WithLock([&condition, &conditionMatched]() {
-		conditionMatched = condition->CheckCondition();
+		conditionMatched = condition->EvaluateCondition();
 	});
+	condition->ApplyVarMappings();
 	const auto endTime = std::chrono::high_resolution_clock::now();
 	const auto timeSpent = endTime - startTime;
 
 	if (timeSpent >= perfLogThreshold) {
-		const long int ms =
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				timeSpent)
-				.count();
 		blog(LOG_WARNING,
-		     "spent %ld ms in %s condition check of macro '%s'!", ms,
+		     "spent %lld ms in %s condition check of macro '%s'!",
+		     (long long)std::chrono::duration_cast<
+			     std::chrono::milliseconds>(timeSpent)
+			     .count(),
 		     condition->GetId().c_str(),
 		     condition->GetMacro()->Name().c_str());
 	}
@@ -145,6 +156,15 @@ bool Macro::CheckConditionHelper(
 		return conditionMatched;
 	};
 
+	if (!condition->Enabled()) {
+		vblog(LOG_INFO, "ignoring condition '%s' for '%s'",
+		      condition->GetId().c_str(), _name.c_str());
+		if (!_useShortCircuitEvaluation) {
+			(void)evaluateCondition();
+		}
+		return _matched;
+	}
+
 	const auto logicType = condition->GetLogicType();
 	if (logicType == Logic::Type::NONE) {
 		vblog(LOG_INFO, "ignoring condition '%s' for '%s'",
@@ -241,9 +261,37 @@ bool Macro::CheckConditions(bool ignorePause)
 
 	vblog(LOG_INFO, "Macro %s returned %d", _name.c_str(), _matched);
 
-	_conditionSateChanged = _lastMatched != _matched;
-	if (!_conditionSateChanged && _performActionsOnChange) {
-		_onPreventedActionExecution = true;
+	_actionModeMatch = false;
+	switch (_actionTriggerMode) {
+	case Macro::ActionTriggerMode::ALWAYS:
+		_actionModeMatch = true;
+		break;
+	case Macro::ActionTriggerMode::MACRO_RESULT_CHANGED:
+		_actionModeMatch = _lastMatched != _matched;
+		break;
+	case Macro::ActionTriggerMode::ANY_CONDITION_CHANGED:
+		for (const auto &condition : _conditions) {
+			if (condition->HasChanged()) {
+				_actionModeMatch = true;
+			}
+		}
+		break;
+	case Macro::ActionTriggerMode::ANY_CONDITION_TRIGGERED:
+		for (const auto &condition : _conditions) {
+			if (condition->IsRisingEdge()) {
+				_actionModeMatch = true;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	const bool hasActionsToExecute = _matched ? (_actions.size() > 0)
+						  : (_elseActions.size() > 0);
+	if (!_actionModeMatch && hasActionsToExecute && !_paused) {
+		_lastActionRunModePreventTime =
+			std::chrono::high_resolution_clock::now();
 	}
 
 	_lastMatched = _matched;
@@ -302,6 +350,16 @@ bool Macro::WasExecutedSince(const TimePoint &time) const
 	return _lastExecutionTime > time;
 }
 
+bool Macro::ActionTriggerModePreventedActionsSince(const TimePoint &time) const
+{
+	return _lastActionRunModePreventTime > time;
+}
+
+Macro::TimePoint Macro::GetLastExecutionTime() const
+{
+	return _lastExecutionTime;
+}
+
 bool Macro::ConditionsShouldBeChecked() const
 {
 	if (!_useCustomConditionCheckInterval) {
@@ -328,10 +386,9 @@ bool Macro::ShouldRunActions() const
 
 	const bool hasActionsToExecute =
 		!_paused && (_matched || _elseActions.size() > 0) &&
-		(!_performActionsOnChange || _conditionSateChanged);
+		_actionModeMatch;
 
-	if (VerboseLoggingEnabled() && _performActionsOnChange &&
-	    !_conditionSateChanged) {
+	if (VerboseLoggingEnabled() && !_actionModeMatch && !_paused) {
 		if (_matched && _actions.size() > 0) {
 			blog(LOG_INFO, "skip actions for Macro %s (on change)",
 			     _name.c_str());
@@ -362,10 +419,24 @@ void Macro::ResetTimers()
 	_lastExecutionTime = {};
 }
 
+void Macro::SetActionTriggerMode(ActionTriggerMode mode)
+{
+	_actionTriggerMode = mode;
+}
+
+Macro::ActionTriggerMode Macro::GetActionTriggerMode() const
+{
+	return _actionTriggerMode;
+}
+
 bool Macro::RunActionsHelper(
 	const std::deque<std::shared_ptr<MacroAction>> &actionsToRun,
 	bool ignorePause)
 {
+	if (_paused && !ignorePause) {
+		return true;
+	}
+
 	// Create copy of action list as elements might be removed, inserted, or
 	// reordered while actions are currently being executed.
 	auto actions = actionsToRun;
@@ -381,6 +452,7 @@ bool Macro::RunActionsHelper(
 			action->WithLock([&action, &actionResult]() {
 				actionResult = action->PerformAction();
 			});
+			action->ApplyVarMappings();
 			actionsExecutedSuccessfully =
 				actionsExecutedSuccessfully && actionResult;
 		} else {
@@ -415,11 +487,6 @@ bool Macro::WasPausedSince(const TimePoint &time) const
 	return _lastUnpauseTime > time;
 }
 
-void Macro::SetMatchOnChange(bool onChange)
-{
-	_performActionsOnChange = onChange;
-}
-
 void Macro::SetStopActionsIfNotDone(bool stopActionsIfNotDone)
 {
 	_stopActionsIfNotDone = stopActionsIfNotDone;
@@ -740,7 +807,8 @@ bool Macro::Save(obs_data_t *obj, bool saveForCopy) const
 	obs_data_set_bool(obj, "pause", _paused);
 	obs_data_set_bool(obj, "parallel", _runInParallel);
 	obs_data_set_bool(obj, "checkConditionsInParallel", _checkInParallel);
-	obs_data_set_bool(obj, "onChange", _performActionsOnChange);
+	obs_data_set_int(obj, "actionTriggerMode",
+			 static_cast<int>(_actionTriggerMode));
 	obs_data_set_bool(obj, "skipExecOnStart", _skipExecOnStart);
 	obs_data_set_bool(obj, "stopActionsIfNotDone", _stopActionsIfNotDone);
 	obs_data_set_bool(obj, "useShortCircuitEvaluation",
@@ -826,7 +894,15 @@ bool Macro::Load(obs_data_t *obj)
 	}
 	_runInParallel = obs_data_get_bool(obj, "parallel");
 	_checkInParallel = obs_data_get_bool(obj, "checkConditionsInParallel");
-	_performActionsOnChange = obs_data_get_bool(obj, "onChange");
+	if (obs_data_has_user_value(obj, "onChange")) {
+		const bool onChange = obs_data_get_bool(obj, "onChange");
+		_actionTriggerMode =
+			onChange ? ActionTriggerMode::MACRO_RESULT_CHANGED
+				 : ActionTriggerMode::ALWAYS;
+	} else {
+		_actionTriggerMode = static_cast<ActionTriggerMode>(
+			obs_data_get_int(obj, "actionTriggerMode"));
+	}
 	_skipExecOnStart = obs_data_get_bool(obj, "skipExecOnStart");
 	_stopActionsIfNotDone = obs_data_get_bool(obj, "stopActionsIfNotDone");
 	_useShortCircuitEvaluation =
@@ -948,12 +1024,12 @@ bool Macro::PostLoad()
 bool Macro::SwitchesScene() const
 {
 	for (const auto &a : _actions) {
-		if (a->GetId() == GetSceneSwitchActionId()) {
+		if (a->GetId() == MacroAction::GetDefaultID()) {
 			return true;
 		}
 	}
 	for (const auto &a : _elseActions) {
-		if (a->GetId() == GetSceneSwitchActionId()) {
+		if (a->GetId() == MacroAction::GetDefaultID()) {
 			return true;
 		}
 	}
@@ -986,18 +1062,8 @@ bool Macro::HasValidSplitterPositions() const
 	       !_elseActionSplitterPosition.empty();
 }
 
-bool Macro::OnChangePreventedActionsRecently()
-{
-	if (_onPreventedActionExecution) {
-		_onPreventedActionExecution = false;
-		return _matched ? _actions.size() > 0 : _elseActions.size() > 0;
-	}
-	return false;
-}
-
 void Macro::ResetUIHelpers()
 {
-	_onPreventedActionExecution = false;
 	for (auto c : _conditions) {
 		c->GetHighlightAndReset();
 	}
@@ -1096,9 +1162,11 @@ void Macro::ClearHotkeys() const
 void setHotkeyDescriptionHelper(const char *formatModuleText,
 				const std::string name, const obs_hotkey_id id)
 {
+#ifndef UNIT_TEST
 	QString format{obs_module_text(formatModuleText)};
 	QString hotkeyDesc = format.arg(QString::fromStdString(name));
 	obs_hotkey_set_description(id, hotkeyDesc.toStdString().c_str());
+#endif // !UNIT_TEST
 }
 
 void Macro::SetHotkeysDesc() const
@@ -1114,7 +1182,7 @@ void Macro::SetHotkeysDesc() const
 void SaveMacros(obs_data_t *obj)
 {
 	obs_data_array_t *macroArray = obs_data_array_create();
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		obs_data_t *array_obj = obs_data_create();
 
 		m->Save(array_obj);
@@ -1128,7 +1196,9 @@ void SaveMacros(obs_data_t *obj)
 
 void LoadMacros(obs_data_t *obj)
 {
+	auto &macros = GetTopLevelMacros();
 	macros.clear();
+
 	obs_data_array_t *macroArray = obs_data_get_array(obj, "macros");
 	size_t count = obs_data_array_count(macroArray);
 
@@ -1178,15 +1248,10 @@ void LoadMacros(obs_data_t *obj)
 	}
 }
 
-std::deque<std::shared_ptr<Macro>> &GetMacros()
-{
-	return macros;
-}
-
 bool CheckMacros()
 {
 	bool matchFound = false;
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		if (!m->ConditionsShouldBeChecked()) {
 			vblog(LOG_INFO,
 			      "skipping condition check for macro \"%s\" "
@@ -1213,7 +1278,7 @@ bool RunMacros()
 	// reordered while macros are currently being executed.
 	// For example, this can happen if a macro is performing a wait action,
 	// as the main lock will be unlocked during this time.
-	auto runPhaseMacros = macros;
+	auto runPhaseMacros = GetTopLevelMacros();
 
 	// Avoid deadlocks when opening settings window and calling frontend
 	// API functions at the same time.
@@ -1253,41 +1318,14 @@ bool RunMacros()
 
 void StopAllMacros()
 {
-	for (const auto &m : macros) {
+	for (const auto &m : GetAllMacros()) {
 		m->Stop();
 	}
 }
 
-Macro *GetMacroByName(const char *name)
-{
-	for (const auto &m : macros) {
-		if (m->Name() == name) {
-			return m.get();
-		}
-	}
-
-	return nullptr;
-}
-
-Macro *GetMacroByQString(const QString &name)
-{
-	return GetMacroByName(name.toUtf8().constData());
-}
-
-std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
-{
-	for (const auto &m : macros) {
-		if (m->Name() == name) {
-			return m;
-		}
-	}
-
-	return {};
-}
-
 void InvalidateMacroTempVarValues()
 {
-	for (const auto &m : macros) {
+	for (const auto &m : GetTopLevelMacros()) {
 		// Do not invalidate the temp vars set during condition checks
 		// or action executions running in parallel to the "main" macro
 		// loop, as otherwise access to the information stored in those
@@ -1302,6 +1340,8 @@ void InvalidateMacroTempVarValues()
 
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval()
 {
+	auto &macros = GetTopLevelMacros();
+
 	if (macros.empty()) {
 		return {};
 	}

lib/macro/macro.hpp

@@ -9,8 +9,6 @@
 #include "temp-variable.hpp"
 
 #include <future>
-#include <QString>
-#include <QByteArray>
 #include <string>
 #include <deque>
 #include <memory>
@@ -28,6 +26,16 @@ class Macro {
 
 public:
 	enum class PauseStateSaveBehavior { PERSIST, PAUSE, UNPAUSE };
+	enum class ActionTriggerMode {
+		// Trigger always
+		ALWAYS,
+		// Trigger when macro match result flips
+		MACRO_RESULT_CHANGED,
+		// Trigger when any individual condition changes
+		ANY_CONDITION_CHANGED,
+		// Trigger when any individual condition evaluates to true
+		ANY_CONDITION_TRIGGERED,
+	};
 
 	Macro(const std::string &name = "");
 	Macro(const std::string &name, const GlobalMacroSettings &settings);
@@ -56,8 +64,8 @@ public:
 	bool GetStop() const { return _stop; }
 	void ResetTimers();
 
-	void SetMatchOnChange(bool onChange);
-	bool MatchOnChange() const { return _performActionsOnChange; }
+	void SetActionTriggerMode(ActionTriggerMode);
+	ActionTriggerMode GetActionTriggerMode() const;
 
 	void SetSkipExecOnStart(bool skip) { _skipExecOnStart = skip; }
 	bool SkipExecOnStart() const { return _skipExecOnStart; }
@@ -139,7 +147,8 @@ public:
 	const QList<int> &GetElseActionSplitterPosition() const;
 	bool HasValidSplitterPositions() const;
 	bool WasExecutedSince(const TimePoint &) const;
-	bool OnChangePreventedActionsRecently();
+	bool ActionTriggerModePreventedActionsSince(const TimePoint &) const;
+	TimePoint GetLastExecutionTime() const;
 	void ResetUIHelpers();
 
 	// Hotkeys
@@ -170,6 +179,7 @@ private:
 	TimePoint _lastCheckTime{};
 	TimePoint _lastUnpauseTime{};
 	TimePoint _lastExecutionTime{};
+	TimePoint _lastActionRunModePreventTime{};
 	std::vector<std::thread> _helperThreads;
 
 	std::deque<std::shared_ptr<MacroCondition>> _conditions;
@@ -184,14 +194,13 @@ private:
 	bool _useShortCircuitEvaluation = false;
 	bool _useCustomConditionCheckInterval = false;
 	Duration _customConditionCheckInterval = 0.3;
-	bool _conditionSateChanged = false;
+	bool _actionModeMatch = false;
 
 	bool _runInParallel = false;
 	bool _checkInParallel = false;
 	bool _matched = false;
 	std::future<void> _conditionCheckFuture;
 	bool _lastMatched = false;
-	bool _performActionsOnChange = true;
 	bool _skipExecOnStart = false;
 	bool _stopActionsIfNotDone = false;
 	bool _paused = false;
@@ -201,14 +210,14 @@ private:
 	obs_hotkey_id _unpauseHotkey = OBS_INVALID_HOTKEY_ID;
 	obs_hotkey_id _togglePauseHotkey = OBS_INVALID_HOTKEY_ID;
 
+	ActionTriggerMode _actionTriggerMode =
+		ActionTriggerMode::MACRO_RESULT_CHANGED;
+
 	PauseStateSaveBehavior _pauseSaveBehavior =
 		PauseStateSaveBehavior::PERSIST;
 
 	MacroInputVariables _inputVariables;
 
-	// UI helpers
-	bool _onPreventedActionExecution = false;
-
 	QList<int> _actionConditionSplitterPosition;
 	QList<int> _elseActionSplitterPosition;
 
@@ -217,13 +226,9 @@ private:
 
 void LoadMacros(obs_data_t *obj);
 void SaveMacros(obs_data_t *obj);
-std::deque<std::shared_ptr<Macro>> &GetMacros();
 bool CheckMacros();
 bool RunMacros();
 void StopAllMacros();
-Macro *GetMacroByName(const char *name);
-Macro *GetMacroByQString(const QString &name);
-std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 void InvalidateMacroTempVarValues();
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
 

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

@@ -6,6 +6,7 @@
 #import <Carbon/Carbon.h>
 #include <Carbon/Carbon.h>
 #include <util/platform.h>
+#include <set>
 #include <vector>
 #include <QStringList>
 #include <QRegularExpression>
@@ -14,56 +15,18 @@
 
 namespace advss {
 
-void GetWindowList(std::vector<std::string> &windows)
+static std::string nsStringToStdString(NSString *str)
 {
-	windows.resize(0);
-
-	@autoreleasepool {
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
-
-			if (!name.empty() &&
-			    find(windows.begin(), windows.end(), name) ==
-				    windows.end()) {
-				windows.emplace_back(name);
-			}
-			if (!owner.empty() &&
-			    find(windows.begin(), windows.end(), owner) ==
-				    windows.end()) {
-				windows.emplace_back(owner);
-			}
-		}
-		apps = nil;
-		CFRelease(cfApps);
+	if (!str) {
+		return "";
 	}
+	const char *utf8 = [str UTF8String];
+	return utf8 ? utf8 : "";
 }
 
-void GetWindowList(QStringList &windows)
+std::string GetCurrentWindowTitle()
 {
-	windows.clear();
-	std::vector<std::string> temp;
-	GetWindowList(temp);
-	for (auto &w : temp) {
-		windows << QString::fromStdString(w);
-	}
-}
-
-void GetCurrentWindowTitle(std::string &title)
-{
-	title.resize(0);
+	std::string title;
 	@autoreleasepool {
 		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
 			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
@@ -107,102 +70,52 @@ void GetCurrentWindowTitle(std::string &title)
 		apps = nil;
 		CFRelease(cfApps);
 	}
+	return title;
 }
 
-bool isWindowOriginOnScreen(NSDictionary *app, NSScreen *screen,
-			    bool fullscreen = false)
-{
-	NSArray *screens = [NSScreen screens];
-	NSRect mainScreenFrame = [screens[0] frame];
-	NSRect screenFrame;
-	if (fullscreen) {
-		screenFrame = [screen frame];
-	} else {
-		screenFrame = [screen visibleFrame];
-	}
-	NSRect windowBounds;
-	CGRectMakeWithDictionaryRepresentation(
-		(CFDictionaryRef)[app objectForKey:@"kCGWindowBounds"],
-		&windowBounds);
-
-	return (windowBounds.origin.x == screenFrame.origin.x &&
-		(mainScreenFrame.size.height - screenFrame.size.height -
-			 windowBounds.origin.y ==
-		 screenFrame.origin.y));
-}
 
 bool isWindowMaximizedOnScreen(NSDictionary *app, NSScreen *screen)
 {
-	double maximizedTolerance = 0.99;
-	NSRect screenFrame = [screen frame];
 	NSRect windowBounds;
 	CGRectMakeWithDictionaryRepresentation(
 		(CFDictionaryRef)[app objectForKey:@"kCGWindowBounds"],
 		&windowBounds);
 
-	int sumX = windowBounds.origin.x + windowBounds.size.width;
-	int sumY = windowBounds.origin.y + windowBounds.size.height;
+	// CGWindowList: flipped coords, origin at top-left of main display.
+	// NSScreen: Cocoa coords, origin at bottom-left of main display.
+	NSRect mainFrame = [[NSScreen screens][0] frame];
+	NSRect visFrame = [screen visibleFrame];
 
-	// Return false if window spans over multiple screens
-	if (sumX > screenFrame.size.width) {
+	// Convert visible area to CGWindow coordinates.
+	// screenTop is just below the menubar; screenBottom is just above the
+	// dock.
+	CGFloat screenLeft = visFrame.origin.x;
+	CGFloat screenTop =
+		mainFrame.size.height - visFrame.origin.y - visFrame.size.height;
+	CGFloat screenRight = screenLeft + visFrame.size.width;
+	CGFloat screenBottom = screenTop + visFrame.size.height;
+
+	const double tolerance = 4.0;
+
+	// Width must span the full visible width.
+	if (fabs(windowBounds.origin.x - screenLeft) > tolerance) {
 		return false;
 	}
-	if (sumY > screenFrame.size.height) {
+	if (fabs((windowBounds.origin.x + windowBounds.size.width) -
+		 screenRight) > tolerance) {
 		return false;
 	}
-
-	return ((double)sumX / (double)screenFrame.size.width) >
-		       maximizedTolerance &&
-	       ((double)sumY / (double)screenFrame.size.height) >
-		       maximizedTolerance;
-}
-
-bool nameMachesPattern(std::string windowName, std::string pattern)
-{
-	return QString::fromStdString(windowName)
-		.contains(QRegularExpression(QString::fromStdString(pattern)));
-}
-
-bool IsMaximized(const std::string &title)
-{
-	@autoreleasepool {
-		NSArray *screens = [NSScreen screens];
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
-
-			bool equals = (title == name || title == owner);
-			bool matches = nameMachesPattern(name, title) ||
-				       nameMachesPattern(owner, title);
-			if (equals || matches) {
-				for (NSScreen *screen in screens) {
-					if (isWindowOriginOnScreen(app,
-								   screen) &&
-					    isWindowMaximizedOnScreen(app,
-								      screen)) {
-						apps = nil;
-						CFRelease(cfApps);
-						return true;
-					}
-				}
-			}
-		}
-		apps = nil;
-		CFRelease(cfApps);
+	// Bottom edge must align with the visible bottom (above dock).
+	if (fabs((windowBounds.origin.y + windowBounds.size.height) -
+		 screenBottom) > tolerance) {
+		return false;
 	}
-	return false;
+	// Top edge must be at or above the menubar line (some apps extend
+	// their window frame behind the menubar).
+	if (windowBounds.origin.y > screenTop + tolerance) {
+		return false;
+	}
+	return true;
 }
 
 bool isWindowFullscreenOnScreen(NSDictionary *app, NSScreen *screen)
@@ -216,52 +129,176 @@ bool isWindowFullscreenOnScreen(NSDictionary *app, NSScreen *screen)
 	return NSEqualSizes(windowBounds.size, screenFrame.size);
 }
 
-bool IsFullscreen(const std::string &title)
+std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
 {
+	std::vector<WindowInfo> result;
+	const std::string foregroundTitle = GetCurrentWindowTitle();
+
 	@autoreleasepool {
 		NSArray *screens = [NSScreen screens];
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
 
-			bool equals = (title == name || title == owner);
-			bool matches = nameMachesPattern(name, title) ||
-				       nameMachesPattern(owner, title);
-			if (equals || matches) {
+		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
+			kCGWindowListExcludeDesktopElements, kCGNullWindowID);
+		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
+
+		// Pre-compute which PIDs own at least one fullscreen-sized window.
+		// A fullscreen app reports a small chrome/title bar window first and
+		// its full-size content window second; checking only the first
+		// window's bounds gives a false negative.
+		std::set<int> fullscreenPIDs;
+		if (options.fullscreen) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
 				for (NSScreen *screen in screens) {
-					if (isWindowOriginOnScreen(app, screen,
-								   true) &&
-					    isWindowFullscreenOnScreen(
-						    app, screen)) {
-						apps = nil;
-						CFRelease(cfApps);
-						return true;
+					if (isWindowFullscreenOnScreen(app,
+								       screen)) {
+						int pid = [[app objectForKey:
+							@"kCGWindowOwnerPID"]
+							intValue];
+						fullscreenPIDs.insert(pid);
+						break;
 					}
 				}
 			}
 		}
+
+		std::set<int> maximizedPIDs;
+		if (options.maximized) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
+				for (NSScreen *screen in screens) {
+					if (isWindowMaximizedOnScreen(app,
+								      screen)) {
+						int pid = [[app objectForKey:
+							@"kCGWindowOwnerPID"]
+							intValue];
+						maximizedPIDs.insert(pid);
+						break;
+					}
+				}
+			}
+		}
+
+		// Pre-compute the largest-area window bounds per PID.
+		// CGWindowList often lists small auxiliary windows (toolbars,
+		// chrome) before the main content window; using the largest area
+		// avoids reporting those wrong bounds for geometry.
+		std::map<int, NSRect> largestBoundsPerPID;
+		if (options.geometry || options.maximized) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
+				NSRect b = NSZeroRect;
+				CGRectMakeWithDictionaryRepresentation(
+					(CFDictionaryRef)[app
+						objectForKey:@"kCGWindowBounds"],
+					&b);
+				int pid = [[app objectForKey:@"kCGWindowOwnerPID"]
+					intValue];
+				auto it = largestBoundsPerPID.find(pid);
+				if (it == largestBoundsPerPID.end() ||
+				    b.size.width * b.size.height >
+					    it->second.size.width *
+						    it->second.size.height) {
+					largestBoundsPerPID[pid] = b;
+				}
+			}
+		}
+
+		// Track titles already added to avoid duplicates (name + owner)
+		std::vector<std::string> seen;
+
+		for (NSDictionary *app in apps) {
+			int layer =
+				[[app objectForKey:@"kCGWindowLayer"] intValue];
+			if (layer != 0) {
+				continue;
+			}
+
+			std::string name = nsStringToStdString(
+				[app objectForKey:@"kCGWindowName"]);
+			std::string owner = nsStringToStdString(
+				[app objectForKey:@"kCGWindowOwnerName"]);
+
+			// Collect geometry once (used for multiple fields)
+			NSRect bounds = NSZeroRect;
+			if (options.geometry || options.fullscreen ||
+			    options.maximized) {
+				CGRectMakeWithDictionaryRepresentation(
+					(CFDictionaryRef)[app
+						objectForKey:@"kCGWindowBounds"],
+					&bounds);
+			}
+
+			// Process both the window name and the owner name as
+			// separate entries, matching the old GetWindowList() behaviour
+			for (int pass = 0; pass < 2; ++pass) {
+				const std::string &title = (pass == 0) ? name
+								       : owner;
+				if (title.empty()) {
+					continue;
+				}
+				if (std::find(seen.begin(), seen.end(),
+					      title) != seen.end()) {
+					continue;
+				}
+				seen.emplace_back(title);
+
+				WindowInfo info;
+				info.title = title;
+
+				if (options.focus) {
+					info.focused =
+						(title == foregroundTitle);
+				}
+
+				if (options.geometry || options.fullscreen ||
+				    options.maximized) {
+					int pid = [[app objectForKey:
+						@"kCGWindowOwnerPID"]
+						intValue];
+					auto it = largestBoundsPerPID.find(pid);
+					const NSRect &geoBounds =
+						(it != largestBoundsPerPID.end())
+							? it->second
+							: bounds;
+					info.x = (int)geoBounds.origin.x;
+					info.y = (int)geoBounds.origin.y;
+					info.width = (int)geoBounds.size.width;
+					info.height = (int)geoBounds.size.height;
+
+					if (options.fullscreen) {
+						info.fullscreen =
+							fullscreenPIDs.count(pid) >
+							0;
+					}
+
+					if (options.maximized) {
+						info.maximized =
+							maximizedPIDs.count(pid) >
+							0;
+					}
+				}
+
+				// windowClass and text not implemented on macOS
+				result.emplace_back(std::move(info));
+			}
+		}
 		apps = nil;
 		CFRelease(cfApps);
 	}
-	return false;
-}
-
-std::optional<std::string> GetTextInWindow(const std::string &window)
-{
-	// Not implemented
-	return {};
+	return result;
 }
 
 int SecondsSinceLastInput()
@@ -273,9 +310,9 @@ int SecondsSinceLastInput()
 	return (int)time;
 }
 
-void GetProcessList(QStringList &list)
+QStringList GetProcessList()
 {
-	list.clear();
+	QStringList list;
 	@autoreleasepool {
 		NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 		NSArray *array = [ws runningApplications];
@@ -291,11 +328,11 @@ void GetProcessList(QStringList &list)
 			}
 		}
 	}
+	return list;
 }
 
-void GetForegroundProcessName(std::string &proc)
+std::string GetForegroundProcessName()
 {
-	proc.resize(0);
 	@autoreleasepool {
 		NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 		NSArray *array = [ws runningApplications];
@@ -308,23 +345,72 @@ void GetForegroundProcessName(std::string &proc)
 				break;
 			}
 			const char *str = name.UTF8String;
-			proc = std::string(str);
+			if (str) {
+				return str;
+			}
 			break;
 		}
 	}
+	return {};
 }
 
-void GetForegroundProcessName(QString &proc)
+std::string GetForegroundProcessPath()
 {
-	std::string temp;
-	GetForegroundProcessName(temp);
-	proc = QString::fromStdString(temp);
+	@autoreleasepool {
+		NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+		for (NSRunningApplication *app in [ws runningApplications]) {
+			if (!app.isActive) {
+				continue;
+			}
+			NSURL *url = app.executableURL;
+			if (!url) {
+				break;
+			}
+			const char *str = url.path.UTF8String;
+			if (str) {
+				return str;
+			}
+			break;
+		}
+	}
+	return {};
+}
+
+QStringList GetProcessPathsFromName(const QString &name)
+{
+	QStringList paths;
+	@autoreleasepool {
+		NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+		for (NSRunningApplication *app in [ws runningApplications]) {
+			NSString *appName = app.localizedName;
+			if (!appName) {
+				continue;
+			}
+			const char *nameStr = appName.UTF8String;
+			if (!nameStr || name != QString::fromUtf8(nameStr)) {
+				continue;
+			}
+			NSURL *url = app.executableURL;
+			if (!url) {
+				continue;
+			}
+			const char *pathStr = url.path.UTF8String;
+			if (!pathStr) {
+				continue;
+			}
+			QString path = QString::fromUtf8(pathStr);
+			if (!paths.contains(path)) {
+				paths.append(path);
+			}
+		}
+	}
+
+	return paths;
 }
 
 bool IsInFocus(const QString &executable)
 {
-	std::string current;
-	GetForegroundProcessName(current);
+	const auto current = GetForegroundProcessName();
 
 	// True if executable switch equals current window
 	bool equals = (executable.toStdString() == current);

lib/platform-funcs.hpp

@@ -11,15 +11,36 @@ namespace advss {
 
 enum class HotkeyType;
 
-EXPORT void GetWindowList(std::vector<std::string> &windows);
-EXPORT void GetWindowList(QStringList &windows);
-EXPORT void GetCurrentWindowTitle(std::string &title);
-EXPORT bool IsFullscreen(const std::string &title);
-EXPORT bool IsMaximized(const std::string &title);
-EXPORT std::optional<std::string> GetTextInWindow(const std::string &window);
+struct WindowQueryOptions {
+	bool geometry = false;
+	bool focus = false;
+	bool fullscreen = false;
+	bool maximized = false;
+	bool windowClass = false; // Windows only, no-op on other platforms
+	bool text = false; // Windows only, expensive, no-op on other platforms
+};
+
+struct WindowInfo {
+	std::string title;
+	bool focused = false;
+	bool fullscreen = false;
+	bool maximized = false;
+	int x = 0;
+	int y = 0;
+	int width = 0;
+	int height = 0;
+	std::string windowClass;
+	std::optional<std::string> text;
+};
+
+EXPORT std::vector<WindowInfo>
+GetWindows(const WindowQueryOptions &options = {});
+EXPORT std::string GetCurrentWindowTitle();
 EXPORT int SecondsSinceLastInput();
-EXPORT void GetProcessList(QStringList &processes);
-EXPORT void GetForegroundProcessName(std::string &name);
+EXPORT QStringList GetProcessList();
+EXPORT std::string GetForegroundProcessName();
+EXPORT std::string GetForegroundProcessPath();
+EXPORT QStringList GetProcessPathsFromName(const QString &name);
 EXPORT bool IsInFocus(const QString &executable);
 void PlatformInit();
 void PlatformCleanup();

lib/queue/action-queue-tab.cpp

@@ -16,14 +16,17 @@ static void setupTab(QTabWidget *);
 
 static ActionQueueTable *tabWidget = nullptr;
 
-void RegisterActionQueueTab()
+static bool setup()
 {
-	AddPluginInitStep([]() {
+	AddPluginInitStep([] {
 		AddSetupTabCallback("actionQueueTab", ActionQueueTable::Create,
 				    setupTab);
 	});
+	return true;
 }
 
+static bool setupDone = setup();
+
 static void setTabVisible(QTabWidget *tabWidget, bool visible)
 {
 	SetTabVisibleByName(

lib/queue/action-queue.cpp

@@ -12,20 +12,16 @@ std::deque<std::shared_ptr<Item>> &GetActionQueues()
 	return queues;
 }
 
-void RegisterActionQueueTab();
-
-void SetupActionQueues()
+static bool setup()
 {
-	static bool done = false;
-	if (done) {
-		return;
-	}
 	AddSaveStep(SaveActionQueues);
 	AddLoadStep(LoadActionQueues);
-	RegisterActionQueueTab();
-	done = true;
+	AddPluginCleanupStep([]() { queues.clear(); });
+	return true;
 }
 
+static bool setupDone = setup();
+
 ActionQueue::ActionQueue() : Item()
 {
 	_lastEmpty = std::chrono::high_resolution_clock::now();
@@ -113,7 +109,7 @@ void ActionQueue::Add(const std::shared_ptr<MacroAction> &action)
 		action->Save(data);
 		copy->Load(data);
 		copy->PostLoad();
-		RunPostLoadSteps();
+		RunAndClearPostLoadSteps();
 		copy->ResolveVariablesToFixedValues();
 		_actions.emplace_back(copy);
 	} else {
@@ -423,7 +419,7 @@ void ImportQueues(obs_data_t *data)
 		importedQueues->emplace_back(queue);
 	}
 
-	QeueUITask(signalImportedQueues, importedQueues);
+	QueueUITask(signalImportedQueues, importedQueues);
 }
 
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

lib/queue/action-queue.hpp

@@ -101,7 +101,6 @@ signals:
 };
 
 std::deque<std::shared_ptr<Item>> &GetActionQueues();
-void SetupActionQueues();
 void SaveActionQueues(obs_data_t *);
 void LoadActionQueues(obs_data_t *);
 void ImportQueues(obs_data_t *);

lib/switcher-data.cpp

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

lib/switcher-data.hpp

@@ -94,7 +94,6 @@ public:
 	bool stop = false;
 	std::condition_variable cv;
 
-	bool firstBoot = true;
 	bool transitionActive = false;
 	bool sceneCollectionStop = false;
 	bool obsIsShuttingDown = false;
@@ -163,8 +162,9 @@ public:
 	bool warnPluginLoadFailure = true;
 	bool disableHints = false;
 	bool disableFilterComboboxFilter = false;
-	bool disableMacroWidgetCache = false;
 	bool hideLegacyTabs = true;
+	bool settingsLockEnabled = false;
+	std::string settingsLockPassword;
 	bool saveWindowGeo = false;
 	QPoint windowPos = {};
 	QSize windowSize = {};

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

@@ -1,34 +1,42 @@
 #include "auto-update-tooltip-label.hpp"
 
+#include <QToolTip>
+
 namespace advss {
 
-AutoUpdateTooltipLabel::AutoUpdateTooltipLabel(
+AutoUpdateHelpIcon::AutoUpdateHelpIcon(
 	QWidget *parent, const std::function<QString()> &updateTooltipCallback,
 	int updateIntervalMs)
-	: QLabel(parent),
+	: HelpIcon("", parent),
 	  _callback(updateTooltipCallback),
 	  _timer(new QTimer(this)),
 	  _updateIntervalMs(updateIntervalMs)
 {
 	connect(_timer, &QTimer::timeout, this,
-		&AutoUpdateTooltipLabel::UpdateTooltip);
+		&AutoUpdateHelpIcon::UpdateTooltip);
 }
 
-void AutoUpdateTooltipLabel::enterEvent(QEnterEvent *event)
+void AutoUpdateHelpIcon::enterEvent(QEnterEvent *event)
 {
+	UpdateTooltip();
 	_timer->start(_updateIntervalMs);
 	QLabel::enterEvent(event);
 }
 
-void AutoUpdateTooltipLabel::leaveEvent(QEvent *event)
+void AutoUpdateHelpIcon::leaveEvent(QEvent *event)
 {
 	_timer->stop();
 	QLabel::leaveEvent(event);
 }
 
-void AutoUpdateTooltipLabel::UpdateTooltip()
+void AutoUpdateHelpIcon::UpdateTooltip()
 {
-	setToolTip(_callback());
+	if (!underMouse()) {
+		return;
+	}
+
+	const QString text = _callback();
+	QToolTip::showText(QCursor::pos(), text, this);
 }
 
 } // namespace advss

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

@@ -1,20 +1,19 @@
 #pragma once
 #include "export-symbol-helper.hpp"
+#include "help-icon.hpp"
 
 #include <functional>
-#include <QLabel>
 #include <QTimer>
 
 namespace advss {
 
-class ADVSS_EXPORT AutoUpdateTooltipLabel : public QLabel {
+class ADVSS_EXPORT AutoUpdateHelpIcon : public HelpIcon {
 	Q_OBJECT
 
 public:
-	AutoUpdateTooltipLabel(
-		QWidget *parent,
-		const std::function<QString()> &updateTooltipCallback,
-		int updateIntervalMs = 300);
+	AutoUpdateHelpIcon(QWidget *parent,
+			   const std::function<QString()> &updateTooltipCallback,
+			   int updateIntervalMs = 300);
 
 protected:
 	void enterEvent(QEnterEvent *event) override;

lib/utils/backup.cpp

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

lib/utils/backup.hpp

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

lib/utils/canvas-helpers.cpp

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

lib/utils/canvas-helpers.hpp

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

lib/utils/condition-logic.cpp

@@ -8,7 +8,6 @@
 namespace advss {
 
 const std::map<Logic::Type, const char *> Logic::localeMap = {
-	{Logic::Type::NONE, {"AdvSceneSwitcher.logic.none"}},
 	{Logic::Type::AND, {"AdvSceneSwitcher.logic.and"}},
 	{Logic::Type::OR, {"AdvSceneSwitcher.logic.or"}},
 	{Logic::Type::AND_NOT, {"AdvSceneSwitcher.logic.andNot"}},
@@ -67,7 +66,7 @@ void Logic::PopulateLogicTypeSelection(QComboBox *list, bool isRootCondition)
 					 return typeValue < rootOffset;
 				 }}
 			       : std::function<bool(int)>{[](int typeValue) {
-					 return typeValue >= rootOffset;
+					 return typeValue > rootOffset;
 				 }};
 	for (const auto &[type, name] : localeMap) {
 		const int typeValue = static_cast<int>(type);