Improve "Studio mode" action

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

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

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

@@ -29,7 +29,6 @@ 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::
 
@@ -53,7 +52,6 @@ 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/.Aptfile

@@ -8,7 +8,6 @@ package 'libcurl4-openssl-dev'
 package 'libxtst-dev'
 package 'libxss-dev'
 package 'libopencv-dev'
-package 'libopencv-contrib-dev'
 package 'libtesseract-dev'
 package 'libproc2-dev'
 package 'libusb-1.0-0-dev'

.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', version: '3.6.2'
+package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
 package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'

.github/scripts/.build-deps.zsh

@@ -284,56 +284,30 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   case ${host_os} {
     macos)
         local opencv_dir="${project_root}/deps/opencv"
-        local opencv_contrib_dir="${project_root}/deps/opencv_contrib"
+        local opencv_build_dir="${opencv_dir}/build_${target##*-}"
-        local opencv_install_x86="${opencv_dir}/install_x86_64"
-        local opencv_install_arm="${opencv_dir}/install_arm64"
 
-        local -a opencv_cmake_args_common=(
+        local -a opencv_cmake_args=(
           -DCMAKE_BUILD_TYPE=Release
-          -DBUILD_LIST=core,imgproc,objdetect,xobjdetect,dnn
+          -DBUILD_LIST=core,imgproc,objdetect
-          -DOPENCV_EXTRA_MODULES_PATH="${opencv_contrib_dir}/modules"
+          -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
           -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
           -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DWITH_KLEIDICV=OFF
+          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
         )
 
+        if [ "${target}" != "macos-x86_64" ]; then
+          opencv_cmake_args+=(-DWITH_IPP=OFF)
+        fi
+
         pushd ${opencv_dir}
+        log_info "Configure OpenCV ..."
+        cmake -S . -B ${opencv_build_dir} ${opencv_cmake_args}
 
-        log_info "Configure OpenCV (x86_64) ..."
+        log_info "Building OpenCV ..."
-        cmake -S . -B build_x86_64 ${opencv_cmake_args_common} \
+        cmake --build ${opencv_build_dir} --config Release
-          -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-          -DCMAKE_PROJECT_INCLUDE="${SCRIPT_HOME}/opencv-force-processor-x86_64.cmake" \
-          -DCMAKE_INSTALL_PREFIX="${opencv_install_x86}" \
-          -DWITH_IPP=OFF
 
-        log_info "Building OpenCV (x86_64) ..."
+        log_info "Installing OpenCV ..."
-        cmake --build build_x86_64 --config Release
+        cmake --install ${opencv_build_dir} --prefix "${advss_dep_path}" --config Release || true
-
-        log_info "Installing OpenCV (x86_64) ..."
-        cmake --install build_x86_64 --prefix "${opencv_install_x86}" --config Release || true
-
-        log_info "Configure OpenCV (arm64) ..."
-        cmake -S . -B build_arm64 ${opencv_cmake_args_common} \
-          -DCMAKE_OSX_ARCHITECTURES=arm64 \
-          -DCMAKE_INSTALL_PREFIX="${opencv_install_arm}"
-
-        log_info "Building OpenCV (arm64) ..."
-        cmake --build build_arm64 --config Release
-
-        log_info "Installing OpenCV (arm64) ..."
-        cmake --install build_arm64 --prefix "${opencv_install_arm}" --config Release || true
-
-        log_info "Merging OpenCV into universal binaries ..."
-        cp -R "${opencv_install_arm}/." "${advss_dep_path}"
-        for arm_lib in ${opencv_install_arm}/lib/**/*.(dylib|a)(.); do
-          local rel="${arm_lib#${opencv_install_arm}/}"
-          local x86_lib="${opencv_install_x86}/${rel}"
-          if [[ -f "${x86_lib}" ]]; then
-            lipo -create "${x86_lib}" "${arm_lib}" -output "${advss_dep_path}/${rel}"
-          fi
-        done
-
-        rm -rf "${opencv_install_x86}" "${opencv_install_arm}"
         popd
 
         local leptonica_dir="${project_root}/deps/leptonica"
@@ -345,7 +319,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
           -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
           -DSW_BUILD=OFF
           -DOPENJPEG_SUPPORT=OFF
-          -DENABLE_WEBP=OFF
+          -DLIBWEBP_SUPPORT=OFF
           -DCMAKE_DISABLE_FIND_PACKAGE_GIF=TRUE
           -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE
           -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE

.github/scripts/.build.zsh

@@ -255,10 +255,6 @@ ${_usage_host:-}"
 
         cmake_args+=(
           -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/.package.zsh

@@ -259,7 +259,7 @@ ${_usage_host:-}"
       cmake --build build_${target##*-} --config ${config} -t package ${cmake_args}
 
       # Mark certain deps as optional
-      build-aux/CI/linux/demote-deps.sh ${project_root}/release/*.deb Recommends '(mqtt)|(opencv)|(tesseract)|(usb)|(x11)|(libobs)'
+      build-aux/CI/linux/demote-deps.sh ${project_root}/release/*.deb Recommends '(mqtt)|(opencv)|(tesseract)|(usb)|(x11)'
 
       if [ ! -e ${project_root}/release/${output_name}.deb ]; then
         mv ${project_root}/release/*.deb ${project_root}/release/${output_name}.deb

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

@@ -106,7 +106,6 @@ function Build {
     $ADVSSDepPath = "$(Resolve-Path -Path ${ProjectRoot}/${OutDirName})"
 
     $OpenCVPath = "${ProjectRoot}/deps/opencv"
-    $OpenCVContribPath = "${ProjectRoot}/deps/opencv_contrib"
     $OpenCVBuildPath = "${OpenCVPath}/build"
 
     Push-Location -Stack BuildOpenCVTemp
@@ -116,8 +115,7 @@ function Build {
         "-DCMAKE_BUILD_TYPE=Release"
         "-DCMAKE_PREFIX_PATH:PATH=${OBSDepPath}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${ADVSSDepPath}"
-        "-DBUILD_LIST=core,imgproc,objdetect,xobjdetect"
+        "-DBUILD_LIST=core,imgproc,objdetect"
-        "-DOPENCV_EXTRA_MODULES_PATH:PATH=${OpenCVContribPath}/modules"
     )
 
     Log-Information "Configuring OpenCV..."

.github/scripts/Package-Windows.ps1

@@ -68,53 +68,14 @@ function Package {
 
     Remove-Item @RemoveArgs
 
-    $ReleasePath = "${ProjectRoot}/release/${Configuration}"
+    Log-Group "Archiving ${ProductName}..."
-    $NewBinPath  = "${ReleasePath}/${ProductName}/bin/64bit"
+    $CompressArgs = @{
-    $NewDataPath = "${ReleasePath}/${ProductName}/data"
+        Path = (Get-ChildItem -Path "${ProjectRoot}/release/${Configuration}" -Exclude "${OutputName}*.*")
-    $CIWindowsDir = "${ProjectRoot}/build-aux/CI/windows"
+        CompressionLevel = 'Optimal'
-
+        DestinationPath = "${ProjectRoot}/release/${OutputName}.zip"
-    # --- Recommended zip (new layout, extract to %ProgramData%\obs-studio\) ---
+        Verbose = ($Env:CI -ne $null)
-    Log-Group "Archiving ${ProductName} (recommended)..."
-    $RecStaging = "${ProjectRoot}/release/zip-staging-rec"
-    Remove-Item -Path $RecStaging -Recurse -Force -ErrorAction SilentlyContinue
-    New-Item -ItemType Directory -Force -Path $RecStaging | Out-Null
-    Copy-Item -Path "${CIWindowsDir}/README.txt" -Destination "${RecStaging}/README.txt"
-    if ( Test-Path -Path $NewBinPath ) {
-        $RecBinPath = "${RecStaging}/${ProductName}/bin/64bit"
-        New-Item -ItemType Directory -Force -Path $RecBinPath | Out-Null
-        Copy-Item -Path "${NewBinPath}/*" -Destination $RecBinPath -Recurse -Force
     }
-    if ( Test-Path -Path $NewDataPath ) {
+    Compress-Archive -Force @CompressArgs
-        $RecDataPath = "${RecStaging}/${ProductName}/data"
-        New-Item -ItemType Directory -Force -Path $RecDataPath | Out-Null
-        Copy-Item -Path "${NewDataPath}/*" -Destination $RecDataPath -Recurse -Force
-    }
-    Compress-Archive -Force -Path (Get-ChildItem -Path $RecStaging) `
-        -CompressionLevel Optimal `
-        -DestinationPath "${ProjectRoot}/release/${OutputName}.zip"
-    Remove-Item -Path $RecStaging -Recurse -Force
-    Log-Group
-
-    # --- Legacy zip (old layout, extract to OBS install directory) ---
-    Log-Group "Archiving ${ProductName} (portable)..."
-    $PortableStaging = "${ProjectRoot}/release/zip-staging-portable"
-    Remove-Item -Path $PortableStaging -Recurse -Force -ErrorAction SilentlyContinue
-    New-Item -ItemType Directory -Force -Path $PortableStaging | Out-Null
-    Copy-Item -Path "${CIWindowsDir}/README-portable.txt" -Destination "${PortableStaging}/README.txt"
-    if ( Test-Path -Path $NewBinPath ) {
-        $PortableBinPath = "${PortableStaging}/obs-plugins/64bit"
-        New-Item -ItemType Directory -Force -Path $PortableBinPath | Out-Null
-        Copy-Item -Path "${NewBinPath}/*" -Destination $PortableBinPath -Recurse -Force
-    }
-    if ( Test-Path -Path $NewDataPath ) {
-        $PortableDataPath = "${PortableStaging}/data/obs-plugins/${ProductName}"
-        New-Item -ItemType Directory -Force -Path $PortableDataPath | Out-Null
-        Copy-Item -Path "${NewDataPath}/*" -Destination $PortableDataPath -Recurse -Force
-    }
-    Compress-Archive -Force -Path (Get-ChildItem -Path $PortableStaging) `
-        -CompressionLevel Optimal `
-        -DestinationPath "${ProjectRoot}/release/${OutputName}-portable.zip"
-    Remove-Item -Path $PortableStaging -Recurse -Force
     Log-Group
 
     if ( ( $BuildInstaller ) ) {
@@ -128,25 +89,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
-
-        # Recommended layout (for %ProgramData%\obs-studio\plugins\)
-        $PkgRec = "Package/recommended"
-        New-Item -ItemType Directory -Force -Path $PkgRec | Out-Null
-        Copy-Item -Path "${Configuration}/*" -Destination $PkgRec -Recurse -Force
-
-        # Legacy layout (for OBS installation directory)
-        if ( Test-Path "${Configuration}/${ProductName}/bin/64bit" ) {
-            $PkgLegBin = "Package/portable/obs-plugins/64bit"
-            New-Item -ItemType Directory -Force -Path $PkgLegBin | Out-Null
-            Copy-Item -Path "${Configuration}/${ProductName}/bin/64bit/*" -Destination $PkgLegBin -Recurse -Force
-        }
-        if ( Test-Path "${Configuration}/${ProductName}/data" ) {
-            $PkgLegData = "Package/portable/data/obs-plugins/${ProductName}"
-            New-Item -ItemType Directory -Force -Path $PkgLegData | Out-Null
-            Copy-Item -Path "${Configuration}/${ProductName}/data/*" -Destination $PkgLegData -Recurse -Force
-        }
-
         Invoke-External iscc ${IsccFile} /O"${ProjectRoot}/release" /F"${OutputName}-Installer"
         Remove-Item -Path Package -Recurse
         Pop-Location -Stack BuildTemp

.github/scripts/opencv-force-processor-x86_64.cmake

@@ -1,7 +0,0 @@
-# Injected via CMAKE_PROJECT_INCLUDE after opencv's project() call. Forces
-# CMAKE_SYSTEM_PROCESSOR into the cache so that third-party subdirectories
-# (mlas) that read the cache directly see x86_64 instead of the arm64 host
-# processor on Apple Silicon CI runners.
-set(CMAKE_SYSTEM_PROCESSOR
-    x86_64
-    CACHE INTERNAL "" FORCE)

.github/scripts/utils.zsh/check_macos

@@ -18,5 +18,7 @@ if (( ! ${+commands[brew]} )) {
 }
 
 brew bundle --file ${SCRIPT_HOME}/.Brewfile
-rehash
+# Workaround to make sure locally built openssl is picked up by cmake
+brew uninstall --ignore-dependencies openssl@3 || true
+rehash || true
 log_group

.github/scripts/utils.zsh/setup_linux

@@ -35,21 +35,14 @@ if (( ! (${skips[(Ie)all]} + ${skips[(Ie)deps]}) )) {
     sudo apt-get install ${apt_args} gcc-${${target##*-}//_/-}-linux-gnu g++-${${target##*-}//_/-}-linux-gnu
   }
 
-  local dist_version
+  sudo add-apt-repository --yes ppa:obsproject/obs-studio
-  read -r dist_version <<< "$(source /etc/os-release; print "${VERSION_ID}")"
+  sudo apt update
 
-  # The OBS PPA may not yet support newer Ubuntu versions.
+  sudo apt-get install ${apt_args} \
-  # On those, use the native obs-studio packages and install libobs-dev separately,
+    build-essential \
-  # as it is not bundled in obs-studio itself on newer Ubuntu releases.
+    libgles2-mesa-dev \
-  local -a obs_packages=(build-essential libgles2-mesa-dev libsimde-dev obs-studio)
+    libsimde-dev \
-  if is-at-least 26.04 ${dist_version}; then
+    obs-studio
-    obs_packages+=(libobs-dev)
-  else
-    sudo add-apt-repository --yes ppa:obsproject/obs-studio
-    sudo apt update
-  fi
-
-  sudo apt-get install ${apt_args} ${obs_packages}
 
   local -a _qt_packages=()
 

.github/workflows/build-debian.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
       - name: check_libobs_revision
@@ -50,7 +50,7 @@ jobs:
           mv ../*.deb .
       - name: Publish
         if: success()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         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-6
+  DEP_DIR: .deps/advss-build-dependencies-3
 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@v6
+      - uses: actions/checkout@v4
         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@v6
+      - uses: actions/checkout@v4
         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@v5
+      - uses: actions/cache@v4
         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@v7
+        uses: actions/upload-artifact@v4
         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@v7
+        uses: actions/upload-artifact@v4
         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@v6
+      - uses: actions/checkout@v4
         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@v5
+      - uses: actions/cache@v4
         id: ccache-cache
         with:
           path: ${{ github.workspace }}/.ccache
@@ -210,19 +210,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-ccache-x86_64-
 
-      - name: Set up Homebrew 🍺
+      - name: Set up CMake 🏗️
-        uses: Homebrew/actions/setup-homebrew@main
+        uses: jwlawson/actions-setup-cmake@v1.13
+        with:
+          cmake-version: '3.x.x'
 
-      - name: Install Vulkan SDK 🌋
+      - name: Set up Homebrew 🍺
-        shell: bash
+        uses: Homebrew/actions/setup-homebrew@master
-        run: |
-          wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc \
-            | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
-          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list \
-            https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list
-          sudo apt-get update -qq
-          sudo apt-get install -y vulkan-sdk
-          echo "VULKAN_SDK=/usr" >> "$GITHUB_ENV"
 
       - name: Build Plugin 🧱
         uses: ./.github/actions/build-plugin
@@ -244,111 +238,23 @@ jobs:
           config: ${{ needs.check-event.outputs.config }}
 
       - name: Upload Source Tarball 🗜️
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         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: Rename artifacts for Ubuntu 24 🏷️
-        run: |
-          : Rename artifacts for Ubuntu 24 🏷️
-          for f in ${{ github.workspace }}/release/*-x86_64-linux-gnu.*; do
-            [ -e "${f}" ] || continue
-            mv "${f}" "${f/x86_64-linux-gnu/x86_64-ubuntu24.04-linux-gnu}"
-          done
-
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         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@v7
+        uses: actions/upload-artifact@v4
         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
-
-  ubuntu-26-build:
-    name: Build for Ubuntu 26 🐧
-    runs-on: ubuntu-26.04
-    needs: check-event
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Set Up Environment 🔧
-        id: setup
-        run: |
-          : Set Up Environment 🔧
-          if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi
-
-          git_tag="$(git describe --tags)"
-
-          read -r product_name product_version <<< \
-            "$(jq -r '. | {name, version} | join(" ")' buildspec.json)"
-
-          echo "pluginName=${product_name}" >> $GITHUB_OUTPUT
-          echo "pluginVersion=${git_tag}" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v5
-        id: ccache-cache
-        with:
-          path: ${{ github.workspace }}/.ccache
-          key: ${{ runner.os }}-ccache-x86_64-${{ needs.check-event.outputs.config }}
-          restore-keys: |
-            ${{ runner.os }}-ccache-x86_64-
-
-      - name: Set up Homebrew 🍺
-        uses: Homebrew/actions/setup-homebrew@main
-
-      - name: Build Plugin 🧱
-        uses: ./.github/actions/build-plugin
-        with:
-          target: x86_64
-          config: ${{ needs.check-event.outputs.config }}
-
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          target: x86_64
-          config: ${{ needs.check-event.outputs.config }}
-
-      - name: Package Plugin 📀
-        uses: ./.github/actions/package-plugin
-        with:
-          package: ${{ fromJSON(needs.check-event.outputs.package) }}
-          target: x86_64
-          config: ${{ needs.check-event.outputs.config }}
-
-      - name: Rename artifacts for Ubuntu 26 🏷️
-        run: |
-          : Rename artifacts for Ubuntu 26 🏷️
-          for f in ${{ github.workspace }}/release/*-x86_64-linux-gnu.*; do
-            [ -e "${f}" ] || continue
-            mv "${f}" "${f/x86_64-linux-gnu/x86_64-ubuntu26.04-linux-gnu}"
-          done
-
-      - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v7
-        with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-26.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@v7
-        if: ${{ fromJSON(needs.check-event.outputs.package) }}
-        with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-26.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 🪟
@@ -358,7 +264,7 @@ jobs:
       run:
         shell: pwsh
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
@@ -385,12 +291,6 @@ jobs:
           target: x64
           config: ${{ needs.check-event.outputs.config }}
 
-      - name: Install Vulkan SDK 🌋
-        uses: jakoch/install-vulkan-sdk-action@v1
-        with:
-          install_runtime: false
-          cache: true
-
       - name: Build Plugin 🧱
         uses: ./.github/actions/build-plugin
         with:
@@ -411,7 +311,7 @@ jobs:
           package: ${{ fromJSON(needs.check-event.outputs.package) }}
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         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@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: clang-format check 🐉
@@ -17,7 +17,7 @@ jobs:
   cmake-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         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@v6
+        uses: actions/checkout@v4
 
       - name: Check locale files
         run: |

.github/workflows/push.yaml

@@ -59,7 +59,7 @@ jobs:
           esac
 
       - name: Download Build Artifacts 📥
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         if: fromJSON(steps.check.outputs.validTag)
         id: download
 
@@ -78,7 +78,6 @@ jobs:
             'windows-x64;zip|exe'
             'macos-universal;tar.xz|pkg'
             'ubuntu-24.04-x86_64;tar.xz|deb|ddeb'
-            'ubuntu-26.04-x86_64;tar.xz|deb|ddeb'
             'sources;tar.xz'
           )
 
@@ -107,7 +106,7 @@ jobs:
       - name: Create Release 🛫
         if: fromJSON(steps.check.outputs.validTag)
         id: create_release
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
+        uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b
         with:
           draft: true
           prerelease: ${{ fromJSON(steps.check.outputs.prerelease) }}

.gitmodules

@@ -28,15 +28,12 @@
 [submodule "deps/libusb"]
 	path = deps/libusb
 	url = https://github.com/libusb/libusb.git
+[submodule "deps/date"]
+	path = deps/date
+	url = https://github.com/HowardHinnant/date.git
 [submodule "deps/jsoncons"]
 	path = deps/jsoncons
 	url = https://github.com/danielaparker/jsoncons.git
 [submodule "deps/paho.mqtt.cpp"]
 	path = deps/paho.mqtt.cpp
 	url = https://github.com/eclipse-paho/paho.mqtt.cpp.git
-[submodule "deps/opencv_contrib"]
-	path = deps/opencv_contrib
-	url = https://github.com/opencv/opencv_contrib.git
-[submodule "deps/whisper.cpp"]
-	path = deps/whisper.cpp
-	url = https://github.com/ggml-org/whisper.cpp.git

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 31 and above, although using the latest version of OBS is recommended to support all features.
+The plugin can be compiled for OBS 27 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/plugins:
+Add the "SceneSwitcher" source directory to your obs-studio source directory under obs-studio/UI/frontend-plugins/:
 ```
-cd obs-studio/plugins
+cd obs-studio/UI/frontend-plugins/
 git clone --recursive https://github.com/WarmUpTill/SceneSwitcher.git
 ```
 
-Then modify the obs-studio/plugins/CMakeLists.txt and add an entry for the scene switcher:
+Then modify the obs-studio/UI/frontend-plugins/CMakeLists.txt Example and add an entry for the scene switcher:
 ```
 add_subdirectory(SceneSwitcher)
 ```

CMakeLists.txt

@@ -16,14 +16,6 @@ if(BUILD_OUT_OF_TREE)
   include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake"
           NO_POLICY_SCOPE)
   include(compilerconfig)
-  # OPENSSL_USE_STATIC_LIBS here ensures FindOpenSSL picks up the static libs
-  # preventing DLL name collisions with other plugins (e.g.NVIDIA AR SDK).
-  if(OS_WINDOWS)
-    set(OPENSSL_USE_STATIC_LIBS
-        ON
-        CACHE BOOL "Use static OpenSSL" FORCE)
-    include(cmake/windows/wingetssl.cmake)
-  endif()
   include(defaults)
   include(helpers)
 endif()
@@ -42,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()
@@ -107,8 +104,6 @@ target_sources(
           lib/macro/macro-action-edit.hpp
           lib/macro/macro-action-factory.cpp
           lib/macro/macro-action-factory.hpp
-          lib/macro/macro-action-loop.cpp
-          lib/macro/macro-action-loop.hpp
           lib/macro/macro-action-macro.cpp
           lib/macro/macro-action-macro.hpp
           lib/macro/macro-action-queue.cpp
@@ -139,9 +134,6 @@ 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
@@ -154,8 +146,6 @@ 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
@@ -173,10 +163,7 @@ target_sources(
           lib/macro/macro-signals.hpp
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
-          lib/macro/macro-undo-redo.cpp
-          lib/macro/macro-undo-redo.hpp
           lib/macro/macro-tree.hpp
-          lib/macro/macro-websocket-trigger.cpp
           lib/macro/macro.cpp
           lib/macro/macro.hpp)
 
@@ -195,8 +182,6 @@ 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
@@ -214,15 +199,6 @@ 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/first-run-wizard-audio.cpp
-          lib/utils/first-run-wizard-audio.hpp
-          lib/utils/first-run-wizard-helpers.hpp
-          lib/utils/first-run-wizard-sequence.cpp
-          lib/utils/first-run-wizard-sequence.hpp
-          lib/utils/first-run-wizard-window.cpp
-          lib/utils/first-run-wizard-window.hpp
           lib/utils/help-icon.hpp
           lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
@@ -305,10 +281,6 @@ target_sources(
           lib/utils/volume-control.hpp
           lib/utils/websocket-api.cpp
           lib/utils/websocket-api.hpp
-          lib/variables/variable-color-button.cpp
-          lib/variables/variable-color-button.hpp
-          lib/variables/variable-color.cpp
-          lib/variables/variable-color.hpp
           lib/variables/variable-line-edit.cpp
           lib/variables/variable-line-edit.hpp
           lib/variables/variable-number.hpp
@@ -381,9 +353,6 @@ set_target_properties(${LIB_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 target_compile_features(${LIB_NAME} PUBLIC cxx_std_17)
 
-target_precompile_headers(${LIB_NAME} PRIVATE
-                          "${CMAKE_CURRENT_SOURCE_DIR}/lib/pch.hpp")
-
 target_include_directories(
   ${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
                      "${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")
@@ -480,29 +449,14 @@ 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(
@@ -528,11 +482,7 @@ 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 ---
 
@@ -561,59 +511,3 @@ else()
     set_target_properties_obs(${PROJECT_NAME} PROPERTIES PREFIX "")
   endif()
 endif()
-
-# --- Install third-party dependency licenses ---
-#
-# Each entry is "display-name:path/to/license/file" relative to deps/. Files are
-# silently skipped when a submodule is not checked out.
-set(_dep_license_files
-    "asio:asio/asio/LICENSE_1_0.txt"
-    "cpp-httplib:cpp-httplib/LICENSE"
-    "json:json/LICENSE.MIT"
-    "jsoncons:jsoncons/LICENSE"
-    "leptonica:leptonica/leptonica-license.txt"
-    "libremidi:libremidi/LICENSE.md"
-    "libusb:libusb/COPYING"
-    "opencv:opencv/LICENSE"
-    "openvr:openvr/LICENSE"
-    "paho-mqtt:paho.mqtt.cpp/LICENSE"
-    "tesseract:tesseract/LICENSE"
-    "websocketpp:websocketpp/COPYING"
-    "whisper:whisper.cpp/LICENSE")
-
-if(DEB_INSTALL)
-  if(NOT DATA_OUT_DIR)
-    set(DATA_OUT_DIR "/share/obs/obs-plugins/${PROJECT_NAME}")
-  endif()
-  set(_license_dest "${CMAKE_INSTALL_PREFIX}/${DATA_OUT_DIR}/licenses")
-elseif(OS_MACOS)
-  # macOS: license files become bundle Resources/licenses/* entries
-  set(_license_dest "")
-else()
-  # Windows and non-DEB Linux: alongside the plugin's data directory
-  set(_license_dest "${CMAKE_PROJECT_NAME}/data/licenses")
-endif()
-
-foreach(_entry IN LISTS _dep_license_files)
-  string(REGEX MATCH "^([^:]+):(.+)$" _m "${_entry}")
-  set(_dep_name "${CMAKE_MATCH_1}")
-  set(_dep_file "${CMAKE_CURRENT_SOURCE_DIR}/deps/${CMAKE_MATCH_2}")
-
-  if(NOT EXISTS "${_dep_file}")
-    continue()
-  endif()
-
-  if(OS_MACOS)
-    # Copy to binary dir so we can give the file a clean name
-    set(_staged "${CMAKE_CURRENT_BINARY_DIR}/licenses/LICENSE-${_dep_name}")
-    configure_file("${_dep_file}" "${_staged}" COPYONLY)
-    target_sources(${PROJECT_NAME} PRIVATE "${_staged}")
-    set_source_files_properties("${_staged}" PROPERTIES MACOSX_PACKAGE_LOCATION
-                                                        "Resources/licenses")
-  else()
-    install(
-      FILES "${_dep_file}"
-      DESTINATION "${_license_dest}"
-      RENAME "LICENSE-${_dep_name}")
-  endif()
-endforeach()

CMakePresets.json

@@ -41,8 +41,7 @@
       "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
       }
     },
     {
@@ -70,8 +69,7 @@
       "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
       }
     },
     {
@@ -99,8 +97,7 @@
       "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
       }
     },
     {
@@ -128,8 +125,7 @@
       "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,6 +14,11 @@ 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-portable.txt

@@ -1,23 +0,0 @@
-Advanced Scene Switcher - Windows Installation (Portable)
-==========================================================
-
-For full installation instructions visit:
-https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation
-
-
-This archive uses the portable plugin layout for older OBS versions,
-portable OBS installs, and Steam.
-
-Extract the CONTENTS of this archive 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 this archive into that directory.
-
-
-For OBS 28 and newer the recommended archive is preferred:
-    advanced-scene-switcher-<version>-windows-x64.zip

build-aux/CI/windows/README.txt

@@ -1,21 +0,0 @@
-Advanced Scene Switcher - Windows Installation
-===============================================
-
-For full installation instructions visit:
-https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation
-
-
-This archive uses the recommended plugin layout for OBS 28 and newer.
-
-Extract the CONTENTS of this archive into:
-
-    C:\ProgramData\obs-studio\plugins\
-
-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
-
-
-If the plugin does not appear in OBS, try the portable archive instead:
-    advanced-scene-switcher-<version>-windows-x64-portable.zip

cmake/common/advss_helpers.cmake

@@ -2,7 +2,7 @@
 
 if(BUILD_OUT_OF_TREE)
   if(OS_WINDOWS)
-    set(OBS_PLUGIN_DESTINATION "${CMAKE_PROJECT_NAME}/bin/64bit")
+    set(OBS_PLUGIN_DESTINATION "obs-plugins/64bit")
   else()
     set(OBS_PLUGIN_DESTINATION "${CMAKE_INSTALL_LIBDIR}/obs-plugins")
   endif()
@@ -157,9 +157,7 @@ else()
       set_target_properties(${target} PROPERTIES INSTALL_RPATH
                                                  "$ORIGIN:$ORIGIN/..")
     endif()
-    get_filename_component(_plugin_dir_name "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
+    message(STATUS "ADVSS: ENABLED PLUGIN     ${target}")
-    set_property(GLOBAL APPEND PROPERTY ADVSS_PLUGINS_ENABLED
-                                        ${_plugin_dir_name})
   endfunction()
 
   function(install_advss_plugin_dependency_target target dep)
@@ -333,8 +331,6 @@ function(setup_advss_plugin target)
     PRIVATE "${ADVSS_SOURCE_DIR}/lib" "${ADVSS_SOURCE_DIR}/lib/legacy"
             "${ADVSS_SOURCE_DIR}/lib/macro" "${ADVSS_SOURCE_DIR}/lib/utils"
             "${ADVSS_SOURCE_DIR}/lib/variables" "${ADVSS_SOURCE_DIR}/forms")
-
-  target_precompile_headers(${target} PRIVATE "${ADVSS_SOURCE_DIR}/lib/pch.hpp")
 endfunction()
 
 function(install_advss_plugin_dependency)

cmake/common/buildspec_common.cmake

@@ -180,53 +180,24 @@ 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})
 
-      set(download_success FALSE)
+      list(GET download_status 0 error_code)
-
+      list(GET download_status 1 error_message)
-      foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
+      if(error_code GREATER 0)
-        message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
+        message(STATUS "Downloading ${url} - Failure")
-
-        file(DOWNLOAD "${url}" "${dependencies_dir}/${file}"
-             STATUS download_status)
-
-        list(GET download_status 0 error_code)
-        list(GET download_status 1 error_message)
-
-        if(error_code EQUAL 0)
-          file(SHA256 "${dependencies_dir}/${file}" actual_hash)
-          if(NOT actual_hash STREQUAL hash)
-            set(error_code 1)
-            set(error_message
-                "hash mismatch (expected ${hash}, got ${actual_hash})")
-          endif()
-        endif()
-
-        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} after ${MAX_DOWNLOAD_RETRIES} attempts")
+            "Unable to download ${url}, failed with error: ${error_message}")
+        file(REMOVE "${dependencies_dir}/${file}")
+      else()
+        message(STATUS "Downloading ${url} - done")
       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,11 +18,8 @@ set(CPACK_PACKAGE_FILE_NAME
     "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_C_LIBRARY_ARCHITECTURE}"
 )
 
-set(CPACK_GENERATOR
+set(CPACK_GENERATOR "DEB")
-    "DEB"
-    CACHE STRING "CPack generator to use")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "obs-studio")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${PLUGIN_EMAIL}")
 set(CPACK_SET_DESTDIR ON)
 
@@ -49,19 +46,6 @@ 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/buildspec.cmake

@@ -6,11 +6,7 @@ include(buildspec_common)
 
 # _check_dependencies_windows: Set up Windows slice for _check_dependencies
 function(_check_dependencies_windows)
-  if(CMAKE_GENERATOR_PLATFORM)
+  set(arch ${CMAKE_GENERATOR_PLATFORM})
-    set(arch ${CMAKE_GENERATOR_PLATFORM})
-  else()
-    set(arch x64)
-  endif()
   set(platform windows-${arch})
 
   set(dependencies_dir "${CMAKE_CURRENT_SOURCE_DIR}/.deps")

cmake/windows/defaults.cmake

@@ -6,9 +6,3 @@ 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 "${target}/bin/64bit"
+    RUNTIME DESTINATION bin/64bit
-    LIBRARY DESTINATION "${target}/bin/64bit")
+    LIBRARY DESTINATION obs-plugins/64bit)
 
   install(
     FILES "$<TARGET_PDB_FILE:${target}>"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION "${target}/bin/64bit"
+    DESTINATION obs-plugins/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}/plugins/${target}/bin/64bit"
+              "${OBS_BUILD_DIR}/obs-plugins/64bit"
       COMMAND
         "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:${target}>"
         "$<$<CONFIG:Debug,RelWithDebInfo,Release>:$<TARGET_PDB_FILE:${target}>>"
-        "${OBS_BUILD_DIR}/plugins/${target}/bin/64bit"
+        "${OBS_BUILD_DIR}/obs-plugins/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 "${target}/data"
+      DESTINATION data/obs-plugins/${target}
       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}/plugins/${target}/data"
+                "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
         COMMAND
           "${CMAKE_COMMAND}" -E copy_directory
           "${CMAKE_CURRENT_SOURCE_DIR}/data"
-          "${OBS_BUILD_DIR}/plugins/${target}/data"
+          "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
         COMMENT "Copy ${target} resources to data directory"
         VERBATIM)
     endif()
@@ -133,7 +133,7 @@ function(target_add_resource target resource)
 
   install(
     FILES "${resource}"
-    DESTINATION "${target}/data"
+    DESTINATION data/obs-plugins/${target}
     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}/plugins/${target}/data"
+              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
       COMMAND "${CMAKE_COMMAND}" -E copy "${resource}"
-              "${OBS_BUILD_DIR}/plugins/${target}/data"
+              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
       COMMENT "Copy ${target} resource ${resource} to library directory"
       VERBATIM)
   endif()

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

@@ -2,13 +2,12 @@
 #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={{{#MyAppId}}
+AppId={{@UUID_APP@}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
@@ -21,19 +20,15 @@ OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 DirExistsWarning=no
-UsePreviousAppDir=no
 SetupIconFile=installer.ico
-UninstallDisplayIcon={code:GetUninstallIconPath}
+UninstallDisplayIcon={app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico
 DisableDirPage=no
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-; Recommended layout - used when installing to %ProgramData%\obs-studio\plugins\
+Source: "..\release\Package\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\release\Package\recommended\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: IsRecommendedLayout
-; Legacy layout - used when installing to the OBS installation directory
-Source: "..\release\Package\portable\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: IsLegacyLayout
 Source: "..\LICENSE"; Flags: dontcopy
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -56,64 +51,17 @@ begin
   );
 end;
 
-// Returns true when the selected install directory is under %ProgramData%,
+// credit where it's due :
-// meaning the recommended plugin layout should be used.
+// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
-function IsRecommendedLayout(): Boolean;
-begin
-  Result := Pos(LowerCase(ExpandConstant('{commonappdata}')),
-                LowerCase(WizardDirValue())) = 1;
-end;
-
-function IsLegacyLayout(): Boolean;
-begin
-  Result := not IsRecommendedLayout();
-end;
-
-function GetUninstallIconPath(Param: string): string;
-begin
-  if IsRecommendedLayout() then
-    Result := ExpandConstant('{app}\advanced-scene-switcher\data\res\images\logo.ico')
-  else
-    Result := ExpandConstant('{app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico');
-end;
-
 function GetDirName(Value: string): string;
 var
-  PrevPath: string;
+  InstallPath: string;
-  UninstallKey: string;
 begin
-  Result := ExpandConstant('{commonappdata}\obs-studio\plugins');
+  // initialize default path, which will be returned when the following registry
-  UninstallKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + '{' + '{#MyAppId}' + '}_is1';
+  // key queries fail due to missing keys or for some different reason
-  if RegQueryStringValue(HKLM, UninstallKey, 'InstallLocation', PrevPath) and (PrevPath <> '') then
+  Result := '{autopf}\obs-studio';
-    Result := PrevPath;
+  // query the first registry value; if this succeeds, return the obtained value
+  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
+    Result := InstallPath
 end;
 
-// Remove files placed by the portable installer (obs-plugins/64bit and
-// data/obs-plugins layout) so the plugin is not loaded twice by OBS.
-// Only runs when upgrading from a portable location to the recommended one.
-procedure RemoveLegacyFiles();
-var
-  OldInstallPath: string;
-  UninstallKey: string;
-begin
-  if not IsRecommendedLayout() then
-    Exit;
-  UninstallKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + '{' + '{#MyAppId}' + '}_is1';
-  if not RegQueryStringValue(HKLM, UninstallKey, 'InstallLocation', OldInstallPath) then
-    Exit;
-  // Skip if the previous install was already in the recommended location
-  if Pos(LowerCase(ExpandConstant('{commonappdata}')), LowerCase(OldInstallPath)) = 1 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

@@ -40,27 +40,19 @@ if(WIN32 AND (NOT OpenSSL_FOUND))
   message(STATUS "Looking for OpenSSL built with CRT variant: ${_crt_kind}")
 
   # Try to find the root and corresponding lib path
-  if(OPENSSL_USE_STATIC_LIBS)
-    set(_crypto_lib_name "libcrypto_static.lib")
-    set(_ssl_lib_name "libssl_static.lib")
-  else()
-    set(_crypto_lib_name "libcrypto.lib")
-    set(_ssl_lib_name "libssl.lib")
-  endif()
-
   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}/${_crypto_lib_name}")
+           AND EXISTS "${_root}/${_suffix}/libcrypto.lib")
           set(OPENSSL_ROOT_DIR
               "${_root}"
               CACHE PATH "Path to OpenSSL root")
           set(OPENSSL_CRYPTO_LIBRARY
-              "${_root}/${_suffix}/${_crypto_lib_name}"
+              "${_root}/${_suffix}/libcrypto.lib"
               CACHE FILEPATH "OpenSSL crypto lib")
           set(OPENSSL_SSL_LIBRARY
-              "${_root}/${_suffix}/${_ssl_lib_name}"
+              "${_root}/${_suffix}/libssl.lib"
               CACHE FILEPATH "OpenSSL ssl lib")
           set(OPENSSL_INCLUDE_DIR
               "${_root}/include"

data/locale/de-DE.ini

@@ -76,6 +76,7 @@ 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?"
@@ -99,6 +100,7 @@ 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"
@@ -144,7 +146,11 @@ 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.layout="{{filePath}}{{conditions}}{{regex}}"
+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.media="Medien"
 AdvSceneSwitcher.condition.media.source="Quelle"
 AdvSceneSwitcher.condition.media.anyOnScene="Beliebige Medienquelle in"
@@ -210,8 +216,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.layout="{{processes}}{{regex}}läuft{{focused}}und ist fokusiert"
+AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}läuft{{focused}}und ist fokusiert"
-AdvSceneSwitcher.condition.process.layout.focus="Aktueller Vordergrundprozess: {{focusProcess}}"
+AdvSceneSwitcher.condition.process.entry.focus="Aktueller Vordergrundprozess: {{focusProcess}}"
 AdvSceneSwitcher.condition.idle="Leerlauf"
 AdvSceneSwitcher.condition.idle.entry="Keine Tastatur- oder Mauseingaben für {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Plugin-Status"
@@ -285,14 +291,14 @@ AdvSceneSwitcher.condition.replay.state.started="Replay Buffer gestartet"
 AdvSceneSwitcher.condition.replay.state.saved="Replay Buffer gespeichert"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Datum"
-AdvSceneSwitcher.day.any="Beliebiger Tag"
+AdvSceneSwitcher.condition.date.anyDay="Beliebiger Tag"
-AdvSceneSwitcher.day.monday="Montag"
+AdvSceneSwitcher.condition.date.monday="Montag"
-AdvSceneSwitcher.day.tuesday="Dienstag"
+AdvSceneSwitcher.condition.date.tuesday="Dienstag"
-AdvSceneSwitcher.day.wednesday="Mittwoch"
+AdvSceneSwitcher.condition.date.wednesday="Mittwoch"
-AdvSceneSwitcher.day.thursday="Donnerstag"
+AdvSceneSwitcher.condition.date.thursday="Donnerstag"
-AdvSceneSwitcher.day.friday="Freitag"
+AdvSceneSwitcher.condition.date.friday="Freitag"
-AdvSceneSwitcher.day.saturday="Samstag"
+AdvSceneSwitcher.condition.date.saturday="Samstag"
-AdvSceneSwitcher.day.sunday="Sonntag"
+AdvSceneSwitcher.condition.date.sunday="Sonntag"
 AdvSceneSwitcher.condition.date.state.at="Am"
 AdvSceneSwitcher.condition.date.state.after="Nach"
 AdvSceneSwitcher.condition.date.state.before="Vor"
@@ -303,13 +309,12 @@ 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.layout.simple.day="Am{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.entry.simple="Am {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.layout.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
+AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
-AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}} Wiederholen alle {{duration}} bei Datumsübereinstimmung"
+AdvSceneSwitcher.condition.date.entry.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
-AdvSceneSwitcher.condition.date.layout.pattern="Aktuelles Datum \"{{currentDate}}\" entspricht dem Muster {{pattern}}"
+AdvSceneSwitcher.condition.date.entry.nextMatchDate="Nächster Treffer bei: %1"
-AdvSceneSwitcher.condition.date.layout.nextMatchDate="Nächster Treffer bei: %1"
+AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
-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"
@@ -382,8 +387,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Warten, bis der Übergan
 AdvSceneSwitcher.action.wait="Warten"
 AdvSceneSwitcher.action.wait.type.fixed="fixe"
 AdvSceneSwitcher.action.wait.type.random="zufällig"
-AdvSceneSwitcher.action.wait.layout.fixed="Warte für {{waitType}} Dauer von {{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Warte für {{waitType}} Dauer von {{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Warte für {{waitType}} Dauer von {{duration}} bis {{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Warte für {{waitType}} Dauer von {{duration}} bis {{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Stummgeschaltet"
 AdvSceneSwitcher.action.audio.type.unmute="Nicht stummgeschaltet"
@@ -407,6 +412,7 @@ 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"
@@ -415,6 +421,7 @@ 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"
@@ -422,7 +429,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Verstecken"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Umschalten"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Quelle"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Beliebig"
-AdvSceneSwitcher.action.sceneVisibility.layout="Auf{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.entry="Auf{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Aktivieren"
 AdvSceneSwitcher.action.filter.type.disable="Deaktivieren"
@@ -450,7 +457,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.runActions="Aktionen ausführen"
+AdvSceneSwitcher.action.macro.type.run="Aktionen ausführen"
 AdvSceneSwitcher.action.macro.type.stop="Aktionen stoppen"
 AdvSceneSwitcher.action.pluginState="Plugin-Status"
 AdvSceneSwitcher.action.pluginState.type.stop="Erweiterten Automatischen Szenenwechsler stoppen"
@@ -488,7 +495,7 @@ AdvSceneSwitcher.action.file.type.write="Schreiben"
 AdvSceneSwitcher.action.file.type.append="Anhängen"
 AdvSceneSwitcher.action.file.entry="{{actions}} in {{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Studio-Modus"
-AdvSceneSwitcher.action.studioMode.type.swap="Vorschau- und Programm-Szene tauschen"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Vorschau- und Programm-Szene tauschen"
 AdvSceneSwitcher.action.studioMode.type.setScene="Vorschau-Szene einstellen auf"
 AdvSceneSwitcher.action.studioMode.type.enable="Studio-Modus aktivieren"
 AdvSceneSwitcher.action.studioMode.type.disable="Studio-Modus deaktivieren"
@@ -498,9 +505,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.layout.type="Anpassen {{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.entry.line1="Anpassen {{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Übergangstyp festlegen auf {{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Übergangstyp festlegen auf {{transitions}}"
-AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Übergangsdauer festlegen auf {{duration}}Sekunden"
+AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}Übergangsdauer festlegen auf {{duration}}Sekunden"
 AdvSceneSwitcher.action.timer="Timer"
 AdvSceneSwitcher.action.timer.type.pause="Pausieren"
 AdvSceneSwitcher.action.timer.type.continue="Fortsetzen"
@@ -827,6 +834,8 @@ 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/es-ES.ini

@@ -72,6 +72,7 @@ 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"
@@ -83,6 +84,7 @@ 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"
@@ -116,7 +118,9 @@ 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.layout="Contenido de{{filePath}}{{conditions}}{{regex}}"
+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.media="Medios"
 AdvSceneSwitcher.condition.media.anyOnScene="Cualquier fuente multimedia activada"
 AdvSceneSwitcher.condition.media.allOnScene="Todas las fuentes de medios activadas"
@@ -172,7 +176,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.layout="{{processes}}{{regex}}se está ejecutando{{focused}}y está enfocado"
+AdvSceneSwitcher.condition.process.entry="{{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"
@@ -237,14 +241,14 @@ AdvSceneSwitcher.condition.replay.state.started="Búfer de reproducción iniciad
 AdvSceneSwitcher.condition.replay.state.saved="Búfer de reproducción guardado"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Fecha"
-AdvSceneSwitcher.day.any="Cualquier día"
+AdvSceneSwitcher.condition.date.anyDay="Cualquier día"
-AdvSceneSwitcher.day.monday="Lunes"
+AdvSceneSwitcher.condition.date.monday="Lunes"
-AdvSceneSwitcher.day.tuesday="Martes"
+AdvSceneSwitcher.condition.date.tuesday="Martes"
-AdvSceneSwitcher.day.wednesday="Miércoles"
+AdvSceneSwitcher.condition.date.wednesday="Miércoles"
-AdvSceneSwitcher.day.thursday="Jueves"
+AdvSceneSwitcher.condition.date.thursday="Jueves"
-AdvSceneSwitcher.day.friday="Viernes"
+AdvSceneSwitcher.condition.date.friday="Viernes"
-AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.day.sunday="Domingo"
+AdvSceneSwitcher.condition.date.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="A las"
 AdvSceneSwitcher.condition.date.state.after="Después"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -254,12 +258,11 @@ 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.layout.simple.day="El{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.entry.simple="El {{dayOfWeek}} {{weekCondition}} {{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.entry.advanced="{{condition}} {{ignoreDate}}{{date}} {{ignoreTime}}{{time}} {{separator}} {{date2}} {{time2}}"
-AdvSceneSwitcher.condition.date.layout.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.layout.repeat="{{repeat}} Repetir cada {{duration}} en la coincidencia de fechas"
+AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima coincidencia en: %1"
-AdvSceneSwitcher.condition.date.layout.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.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"
@@ -312,8 +315,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Espere hasta que se comp
 AdvSceneSwitcher.action.wait="Esperar"
 AdvSceneSwitcher.action.wait.type.fixed="fijo"
 AdvSceneSwitcher.action.wait.type.random="aleatorio"
-AdvSceneSwitcher.action.wait.layout.fixed="Espere {{waitType}} de {{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Espere {{waitType}} de {{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Espere {{waitType}} de {{duration}} a {{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Espere {{waitType}} de {{duration}} a {{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Silencio"
 AdvSceneSwitcher.action.audio.type.unmute="Activar silencio"
@@ -331,6 +334,7 @@ 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"
@@ -339,13 +343,14 @@ 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.layout="En{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.entry="En{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Deshabilitar"
@@ -370,7 +375,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.runActions="Ejecutar"
+AdvSceneSwitcher.action.macro.type.run="Ejecutar"
 AdvSceneSwitcher.action.macro.type.stop="Detener"
 AdvSceneSwitcher.action.pluginState="Estado del complemento"
 AdvSceneSwitcher.action.pluginState.type.stop="Detener el complemento Advanced Scene Switcher"
@@ -408,7 +413,7 @@ AdvSceneSwitcher.action.file.type.write="Escribir"
 AdvSceneSwitcher.action.file.type.append="Agregar"
 AdvSceneSwitcher.action.file.entry="{{actions}} a {{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Modo estudio"
-AdvSceneSwitcher.action.studioMode.type.swap="Intercambiar vista previa y escena del programa"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Intercambiar vista previa y escena del programa"
 AdvSceneSwitcher.action.studioMode.type.setScene="Establecer escena de vista previa en"
 AdvSceneSwitcher.action.studioMode.type.enable="Activar modo estudio"
 AdvSceneSwitcher.action.studioMode.type.disable="Deshabilitar el modo de estudio"
@@ -418,9 +423,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.layout.type="Modificar {{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.entry.line1="Modificar {{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Establecer el tipo de transición en {{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{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.transition.entry.line3="{{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"
@@ -675,6 +680,8 @@ 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,6 +78,7 @@ 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\" ?"
@@ -131,6 +132,7 @@ 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"
@@ -186,6 +188,8 @@ 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"
@@ -257,10 +261,10 @@ AdvSceneSwitcher.condition.video.layout.modelPath="Données du modèle (classifi
 AdvSceneSwitcher.condition.video.layout.minNeighbor="Nombre minimum de voisins :{{minNeighbors}}"
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Réduire la charge CPU en effectuant la vérification uniquement toutes les{{throttleCount}}millisecondes"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Effectuer la vérification uniquement dans la zone"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Vérifier la couleur du texte :{{color}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="Vérifier la couleur du texte :{{textColor}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="Vérifier le type de texte :{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="Vérifier la langue :{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="Vérifier la couleur :{{color}}"
+AdvSceneSwitcher.condition.video.layout.color="Vérifier la couleur :{{color}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.minSize="Taille minimale :"
 AdvSceneSwitcher.condition.video.maxSize="Taille maximale :"
 AdvSceneSwitcher.condition.video.selectArea="Sélectionner la zone"
@@ -278,8 +282,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.layout="{{processes}}{{regex}}en cours d'exécution{{focused}}et est au premier plan"
+AdvSceneSwitcher.condition.process.entry="{{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.process.entry.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"
@@ -352,14 +356,14 @@ AdvSceneSwitcher.condition.replay.state.stopped="Tampon de répétition arrêté
 AdvSceneSwitcher.condition.replay.state.started="Tampon de répétition démarré"
 AdvSceneSwitcher.condition.replay.state.saved="Tampon de répétition enregistré"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.day.any="N'importe quel jour"
+AdvSceneSwitcher.condition.date.anyDay="N'importe quel jour"
-AdvSceneSwitcher.day.monday="Lundi"
+AdvSceneSwitcher.condition.date.monday="Lundi"
-AdvSceneSwitcher.day.tuesday="Mardi"
+AdvSceneSwitcher.condition.date.tuesday="Mardi"
-AdvSceneSwitcher.day.wednesday="Mercredi"
+AdvSceneSwitcher.condition.date.wednesday="Mercredi"
-AdvSceneSwitcher.day.thursday="Jeudi"
+AdvSceneSwitcher.condition.date.thursday="Jeudi"
-AdvSceneSwitcher.day.friday="Vendredi"
+AdvSceneSwitcher.condition.date.friday="Vendredi"
-AdvSceneSwitcher.day.saturday="Samedi"
+AdvSceneSwitcher.condition.date.saturday="Samedi"
-AdvSceneSwitcher.day.sunday="Dimanche"
+AdvSceneSwitcher.condition.date.sunday="Dimanche"
 AdvSceneSwitcher.condition.date.state.at="À"
 AdvSceneSwitcher.condition.date.state.after="Après"
 AdvSceneSwitcher.condition.date.state.before="Avant"
@@ -370,12 +374,11 @@ 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.layout.simple.day="Le{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.entry.simple="Le{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.entry.repeat="{{repeat}}Répéter toutes les{{duration}}lorsque la date correspond"
-AdvSceneSwitcher.condition.date.layout.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.layout.pattern="La date actuelle \"{{currentDate}}\" correspond au motif{{pattern}}"
+AdvSceneSwitcher.condition.date.entry.nextMatchDate="Prochaine correspondance à : %1"
-AdvSceneSwitcher.condition.date.layout.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.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"
@@ -460,8 +463,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Attendre que la transiti
 AdvSceneSwitcher.action.wait="Attendre"
 AdvSceneSwitcher.action.wait.type.fixed="fixe"
 AdvSceneSwitcher.action.wait.type.random="aléatoire"
-AdvSceneSwitcher.action.wait.layout.fixed="Attendre pour{{waitType}}une durée de{{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Attendre pour{{waitType}}une durée de{{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Attendre pour{{waitType}}une durée de{{duration}}à{{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Attendre pour{{waitType}}une durée de{{duration}}à{{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Muet"
 AdvSceneSwitcher.action.audio.type.unmute="Activer le son"
@@ -507,7 +510,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Masquer"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Basculer"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="N'importe"
-AdvSceneSwitcher.action.sceneVisibility.layout="Sur{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.entry="Sur{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtre"
 AdvSceneSwitcher.action.filter.type.enable="Activer"
 AdvSceneSwitcher.action.filter.type.disable="Désactiver"
@@ -550,7 +553,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.runActions="Exécuter les actions"
+AdvSceneSwitcher.action.macro.type.run="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"
@@ -610,7 +613,7 @@ AdvSceneSwitcher.action.file.type.write="Écrire"
 AdvSceneSwitcher.action.file.type.append="Ajouter"
 AdvSceneSwitcher.action.file.entry="{{actions}}vers{{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Mode studio"
-AdvSceneSwitcher.action.studioMode.type.swap="Permuter la scène de prévisualisation et la scène du programme"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Permuter la scène de prévisualisation et la scène du programme"
 AdvSceneSwitcher.action.studioMode.type.setScene="Définir la scène de prévisualisation sur"
 AdvSceneSwitcher.action.studioMode.type.enable="Activer le mode studio"
 AdvSceneSwitcher.action.studioMode.type.disable="Désactiver le mode studio"
@@ -619,9 +622,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.layout.type="Modifier{{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.entry.line1="Modifier{{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Définir le type de transition sur{{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{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.transition.entry.line3="{{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"
@@ -698,8 +701,8 @@ AdvSceneSwitcher.action.variable.invalidSelection="Sélection invalide !"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="La récupération de valeurs de variables à partir d'actions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="La récupération de valeurs de variables à partir de conditions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valeur actuelle :"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}{{subStringRegex}}"
+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:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
 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"
@@ -1119,6 +1122,8 @@ 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,6 +42,7 @@ 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="切り替え方法の優先順位（優先順位が高いものが上）"
@@ -164,6 +165,7 @@ 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\" は既にマクロで使用されています。"
@@ -275,6 +277,7 @@ 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"
@@ -330,6 +333,14 @@ 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="時間が一致"
@@ -414,12 +425,12 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="最小近傍数:{{minNeighb
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}:{{throttleCount}}ミリ秒ごとにのみパフォーマンスチェックを実行することでCPU負荷を軽減します"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="エリア内のみチェックを実施"
 ; AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="テキストカラーの確認:{{color}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="テキストカラーの確認:{{textColor}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="テキストタイプの確認:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrBaseDir="Tesseractベースディレクトリ:{{tesseractBaseDir}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="言語の確認:{{languageCode}}"
 AdvSceneSwitcher.condition.video.layout.ocrConfig="設定ファイル:{{configFile}}{{openConfigFile}}{{reloadConfig}}{{configFileHint}}"
-AdvSceneSwitcher.condition.video.layout.color="カラーを確認してください:{{color}}"
+AdvSceneSwitcher.condition.video.layout.color="カラーを確認してください:{{color}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.minSize="最小サイズ："
 AdvSceneSwitcher.condition.video.maxSize="最大サイズ："
 AdvSceneSwitcher.condition.video.selectArea="範囲指定"
@@ -444,8 +455,8 @@ AdvSceneSwitcher.condition.stream.service.tooltip="現在のサービス名: %1"
 AdvSceneSwitcher.condition.record.state.duration="録音時間が長くなっています。"
 ; AdvSceneSwitcher.condition.record.entry="{{condition}}{{duration}}"
 AdvSceneSwitcher.condition.process="プロセス"
-AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}が実行中{{focused}}に集中しています"
+AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}が実行中{{focused}}に集中しています"
-AdvSceneSwitcher.condition.process.layout.focus="現在のフォアグラウンドプロセス:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.entry.focus="現在のフォアグラウンドプロセス:{{focusProcess}}"
 AdvSceneSwitcher.condition.idle="アイドル"
 AdvSceneSwitcher.condition.idle.entry="{{duration}}の間、キーボードまたはマウスの入力がありません"
 AdvSceneSwitcher.condition.pluginState="プラグインの状態"
@@ -545,14 +556,14 @@ AdvSceneSwitcher.condition.replay.state.started="リプレイバッファを開
 AdvSceneSwitcher.condition.replay.state.saved="リプレイバッファを保存"
 ; AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="日付条件"
-AdvSceneSwitcher.day.any="いつでも"
+AdvSceneSwitcher.condition.date.anyDay="いつでも"
-AdvSceneSwitcher.day.monday="月曜日"
+AdvSceneSwitcher.condition.date.monday="月曜日"
-AdvSceneSwitcher.day.tuesday="火曜日"
+AdvSceneSwitcher.condition.date.tuesday="火曜日"
-AdvSceneSwitcher.day.wednesday="水曜日"
+AdvSceneSwitcher.condition.date.wednesday="水曜日"
-AdvSceneSwitcher.day.thursday="木曜日"
+AdvSceneSwitcher.condition.date.thursday="木曜日"
-AdvSceneSwitcher.day.friday="金曜日"
+AdvSceneSwitcher.condition.date.friday="金曜日"
-AdvSceneSwitcher.day.saturday="土曜日"
+AdvSceneSwitcher.condition.date.saturday="土曜日"
-AdvSceneSwitcher.day.sunday="日曜日"
+AdvSceneSwitcher.condition.date.sunday="日曜日"
 ; AdvSceneSwitcher.condition.date.state.at="At"
 AdvSceneSwitcher.condition.date.state.after="アフター"
 AdvSceneSwitcher.condition.date.state.before="前"
@@ -563,9 +574,12 @@ AdvSceneSwitcher.condition.date.ignoreDate="チェックを外すと日付部分
 AdvSceneSwitcher.condition.date.ignoreTime="チェックを外すと時間要素は無視されます"
 AdvSceneSwitcher.condition.date.showAdvancedSettings="詳細設定を表示"
 AdvSceneSwitcher.condition.date.showSimpleSettings="簡単設定を表示"
-AdvSceneSwitcher.condition.date.layout.repeat="{{repeat}}日付の一致ごとに{{duration}}繰り返します"
+; AdvSceneSwitcher.condition.date.entry.simple="On{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.layout.pattern="現在の日付「{{currentDate}}」はパターン{{pattern}}と一致します"
+; AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.layout.updateOnRepeat="{{updateOnRepeat}}繰り返しの場合、選択した日付を繰り返しの日付に更新します"
+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.sceneTransform="Scene item transform"
 ; AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
 AdvSceneSwitcher.condition.sceneTransform.getCurrentValue="現在の値を取得"
@@ -800,8 +814,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="目的のシーンへの
 ; AdvSceneSwitcher.action.wait="Wait"
 AdvSceneSwitcher.action.wait.type.fixed="指定"
 AdvSceneSwitcher.action.wait.type.random="ランダム"
-AdvSceneSwitcher.action.wait.layout.fixed="{{waitType}}期間{{duration}}待機します"
+AdvSceneSwitcher.action.wait.entry.fixed="{{waitType}}期間{{duration}}待機します"
-AdvSceneSwitcher.action.wait.layout.random="{{duration}}から{{duration2}}までの{{waitType}}期間待ちます"
+AdvSceneSwitcher.action.wait.entry.random="{{duration}}から{{duration2}}までの{{waitType}}期間待ちます"
 AdvSceneSwitcher.action.audio="音声"
 AdvSceneSwitcher.action.audio.type.mute="ミュート"
 AdvSceneSwitcher.action.audio.type.unmute="ミュート解除"
@@ -830,6 +844,7 @@ 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="注意: 最大リプレイ時間の変更は、次回再生バッファを開始したときから適用されます！"
@@ -856,6 +871,7 @@ 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="無効化"
@@ -921,7 +937,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.runActions="マクロを実行"
+AdvSceneSwitcher.action.macro.type.run="マクロを実行"
 AdvSceneSwitcher.action.macro.type.run.conditions.ignore="条件の状態を考慮しない"
 AdvSceneSwitcher.action.macro.type.run.conditions.true="条件が true と評価された場合のみ"
 AdvSceneSwitcher.action.macro.type.run.conditions.false="条件が false と評価された場合のみ"
@@ -1000,7 +1016,7 @@ AdvSceneSwitcher.action.file="ファイル"
 ; AdvSceneSwitcher.action.file.type.append="Append"
 AdvSceneSwitcher.action.file.entry="{{actions}}から{{filePath}}へ:"
 AdvSceneSwitcher.action.studioMode="スタジオモード"
-AdvSceneSwitcher.action.studioMode.type.swap="プレビューと番組シーンの入れ替え"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="プレビューと番組シーンの入れ替え"
 AdvSceneSwitcher.action.studioMode.type.setScene="プレビューシーンを設定する"
 AdvSceneSwitcher.action.studioMode.type.enable="スタジオモードを有効にする"
 AdvSceneSwitcher.action.studioMode.type.disable="スタジオモードを無効にする"
@@ -1010,9 +1026,9 @@ AdvSceneSwitcher.action.transition="トランジション"
 ; AdvSceneSwitcher.action.transition.type.sceneOverride="シーントランジションオーバーライド"
 ; AdvSceneSwitcher.action.transition.type.sourceShow="ソース表示トランジション"
 ; AdvSceneSwitcher.action.transition.type.sourceHide="ソース非表示トランジション"
-; AdvSceneSwitcher.action.transition.layout.type="{{type}}{{scenes}}{{sources}} の変更"
+; AdvSceneSwitcher.action.transition.entry.line1="{{type}}{{scenes}}{{sources}} の変更"
-AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}トランジションタイプを{{transitions}}に設定します"
+AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}トランジションタイプを{{transitions}}に設定します"
-AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}移行時間を {{duration}} 秒に設定します"
+AdvSceneSwitcher.action.transition.entry.line3="{{setDuration}}移行時間を {{duration}} 秒に設定します"
 AdvSceneSwitcher.action.timer="タイマー"
 AdvSceneSwitcher.action.timer.type.pause="一時停止"
 AdvSceneSwitcher.action.timer.type.continue="続行"
@@ -1134,8 +1150,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}}{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:"
 ; AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}カスタム プロンプトを使用する{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}プレースホルダーを入力{{inputPlaceholder}}"
@@ -1178,17 +1194,10 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="ユーザー情報を取得"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="チャンネルポイントリワード情報を取得"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="リワード名/変数選択コントロールの切り替え"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Twitchアカウントを選択しないとカテゴリを選択できません！"
-; AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
+; AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
-AdvSceneSwitcher.action.twitch.layout.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
+AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
-AdvSceneSwitcher.action.twitch.layout.channel.getInfo="チャンネル{{channel}}でアカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.entry.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
-AdvSceneSwitcher.action.twitch.layout.user.getInfo.row1="アカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.entry.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{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="クリップをキャプチャする前にわずかな遅延を追加します"
@@ -2248,6 +2257,8 @@ 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,6 +147,7 @@ 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."
@@ -239,6 +240,7 @@ 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"
@@ -294,6 +296,11 @@ 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"
@@ -371,10 +378,10 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="Vizinhos mínimos:{{minNeig
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Reduzir carga de CPU realizando a verificação apenas a cada {{throttleCount}} milissegundos"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Realizar verificação apenas na área"
 AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Verificar cor do texto:{{color}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="Verificar cor do texto:{{textColor}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="Verificar tipo de texto:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="Verificar idioma:{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="Verificar cor:{{color}}"
+AdvSceneSwitcher.condition.video.layout.color="Verificar cor:{{color}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.minSize="Tamanho mínimo:"
 AdvSceneSwitcher.condition.video.maxSize="Tamanho máximo:"
 AdvSceneSwitcher.condition.video.selectArea="Selecionar área"
@@ -394,8 +401,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.layout="{{processes}}{{regex}}está em execução{{focused}}e está em foco"
+AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}está em execução{{focused}}e está em foco"
-AdvSceneSwitcher.condition.process.layout.focus="Processo atual em primeiro plano:{{focusProcess}}"
+AdvSceneSwitcher.condition.process.entry.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"
@@ -495,14 +502,14 @@ AdvSceneSwitcher.condition.replay.state.started="Buffer de replay iniciado"
 AdvSceneSwitcher.condition.replay.state.saved="Buffer de replay salvo"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Data"
-AdvSceneSwitcher.day.any="Qualquer dia"
+AdvSceneSwitcher.condition.date.anyDay="Qualquer dia"
-AdvSceneSwitcher.day.monday="Segunda-feira"
+AdvSceneSwitcher.condition.date.monday="Segunda-feira"
-AdvSceneSwitcher.day.tuesday="Terça-feira"
+AdvSceneSwitcher.condition.date.tuesday="Terça-feira"
-AdvSceneSwitcher.day.wednesday="Quarta-feira"
+AdvSceneSwitcher.condition.date.wednesday="Quarta-feira"
-AdvSceneSwitcher.day.thursday="Quinta-feira"
+AdvSceneSwitcher.condition.date.thursday="Quinta-feira"
-AdvSceneSwitcher.day.friday="Sexta-feira"
+AdvSceneSwitcher.condition.date.friday="Sexta-feira"
-AdvSceneSwitcher.day.saturday="Sábado"
+AdvSceneSwitcher.condition.date.saturday="Sábado"
-AdvSceneSwitcher.day.sunday="Domingo"
+AdvSceneSwitcher.condition.date.sunday="Domingo"
 AdvSceneSwitcher.condition.date.state.at="Às"
 AdvSceneSwitcher.condition.date.state.after="Após"
 AdvSceneSwitcher.condition.date.state.before="Antes"
@@ -513,13 +520,12 @@ 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.layout.simple.day="Em{{dayOfWeek}}"
+AdvSceneSwitcher.condition.date.entry.simple="Em{{dayOfWeek}}{{weekCondition}}{{ignoreWeekTime}}{{weekTime}}"
-AdvSceneSwitcher.condition.date.layout.simple.time="{{ignoreWeekTime}}{{weekCondition}}{{weekTime}}"
+AdvSceneSwitcher.condition.date.entry.advanced="{{condition}}{{ignoreDate}}{{date}}{{ignoreTime}}{{time}}{{separator}}{{date2}}{{time2}}"
-AdvSceneSwitcher.condition.date.layout.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.layout.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.layout.pattern="Data atual \"{{currentDate}}\" corresponde ao padrão{{pattern}}"
+AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima correspondência em: %1"
-AdvSceneSwitcher.condition.date.layout.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.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"
@@ -718,8 +724,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Aguardar até que a tran
 AdvSceneSwitcher.action.wait="Aguardar"
 AdvSceneSwitcher.action.wait.type.fixed="fixo"
 AdvSceneSwitcher.action.wait.type.random="aleatório"
-AdvSceneSwitcher.action.wait.layout.fixed="Aguardando por{{waitType}}duração de{{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Aguardando por{{waitType}}duração de{{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Aguardando por{{waitType}}duração de{{duration}}para{{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Aguardando por{{waitType}}duração de{{duration}}para{{duration2}}"
 AdvSceneSwitcher.action.audio="Áudio"
 AdvSceneSwitcher.action.audio.type.mute="Silenciar"
 AdvSceneSwitcher.action.audio.type.unmute="Ativar som"
@@ -748,6 +754,7 @@ 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!"
@@ -764,6 +771,7 @@ 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."
@@ -773,7 +781,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.hide="Ocultar"
 AdvSceneSwitcher.action.sceneVisibility.type.toggle="Alternar"
 AdvSceneSwitcher.action.sceneVisibility.type.source="Fonte"
 AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Qualquer"
-AdvSceneSwitcher.action.sceneVisibility.layout="Em{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.entry="Em{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtro"
 AdvSceneSwitcher.action.filter.type.enable="Habilitar"
 AdvSceneSwitcher.action.filter.type.disable="Desabilitar"
@@ -838,7 +846,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.runActions="Executar macro"
+AdvSceneSwitcher.action.macro.type.run="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"
@@ -853,9 +861,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.layout.run="{{actions}}{{actionSections}}de{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}de{{macros}}"
-AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
+AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{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:"
@@ -915,7 +923,7 @@ AdvSceneSwitcher.action.file.type.write="Escrever"
 AdvSceneSwitcher.action.file.type.append="Anexar"
 AdvSceneSwitcher.action.file.entry="{{actions}}para{{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Modo estúdio"
-AdvSceneSwitcher.action.studioMode.type.swap="Trocar cena de visualização e programa"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Trocar cena de visualização e programa"
 AdvSceneSwitcher.action.studioMode.type.setScene="Definir cena de visualização para"
 AdvSceneSwitcher.action.studioMode.type.enable="Habilitar modo estúdio"
 AdvSceneSwitcher.action.studioMode.type.disable="Desabilitar modo estúdio"
@@ -925,9 +933,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.layout.type="Modificar{{type}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.transition.entry.line1="Modificar{{type}}{{scenes}}{{sources}}"
-AdvSceneSwitcher.action.transition.layout.transition="{{setTransition}}Definir tipo de transição para{{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{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.transition.entry.line3="{{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"
@@ -1022,8 +1030,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Obter valores de va
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valor atual:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}de{{variables}}para comprimento{{stringLength}}adicionando{{paddingCharSelection}}ao{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}de{{variables}}para comprimento{{stringLength}}removendo caracteres da{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}{{subStringRegex}}"
+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:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:"
 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}}"
@@ -1057,8 +1065,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.layout.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}{{nonModDelayDuration}}"
+AdvSceneSwitcher.action.twitch.entry.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.layout.chat="Usando conta{{account}}{{actions}}em{{channel}}"
+AdvSceneSwitcher.action.twitch.entry.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"
@@ -1863,6 +1871,8 @@ 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,6 +70,7 @@ AdvSceneSwitcher.macroTab.name="Имя:"
 AdvSceneSwitcher.macroTab.defaultname="Макрос %1"
 AdvSceneSwitcher.macroTab.copy="Создать копию"
 ; Macro Logic
+AdvSceneSwitcher.logic.none="Игнорировать вход"
 AdvSceneSwitcher.logic.and="И"
 AdvSceneSwitcher.logic.or="Или"
 AdvSceneSwitcher.logic.andNot="И не"
@@ -84,6 +85,8 @@ 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="точно соответствует"
@@ -102,7 +105,7 @@ AdvSceneSwitcher.condition.record.state.start="Запись запущена"
 AdvSceneSwitcher.condition.record.state.pause="Запись приостановлена"
 AdvSceneSwitcher.condition.record.state.stop="Запись остановлена"
 AdvSceneSwitcher.condition.process="Процесс"
-AdvSceneSwitcher.condition.process.layout="{{processes}}{{regex}}запущен{{focused}}и сфокусирован"
+AdvSceneSwitcher.condition.process.entry="{{processes}}{{regex}}запущен{{focused}}и сфокусирован"
 AdvSceneSwitcher.condition.idle="Простой"
 AdvSceneSwitcher.condition.idle.entry="Не было ни клавиатуры, ни мыши в течении{{duration}}"
 AdvSceneSwitcher.condition.pluginState="Состояние плагина"
@@ -114,8 +117,8 @@ AdvSceneSwitcher.action.scene="Переключить сцену"
 AdvSceneSwitcher.action.wait="Подождать"
 AdvSceneSwitcher.action.wait.type.fixed="фиксированный"
 AdvSceneSwitcher.action.wait.type.random="случайный"
-AdvSceneSwitcher.action.wait.layout.fixed="Ожидать {{waitType}} в течении {{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Ожидать {{waitType}} в течении {{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Ожидание {{waitType}} длительностью от {{duration}} до {{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Ожидание {{waitType}} длительностью от {{duration}} до {{duration2}}"
 AdvSceneSwitcher.action.audio="Аудио"
 AdvSceneSwitcher.action.audio.type.mute="Замьютить"
 AdvSceneSwitcher.action.audio.type.unmute="Размьютить"
@@ -127,6 +130,7 @@ 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="Начать воспроизведение буфера"
@@ -134,6 +138,7 @@ 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,12 +72,14 @@ 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"
@@ -106,7 +108,9 @@ 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.layout="İçerik{{filePath}}{{conditions}}{{regex}}"
+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.media="Medya"
 AdvSceneSwitcher.condition.media.anyOnScene="Herhangi bir medya kaynağı"
 AdvSceneSwitcher.condition.media.allOnScene="Tüm medya kaynakları "
@@ -149,7 +153,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.layout="{{processes}}{{regex}}çalışıyor{{focused}}ve odaklandı"
+AdvSceneSwitcher.condition.process.entry="{{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"
@@ -249,8 +253,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Hedef sahneye geçiş ta
 AdvSceneSwitcher.action.wait="Bekle"
 AdvSceneSwitcher.action.wait.type.fixed="sabit"
 AdvSceneSwitcher.action.wait.type.random="rastgele"
-AdvSceneSwitcher.action.wait.layout.fixed="Şunu bekle {{waitType}} süre {{duration}}"
+AdvSceneSwitcher.action.wait.entry.fixed="Şunu bekle {{waitType}} süre {{duration}}"
-AdvSceneSwitcher.action.wait.layout.random="Şunu bekle {{waitType}} bu aralıktan {{duration}} buna {{duration2}}"
+AdvSceneSwitcher.action.wait.entry.random="Şunu bekle {{waitType}} bu aralıktan {{duration}} buna {{duration2}}"
 AdvSceneSwitcher.action.audio="Ses"
 AdvSceneSwitcher.action.audio.type.mute="Sessiz"
 AdvSceneSwitcher.action.audio.type.unmute="Ses açmak"
@@ -262,6 +266,7 @@ 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"
@@ -269,13 +274,14 @@ 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.layout="Açık{{scenes}}{{actions}}{{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.entry="Açık{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.filter="Filtrele"
 AdvSceneSwitcher.action.filter.type.enable="Etkin"
 AdvSceneSwitcher.action.filter.type.disable="Etkisiz"
@@ -299,7 +305,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.runActions="Çalıştır"
+AdvSceneSwitcher.action.macro.type.run="Ç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:"
@@ -336,8 +342,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.layout.transition="{{setTransition}}Geçiş türünü ayarla {{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{setTransition}}Geçiş türünü ayarla {{transitions}}"
-AdvSceneSwitcher.action.transition.layout.duration="{{setDuration}}Geçiş süresini şuna ayarla: {{duration}}saniyeler"
+AdvSceneSwitcher.action.transition.entry.line3="{{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"
@@ -581,6 +587,8 @@ 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/res/images/DarkVariable.svg

@@ -1,10 +0,0 @@
-<?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

@@ -1,10 +0,0 @@
-<?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,162 +68,365 @@
             <x>0</x>
             <y>0</y>
             <width>962</width>
-            <height>1190</height>
+            <height>1057</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
            <item>
-            <widget class="QGroupBox" name="statusBox">
+            <layout class="QHBoxLayout" name="horizontalLayout_31">
-             <property name="title">
+             <item>
-              <string>AdvSceneSwitcher.generalTab.status</string>
+              <layout class="QVBoxLayout" name="verticalLayout_2">
-             </property>
+               <item>
-             <layout class="QGridLayout" name="gridLayout_4">
+                <widget class="QGroupBox" name="statusBox">
-              <item row="0" column="0">
+                 <property name="title">
-               <layout class="QGridLayout" name="statusLayout">
+                  <string>AdvSceneSwitcher.generalTab.status</string>
-                <item row="4" column="1">
+                 </property>
-                 <widget class="QComboBox" name="autoStartEvent"/>
+                 <layout class="QGridLayout" name="gridLayout_4">
-                </item>
+                  <item row="0" column="0">
-                <item row="4" column="0">
+                   <layout class="QGridLayout" name="statusLayout">
-                 <widget class="QLabel" name="label_10">
+                    <item row="4" column="1">
-                  <property name="text">
+                     <widget class="QComboBox" name="autoStartEvent"/>
-                   <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
+                    </item>
-                  </property>
+                    <item row="4" column="0">
-                 </widget>
+                     <widget class="QLabel" name="label_10">
-                </item>
+                      <property name="text">
-                <item row="0" column="0">
+                       <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
-                 <layout class="QVBoxLayout" name="verticalLayout_33">
+                      </property>
-                  <item>
+                     </widget>
-                   <widget class="QLabel" name="label_4">
+                    </item>
-                    <property name="text">
+                    <item row="0" column="0">
-                     <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
+                     <layout class="QVBoxLayout" name="verticalLayout_33">
-                    </property>
+                      <item>
-                   </widget>
+                       <widget class="QLabel" name="label_4">
-                  </item>
+                        <property name="text">
-                  <item>
+                         <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
-                   <widget class="QLabel" name="checkIntervalTooLowWarning">
+                        </property>
-                    <property name="text">
+                       </widget>
-                     <string/>
+                      </item>
-                    </property>
+                      <item>
-                   </widget>
+                       <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>
                   </item>
                  </layout>
-                </item>
+                </widget>
-                <item row="3" column="1">
+               </item>
-                 <widget class="QComboBox" name="startupBehavior"/>
+               <item>
-                </item>
+                <widget class="QGroupBox" name="generalSettingsBox">
-                <item row="1" column="1">
+                 <property name="title">
-                 <widget class="QWidget" name="placeholder3" native="true"/>
+                  <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
-                </item>
+                 </property>
-                <item row="1" column="0">
+                 <layout class="QVBoxLayout" name="verticalLayout_32">
-                 <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"/>
+                   <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>
                   </item>
                   <item>
-                   <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
+                   <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>
                   </item>
                   <item>
-                   <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
+                   <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>
                   </item>
                  </layout>
-                </item>
+                </widget>
-               </layout>
+               </item>
-              </item>
+               <item>
-             </layout>
+                <layout class="QVBoxLayout" name="verticalLayout_18">
-            </widget>
+                 <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>
            <item>
-            <widget class="QGroupBox" name="saveLoadBox">
+            <widget class="QGroupBox" name="groupBox_6">
              <property name="title">
-              <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
+              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_17">
+             <layout class="QVBoxLayout" name="verticalLayout_37">
               <item>
-               <widget class="QPushButton" name="exportSettings">
+               <layout class="QHBoxLayout" name="cooldownLayout">
-                <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="QLabel" name="label_21">
+                 <widget class="QCheckBox" name="enableCooldown">
                   <property name="text">
-                   <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QComboBox" name="logLevel"/>
+                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_49">
+                 <spacer name="horizontalSpacer_21">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -238,86 +441,80 @@
                </layout>
               </item>
               <item>
-               <widget class="QCheckBox" name="showTrayNotifications">
+               <layout class="QGridLayout" name="gridLayout">
-                <property name="text">
+                <item row="0" column="2">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
+                 <layout class="QHBoxLayout" name="horizontalLayout_43">
-                </property>
+                  <item>
-               </widget>
+                   <widget class="QRadioButton" name="noMatchDontSwitch">
-              </item>
+                    <property name="text">
-              <item>
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
-               <widget class="QCheckBox" name="warnPluginLoadFailure">
+                    </property>
-                <property name="text">
+                    <property name="checked">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
+                     <bool>true</bool>
-                </property>
+                    </property>
-               </widget>
+                   </widget>
-              </item>
+                  </item>
-              <item>
+                 </layout>
-               <widget class="QCheckBox" name="suppressCrashRecoveryDialog">
+                </item>
-                <property name="text">
+                <item row="2" column="2">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.suppressCrashRecoveryDialog</string>
+                 <layout class="QHBoxLayout" name="horizontalLayout_45">
-                </property>
+                  <item>
-               </widget>
+                   <widget class="QRadioButton" name="noMatchRandomSwitch">
-              </item>
+                    <property name="text">
-              <item>
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
-               <widget class="QCheckBox" name="settingsLock">
+                    </property>
-                <property name="text">
+                   </widget>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.settingsLock</string>
+                  </item>
-                </property>
+                 </layout>
-               </widget>
+                </item>
-              </item>
+                <item row="1" column="2">
-             </layout>
+                 <layout class="QHBoxLayout" name="horizontalLayout">
-            </widget>
+                  <property name="leftMargin">
-           </item>
+                   <number>0</number>
-           <item>
+                  </property>
-            <widget class="QGroupBox" name="groupBox_6">
+                  <property name="topMargin">
-             <property name="title">
+                   <number>0</number>
-              <string>AdvSceneSwitcher.generalTab.uiBehavior</string>
+                  </property>
-             </property>
+                  <property name="rightMargin">
-             <layout class="QVBoxLayout" name="verticalLayout_2">
+                   <number>0</number>
-              <item>
+                  </property>
-               <widget class="QCheckBox" name="saveWindowGeo">
+                  <property name="bottomMargin">
-                <property name="text">
+                   <number>0</number>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
+                  </property>
-                </property>
+                  <item>
-               </widget>
+                   <widget class="QRadioButton" name="noMatchSwitch">
-              </item>
+                    <property name="text">
-              <item>
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
-               <widget class="QCheckBox" name="alwaysShowMacroSearch">
+                    </property>
-                <property name="text">
+                   </widget>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
+                  </item>
-                </property>
+                  <item>
-               </widget>
+                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene">
-              </item>
+                   </widget>
-              <item>
+                  </item>
-               <widget class="QCheckBox" name="alwaysShowFeatureTabs">
+                 </layout>
-                <property name="toolTip">
+                </item>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip</string>
+                <item row="1" column="1">
-                </property>
+                 <layout class="QHBoxLayout" name="noMatchLayout">
-                <property name="text">
+                  <item>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs</string>
+                   <widget class="QLabel" name="label_2">
-                </property>
+                    <property name="sizePolicy">
-               </widget>
+                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              </item>
+                      <horstretch>0</horstretch>
-              <item>
+                      <verstretch>0</verstretch>
-               <widget class="QCheckBox" name="disableComboBoxFilter">
+                     </sizepolicy>
-                <property name="text">
+                    </property>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
+                    <property name="text">
-                </property>
+                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
-               </widget>
+                    </property>
-              </item>
+                    <property name="alignment">
-              <item>
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               <widget class="QCheckBox" name="uiHintsDisable">
+                    </property>
-                <property name="text">
+                   </widget>
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
+                  </item>
-                </property>
+                 </layout>
-               </widget>
+                </item>
-              </item>
+               </layout>
-              <item>
-               <widget class="QCheckBox" name="hideLegacyTabs">
-                <property name="text">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
-                </property>
-               </widget>
               </item>
              </layout>
             </widget>
@@ -365,109 +562,6 @@
              </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">
@@ -482,7 +576,15 @@
                </widget>
               </item>
               <item>
-               <widget class="QListWidget" name="priorityList"/>
+               <layout class="QVBoxLayout" name="verticalLayout_10">
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_41">
+                  <item>
+                   <widget class="QListWidget" name="priorityList"/>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
               </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_32">
@@ -579,13 +681,6 @@
              </layout>
             </widget>
            </item>
-           <item>
-            <widget class="QPushButton" name="openSetupWizard">
-             <property name="text">
-              <string>FirstRunWizard.openButton</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
         </widget>
@@ -611,7 +706,7 @@
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <widget class="QGroupBox" name="macroListBox">
+         <widget class="QGroupBox" name="groupBox_5">
           <property name="title">
            <string>AdvSceneSwitcher.macroTab.macros</string>
           </property>
@@ -626,55 +721,6 @@
              </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">
@@ -807,19 +853,25 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_18">
+              <widget class="QCheckBox" name="runMacroOnChange">
-               <property name="text">
+               <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.label</string>
+                <string>AdvSceneSwitcher.macroTab.onChange</string>
                </property>
-               <property name="wordWrap">
+               <property name="text">
-                <bool>true</bool>
+                <string/>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="actionTriggerMode">
+              <widget class="QLabel" name="label_18">
                <property name="toolTip">
-                <string>AdvSceneSwitcher.macroTab.actionTriggerMode.tooltip</string>
+                <string>AdvSceneSwitcher.macroTab.onChange</string>
+               </property>
+               <property name="text">
+                <string>AdvSceneSwitcher.macroTab.onChange</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
@@ -4112,7 +4164,12 @@
   <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>
@@ -4133,7 +4190,7 @@
   <tabstop>macroName</tabstop>
   <tabstop>runMacro</tabstop>
   <tabstop>runMacroInParallel</tabstop>
-  <tabstop>actionTriggerMode</tabstop>
+  <tabstop>runMacroOnChange</tabstop>
   <tabstop>macroSettings</tabstop>
   <tabstop>macroEdit</tabstop>
   <tabstop>sceneGroups</tabstop>

lib/advanced-scene-switcher.cpp

@@ -1,6 +1,5 @@
 #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"
@@ -19,10 +18,8 @@
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
-#include <QInputDialog>
 #include <QLibrary>
 #include <QMainWindow>
-#include <QMessageBox>
 #include <QTextStream>
 #include <regex>
 
@@ -43,12 +40,9 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 {
 	switcher->settingsWindowOpened = true;
 	ui->setupUi(this);
-	{
+	std::lock_guard<std::mutex> lock(switcher->m);
-		std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->Prune();
-		switcher->Prune();
+	LoadUI();
-		LoadUI();
-	}
-	CheckFirstTimeSetup();
 }
 
 AdvSceneSwitcher::~AdvSceneSwitcher()
@@ -144,6 +138,7 @@ void AdvSceneSwitcher::LoadUI()
 	SetTabOrder(ui->tabWidget);
 	SetCurrentTab(ui->tabWidget);
 	RestoreWindowGeo();
+	CheckFirstTimeSetup();
 
 	loading = false;
 }
@@ -196,21 +191,25 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
 
 		switcher->m.lock();
 		if (switcher->VersionChanged(data, g_GIT_SHA1)) {
-			AskForBackup(data);
+			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();
 		}
 
 		switcher->LoadSettings(data);
 		switcher->m.unlock();
 
-		if (switcher->stop) {
+		if (!switcher->stop) {
-			return;
+			switcher->Start();
 		}
-
-		if (ShouldSkipPluginStartOnUncleanShutdown()) {
-			return;
-		}
-
-		switcher->Start();
 	}
 }
 
@@ -326,7 +325,8 @@ void SwitcherData::SetPreconditions()
 {
 	// Window title
 	lastTitle = currentTitle;
-	auto title = GetCurrentWindowTitle();
+	std::string title;
+	GetCurrentWindowTitle(title);
 	for (auto &window : ignoreWindowsSwitches) {
 		bool equals = (title == window);
 		bool matches = false;
@@ -346,7 +346,7 @@ void SwitcherData::SetPreconditions()
 	currentTitle = title;
 
 	// Process name
-	currentForegroundProcess = GetForegroundProcessName();
+	GetForegroundProcessName(currentForegroundProcess);
 
 	// Macro
 	InvalidateMacroTempVarValues();
@@ -421,7 +421,7 @@ bool SwitcherData::CheckForMatch(OBSWeakSource &scene,
 
 static void ResetMacros()
 {
-	for (auto &m : GetTopLevelMacros()) {
+	for (auto &m : GetMacros()) {
 		ResetMacroRunCount(m.get());
 		ResetMacroConditionTimers(m.get());
 	}
@@ -461,13 +461,12 @@ void SwitcherData::Stop()
 		SetMacroAbortWait(true);
 		GetMacroWaitCV().notify_all();
 		GetMacroTransitionCV().notify_all();
-		SignalStopAllMacros();
+		StopAllMacros();
 		StopAndClearAllActionQueues();
 		CloseAllInputDialogs();
 		th->wait();
 		delete th;
 		th = nullptr;
-		WaitForAllMacros();
 		RunStopSteps();
 	}
 
@@ -511,8 +510,6 @@ bool SwitcherData::AnySceneTransitionStarted()
  ******************************************************************************/
 extern "C" EXPORT void FreeSceneSwitcher()
 {
-	switcher->Stop();
-
 	PlatformCleanup();
 	RunPluginCleanupSteps();
 
@@ -634,20 +631,13 @@ 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 *)
+static void OBSEvent(enum obs_frontend_event event, void *switcher)
 {
 	if (!switcher) {
 		return;
@@ -721,54 +711,19 @@ 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();
-		return;
+	} else {
+		AdvSceneSwitcher::window =
+			new AdvSceneSwitcher(static_cast<QMainWindow *>(
+				obs_frontend_get_main_window()));
+		AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
+		AdvSceneSwitcher::window->show();
 	}
-
-	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)
@@ -816,6 +771,8 @@ void HighlightMacroSettingsButton(bool enable)
 		enable);
 }
 
+void SetupActionQueues();
+
 extern "C" EXPORT void InitSceneSwitcher(obs_module_t *module,
 					 translateFunc translate)
 {
@@ -827,11 +784,12 @@ 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, nullptr);
+	obs_frontend_add_event_callback(OBSEvent, switcher);
 
 	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
 		obs_module_text("AdvSceneSwitcher.pluginName"));

lib/advanced-scene-switcher.hpp

@@ -1,4 +1,7 @@
 #pragma once
+#include "macro-segment-list.hpp"
+#include "condition-logic.hpp"
+#include "log-helper.hpp"
 
 #include <ui_advanced-scene-switcher.h>
 
@@ -62,14 +65,12 @@ 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 --- */
 
@@ -107,15 +108,13 @@ public slots:
 	void on_macroDown_clicked() const;
 	void on_macroName_editingFinished();
 	void on_runMacroInParallel_stateChanged(int value) const;
-	void on_actionTriggerMode_currentIndexChanged(int index) const;
+	void on_runMacroOnChange_stateChanged(int value) const;
 	void MacroSelectionChanged();
 	void ShowMacroContextMenu(const QPoint &);
 	void CopyMacro();
 	void RenameSelectedMacro();
 	void ExportMacros() const;
 	void ImportMacros();
-	void PauseSelectedMacros();
-	void UnpauseSelectedMacros();
 	void HighlightOnChange() const;
 	void on_macroSettings_clicked();
 

lib/general.cpp

@@ -1,28 +1,23 @@
 #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-helpers.hpp"
-#include "macro-search.hpp"
-#include "macro-settings.hpp"
 #include "macro.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 {
 
@@ -190,6 +185,16 @@ 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) {
@@ -199,15 +204,6 @@ 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(
@@ -247,64 +243,6 @@ 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 =
@@ -432,50 +370,14 @@ 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 (!IsFirstRun() || !GetTopLevelMacros().empty()) {
+	if (switcher->firstBoot && !switcher->disableHints) {
-		return;
+		switcher->firstBoot = false;
+		DisplayMessage(
+			obs_module_text("AdvSceneSwitcher.firstBootMessage"));
+		switcher->Start();
 	}
-
-	bool wasSkipped = false;
-	auto macro = wiz::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 = wiz::FirstRunWizard::ShowWizard(this);
-	if (!macro) {
-		return;
-	}
-
-	renameMacroIfNecessary(macro);
-	ui->macros->Add(macro);
-	ui->tabWidget->setCurrentWidget(ui->macroTab);
 }
 
 void AdvSceneSwitcher::on_tabWidget_currentChanged(int)
@@ -534,6 +436,7 @@ 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);
 
@@ -556,7 +459,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
 
-	RunAndClearPostLoadSteps();
+	RunPostLoadSteps();
 
 	// Reset on startup and scene collection change
 	ResetLastOpenedTab();
@@ -572,6 +475,7 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 	saveSceneGroups(obj);
 	SaveMacros(obj);
 	SaveGlobalMacroSettings(obj);
+	SaveVariables(obj);
 	saveWindowTitleSwitches(obj);
 	saveScreenRegionSwitches(obj);
 	savePauseSwitches(obj);
@@ -627,11 +531,10 @@ 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);
 
@@ -699,12 +602,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);
@@ -1024,10 +927,11 @@ 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);
@@ -1109,19 +1013,6 @@ 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);
@@ -1141,8 +1032,6 @@ 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,11 +92,12 @@ bool SwitcherData::checkExeSwitch(OBSWeakSource &scene,
 	}
 
 	std::string title = switcher->currentTitle;
+	QStringList runningProcesses;
 	bool ignored = false;
 	bool match = false;
 
 	// Check for match
-	const auto runningProcesses = GetProcessList();
+	GetProcessList(runningProcesses);
 	for (ExecutableSwitch &s : executableSwitches) {
 		if (!s.initialized()) {
 			continue;

lib/legacy/switch-window.cpp

@@ -178,19 +178,47 @@ void AdvSceneSwitcher::on_ignoreWindows_currentRowChanged(int idx)
 	}
 }
 
-static bool windowInfoMatchesSwitch(const WindowInfo &info,
+void checkWindowTitleSwitchDirect(WindowSwitch &s,
-				    const WindowSwitch &s)
+				  std::string &currentWindowTitle, bool &match,
+				  OBSWeakSource &scene,
+				  OBSWeakSource &transition)
 {
-	if (s.focus && !info.focused) {
+	bool focus = (!s.focus || s.window == currentWindowTitle);
-		return false;
+	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.fullscreen && !info.fullscreen) {
+}
-		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.maximized && !info.maximized) {
-		return false;
-	}
-	return true;
 }
 
 bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
@@ -200,37 +228,24 @@ bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
 		return false;
 	}
 
+	std::string currentWindowTitle = switcher->currentTitle;
 	bool match = false;
-
+	std::vector<std::string> windowList;
-	WindowQueryOptions options;
+	GetWindowList(windowList);
-	options.focus = true;
-	options.fullscreen = true;
-	options.maximized = true;
-	const auto windows = GetWindows(options);
 
 	for (WindowSwitch &s : windowSwitches) {
 		if (!s.initialized()) {
 			continue;
 		}
 
-		for (const auto &info : windows) {
+		if (std::find(windowList.begin(), windowList.end(), s.window) !=
-			bool titleMatch = false;
+		    windowList.end()) {
-			try {
+			checkWindowTitleSwitchDirect(s, currentWindowTitle,
-				std::regex expr(s.window);
+						     match, scene, transition);
-				titleMatch = info.title == s.window ||
+		} else {
-					     std::regex_match(info.title, expr);
+			checkWindowTitleSwitchRegex(s, currentWindowTitle,
-			} catch (const std::regex_error &) {
+						    windowList, match, scene,
-				titleMatch = info.title == s.window;
+						    transition);
-			}
-
-			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,9 +32,6 @@
 #endif
 #include <fstream>
 #include <sstream>
-#include <climits>
-#include <dirent.h>
-#include <unistd.h>
 #include "kwin-helpers.h"
 
 namespace advss {
@@ -236,89 +233,28 @@ std::string getWindowName(Window window)
 	return windowTitle;
 }
 
-std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
+void GetWindowList(std::vector<std::string> &windows)
 {
-	const std::string foregroundTitle = GetCurrentWindowTitle();
+	windows.resize(0);
-	const auto topLevel = getTopLevelWindows();
+	for (auto window : getTopLevelWindows()) {
-	auto display = disp();
-
-	std::vector<WindowInfo> result;
-	result.reserve(topLevel.size());
-
-	for (auto window : topLevel) {
 		auto name = getWindowName(window);
 		if (name.empty()) {
 			continue;
 		}
-
+		windows.emplace_back(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));
 	}
+}
 
-	// When KWin compat is active, native Wayland windows are not tracked by
+void GetWindowList(QStringList &windows)
-	// X11 and therefore do not appear in the list above. Merge in any window
+{
-	// reported by KWin that is not already present (matched by title) so that
+	windows.clear();
-	// title and focus conditions work for native Wayland windows.
+	for (auto window : getTopLevelWindows()) {
-	if (KWin) {
+		auto name = getWindowName(window);
-		for (const auto &[pid, title] :
+		if (name.empty()) {
-		     FocusNotifier::getWindowList()) {
+			continue;
-			bool found = false;
-			for (const auto &info : result) {
-				if (info.title == title) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				WindowInfo waylandWindow;
-				waylandWindow.title = title;
-				waylandWindow.focused =
-					(title == foregroundTitle);
-				result.emplace_back(std::move(waylandWindow));
-			}
 		}
+		windows << QString::fromStdString(name);
 	}
-
-	return result;
 }
 
 int getActiveWindow(Window *&window)
@@ -342,24 +278,91 @@ int getActiveWindow(Window *&window)
 				  &bytes, (uint8_t **)&window);
 }
 
-std::string GetCurrentWindowTitle()
+void GetCurrentWindowTitle(std::string &title)
 {
 	if (KWin) {
-		return FocusNotifier::getActiveWindowTitle();
+		title = FocusNotifier::getActiveWindowTitle();
+		return;
 	}
 
 	Window *data = 0;
 	if (getActiveWindow(data) != Success || !data) {
-		return {};
+		return;
 	}
 	if (!data[0]) {
 		XFree(data);
-		return {};
+		return;
 	}
 
 	auto name = getWindowName(data[0]);
 	XFree(data);
-	return name;
+
+	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 {};
 }
 
 static void getProcessListProcps(QStringList &processes)
@@ -406,17 +409,16 @@ static void getProcessListProcps2(QStringList &processes)
 #endif
 }
 
-QStringList GetProcessList()
+void GetProcessList(QStringList &processes)
 {
-	QStringList processes;
+	processes.clear();
 	if (libprocpsSupported) {
 		getProcessListProcps(processes);
-		return processes;
+		return;
 	}
 	if (libprocps2Supported) {
 		getProcessListProcps2(processes);
 	}
-	return processes;
 }
 
 long getForegroundProcessPid()
@@ -467,83 +469,24 @@ std::string getProcNameFromPid(long pid)
 	return name;
 }
 
-std::string GetForegroundProcessName()
+void GetForegroundProcessName(QString &proc)
 {
+	std::string temp;
+	GetForegroundProcessName(temp);
+	proc = QString::fromStdString(temp);
+}
+
+void GetForegroundProcessName(std::string &proc)
+{
+	proc.resize(0);
 	auto pid = getForegroundProcessPid();
-	return getProcNameFromPid(pid);
+	proc = getProcNameFromPid(pid);
-}
-
-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()
-{
-	auto pid = getForegroundProcessPid();
-	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)
 {
-	const auto current = GetForegroundProcessName();
+	std::string current;
+	GetForegroundProcessName(current);
 
 	// True if executable switch equals current window
 	bool equals = (executable.toStdString() == current);

lib/linux/kwin-helpers.cpp

@@ -12,82 +12,35 @@
 
 namespace advss {
 
-std::mutex FocusNotifier::_mutex;
 int FocusNotifier::activePID = -1;
 std::string FocusNotifier::activeTitle = {};
-std::map<std::string, std::pair<int, std::string>> FocusNotifier::_windows;
 
 int FocusNotifier::getActiveWindowPID()
 {
-	std::lock_guard<std::mutex> lock(_mutex);
 	return activePID;
 }
 
 std::string FocusNotifier::getActiveWindowTitle()
 {
-	std::lock_guard<std::mutex> lock(_mutex);
 	return activeTitle;
 }
 
-std::vector<std::pair<int, std::string>> FocusNotifier::getWindowList()
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	std::vector<std::pair<int, std::string>> result;
-	result.reserve(_windows.size());
-	for (const auto &entry : _windows) {
-		result.emplace_back(entry.second);
-	}
-	return result;
-}
-
 void FocusNotifier::focusChanged(const int pid)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
 	activePID = pid;
 }
 
 void FocusNotifier::focusTitle(const QString &title)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
 	activeTitle = title.toStdString();
 }
 
-void FocusNotifier::focusUpdate(const int pid, const QString &title)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	activePID = pid;
-	activeTitle = title.toStdString();
-}
-
-void FocusNotifier::windowAdded(const QString &id, const int pid,
-				const QString &title)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	_windows[id.toStdString()] = {pid, title.toStdString()};
-}
-
-void FocusNotifier::windowRemoved(const QString &id)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	_windows.erase(id.toStdString());
-}
-
-void FocusNotifier::windowTitleChanged(const QString &id, const QString &title)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	auto it = _windows.find(id.toStdString());
-	if (it != _windows.end()) {
-		it->second.second = title.toStdString();
-	}
-}
-
 bool isKWinAvailable()
 {
 	const QDBusConnectionInterface *interface =
 		QDBusConnection::sessionBus().interface();
-	if (!interface) {
+	if (!interface)
 		return false;
-	}
 
 	const QStringList services =
 		interface->registeredServiceNames().value();
@@ -100,32 +53,25 @@ bool startKWinScript(QString &scriptObjectPath)
 		"/tmp/AdvancedSceneSwitcher/KWinFocusNotifier.js";
 
 	const QString script =
-		R"(var adss = "com.github.AdvancedSceneSwitcher";
+		R"(workspace.windowActivated.connect(function(client) {
-var adssPath = "/com/github/AdvancedSceneSwitcher";
+if (!client) return;
+if (!client.pid) return;
+if (!client.caption) return;
 
-function trackWindow(window) {
+callDBus(
-    var id = window.internalId.toString();
+    "com.github.AdvancedSceneSwitcher",
-    callDBus(adss, adssPath, adss, "windowAdded", id, window.pid, window.caption);
+	"/com/github/AdvancedSceneSwitcher",
-    window.captionChanged.connect(function() {
+	"com.github.AdvancedSceneSwitcher",
-        callDBus(adss, adssPath, adss, "windowTitleChanged", id, window.caption);
+	"focusChanged",
-    });
+	client.pid
-}
+);
-
+callDBus(
-var windows = workspace.windowList();
+    "com.github.AdvancedSceneSwitcher",
-for (var i = 0; i < windows.length; i++) {
+	"/com/github/AdvancedSceneSwitcher",
-    trackWindow(windows[i]);
+	"com.github.AdvancedSceneSwitcher",
-}
+	"focusTitle",
-
+	client.caption
-workspace.windowAdded.connect(trackWindow);
+);
-
-workspace.windowRemoved.connect(function(window) {
-    callDBus(adss, adssPath, adss, "windowRemoved", window.internalId.toString());
-});
-
-workspace.windowActivated.connect(function(client) {
-    callDBus(adss, adssPath, adss, "focusUpdate",
-        client ? client.pid : 0,
-        client ? client.caption : "");
 }))";
 
 	if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {

lib/linux/kwin-helpers.h

@@ -2,11 +2,7 @@
 
 #include <QObject>
 #include <QString>
-#include <map>
-#include <mutex>
 #include <string>
-#include <utility>
-#include <vector>
 
 namespace advss {
 
@@ -14,27 +10,18 @@ class FocusNotifier final : public QObject {
 	Q_OBJECT
 	Q_CLASSINFO("D-Bus Interface", "com.github.AdvancedSceneSwitcher")
 
-	static std::mutex _mutex;
 	static int activePID;
 	static std::string activeTitle;
-	// Maps KWin internal window ID to {pid, title}
-	static std::map<std::string, std::pair<int, std::string>> _windows;
 
 public:
 	using QObject::QObject;
 
 	static int getActiveWindowPID();
 	static std::string getActiveWindowTitle();
-	static std::vector<std::pair<int, std::string>> getWindowList();
 
 public slots:
 	void focusChanged(const int pid);
 	void focusTitle(const QString &title);
-	void focusUpdate(const int pid, const QString &title);
-	void windowAdded(const QString &id, const int pid,
-			 const QString &title);
-	void windowRemoved(const QString &id);
-	void windowTitleChanged(const QString &id, const QString &title);
 };
 
 bool isKWinAvailable();

lib/macro/macro-action-edit.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-edit.hpp"
-#include "macro-undo-redo.hpp"
 #include "advanced-scene-switcher.hpp"
 #include "macro-helpers.hpp"
 #include "macro-settings.hpp"
@@ -29,7 +28,8 @@ static inline void populateActionSelection(QComboBox *list)
 }
 
 MacroActionEdit::MacroActionEdit(QWidget *parent,
-				 std::shared_ptr<MacroAction> *entryData)
+				 std::shared_ptr<MacroAction> *entryData,
+				 const std::string &id)
 	: MacroSegmentEdit(parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
@@ -50,12 +50,10 @@ 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;
@@ -64,6 +62,7 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	mainLayout->addWidget(_frame);
 	setLayout(mainLayout);
 
+	_entryData = entryData;
 	SetupWidgets(true);
 
 	actionStateTimer->start(300);
@@ -92,10 +91,7 @@ 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;
@@ -112,57 +108,21 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 		return;
 	}
 
-	Macro *const parentMacro =
-		(*_entryData)->GetMacro()->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	}
-
-	const std::string oldId = (*_entryData)->GetId();
-	OBSDataAutoRelease oldData = obs_data_create();
-	(*_entryData)->Save(oldData);
-
 	HeaderInfoChanged("");
 	auto idx = _entryData->get()->GetIndex();
 	auto macro = _entryData->get()->GetMacro();
-
-	// Determine whether this is an action or else-action before resetting.
-	const auto *rawPtr = (*_entryData).get();
-	const auto &elseActions = macro->ElseActions();
-	const bool isElse = std::any_of(elseActions.begin(), elseActions.end(),
-					[rawPtr](const auto &a) {
-						return a.get() == rawPtr;
-					});
-	const auto segmentType = isElse ? MacroEdit::SegmentType::ELSE_ACTION
-					: MacroEdit::SegmentType::ACTION;
-
 	{
 		auto lock = LockContext();
 		_entryData->reset();
 		*_entryData = MacroActionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
-	}
-
-	OBSDataAutoRelease newData = obs_data_create();
-	(*_entryData)->Save(newData);
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	} else {
-		RegisterSegmentTypeChangeUndoRedo(macro, segmentType, idx,
-						  oldId, oldData, 0, id,
-						  newData, 0);
 	}
 	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();
 }
 
@@ -198,9 +158,4 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }
 
-void MacroActionEdit::FocusTypeSelection()
-{
-	_actionSelection->setFocus();
-}
-
 } // namespace advss

lib/macro/macro-action-edit.hpp

@@ -13,11 +13,12 @@ class MacroActionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 
 public:
-	MacroActionEdit(QWidget *parent = nullptr,
+	MacroActionEdit(
-			std::shared_ptr<MacroAction> * = nullptr);
+		QWidget *parent = nullptr,
+		std::shared_ptr<MacroAction> * = nullptr,
+		const std::string &id = MacroAction::GetDefaultID().data());
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroAction> *);
-	void FocusTypeSelection() override;
 
 private slots:
 	void ActionSelectionChanged(const QString &text);

lib/macro/macro-action-loop.cpp

@@ -1,197 +0,0 @@
-#include "macro-action-loop.hpp"
-
-#include "layout-helpers.hpp"
-#include "macro-action-factory.hpp"
-#include "macro.hpp"
-
-namespace advss {
-
-const std::string MacroActionLoop::id = "loop";
-
-bool MacroActionLoop::_registered = MacroActionFactory::Register(
-	MacroActionLoop::id,
-	{MacroActionLoop::Create, MacroActionLoopEdit::Create,
-	 "AdvSceneSwitcher.action.loop"});
-
-bool MacroActionLoop::PerformAction()
-{
-	int iterations = 0;
-	const int maxIterations = _maxIterations;
-	Macro *parentMacro = GetMacro();
-
-	if (maxIterations <= 0) {
-		blog(LOG_WARNING,
-		     "loop action has invalid max iterations value of %d",
-		     maxIterations);
-		return true;
-	}
-
-	while (_loopMacro->CheckConditions()) {
-		if (iterations >= maxIterations) {
-			blog(LOG_WARNING,
-			     "loop action reached iteration limit of %d",
-			     maxIterations);
-			break;
-		}
-		ablog(LOG_INFO, "loop iteration %d", iterations);
-		if (!_loopMacro->PerformActions(true, false, true)) {
-			break;
-		}
-		++iterations;
-		if (parentMacro && parentMacro->GetStop()) {
-			break;
-		}
-	}
-	ablog(LOG_INFO, "loop completed after %d iteration(s)", iterations);
-	SetTempVarValue("count", std::to_string(iterations));
-	return true;
-}
-
-void MacroActionLoop::LogAction() const
-{
-	ablog(LOG_INFO, "running loop (max %d iterations)",
-	      _maxIterations.GetValue());
-}
-
-bool MacroActionLoop::Save(obs_data_t *obj) const
-{
-	MacroAction::Save(obj);
-	_maxIterations.Save(obj, "maxIterations");
-	OBSDataAutoRelease loopMacroData = obs_data_create();
-	_loopMacro->Save(loopMacroData);
-	obs_data_set_obj(obj, "loopMacro", loopMacroData);
-	obs_data_set_int(obj, "customWidgetHeight", _customWidgetHeight);
-	return true;
-}
-
-bool MacroActionLoop::Load(obs_data_t *obj)
-{
-	MacroAction::Load(obj);
-	_maxIterations.Load(obj, "maxIterations");
-	if (obs_data_has_user_value(obj, "loopMacro")) {
-		OBSDataAutoRelease loopMacroData =
-			obs_data_get_obj(obj, "loopMacro");
-		_loopMacro = std::make_shared<Macro>();
-		_loopMacro->Load(loopMacroData);
-	}
-	_customWidgetHeight = obs_data_get_int(obj, "customWidgetHeight");
-	return true;
-}
-
-bool MacroActionLoop::PostLoad()
-{
-	MacroAction::PostLoad();
-	_loopMacro->PostLoad();
-	_loopMacro->SetActionTriggerMode(Macro::ActionTriggerMode::ALWAYS);
-	_loopMacro->SetNestedParentMacro(GetMacro());
-	return true;
-}
-
-std::shared_ptr<MacroAction> MacroActionLoop::Create(Macro *m)
-{
-	return std::make_shared<MacroActionLoop>(m);
-}
-
-std::shared_ptr<MacroAction> MacroActionLoop::Copy() const
-{
-	auto copy = std::make_shared<MacroActionLoop>(*this);
-
-	OBSDataAutoRelease data = obs_data_create();
-	_loopMacro->Save(data);
-
-	copy->_loopMacro = std::make_shared<Macro>();
-	copy->_loopMacro->Load(data);
-	copy->_loopMacro->PostLoad();
-
-	return copy;
-}
-
-void MacroActionLoop::ResolveVariablesToFixedValues()
-{
-	_maxIterations.ResolveVariables();
-	for (auto &action : _loopMacro->Actions()) {
-		action->ResolveVariablesToFixedValues();
-	}
-}
-
-void MacroActionLoop::SetupTempVars()
-{
-	MacroAction::SetupTempVars();
-	AddTempvar("count",
-		   obs_module_text("AdvSceneSwitcher.tempVar.loop.count"),
-		   obs_module_text(
-			   "AdvSceneSwitcher.tempVar.loop.count.description"));
-}
-
-MacroActionLoopEdit::MacroActionLoopEdit(
-	QWidget *parent, std::shared_ptr<MacroActionLoop> entryData)
-	: ResizableWidget(parent),
-	  _macroEdit(new MacroEdit(
-		  this, QStringList()
-				<< "AdvSceneSwitcher.action.loop.conditionHelp"
-				<< "AdvSceneSwitcher.action.loop.actionHelp"
-				<< "")),
-	  _maxIterations(new VariableSpinBox())
-{
-	_maxIterations->setMinimum(1);
-	_maxIterations->setMaximum(10000000);
-
-	QWidget::connect(
-		_maxIterations,
-		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
-		this, SLOT(MaxIterationsChanged(const NumberVariable<int> &)));
-
-	auto controlsLayout = new QHBoxLayout();
-	controlsLayout->addWidget(new QLabel(
-		obs_module_text("AdvSceneSwitcher.action.loop.maxIterations")));
-	controlsLayout->addWidget(_maxIterations);
-	controlsLayout->addStretch();
-
-	auto layout = new QVBoxLayout();
-	layout->addLayout(controlsLayout);
-	layout->addWidget(_macroEdit);
-	setLayout(layout);
-
-	_macroEdit->HideElseSection();
-
-	_entryData = entryData;
-	UpdateEntryData();
-	_loading = false;
-}
-
-MacroActionLoopEdit::~MacroActionLoopEdit()
-{
-	if (!_entryData) {
-		return;
-	}
-	_entryData->_customWidgetHeight = GetCustomHeight();
-	_macroEdit->SetMacro({});
-}
-
-void MacroActionLoopEdit::UpdateEntryData()
-{
-	if (!_entryData) {
-		return;
-	}
-
-	_maxIterations->SetValue(_entryData->_maxIterations);
-	_macroEdit->SetMacro(_entryData->_loopMacro);
-
-	if (_macroEdit->IsEmpty()) {
-		_macroEdit->ShowAllMacroSections();
-		_entryData->_customWidgetHeight = 600;
-	}
-	SetResizingEnabled(true);
-	SetCustomHeight(_entryData->_customWidgetHeight);
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroActionLoopEdit::MaxIterationsChanged(const NumberVariable<int> &value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_maxIterations = value;
-}
-
-} // namespace advss

lib/macro/macro-action-loop.hpp

@@ -1,64 +0,0 @@
-#pragma once
-#include "macro-action-edit.hpp"
-#include "macro-edit.hpp"
-#include "resizable-widget.hpp"
-#include "variable-spinbox.hpp"
-
-#include <QLabel>
-#include <QVBoxLayout>
-
-namespace advss {
-
-class MacroActionLoop : public MacroAction {
-public:
-	MacroActionLoop(Macro *m) : MacroAction(m) {}
-	bool PerformAction();
-	void LogAction() const;
-	bool Save(obs_data_t *obj) const;
-	bool Load(obs_data_t *obj);
-	bool PostLoad();
-	std::string GetId() const { return id; }
-	static std::shared_ptr<MacroAction> Create(Macro *m);
-	std::shared_ptr<MacroAction> Copy() const;
-	void ResolveVariablesToFixedValues();
-
-	std::shared_ptr<Macro> _loopMacro = std::make_shared<Macro>();
-	IntVariable _maxIterations = 100;
-	int _customWidgetHeight = 0;
-
-private:
-	void SetupTempVars();
-
-	static bool _registered;
-	static const std::string id;
-};
-
-class MacroActionLoopEdit : public ResizableWidget {
-	Q_OBJECT
-
-public:
-	MacroActionLoopEdit(
-		QWidget *parent,
-		std::shared_ptr<MacroActionLoop> entryData = nullptr);
-	~MacroActionLoopEdit();
-	void UpdateEntryData();
-	static QWidget *Create(QWidget *parent,
-			       std::shared_ptr<MacroAction> action)
-	{
-		return new MacroActionLoopEdit(
-			parent,
-			std::dynamic_pointer_cast<MacroActionLoop>(action));
-	}
-
-private slots:
-	void MaxIterationsChanged(const NumberVariable<int> &value);
-
-private:
-	MacroEdit *_macroEdit;
-	VariableSpinBox *_maxIterations;
-
-	std::shared_ptr<MacroActionLoop> _entryData;
-	bool _loading = true;
-};
-
-} // namespace advss

lib/macro/macro-action-macro.cpp

@@ -1,14 +1,8 @@
 #include "macro-action-macro.hpp"
-
-#include "condition-logic.hpp"
 #include "help-icon.hpp"
 #include "layout-helpers.hpp"
-#include "macro-action-factory.hpp"
-#include "macro-helpers.hpp"
 #include "macro.hpp"
 
-#include <chrono>
-
 namespace advss {
 
 const std::string MacroActionMacro::id = "macro";
@@ -18,74 +12,6 @@ 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) {
@@ -98,85 +24,47 @@ bool MacroActionMacro::PerformAction()
 		return true;
 	}
 
-	const auto performActionForMacro = [this](Macro *macro) {
+	switch (_action) {
-		switch (_action) {
+	case Action::PAUSE:
-		case Action::PAUSE:
+		macro->SetPaused();
-			macro->SetPaused();
+		break;
-			break;
+	case Action::UNPAUSE:
-		case Action::UNPAUSE:
+		macro->SetPaused(false);
-			macro->SetPaused(false);
+		break;
-			break;
+	case Action::TOGGLE_PAUSE:
-		case Action::TOGGLE_PAUSE:
+		macro->SetPaused(!macro->Paused());
-			macro->SetPaused(!macro->Paused());
+		break;
-			break;
+	case Action::RESET_COUNTER:
-		case Action::RESET_COUNTER:
+		macro->ResetRunCount();
-			macro->ResetRunCount();
+		break;
-			break;
+	case Action::RUN_ACTIONS:
-		case Action::RUN_ACTIONS:
+		RunActions(macro.get());
-			RunActions(macro);
+		break;
-			break;
+	case Action::STOP:
-		case Action::STOP:
+		macro->Stop();
-			macro->Stop();
+		break;
-			break;
+	case Action::DISABLE_ACTION:
-		case Action::DISABLE_ACTION:
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-		case Action::ENABLE_ACTION:
+					     false)) {
-		case Action::TOGGLE_ACTION:
+			macro->Actions().at(_actionIndex - 1)->SetEnabled(false);
-			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;
 		}
-		case Action::GET_INFO: {
+		break;
-			SetTempVarValue(
+	case Action::ENABLE_ACTION:
-				"conditionCount",
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
-				std::to_string(macro->Conditions().size()));
+					     false)) {
-			SetTempVarValue(
+			macro->Actions().at(_actionIndex - 1)->SetEnabled(true);
-				"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;
 		}
-		default:
+		break;
-			break;
+	case Action::TOGGLE_ACTION:
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
+					     false)) {
+			auto action = macro->Actions().at(_actionIndex - 1);
+			action->SetEnabled(!action->Enabled());
 		}
-	};
+		break;
-
+	default:
-	if (!IsGroupMacro(macro.get())) {
+		break;
-		performActionForMacro(macro.get());
-		return true;
 	}
-
-	auto macros = GetGroupMacroEntries(macro.get());
-	for (const auto &macro : macros) {
-		performActionForMacro(macro.get());
-	}
-
 	return true;
 }
 
@@ -219,12 +107,6 @@ 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;
 	}
@@ -233,14 +115,9 @@ void MacroActionMacro::LogAction() const
 bool MacroActionMacro::Save(obs_data_t *obj) const
 {
 	MacroAction::Save(obj);
-	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_int(obj, "action", static_cast<int>(_action));
-	obs_data_set_string(obj, "actionId", _actionId.c_str());
-	_regex.Save(obj);
 	_runOptions.Save(obj);
 	OBSDataAutoRelease nestedMacroData = obs_data_create();
 	_nestedMacro->Save(nestedMacroData);
@@ -252,21 +129,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");
-	_label.Load(obj, "label");
+	_action = static_cast<MacroActionMacro::Action>(
-	_actionId = obs_data_get_string(obj, "actionId");
+		obs_data_get_int(obj, "action"));
-	_regex.Load(obj);
 	_runOptions.Load(obj);
 
 	if (obs_data_has_user_value(obj, "nestedMacro")) {
 		OBSDataAutoRelease nestedMacroData =
 			obs_data_get_obj(obj, "nestedMacro");
-		_nestedMacro = std::make_shared<Macro>();
 		_nestedMacro->Load(nestedMacroData);
 	}
 
@@ -281,7 +152,6 @@ bool MacroActionMacro::PostLoad()
 	MacroAction::PostLoad();
 	_runOptions.macro.PostLoad();
 	_nestedMacro->PostLoad();
-	_nestedMacro->SetNestedParentMacro(GetMacro());
 	return true;
 }
 
@@ -313,16 +183,6 @@ std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
 void MacroActionMacro::ResolveVariablesToFixedValues()
 {
 	_actionIndex.ResolveVariables();
-	_label.ResolveVariables();
-
-	if (_action == Action::NESTED_MACRO) {
-		for (auto &action : _nestedMacro->Actions()) {
-			action->ResolveVariablesToFixedValues();
-		}
-		for (auto &action : _nestedMacro->ElseActions()) {
-			action->ResolveVariablesToFixedValues();
-		}
-	}
 }
 
 static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
@@ -364,56 +224,6 @@ 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>>
@@ -429,9 +239,7 @@ static void populateActionSelection(QComboBox *list)
 			{MacroActionMacro::Action::NESTED_MACRO,
 			 "AdvSceneSwitcher.action.macro.type.nestedMacro"},
 			{MacroActionMacro::Action::RUN_ACTIONS,
-			 "AdvSceneSwitcher.action.macro.type.runActions"},
+			 "AdvSceneSwitcher.action.macro.type.run"},
-			{MacroActionMacro::Action::RUN_MACRO,
-			 "AdvSceneSwitcher.action.macro.type.runMacro"},
 			{MacroActionMacro::Action::STOP,
 			 "AdvSceneSwitcher.action.macro.type.stop"},
 			{MacroActionMacro::Action::DISABLE_ACTION,
@@ -440,8 +248,6 @@ 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) {
@@ -460,7 +266,7 @@ static void populateConditionBehaviorSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
 }
 
-static void populateActionSectionSelection(QComboBox *list)
+static void populateActionTypeSelection(QComboBox *list)
 {
 	list->addItem(obs_module_text(
 		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
@@ -468,53 +274,21 @@ static void populateActionSectionSelection(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)),
-	  _label(new VariableLineEdit(this)),
+	  _actions(new QComboBox()),
-	  _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"))),
-	  _actionSections(new QComboBox(this)),
+	  _actionTypes(new QComboBox()),
 	  _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()),
@@ -531,36 +305,24 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 {
 	populateActionSelection(_actions);
 	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionSectionSelection(_actionSections);
+	populateActionTypeSelection(_actionTypes);
-	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(_actionSections, SIGNAL(currentIndexChanged(int)),
+	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 this, SLOT(ActionSectionChanged(int)));
+			 SLOT(ActionTypeChanged(int)));
 	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
 			 SLOT(SkipWhenPausedChanged(int)));
 	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
@@ -588,7 +350,6 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	layout->addLayout(_setInputsLayout);
 	layout->addWidget(_inputs);
 	layout->addWidget(_skipWhenPaused);
-	layout->addWidget(_noConditionsWarning);
 	layout->addWidget(_nestedMacro);
 	setLayout(layout);
 	_entryData = entryData;
@@ -614,24 +375,17 @@ void MacroActionMacroEdit::UpdateEntryData()
 	if (!_entryData) {
 		return;
 	}
-
 	_actions->setCurrentIndex(
-		_actions->findData(static_cast<int>(_entryData->GetAction())));
+		_actions->findData(static_cast<int>(_entryData->_action)));
-	_actionSelectionType->setCurrentIndex(_actionSelectionType->findData(
-		static_cast<int>(_entryData->_actionSelectionType)));
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
-	_label->setText(_entryData->_label);
-	_actionTypes->setCurrentIndex(_actionTypes->findData(
-		QString::fromStdString(_entryData->_actionId)));
-	_regex->SetRegexConfig(_entryData->_regex);
 	_macros->SetCurrentMacro(_entryData->_macro);
 	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
 	_conditionBehaviors->setCurrentIndex(
 		static_cast<int>(_entryData->_runOptions.logic));
 	_reevaluateConditionState->setChecked(
 		_entryData->_runOptions.reevaluateConditionState);
-	_actionSections->setCurrentIndex(
+	_actionTypes->setCurrentIndex(
 		_entryData->_runOptions.runElseActions ? 1 : 0);
 	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
 	_setInputs->setChecked(_entryData->_runOptions.setInputs);
@@ -665,17 +419,8 @@ void MacroActionMacroEdit::MacroChanged(const QString &text)
 void MacroActionMacroEdit::ActionChanged(int idx)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->SetAction(static_cast<MacroActionMacro::Action>(
+	_entryData->_action = static_cast<MacroActionMacro::Action>(
-		_actions->itemData(idx).toInt()));
+		_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();
 }
 
@@ -685,25 +430,6 @@ 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();
@@ -725,13 +451,10 @@ void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
 	SetWidgetVisibility();
 }
 
-void MacroActionMacroEdit::ActionSectionChanged(int useElse)
+void MacroActionMacroEdit::ActionTypeChanged(int value)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = useElse;
+	_entryData->_runOptions.runElseActions = value;
-	_entryData->_useElseSection = useElse;
-	_actionIndex->SetType(useElse ? MacroSegmentSelection::Type::ELSE_ACTION
-				      : MacroSegmentSelection::Type::ACTION);
 }
 
 void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
@@ -758,14 +481,9 @@ 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);
 
@@ -774,47 +492,21 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 
 	const std::unordered_map<std::string, QWidget *> placeholders = {
 		{"{{actions}}", _actions},
-		{"{{runMacroHelp}}", _runMacroHelp},
 		{"{{actionIndex}}", _actionIndex},
 		{"{{macros}}", _macros},
-		{"{{actionSections}}", _actionSections},
+		{"{{actionTypes}}", _actionTypes},
 		{"{{conditionBehaviors}}", _conditionBehaviors},
 		{"{{conditionMacros}}", _conditionMacros},
-		{"{{actionSelectionType}}", _actionSelectionType},
-		{"{{label}}", _label},
-		{"{{regex}}", _regex},
-		{"{{actionTypes}}", _actionTypes},
 
 	};
 
-	const auto action = _entryData->GetAction();
+	PlaceWidgets(
-	const char *layoutText = "";
+		obs_module_text(
-	switch (action) {
+			_entryData->_action ==
-	case MacroActionMacro::Action::PAUSE:
+					MacroActionMacro::Action::RUN_ACTIONS
-	case MacroActionMacro::Action::UNPAUSE:
+				? "AdvSceneSwitcher.action.macro.entry.run"
-	case MacroActionMacro::Action::TOGGLE_PAUSE:
+				: "AdvSceneSwitcher.action.macro.entry.other"),
-	case MacroActionMacro::Action::RESET_COUNTER:
+		_entryLayout, placeholders);
-	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) {
@@ -823,75 +515,56 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	} else {
 		PlaceWidgets(
 			obs_module_text(
-				"AdvSceneSwitcher.action.macro.layout.run.condition"),
+				"AdvSceneSwitcher.action.macro.entry.run.condition"),
 			_conditionLayout, placeholders);
 	}
 
-	if (action == MacroActionMacro::Action::RUN_ACTIONS ||
+	if (_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS ||
-	    action == MacroActionMacro::Action::STOP ||
+	    _entryData->_action == MacroActionMacro::Action::STOP) {
-	    action == MacroActionMacro::Action::RUN_MACRO) {
 		_macros->HideSelectedMacro();
 	} else {
 		_macros->ShowAllMacros();
 	}
 
-	const auto actionSelectionType = _entryData->_actionSelectionType;
 	const bool isModifyingActionState =
-		action == MacroActionMacro::Action::DISABLE_ACTION ||
+		_entryData->_action ==
-		action == MacroActionMacro::Action::ENABLE_ACTION ||
+			MacroActionMacro::Action::DISABLE_ACTION ||
-		action == MacroActionMacro::Action::TOGGLE_ACTION;
+		_entryData->_action ==
-	_actionSelectionType->setVisible(isModifyingActionState);
+			MacroActionMacro::Action::ENABLE_ACTION ||
-	_actionIndex->setVisible(
+		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
-		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,
-			 action == MacroActionMacro::Action::RUN_ACTIONS);
+			 _entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
 	const bool needsAdditionalConditionWidgets =
-		action == MacroActionMacro::Action::RUN_ACTIONS &&
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.logic !=
 			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
 	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
 	SetLayoutVisible(_reevaluateConditionStateLayout,
 			 needsAdditionalConditionWidgets);
 	SetLayoutVisible(_setInputsLayout,
-			 action == MacroActionMacro::Action::RUN_ACTIONS);
+			 _entryData->_action ==
-	_inputs->setVisible(action == MacroActionMacro::Action::RUN_ACTIONS &&
+				 MacroActionMacro::Action::RUN_ACTIONS);
+	_inputs->setVisible(_entryData->_action ==
+				    MacroActionMacro::Action::RUN_ACTIONS &&
 			    _entryData->_runOptions.setInputs);
 	HighlightMacroSettingsButton(
-		action == MacroActionMacro::Action::RUN_ACTIONS &&
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.setInputs &&
 		!_inputs->HasInputsToSet());
-	_actionSections->setVisible(
+	_actionTypes->setVisible(_entryData->_action ==
-		action == MacroActionMacro::Action::RUN_ACTIONS ||
+				 MacroActionMacro::Action::RUN_ACTIONS);
-		isModifyingActionState);
+	_skipWhenPaused->setVisible(_entryData->_action ==
-	_skipWhenPaused->setVisible(
+				    MacroActionMacro::Action::RUN_ACTIONS);
-		action == MacroActionMacro::Action::RUN_ACTIONS ||
-		action == MacroActionMacro::Action::RUN_MACRO);
 
-	if (action == MacroActionMacro::Action::RUN_MACRO) {
+	_nestedMacro->setVisible(_entryData->_action ==
-		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(action != MacroActionMacro::Action::NESTED_MACRO);
+	_macros->setVisible(_entryData->_action !=
-	SetResizingEnabled(action == MacroActionMacro::Action::NESTED_MACRO);
+			    MacroActionMacro::Action::NESTED_MACRO);
+	SetResizingEnabled(_entryData->_action ==
+			   MacroActionMacro::Action::NESTED_MACRO);
 
 	if (_nestedMacro->IsEmpty()) {
 		_nestedMacro->ShowAllMacroSections();

lib/macro/macro-action-macro.hpp

@@ -5,13 +5,10 @@
 #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 {
 
@@ -57,31 +54,15 @@ 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;
@@ -101,15 +82,11 @@ 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 ActionSectionChanged(int value);
+	void ActionTypeChanged(int value);
 	void SkipWhenPausedChanged(int value);
 	void SetInputsChanged(int value);
 	void InputsChanged(const StringList &);
@@ -121,20 +98,14 @@ private:
 	void SetWidgetVisibility();
 	void SetupMacroInput(Macro *) const;
 
-	QComboBox *_actions;
 	MacroSelection *_macros;
-	QComboBox *_actionSelectionType;
 	MacroSegmentSelection *_actionIndex;
-	VariableLineEdit *_label;
+	QComboBox *_actions;
-	FilterComboBox *_actionTypes;
-	RegexConfigWidget *_regex;
 	MacroSelection *_conditionMacros;
 	QComboBox *_conditionBehaviors;
 	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionSections;
+	QComboBox *_actionTypes;
 	QCheckBox *_skipWhenPaused;
-	QLabel *_noConditionsWarning;
-	HelpIcon *_runMacroHelp;
 	QCheckBox *_setInputs;
 	MacroInputEdit *_inputs;
 	QHBoxLayout *_entryLayout;

lib/macro/macro-action-variable.cpp

@@ -17,15 +17,6 @@ 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,
@@ -228,43 +219,6 @@ 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_),
@@ -332,14 +286,6 @@ 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) {
@@ -447,19 +393,7 @@ bool MacroActionVariable::PerformAction()
 		if (!value.has_value()) {
 			return true;
 		}
-
+		var->SetValue(*value);
-		if (!_jsonQueryExtractSingle) {
-			var->SetValue(*value);
-			return true;
-		}
-
-		auto extracted = ExtractSingleJsonArrayElement(*value);
-		if (extracted.has_value()) {
-			var->SetValue(*extracted);
-		} else {
-			var->SetValue(*value);
-		}
-
 		return true;
 	}
 	case Action::ARRAY_JSON: {
@@ -516,9 +450,6 @@ bool MacroActionVariable::PerformAction()
 	case Action::RANDOM_NUMBER:
 		GenerateRandomNumber(var.get());
 		return true;
-	case Action::RANDOM_LIST_VALUE:
-		PickRandomValue(var.get());
-		return true;
 	}
 
 	return true;
@@ -559,12 +490,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");
-	obs_data_set_bool(obj, "jsonQueryExtractSingle",
-			  _jsonQueryExtractSingle);
 
 	obs_data_set_int(obj, "version", 1);
 
@@ -621,12 +548,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");
-	_jsonQueryExtractSingle =
-		obs_data_get_bool(obj, "jsonQueryExtractSingle");
 
 	return true;
 }
@@ -747,8 +670,6 @@ 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,
@@ -793,8 +714,6 @@ 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,
@@ -872,10 +791,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _segmentValueStatus(new QLabel()),
 	  _segmentValue(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _substringLayout(new QVBoxLayout()),
-	  _subStringControlsLayout(new QHBoxLayout()),
+	  _subStringIndexEntryLayout(new QHBoxLayout()),
+	  _subStringRegexEntryLayout(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()),
@@ -907,28 +827,13 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		  obs_module_text(
 			  "AdvSceneSwitcher.action.variable.generateInteger"),
 		  this)),
-	  _randomNumberLayout(new QVBoxLayout()),
+	  _randomLayout(new QVBoxLayout()),
-	  _randomValues(new StringListEdit(this)),
-	  _allowRepeatValues(new QCheckBox(
-		  obs_module_text(
-			  "AdvSceneSwitcher.action.variable.type.allowRepeat"),
-		  this)),
-	  _randomValueLayout(new QVBoxLayout()),
 	  _jsonQuery(new VariableLineEdit(this)),
 	  _jsonQueryHelp(new HelpIcon(
 		  obs_module_text(
 			  "AdvSceneSwitcher.action.variable.type.queryJson.info"),
 		  this)),
 	  _jsonIndex(new VariableSpinBox(this)),
-	  _jsonExtractSingle(new QCheckBox(
-		  obs_module_text(
-			  "AdvSceneSwitcher.action.variable.type.queryJson.extractSingle"),
-		  this)),
-	  _jsonExtractSingleHelp(new HelpIcon(
-		  obs_module_text(
-			  "AdvSceneSwitcher.action.variable.type.queryJson.extractSingle.info"),
-		  this)),
-	  _jsonQueryLayout(new QVBoxLayout()),
 	  _entryLayout(new QHBoxLayout())
 {
 	_numValue->setMinimum(-9999999999);
@@ -958,13 +863,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_randomNumberStart->setMaximum(9999999999);
 	_randomNumberEnd->setMinimum(-9999999999);
 	_randomNumberEnd->setMaximum(9999999999);
-	_randomValues->SetMaxStringSize(99999999);
 	_jsonIndex->setMaximum(999);
-	auto jsonExtractSingleLayout = new QHBoxLayout();
-	jsonExtractSingleLayout->addWidget(_jsonExtractSingle);
-	jsonExtractSingleLayout->addWidget(_jsonExtractSingleHelp);
-	jsonExtractSingleLayout->addStretch();
-	_jsonQueryLayout->addLayout(jsonExtractSingleLayout);
 
 	QWidget::connect(_variables, SIGNAL(SelectionChanged(const QString &)),
 			 this, SLOT(VariableChanged(const QString &)));
@@ -992,7 +891,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,
@@ -1052,19 +951,12 @@ 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(
 		_jsonIndex,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(JsonIndexChanged(const NumberVariable<int> &)));
-	QWidget::connect(_jsonExtractSingle, SIGNAL(stateChanged(int)), this,
-			 SLOT(JsonQueryExtractSingleChanged(int)));
 
 	const std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{variables}}", _variables},
@@ -1073,6 +965,9 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{strValue}}", _strValue},
 		{"{{numValue}}", _numValue},
 		{"{{segmentIndex}}", _segmentIdx},
+		{"{{subStringStart}}", _subStringStart},
+		{"{{subStringSize}}", _subStringSize},
+		{"{{regexMatchIdx}}", _regexMatchIdx},
 		{"{{findRegex}}", _findRegex},
 		{"{{findStr}}", _findStr},
 		{"{{replaceStr}}", _replaceStr},
@@ -1104,7 +999,12 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	PlaceWidgets(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.substringIndex"),
-		_subStringControlsLayout, widgetPlaceholders);
+		_subStringIndexEntryLayout, widgetPlaceholders);
+
+	PlaceWidgets(
+		obs_module_text(
+			"AdvSceneSwitcher.action.variable.layout.substringRegex"),
+		_subStringRegexEntryLayout, widgetPlaceholders);
 
 	PlaceWidgets(
 		obs_module_text(
@@ -1125,23 +1025,20 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.randomNumber"),
 		randomLayout, widgetPlaceholders);
-	_randomNumberLayout->addLayout(randomLayout);
+	_randomLayout->addLayout(randomLayout);
-	_randomNumberLayout->addWidget(_generateInteger);
+	_randomLayout->addWidget(_generateInteger);
-
-	_randomValueLayout->addWidget(_randomValues);
-	_randomValueLayout->addWidget(_allowRepeatValues);
 
 	auto regexConfigLayout = new QHBoxLayout;
-	regexConfigLayout->addWidget(_subStringRegex);
+	regexConfigLayout->addWidget(_substringRegex);
 	regexConfigLayout->addStretch();
 
-	_substringLayout->addLayout(_subStringControlsLayout);
+	_substringLayout->addLayout(_subStringIndexEntryLayout);
+	_substringLayout->addLayout(_subStringRegexEntryLayout);
 	_substringLayout->addWidget(_regexPattern);
 	_substringLayout->addLayout(regexConfigLayout);
 
 	auto layout = new QVBoxLayout;
 	layout->addLayout(_entryLayout);
-	layout->addLayout(_jsonQueryLayout);
 	layout->addLayout(_substringLayout);
 	layout->addWidget(_segmentValueStatus);
 	layout->addWidget(_segmentValue);
@@ -1149,8 +1046,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	layout->addWidget(_mathExpressionResult);
 	layout->addLayout(_promptLayout);
 	layout->addLayout(_placeholderLayout);
-	layout->addLayout(_randomNumberLayout);
+	layout->addLayout(_randomLayout);
-	layout->addLayout(_randomValueLayout);
 	setLayout(layout);
 
 	_entryData = entryData;
@@ -1184,7 +1080,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));
@@ -1209,11 +1105,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);
-	_jsonExtractSingle->setChecked(_entryData->_jsonQueryExtractSingle);
 
 	SetWidgetVisibility();
 }
@@ -1493,7 +1386,6 @@ void MacroActionVariableEdit::SelectionChanged(const TempVariableRef &var)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_tempVar = var;
-	IncrementTempVarInUseGeneration();
 	SetWidgetVisibility();
 }
 
@@ -1555,18 +1447,6 @@ 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();
@@ -1579,12 +1459,6 @@ void MacroActionVariableEdit::JsonIndexChanged(const NumberVariable<int> &value)
 	_entryData->_jsonIndex = value;
 }
 
-void MacroActionVariableEdit::JsonQueryExtractSingleChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_jsonQueryExtractSingle = value;
-}
-
 void MacroActionVariableEdit::SetWidgetVisibility()
 {
 	if (!_entryData) {
@@ -1611,20 +1485,8 @@ 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(
@@ -1633,15 +1495,16 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		   MacroActionVariable::Action::TRUNCATE) {
 		layoutString = obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.truncate");
-	} else if (_entryData->_action ==
-		   MacroActionVariable::Action::COPY_VAR) {
-		layoutString = obs_module_text(
-			"AdvSceneSwitcher.action.variable.layout.copy");
 	} else {
 		layoutString = obs_module_text(
 			"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 ||
@@ -1658,7 +1521,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 	}
 
 	_variables2->setVisible(
-		_entryData->_action == MacroActionVariable::Action::COPY_VAR ||
 		_entryData->_action ==
 			MacroActionVariable::Action::APPEND_VAR ||
 		_entryData->_action ==
@@ -1688,25 +1550,15 @@ 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);
-	_regexPattern->setVisible(
+	if (_entryData->_action == MacroActionVariable::Action::SUBSTRING) {
-		showRegex &&
+		bool showRegex = _entryData->_subStringRegex.Enabled();
-		_entryData->_action == MacroActionVariable::Action::SUBSTRING);
+		SetLayoutVisible(_subStringIndexEntryLayout, !showRegex);
-
+		SetLayoutVisible(_subStringRegexEntryLayout, showRegex);
+		_regexPattern->setVisible(showRegex);
+	}
 	SetLayoutVisible(_findReplaceLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::FIND_AND_REPLACE);
@@ -1771,22 +1623,15 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 					  MacroActionVariable::Action::PAD);
 	_caseType->setVisible(_entryData->_action ==
 			      MacroActionVariable::Action::CHANGE_CASE);
-	SetLayoutVisible(_randomNumberLayout,
+	SetLayoutVisible(_randomLayout,
 			 _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 ==
 				   MacroActionVariable::Action::QUERY_JSON);
 	_jsonIndex->setVisible(_entryData->_action ==
 			       MacroActionVariable::Action::ARRAY_JSON);
-	SetLayoutVisible(_jsonQueryLayout,
-			 _entryData->_action ==
-				 MacroActionVariable::Action::QUERY_JSON);
 
 	adjustSize();
 	updateGeometry();

lib/macro/macro-action-variable.hpp

@@ -6,7 +6,6 @@
 #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"
@@ -23,7 +22,6 @@ 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);
@@ -57,8 +55,6 @@ public:
 		RANDOM_NUMBER,
 		QUERY_JSON,
 		ARRAY_JSON,
-		COPY_VAR,
-		RANDOM_LIST_VALUE,
 	};
 
 	Action _action = Action::SET_VALUE;
@@ -110,13 +106,8 @@ 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;
-	bool _jsonQueryExtractSingle = true;
 
 private:
 	void DecrementCurrentSegmentVariableRef();
@@ -127,7 +118,6 @@ private:
 	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
 	void GenerateRandomNumber(Variable *);
-	void PickRandomValue(Variable *);
 
 	std::weak_ptr<MacroSegment> _macroSegment;
 	int _segmentIdxLoadValue = -1;
@@ -184,11 +174,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> &);
-	void JsonQueryExtractSingleChanged(int);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -206,10 +193,11 @@ private:
 	QLabel *_segmentValueStatus;
 	ResizingPlainTextEdit *_segmentValue;
 	QVBoxLayout *_substringLayout;
-	QHBoxLayout *_subStringControlsLayout;
+	QHBoxLayout *_subStringIndexEntryLayout;
+	QHBoxLayout *_subStringRegexEntryLayout;
 	VariableSpinBox *_subStringStart;
 	VariableSpinBox *_subStringSize;
-	RegexConfigWidget *_subStringRegex;
+	RegexConfigWidget *_substringRegex;
 	ResizingPlainTextEdit *_regexPattern;
 	VariableSpinBox *_regexMatchIdx;
 	QHBoxLayout *_findReplaceLayout;
@@ -236,16 +224,10 @@ private:
 	VariableDoubleSpinBox *_randomNumberStart;
 	VariableDoubleSpinBox *_randomNumberEnd;
 	QCheckBox *_generateInteger;
-	QVBoxLayout *_randomNumberLayout;
+	QVBoxLayout *_randomLayout;
-	StringListEdit *_randomValues;
-	QCheckBox *_allowRepeatValues;
-	QVBoxLayout *_randomValueLayout;
 	VariableLineEdit *_jsonQuery;
-	HelpIcon *_jsonQueryHelp;
+	QLabel *_jsonQueryHelp;
 	VariableSpinBox *_jsonIndex;
-	QCheckBox *_jsonExtractSingle;
-	HelpIcon *_jsonExtractSingleHelp;
-	QVBoxLayout *_jsonQueryLayout;
 	QHBoxLayout *_entryLayout;
 
 	std::shared_ptr<MacroActionVariable> _entryData;

lib/macro/macro-condition-edit.cpp

@@ -1,15 +1,10 @@
 #include "macro-condition-edit.hpp"
-#include "macro-undo-redo.hpp"
-
 #include "advanced-scene-switcher.hpp"
-#include "condition-logic.hpp"
 #include "macro-settings.hpp"
-#include "macro-signals.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"
 
@@ -105,17 +100,14 @@ void DurationModifierEdit::Collapse(bool collapse)
 
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	bool isRootCondition)
+	const std::string &id, 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,
@@ -130,17 +122,14 @@ 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;
@@ -163,17 +152,8 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 	const auto logic = static_cast<Logic::Type>(
 		_logicSelection->itemData(idx).toInt());
 	(*_entryData)->SetLogicType(logic);
-}
 
-void MacroConditionEdit::ConditionEnableChanged(bool value)
+	SetEnableAppearance(logic != Logic::Type::NONE);
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
-	(*_entryData)->SetEnabled(value);
-	SetDisableEffect(!value);
 }
 
 bool MacroConditionEdit::IsRootNode() const
@@ -186,9 +166,7 @@ void MacroConditionEdit::SetLogicSelection()
 	const auto logic = (*_entryData)->GetLogicType();
 	_logicSelection->setCurrentIndex(
 		_logicSelection->findData(static_cast<int>(logic)));
-	const bool enabled = (*_entryData)->Enabled();
+	SetEnableAppearance(logic != Logic::Type::NONE);
-	_enable->setChecked(enabled);
-	SetEnableAppearance(enabled);
 }
 
 void MacroConditionEdit::SetRootNode(bool root)
@@ -226,10 +204,7 @@ 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;
@@ -251,19 +226,6 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 		return;
 	}
 
-	Macro *const parentMacro =
-		(*_entryData)->GetMacro()->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	}
-
-	const std::string oldId = (*_entryData)->GetId();
-	const int oldLogic = (int)(*_entryData)->GetLogicType();
-	OBSDataAutoRelease oldData = obs_data_create();
-	(*_entryData)->Save(oldData);
-
 	auto temp = DurationModifier();
 	_dur->SetValue(temp);
 	HeaderInfoChanged("");
@@ -272,39 +234,20 @@ 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();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
-	}
-
-	OBSDataAutoRelease newData = obs_data_create();
-	(*_entryData)->Save(newData);
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	} else {
-		RegisterSegmentTypeChangeUndoRedo(
-			macro, MacroEdit::SegmentType::CONDITION, idx, oldId,
-			oldData, oldLogic, id, newData,
-			(int)(*_entryData)->GetLogicType());
 	}
 	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)
@@ -332,9 +275,4 @@ std::shared_ptr<MacroSegment> MacroConditionEdit::Data() const
 	return *_entryData;
 }
 
-void MacroConditionEdit::FocusTypeSelection()
-{
-	_conditionSelection->setFocus();
-}
-
 } // namespace advss

lib/macro/macro-condition-edit.hpp

@@ -8,8 +8,6 @@
 
 namespace advss {
 
-class SwitchButton;
-
 class DurationModifierEdit : public QWidget {
 	Q_OBJECT
 public:
@@ -36,27 +34,26 @@ class MacroConditionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 
 public:
-	MacroConditionEdit(QWidget *parent = nullptr,
+	MacroConditionEdit(
-			   std::shared_ptr<MacroCondition> * = nullptr,
+		QWidget *parent = nullptr,
-			   bool root = true);
+		std::shared_ptr<MacroCondition> * = nullptr,
+		const std::string &id = MacroCondition::GetDefaultID().data(),
+		bool root = true);
 	bool IsRootNode() const;
 	void SetRootNode(bool);
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroCondition> *);
-	void FocusTypeSelection() override;
 
 private slots:
 	void LogicSelectionChanged(int idx);
 	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

@@ -1,9 +1,6 @@
 #include "macro-condition-macro.hpp"
-
 #include "layout-helpers.hpp"
 #include "macro-action-edit.hpp"
-#include "macro-helpers.hpp"
-#include "macro-ref.hpp"
 #include "macro-signals.hpp"
 #include "macro.hpp"
 
@@ -105,7 +102,7 @@ bool MacroConditionMacro::CheckActionStateCondition()
 	if (!macro) {
 		return false;
 	}
-	if (!IsValidActionIndex(macro.get(), _actionIndex - 1)) {
+	if (!IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1, false)) {
 		return false;
 	}
 	if (_type == Type::ACTION_DISABLED) {
@@ -318,7 +315,6 @@ 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,15 +6,6 @@ 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,
@@ -275,7 +266,6 @@ 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,7 +20,6 @@ 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

@@ -1,7 +1,5 @@
 #include "macro-condition.hpp"
 
-#include "condition-logic.hpp"
-
 namespace advss {
 
 MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
@@ -9,17 +7,6 @@ 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);
@@ -33,10 +20,6 @@ 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;
 }
@@ -56,8 +39,7 @@ void MacroCondition::ValidateLogicSelection(bool isRootCondition,
 		return;
 	}
 
-	_logic.SetType(Logic::Type::AND);
+	_logic.SetType(Logic::Type::NONE);
-	SetEnabled(false);
 	blog(LOG_WARNING,
 	     "setting invalid logic selection to 'ignore' for macro %s",
 	     context);

lib/macro/macro-condition.hpp

@@ -4,19 +4,13 @@
 #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;
 
@@ -34,15 +28,9 @@ 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-settings.cpp

@@ -1,11 +1,8 @@
 #include "macro-dock-settings.hpp"
-
-#include "macro-dock-window.hpp"
 #include "macro-dock.hpp"
-#include "macro-helpers.hpp"
+#include "macro-dock-window.hpp"
 #include "macro.hpp"
 #include "plugin-state-helpers.hpp"
-#include "variable-string.hpp"
 
 #include <obs-frontend-api.h>
 #include <util/platform.h>

lib/macro/macro-dock.cpp

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

lib/macro/macro-edit.cpp

@@ -1,21 +1,17 @@
 #include "macro-edit.hpp"
-
-#include "condition-logic.hpp"
-#include "macro-undo-redo.hpp"
 #include "cursor-shape-changer.hpp"
+#include "macro.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-action-macro.hpp"
 #include "macro-condition-edit.hpp"
-#include "macro-helpers.hpp"
 #include "macro-segment-copy-paste.hpp"
 #include "macro-segment-list.hpp"
 #include "macro-settings.hpp"
 #include "macro-signals.hpp"
-#include "macro.hpp"
 #include "math-helpers.hpp"
 #include "name-dialog.hpp"
-#include "obs-module-helper.hpp"
 #include "path-helpers.hpp"
+#include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
 #include "splitter-helpers.hpp"
 #include "tab-helpers.hpp"
@@ -258,92 +254,6 @@ std::shared_ptr<Macro> MacroEdit::GetMacro() const
 	return _currentMacro;
 }
 
-void MacroEdit::InsertSegmentWidget(SegmentType type, int idx)
-{
-	auto macro = _currentMacro;
-	if (!macro) {
-		return;
-	}
-
-	switch (type) {
-	case SegmentType::ACTION: {
-		if (idx < 0 || idx > (int)macro->Actions().size()) {
-			break;
-		}
-		ui->actionsList->Insert(
-			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
-		SetActionData(*macro);
-		ui->actionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	case SegmentType::ELSE_ACTION: {
-		if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-			break;
-		}
-		ui->elseActionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->ElseActions()[idx]));
-		SetElseActionData(*macro);
-		ui->elseActionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	case SegmentType::CONDITION: {
-		if (idx < 0 || idx > (int)macro->Conditions().size()) {
-			break;
-		}
-		ui->conditionsList->Insert(
-			idx,
-			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       idx == 0));
-		if (idx == 0 && macro->Conditions().size() > 1) {
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(1))
-				->SetRootNode(false);
-		}
-		SetConditionData(*macro);
-		ui->conditionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	}
-}
-
-void MacroEdit::RemoveSegmentWidget(SegmentType type, int idx)
-{
-	auto macro = _currentMacro;
-	if (!macro) {
-		return;
-	}
-
-	switch (type) {
-	case SegmentType::ACTION:
-		if (idx >= 0 &&
-		    idx < ui->actionsList->ContentLayout()->count()) {
-			ui->actionsList->Remove(idx);
-			SetActionData(*macro);
-		}
-		break;
-	case SegmentType::ELSE_ACTION:
-		if (idx >= 0 &&
-		    idx < ui->elseActionsList->ContentLayout()->count()) {
-			ui->elseActionsList->Remove(idx);
-			SetElseActionData(*macro);
-		}
-		break;
-	case SegmentType::CONDITION:
-		if (idx >= 0 &&
-		    idx < ui->conditionsList->ContentLayout()->count()) {
-			ui->conditionsList->Remove(idx);
-			if (idx == 0 && !macro->Conditions().empty()) {
-				static_cast<MacroConditionEdit *>(
-					ui->conditionsList->WidgetAt(0))
-					->SetRootNode(true);
-			}
-			SetConditionData(*macro);
-		}
-		break;
-	}
-}
-
 void MacroEdit::ClearSegmentWidgetCacheFor(Macro *macro) const
 {
 	ui->conditionsList->ClearWidgetsFromCacheFor(macro);
@@ -382,7 +292,7 @@ isValidMacroSegmentIdx(const std::deque<std::shared_ptr<MacroSegment>> &list,
 	return (idx > 0 || (unsigned)idx < list.size());
 }
 
-void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
+void MacroEdit::SetupMacroSegmentSelection(MacroSection type, int idx)
 {
 	auto macro = _currentMacro;
 	if (!macro) {
@@ -395,7 +305,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 	std::deque<std::shared_ptr<MacroSegment>> segments;
 
 	switch (type) {
-	case MacroEdit::SegmentType::CONDITION:
+	case MacroEdit::MacroSection::CONDITIONS:
 		setList = ui->conditionsList;
 		setIdx = &currentConditionIdx;
 		segments = {macro->Conditions().begin(),
@@ -406,7 +316,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 		resetIdx1 = &currentActionIdx;
 		resetIdx2 = &currentElseActionIdx;
 		break;
-	case MacroEdit::SegmentType::ACTION:
+	case MacroEdit::MacroSection::ACTIONS:
 		setList = ui->actionsList;
 		setIdx = &currentActionIdx;
 		segments = {macro->Actions().begin(), macro->Actions().end()};
@@ -416,7 +326,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 		resetIdx1 = &currentConditionIdx;
 		resetIdx2 = &currentElseActionIdx;
 		break;
-	case MacroEdit::SegmentType::ELSE_ACTION:
+	case MacroEdit::MacroSection::ELSE_ACTIONS:
 		setList = ui->elseActionsList;
 		setIdx = &currentElseActionIdx;
 		segments = {macro->ElseActions().begin(),
@@ -456,7 +366,7 @@ static void runSegmentHighlightChecksHelper(MacroSegmentList *list)
 		// highlight its segments if required
 		auto macroAction = dynamic_cast<MacroActionMacro *>(data.get());
 		if (macroAction &&
-		    macroAction->GetAction() ==
+		    macroAction->_action ==
 			    MacroActionMacro::Action::NESTED_MACRO) {
 			continue;
 		}
@@ -508,7 +418,8 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx)
 	ui->actionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
+						    actions[afterIdx]->GetId());
 		ui->actionsList->Add(newEntry);
 	}
 
@@ -533,7 +444,8 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx)
 	ui->elseActionsList->SetVisibilityCheckEnable(false);
 
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
+						    actions[afterIdx]->GetId());
 		ui->elseActionsList->Add(newEntry);
 	}
 
@@ -560,7 +472,8 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
 
 	for (; afterIdx < conditions.size(); afterIdx++) {
 		auto newEntry = new MacroConditionEdit(
-			this, &conditions[afterIdx], root);
+			this, &conditions[afterIdx],
+			conditions[afterIdx]->GetId(), root);
 		ui->conditionsList->Add(newEntry);
 		root = false;
 	}
@@ -740,18 +653,6 @@ void MacroEdit::HighlightCondition(int idx, QColor color) const
 	ui->conditionsList->Highlight(idx, color);
 }
 
-void MacroEdit::ScrollAndFocusNewSegment(MacroSegmentList *list, int newIdx,
-					 int *currentIdx)
-{
-	QTimer::singleShot(0, this, [this, list, newIdx, currentIdx]() {
-		list->ensureWidgetVisible(list->WidgetAt(*currentIdx));
-		auto *widget = list->WidgetAt(newIdx);
-		if (widget) {
-			widget->FocusTypeSelection();
-		}
-	});
-}
-
 static void resetSegmentHighlights(MacroSegmentList *list)
 {
 	MacroSegmentEdit *widget = nullptr;
@@ -1052,7 +953,7 @@ void MacroEdit::UpMacroSegmentHotkey()
 	int conditionSize = macro->Conditions().size();
 
 	if (currentActionIdx == -1 && currentConditionIdx == -1) {
-		if (lastInteracted == SegmentType::CONDITION) {
+		if (lastInteracted == MacroSection::CONDITIONS) {
 			if (conditionSize == 0) {
 				MacroActionSelectionChanged(0);
 			} else {
@@ -1108,7 +1009,7 @@ void MacroEdit::DownMacroSegmentHotkey()
 	int conditionSize = macro->Conditions().size();
 
 	if (currentActionIdx == -1 && currentConditionIdx == -1) {
-		if (lastInteracted == SegmentType::CONDITION) {
+		if (lastInteracted == MacroSection::CONDITIONS) {
 			if (conditionSize == 0) {
 				MacroActionSelectionChanged(0);
 			} else {
@@ -1171,13 +1072,6 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	}
-
 	{
 		auto lock = LockContext();
 		macro->Actions().emplace(macro->Actions().begin() + idx,
@@ -1186,22 +1080,16 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 			macro->Actions().at(idx)->Load(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		macro->UpdateActionIndices();
 		ui->actionsList->Insert(
-			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
+			idx,
+			new MacroActionEdit(this, &macro->Actions()[idx], id));
 		SetActionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	} else {
-		RegisterSegmentAddUndoRedo(macro, SegmentType::ACTION, idx);
-	}
 	HighlightAction(idx);
 	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
-
-	ScrollAndFocusNewSegment(ui->actionsList, idx, &currentActionIdx);
 }
 
 void MacroEdit::AddMacroAction(int idx)
@@ -1229,9 +1117,6 @@ 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()
@@ -1262,24 +1147,6 @@ void MacroEdit::RemoveMacroAction(int idx)
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	} else {
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		{
-			auto lock = LockContext();
-			macro->Actions().at(idx)->Save(segData);
-			segId = macro->Actions().at(idx)->GetId();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(), SegmentType::ACTION,
-					      idx, segId, segData,
-					      (int)Logic::Type::ROOT_NONE);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->actionsList->Remove(idx);
@@ -1289,11 +1156,8 @@ void MacroEdit::RemoveMacroAction(int idx)
 		macro->UpdateActionIndices();
 		SetActionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	}
 	MacroActionSelectionChanged(-1);
-	lastInteracted = SegmentType::ACTION;
+	lastInteracted = MacroSection::ACTIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1473,7 +1337,7 @@ void MacroEdit::MoveMacroActionDown(int idx)
 
 void MacroEdit::MacroElseActionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::ELSE_ACTION, idx);
+	SetupMacroSegmentSelection(MacroSection::ELSE_ACTIONS, idx);
 }
 
 void MacroEdit::MacroElseActionReorder(int to, int from)
@@ -1510,13 +1374,6 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	}
-
 	{
 		auto lock = LockContext();
 		macro->ElseActions().emplace(macro->ElseActions().begin() + idx,
@@ -1526,25 +1383,16 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		macro->UpdateElseActionIndices();
 		ui->elseActionsList->Insert(
-			idx,
+			idx, new MacroActionEdit(
-			new MacroActionEdit(this, &macro->ElseActions()[idx]));
+				     this, &macro->ElseActions()[idx], id));
 		SetElseActionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	} else {
-		RegisterSegmentAddUndoRedo(macro, SegmentType::ELSE_ACTION,
-					   idx);
-	}
 	HighlightElseAction(idx);
 	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
-
-	ScrollAndFocusNewSegment(ui->elseActionsList, idx,
-				 &currentElseActionIdx);
 }
 
 void MacroEdit::AddMacroElseAction(int idx)
@@ -1572,9 +1420,6 @@ 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)
@@ -1588,25 +1433,6 @@ void MacroEdit::RemoveMacroElseAction(int idx)
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	} else {
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		{
-			auto lock = LockContext();
-			macro->ElseActions().at(idx)->Save(segData);
-			segId = macro->ElseActions().at(idx)->GetId();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(),
-					      SegmentType::ELSE_ACTION, idx,
-					      segId, segData,
-					      (int)Logic::Type::ROOT_NONE);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->elseActionsList->Remove(idx);
@@ -1616,11 +1442,8 @@ void MacroEdit::RemoveMacroElseAction(int idx)
 		macro->UpdateElseActionIndices();
 		SetElseActionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	}
 	MacroElseActionSelectionChanged(-1);
-	lastInteracted = SegmentType::ELSE_ACTION;
+	lastInteracted = MacroSection::ELSE_ACTIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1681,7 +1504,7 @@ void MacroEdit::MoveMacroElseActionDown(int idx)
 
 void MacroEdit::MacroActionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::ACTION, idx);
+	SetupMacroSegmentSelection(MacroSection::ACTIONS, idx);
 }
 
 void MacroEdit::MacroActionReorder(int to, int from)
@@ -1741,9 +1564,6 @@ 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,
@@ -1754,13 +1574,6 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	}
-
 	{
 		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
@@ -1770,25 +1583,18 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 			macro->Conditions().at(idx)->Load(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		(*cond)->SetLogicType(logic);
 		macro->UpdateConditionIndices();
 		ui->conditionsList->Insert(
 			idx,
 			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       idx == 0));
+					       id, idx == 0));
 		SetConditionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	} else {
-		RegisterSegmentAddUndoRedo(macro, SegmentType::CONDITION, idx);
-	}
 	HighlightCondition(idx);
 	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
-
-	ScrollAndFocusNewSegment(ui->conditionsList, idx, &currentConditionIdx);
 }
 
 void MacroEdit::on_conditionAdd_clicked()
@@ -1819,26 +1625,6 @@ void MacroEdit::RemoveMacroCondition(int idx)
 		return;
 	}
 
-	Macro *const parentMacro = macro->GetNestedParentMacro();
-	OBSDataAutoRelease parentBeforeData;
-	if (parentMacro) {
-		parentBeforeData = obs_data_create();
-		parentMacro->Save(parentBeforeData);
-	} else {
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		int logic;
-		{
-			auto lock = LockContext();
-			macro->Conditions().at(idx)->Save(segData);
-			segId = macro->Conditions().at(idx)->GetId();
-			logic = (int)macro->Conditions().at(idx)->GetLogicType();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(),
-					      SegmentType::CONDITION, idx,
-					      segId, segData, logic);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->conditionsList->Remove(idx);
@@ -1853,11 +1639,8 @@ void MacroEdit::RemoveMacroCondition(int idx)
 		}
 		SetConditionData(*macro);
 	}
-	if (parentMacro) {
-		RegisterMacroModifyUndoRedo(parentMacro, parentBeforeData);
-	}
 	MacroConditionSelectionChanged(-1);
-	lastInteracted = SegmentType::CONDITION;
+	lastInteracted = MacroSection::CONDITIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1982,7 +1765,7 @@ void MacroEdit::MoveMacroConditionDown(int idx)
 
 void MacroEdit::MacroConditionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::CONDITION, idx);
+	SetupMacroSegmentSelection(MacroSection::CONDITIONS, idx);
 }
 
 void MacroEdit::MacroConditionReorder(int to, int from)
@@ -2043,13 +1826,6 @@ bool MacroEdit::IsEmpty() const
 	       ui->elseActionsList->IsEmpty();
 }
 
-void MacroEdit::HideElseSection() const
-{
-	ui->toggleElseActions->setVisible(false);
-	ui->macroElseActions->setMaximumHeight(0);
-	ui->macroElseActionSplitter->handle(1)->setCursor(Qt::ArrowCursor);
-}
-
 void MacroEdit::ShowAllMacroSections()
 {
 	if (!ElseSectionIsVisible()) {

lib/macro/macro-edit.hpp

@@ -8,19 +8,18 @@ namespace advss {
 class Macro;
 class MacroSegment;
 
+/*******************************************************************************
+ * Advanced Scene Switcher window
+ *******************************************************************************/
 class MacroEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	enum class SegmentType { CONDITION, ACTION, ELSE_ACTION };
-
 	MacroEdit(QWidget *parent, QStringList helpMsg = {});
 	void SetMacro(const std::shared_ptr<Macro> &);
 	std::shared_ptr<Macro> GetMacro() const;
 	void ClearSegmentWidgetCacheFor(Macro *) const;
 	void SetControlsDisabled(bool disable) const;
-	void InsertSegmentWidget(SegmentType type, int idx);
-	void RemoveSegmentWidget(SegmentType type, int idx);
 	void HighlightAction(int idx, QColor color = QColor(Qt::green)) const;
 	void HighlightElseAction(int idx,
 				 QColor color = QColor(Qt::green)) const;
@@ -38,7 +37,6 @@ public:
 	void PasteMacroSegment();
 	bool IsEmpty() const;
 	void ShowAllMacroSections();
-	void HideElseSection() const;
 
 private slots:
 	void on_conditionAdd_clicked();
@@ -116,12 +114,12 @@ protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
+	enum class MacroSection { CONDITIONS, ACTIONS, ELSE_ACTIONS };
+
 	void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroElseActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
-	void ScrollAndFocusNewSegment(MacroSegmentList *list, int newIdx,
+	void SetupMacroSegmentSelection(MacroSection type, int idx);
-				      int *currentIdx);
-	void SetupMacroSegmentSelection(SegmentType type, int idx);
 	void
 	SetupContextMenu(const QPoint &pos,
 			 const std::function<void(MacroEdit *, int)> &remove,
@@ -133,7 +131,7 @@ private:
 	void RunSegmentHighlightChecks();
 	bool ElseSectionIsVisible() const;
 
-	SegmentType lastInteracted = SegmentType::CONDITION;
+	MacroSection lastInteracted = MacroSection::CONDITIONS;
 	int currentConditionIdx = -1;
 	int currentActionIdx = -1;
 	int currentElseActionIdx = -1;

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

@@ -1,89 +0,0 @@
-#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

@@ -1,17 +0,0 @@
-#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

@@ -1,41 +0,0 @@
-#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,183 +1,22 @@
 #include "macro-export-import-dialog.hpp"
-#include "macro-export-extensions.hpp"
 #include "obs-module-helper.hpp"
-#include "section.hpp"
 
 #include <obs.hpp>
-#include <QDialogButtonBox>
-#include <QLabel>
 #include <QLayout>
-#include <QScrollArea>
+#include <QLabel>
-#include <QSplitter>
+#include <QDialogButtonBox>
-#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
-// ---------------------------------------------------------------------------
-
-QWidget *MacroExportImportDialog::BuildExtensionWidget()
-{
-	auto wrapper = new QWidget(this);
-	auto wrapperLayout = new QVBoxLayout(wrapper);
-	wrapperLayout->setContentsMargins(0, 0, 0, 0);
-	wrapperLayout->setSpacing(4);
-
-	wrapperLayout->addWidget(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();
-
-	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));
-			_extensionOrder.push_back(extIdx);
-			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.
-		auto items = ext.getExportItems();
-		if (items.isEmpty()) {
-			continue;
-		}
-
-		std::sort(items.begin(), items.end(),
-			  [](const QPair<QString, QString> &a,
-			     const QPair<QString, QString> &b) {
-				  return QString::localeAwareCompare(
-						 a.second, b.second) < 0;
-			  });
-
-		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, true);
-		outerLayout->addWidget(innerSection);
-		_extensionUIs.append(std::move(ui));
-		_extensionOrder.push_back(extIdx);
-	}
-
-	outerLayout->addStretch();
-
-	auto scrollArea = new QScrollArea(wrapper);
-	scrollArea->setWidget(outerContent);
-	scrollArea->setWidgetResizable(true);
-	scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	scrollArea->setFrameShape(QFrame::NoFrame);
-	wrapperLayout->addWidget(scrollArea);
-
-	return wrapper;
-}
-
-// ---------------------------------------------------------------------------
-// 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"
@@ -200,90 +39,40 @@ MacroExportImportDialog::MacroExportImportDialog(Type type,
 	connect(_usePlainText, &QCheckBox::stateChanged, this,
 		&MacroExportImportDialog::UsePlainTextChanged);
 
-	auto layout = new QVBoxLayout(this);
+	auto layout = new QVBoxLayout;
-
+	layout->addWidget(label);
-	if (type == Type::EXPORT_MACRO && !GetMacroExportExtensions().empty()) {
+	layout->addWidget(_importExportString);
-		auto splitter = new QSplitter(Qt::Vertical, this);
+	layout->addWidget(_usePlainText);
-		splitter->setChildrenCollapsible(false);
-		splitter->addWidget(BuildExtensionWidget());
-
-		auto textWidget = new QWidget(splitter);
-		auto textLayout = new QVBoxLayout(textWidget);
-		textLayout->setContentsMargins(0, 0, 0, 0);
-		textLayout->addWidget(label);
-		textLayout->addWidget(_importExportString);
-		textLayout->addWidget(_usePlainText);
-		splitter->addWidget(textWidget);
-
-		layout->addWidget(splitter);
-	} else {
-		layout->addWidget(label);
-		layout->addWidget(_importExportString);
-		layout->addWidget(_usePlainText);
-	}
-
 	layout->addWidget(buttons);
 	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
 {
-	OBSDataAutoRelease data =
+	QByteArray inputData = input.toUtf8();
-		obs_data_create_from_json(_baseJson.toStdString().c_str());
+	auto compressedData = qCompress(inputData);
-	if (!data) {
+	QByteArray encodedData = compressedData.toBase64();
-		return _baseJson;
+	return QString::fromUtf8(encodedData);
-	}
-
-	const auto &extensions = GetMacroExportExtensions();
-	for (int i = 0; i < (int)_extensionUIs.size(); ++i) {
-		const auto &ui = _extensionUIs[i];
-
-		QStringList selectedIds;
-		if (ui.itemChecks.isEmpty()) {
-			if (!ui.mainCheck->isChecked()) {
-				continue;
-			}
-		} else {
-			for (const auto &[id, cb] : ui.itemChecks) {
-				if (cb->isChecked()) {
-					selectedIds << id;
-				}
-			}
-			if (selectedIds.isEmpty()) {
-				continue;
-			}
-		}
-
-		extensions[_extensionOrder[i]].save(data, selectedIds);
-	}
-
-	const char *json = obs_data_get_json(data);
-	return json ? QString::fromUtf8(json) : QString{};
 }
 
-void MacroExportImportDialog::RefreshExportText()
+QString decompressMacroString(const QString &input)
 {
-	const QString json = BuildExportJson();
+	QByteArray encodedData = input.toUtf8();
-	if (usePlainText) {
+	QByteArray compressedData = QByteArray::fromBase64(encodedData);
-		_importExportString->setPlainText(json);
+	auto outputData = qUncompress(compressedData);
-	} else {
+	return QString::fromUtf8(outputData);
-		_importExportString->setPlainText(compressMacroString(json));
-	}
 }
 
-void MacroExportImportDialog::UpdateExportString()
+void MacroExportImportDialog::ExportMacros(const QString &json)
 {
-	RefreshExportText();
+	MacroExportImportDialog dialog(
+		MacroExportImportDialog::Type::EXPORT_MACRO);
+	dialog._importExportString->setPlainText(compressMacroString(json));
+	dialog.adjustSize();
+	dialog.updateGeometry();
+	dialog.exec();
 }
 
 void MacroExportImportDialog::UsePlainTextChanged(int value)
@@ -301,45 +90,26 @@ void MacroExportImportDialog::UsePlainTextChanged(int value)
 	usePlainText = value;
 }
 
-// ---------------------------------------------------------------------------
+static bool isValidData(const QString &json)
-// Static entry points
-// ---------------------------------------------------------------------------
-
-void MacroExportImportDialog::ExportMacros(obs_data_t *macroData)
 {
-	const char *rawJson = obs_data_get_json(macroData);
+	OBSDataAutoRelease data =
-	const QString baseJson = rawJson ? QString::fromUtf8(rawJson)
+		obs_data_create_from_json(json.toStdString().c_str());
-					 : QString{};
+	return !!data;
-
-	MacroExportImportDialog dialog(Type::EXPORT_MACRO, baseJson);
-	dialog.adjustSize();
-	dialog.updateGeometry();
-	dialog.exec();
 }
 
 bool MacroExportImportDialog::ImportMacros(QString &json)
 {
-	MacroExportImportDialog dialog(Type::IMPORT_MACRO);
+	MacroExportImportDialog dialog(
-	if (dialog.exec() != QDialog::Accepted) {
+		MacroExportImportDialog::Type::IMPORT_MACRO);
-		return false;
+	if (dialog.exec() == QDialog::Accepted) {
-	}
+		json = decompressMacroString(
-
+			dialog._importExportString->toPlainText());
-	json = decompressMacroString(dialog._importExportString->toPlainText());
+		if (!isValidData(json)) { // Fallback to support raw json format
-	if (!isValidData(json)) {
+			json = dialog._importExportString->toPlainText();
-		// 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;
 	}
-
+	return false;
-	return true;
 }
 
 } // namespace advss

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

@@ -1,47 +1,25 @@
 #pragma once
-
 #include <QCheckBox>
 #include <QDialog>
-#include <QList>
 #include <QPlainTextEdit>
 
-#include <obs-data.h>
-#include <vector>
-
 namespace advss {
 
 class MacroExportImportDialog : public QDialog {
 	Q_OBJECT
 public:
 	enum class Type { EXPORT_MACRO, IMPORT_MACRO };
+	MacroExportImportDialog(Type type);
 
-	static void ExportMacros(obs_data_t *macroData);
+	static void ExportMacros(const QString &json);
 	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;
-	};
-
-	QWidget *BuildExtensionWidget();
-	QString BuildExportJson() const;
-	void RefreshExportText();
-
-	QString _baseJson;
 	QPlainTextEdit *_importExportString;
 	QCheckBox *_usePlainText;
-	QList<ExtensionUI> _extensionUIs;
-	std::vector<int> _extensionOrder;
 };
 
 } // namespace advss

lib/macro/macro-helpers.cpp

@@ -1,6 +1,5 @@
 #include "macro-helpers.hpp"
 #include "macro.hpp"
-#include "macro-action-macro.hpp"
 #include "plugin-state-helpers.hpp"
 
 namespace advss {
@@ -9,87 +8,6 @@ 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)
 {
@@ -99,15 +17,6 @@ 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)
 {
@@ -117,32 +26,9 @@ GetMacroConditions(Macro *macro)
 	return macro->Conditions();
 }
 
-bool IsGroupMacro(Macro *macro)
+std::string_view GetSceneSwitchActionId()
 {
-	return macro && macro->IsGroup();
+	return MacroAction::GetDefaultID();
-}
-
-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()
@@ -214,20 +100,6 @@ 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)
@@ -251,20 +123,9 @@ void AddMacroHelperThread(Macro *macro, std::thread &&newThread)
 	macro->AddHelperThread(std::move(newThread));
 }
 
-bool RunMacroActions(Macro *macro, bool forceParallel, bool ignorePause)
+bool RunMacroActions(Macro *macro)
 {
-	return macro && macro->PerformActions(true, forceParallel, ignorePause);
+	return macro && macro->PerformActions(true);
-}
-
-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)
@@ -283,42 +144,20 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }
 
-bool IsValidActionIndex(const Macro *m, const int idx)
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
 {
 	if (!m || idx < 0) {
 		return false;
 	}
-
+	if (isCondition) {
-	if (idx >= (int)m->Actions().size()) {
+		if (idx >= (int)m->Conditions().size()) {
-		return false;
+			return false;
+		}
+	} else {
+		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,13 +1,12 @@
 #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;
@@ -19,25 +18,16 @@ class Macro;
 class MacroAction;
 class MacroCondition;
 
-static const int macro_func = 10;
+EXPORT std::deque<std::shared_ptr<Macro>> &GetMacros();
-
-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 *);
 
-EXPORT bool IsGroupMacro(Macro *);
+std::string_view GetSceneSwitchActionId();
-EXPORT std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *);
+
+constexpr auto macro_func = 10;
 
 EXPORT std::condition_variable &GetMacroWaitCV();
 EXPORT std::condition_variable &GetMacroTransitionCV();
@@ -58,8 +48,6 @@ 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 &);
@@ -68,16 +56,10 @@ 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 *, bool forceParallel = false,
+EXPORT bool RunMacroActions(Macro *);
-			    bool ignorePause = false);
-EXPORT bool RunMacroElseActions(Macro *, bool forceParallel = false,
-				bool ignorePause = false);
 EXPORT bool RunMacros();
-
+void StopAllMacros();
-void SignalStopAllMacros();
-void WaitForAllMacros();
 
 EXPORT void LoadMacros(obs_data_t *obj);
 EXPORT void SaveMacros(obs_data_t *obj);
@@ -86,8 +68,6 @@ EXPORT void InvalidateMacroTempVarValues();
 EXPORT void ResetMacroConditionTimers(Macro *);
 EXPORT void ResetMacroRunCount(Macro *);
 
-bool IsValidActionIndex(const Macro *m, const int idx);
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition);
-bool IsValidElseActionIndex(const Macro *m, const int idx);
-bool IsValidConditionIndex(const Macro *m, const int idx);
 
 } // namespace advss

lib/macro/macro-ref.cpp

@@ -1,8 +1,5 @@
 #include "macro-ref.hpp"
-
-#include "macro-helpers.hpp"
 #include "macro.hpp"
-#include "plugin-state-helpers.hpp"
 
 namespace advss {
 
@@ -22,7 +19,6 @@ 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()
@@ -75,11 +71,11 @@ void LoadMacroList(obs_data_t *obj, std::vector<MacroRef> &macros,
 {
 	obs_data_array_t *array = obs_data_get_array(obj, name.c_str());
 	size_t count = obs_data_array_count(array);
-	macros.reserve(macros.size() + count);
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj = obs_data_array_item(array, i);
-		macros.emplace_back();
+		MacroRef ref;
-		macros.back().Load(array_obj);
+		ref.Load(array_obj);
+		macros.push_back(ref);
 		obs_data_release(array_obj);
 	}
 	obs_data_array_release(array);

lib/macro/macro-run-button.cpp

@@ -108,7 +108,7 @@ void MacroRunButton::Pressed()
 	const bool abortMacro = DisplayMessage(
 		err.arg(QString::fromStdString(macro->Name())), true);
 	if (abortMacro) {
-		macro->SignalStop();
+		macro->Stop();
 	}
 }
 

lib/macro/macro-search.cpp

@@ -1,323 +0,0 @@
-#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

@@ -1,43 +0,0 @@
-#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

@@ -1,7 +1,5 @@
 #include "macro-segment-copy-paste.hpp"
-
 #include "advanced-scene-switcher.hpp"
-#include "condition-logic.hpp"
 #include "macro.hpp"
 
 #include <QShortcut>
@@ -74,24 +72,15 @@ 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-list.cpp

@@ -201,8 +201,6 @@ bool MacroSegmentList::PopulateWidgetsFromCache(const Macro *macro)
 		_contentLayout->addWidget(widget);
 		widget->show();
 	}
-	// Widgets are now owned by the layout again, so the cache entry is stale.
-	_widgetCache.erase(it);
 
 	adjustSize();
 	updateGeometry();
@@ -465,17 +463,7 @@ void MacroSegmentList::SetupVisibleMacroSegmentWidgets()
 
 	const auto viewportRect = viewport()->rect();
 
-	for (int i = 0; i < _contentLayout->count(); ++i) {
+	for (auto segment : widget()->findChildren<MacroSegmentEdit *>()) {
-		auto item = _contentLayout->itemAt(i);
-		if (!item) {
-			continue;
-		}
-
-		auto segment = dynamic_cast<MacroSegmentEdit *>(item->widget());
-		if (!segment) {
-			continue;
-		}
-
 		const auto pos = segment->mapTo(viewport(), QPoint(0, 0));
 		const QRect rect(pos, segment->size());
 		if (!viewportRect.intersects(rect)) {

lib/macro/macro-segment-selection.cpp

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

lib/macro/macro-segment.cpp

@@ -1,119 +1,32 @@
 #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>
-#include <QFrame>
 #include <QGraphicsOpacityEffect>
 #include <QLabel>
 #include <QMouseEvent>
-#include <QPushButton>
 #include <QScrollBar>
-#include <QVBoxLayout>
 
 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", 2);
+	obs_data_set_int(data, "version", 1);
-
-	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;
 }
@@ -122,7 +35,6 @@ 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);
@@ -133,26 +45,6 @@ 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;
 }
@@ -260,16 +152,6 @@ 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)
 {
@@ -329,38 +211,11 @@ 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);
@@ -422,21 +277,6 @@ 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

@@ -7,27 +7,17 @@
 #include "sync-helpers.hpp"
 #include "temp-variable.hpp"
 
+#include <QWidget>
+#include <QFrame>
+#include <QVBoxLayout>
+#include <QTimer>
 #include <obs-data.h>
 
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QWidget>
-
-#include <memory>
-
-class QFrame;
 class QLabel;
-class QVBoxLayout;
 
 namespace advss {
 
 class Macro;
-class Variable;
-
-struct VarMapping {
-	TempVariableRef tempVar;
-	std::weak_ptr<Variable> variable;
-};
 
 class EXPORT MacroSegment : public Lockable {
 public:
@@ -38,15 +28,12 @@ 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;
@@ -55,11 +42,6 @@ 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 *);
@@ -72,7 +54,6 @@ 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<
@@ -83,14 +64,6 @@ 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>
@@ -104,7 +77,6 @@ private:
 	// UI helper
 	bool _highlight = false;
 	bool _collapsed = false;
-	bool _varMappingExpanded = false;
 	bool _enabled = true;
 
 	// Custom header labels
@@ -117,7 +89,6 @@ private:
 	int _variableRefs = 0;
 	std::string _variableValue;
 	std::vector<TempVariable> _tempVariables;
-	std::vector<VarMapping> _varMappings;
 
 	friend class Macro;
 };
@@ -136,13 +107,9 @@ public:
 	void SetSelected(bool);
 	virtual std::shared_ptr<MacroSegment> Data() const = 0;
 	virtual void SetupWidgets(bool basicSetup = false) = 0;
-	virtual void FocusTypeSelection() {}
-
-	void SetupVarMappings(MacroSegment *segment);
 
 public slots:
 	void HeaderInfoChanged(const QString &);
-	void ShowVariableMappings(bool show);
 
 protected slots:
 	void Collapsed(bool) const;
@@ -157,8 +124,6 @@ protected:
 	QLabel *_headerInfo;
 	QWidget *_frame;
 	QVBoxLayout *_contentLayout;
-	TempVarOutputMappingsWidget *_outputMappings;
-	QPushButton *_varMappingToggle;
 	bool _allWidgetsAreSetup = false;
 
 private:

lib/macro/macro-selection.cpp

@@ -1,11 +1,8 @@
 #include "macro-selection.hpp"
-
 #include "advanced-scene-switcher.hpp"
 #include "layout-helpers.hpp"
-#include "macro-helpers.hpp"
-#include "macro-ref.hpp"
-#include "macro-signals.hpp"
 #include "macro.hpp"
+#include "macro-signals.hpp"
 #include "ui-helpers.hpp"
 
 #include <QDialogButtonBox>
@@ -17,7 +14,10 @@ MacroSelection::MacroSelection(QWidget *parent)
 	: FilterComboBox(parent,
 			 obs_module_text("AdvSceneSwitcher.selectMacro"))
 {
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : GetMacros()) {
+		if (m->IsGroup()) {
+			continue;
+		}
 		addItem(QString::fromStdString(m->Name()));
 	}
 
@@ -54,7 +54,6 @@ void MacroSelection::HideSelectedMacro()
 		return;
 	}
 
-#ifndef UNIT_TEST
 	const auto m = ssWindow->ui->macros->GetCurrentMacro();
 	if (!m) {
 		return;
@@ -65,23 +64,6 @@ 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,7 +15,6 @@ 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,7 +18,6 @@ signals:
 	void Remove(const QString &);
 	void SegmentOrderChanged();
 	void HighlightChanged(bool value);
-	void ConditionTypeCreated(const QString &typeId);
 
 private:
 	MacroSignalManager(QObject *parent = nullptr);