Fix system tray warning not being translated

* Use GetSettingsWindow() instead of window() to avoid connecting to the
  wrong widget
* Fix typos

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -2,7 +2,7 @@
 # https://github.com/obsproject/.github/tree/master/.github/ISSUE_TEMPLATE
 
 name: Feature request
-description: Suggest an idea for this projectReport a bug or crash
+description: Suggest an idea for this project
 body:
 - type: markdown
   id: md_welcome

.github/scripts/.Aptfile

@@ -12,4 +12,7 @@ package 'libtesseract-dev'
 package 'libproc2-dev'
 package 'libusb-1.0-0-dev'
 package 'libpaho-mqttpp-dev'
-package 'libpaho-mqtt-dev'
+package 'libpaho-mqtt-dev'
+package 'libpaho-mqtt-dev'
+package 'libasound2-dev'
+package 'libpipewire-0.3-dev'

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.26)
+cmake_minimum_required(VERSION 3.21...3.26)
 
 project(advanced-scene-switcher VERSION 1.0.0)
 
@@ -103,8 +103,6 @@ target_sources(
           lib/macro/macro-action-macro.hpp
           lib/macro/macro-action-queue.cpp
           lib/macro/macro-action-queue.hpp
-          lib/macro/macro-action-script.cpp
-          lib/macro/macro-action-script.hpp
           lib/macro/macro-action-variable.cpp
           lib/macro/macro-action-variable.hpp
           lib/macro/macro-action.cpp
@@ -117,8 +115,6 @@ target_sources(
           lib/macro/macro-condition-macro.hpp
           lib/macro/macro-condition-queue.cpp
           lib/macro/macro-condition-queue.hpp
-          lib/macro/macro-condition-script.cpp
-          lib/macro/macro-condition-script.hpp
           lib/macro/macro-condition-tempvar.cpp
           lib/macro/macro-condition-tempvar.hpp
           lib/macro/macro-condition-variable.cpp
@@ -127,6 +123,8 @@ target_sources(
           lib/macro/macro-condition.hpp
           lib/macro/macro-dock.cpp
           lib/macro/macro-dock.hpp
+          lib/macro/macro-edit.cpp
+          lib/macro/macro-edit.hpp
           lib/macro/macro-export-import-dialog.cpp
           lib/macro/macro-export-import-dialog.hpp
           lib/macro/macro-helpers.cpp
@@ -139,14 +137,10 @@ target_sources(
           lib/macro/macro-ref.hpp
           lib/macro/macro-run-button.cpp
           lib/macro/macro-run-button.hpp
-          lib/macro/macro-script-handler.cpp
-          lib/macro/macro-script-handler.hpp
           lib/macro/macro-segment-copy-paste.cpp
           lib/macro/macro-segment-copy-paste.hpp
           lib/macro/macro-segment-list.cpp
           lib/macro/macro-segment-list.hpp
-          lib/macro/macro-segment-script.cpp
-          lib/macro/macro-segment-script.hpp
           lib/macro/macro-segment-selection.cpp
           lib/macro/macro-segment-selection.hpp
           lib/macro/macro-segment.cpp
@@ -223,17 +217,14 @@ target_sources(
           lib/utils/plugin-state-helpers.hpp
           lib/utils/priority-helper.cpp
           lib/utils/priority-helper.hpp
-          lib/utils/properties-view.cpp
-          lib/utils/properties-view.hpp
-          lib/utils/properties-view.moc.hpp
           lib/utils/regex-config.cpp
           lib/utils/regex-config.hpp
+          lib/utils/resizable-widget.cpp
+          lib/utils/resizable-widget.hpp
           lib/utils/resizing-text-edit.cpp
           lib/utils/resizing-text-edit.hpp
           lib/utils/resource-table.cpp
           lib/utils/resource-table.hpp
-          lib/utils/resource-table-hotkey-handler.cpp
-          lib/utils/resource-table-hotkey-handler.hpp
           lib/utils/scene-selection.cpp
           lib/utils/scene-selection.hpp
           lib/utils/scene-switch-helpers.cpp
@@ -428,6 +419,7 @@ else()
   set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
   set_target_properties(${LIB_NAME} PROPERTIES SOVERSION 1)
 
+  find_package(Qt6 REQUIRED COMPONENTS DBus)
   find_package(X11 REQUIRED COMPONENTS Xss)
   target_include_directories(${LIB_NAME} PRIVATE "${X11_INCLUDE_DIR}"
                                                  "${X11_Xss_INCLUDE_PATH}")
@@ -459,7 +451,8 @@ else()
     )
   endif()
   target_include_directories(${LIB_NAME} PRIVATE "${PROC_INCLUDE_DIR}")
-  target_sources(${LIB_NAME} PRIVATE lib/linux/advanced-scene-switcher-nix.cpp)
+  target_sources(${LIB_NAME} PRIVATE lib/linux/advanced-scene-switcher-nix.cpp
+                                     lib/linux/kwin-helpers.cpp)
 
   # Don't include irrelevant folders into sources archive
   list(APPEND CPACK_SOURCE_IGNORE_FILES "\\.deps/.*")

cmake/windows/helpers.cmake

@@ -80,6 +80,8 @@ function(set_target_properties_plugin target)
 
   configure_file(cmake/windows/resources/installer-Windows.iss.in
                  "${CMAKE_CURRENT_BINARY_DIR}/installer-Windows.generated.iss")
+  configure_file(data/res/images/logo.ico
+                 "${CMAKE_CURRENT_BINARY_DIR}/installer.ico" COPYONLY)
 
   configure_file(cmake/windows/resources/resource.rc.in
                  "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.rc")

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

@@ -20,6 +20,8 @@ OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 DirExistsWarning=no
+SetupIconFile=installer.ico
+UninstallDisplayIcon={app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"

data/locale/de-DE.ini

@@ -40,7 +40,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exportieren"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importieren"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exportiere Erweiterter Automatischer Szenenwechsler Einstellungen zu Datei ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Exportiere Erweiterter Automatischer Szenenwechsler Einstellungen von Datei ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text Dateien (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text Dateien (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Importieren der Einstellungen ist fehlgeschlagen"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Einstellungen wurden erfolgreich importiert"
 AdvSceneSwitcher.generalTab.priority.fileContent="Datei Inhalt"

data/locale/en-US.ini

@@ -53,7 +53,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Export"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Import"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Export Advanced Scene Switcher settings to file ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Import Advanced Scene Switcher settings from file ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text files (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text files (*.txt);;JSON files (*.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Advanced Scene Switcher failed to import settings"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Advanced Scene Switcher settings imported successfully"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportSensitiveDataWarning="Warning:\nThe exported data might contain sensitive information!"
@@ -150,9 +150,9 @@ AdvSceneSwitcher.macroTab.title="Macro"
 AdvSceneSwitcher.macroTab.macros="Macros"
 AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
-AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define Macro conditions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new condition."
-AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define Macro actions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new action."
-AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define Macro actions, which are executed if the conditions are *not* met.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new action."
+AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define macro conditions.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new condition."
+AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
+AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
 AdvSceneSwitcher.macroTab.edit="Edit macro"
 AdvSceneSwitcher.macroTab.edit.logic="Logic type:"
 AdvSceneSwitcher.macroTab.edit.condition="Condition type:"
@@ -177,6 +177,8 @@ AdvSceneSwitcher.macroTab.contextMenuAdd="Add"
 AdvSceneSwitcher.macroTab.copy="Duplicate Macro"
 AdvSceneSwitcher.macroTab.group="Group Selected Macros"
 AdvSceneSwitcher.macroTab.ungroup="Ungroup Selected Groups"
+AdvSceneSwitcher.macroTab.expandAllGroups="Expand all Groups"
+AdvSceneSwitcher.macroTab.collapseAllGroups="Collapse all Groups"
 AdvSceneSwitcher.macroTab.rename="Rename"
 AdvSceneSwitcher.macroTab.remove="Remove"
 AdvSceneSwitcher.macroTab.export="Export"
@@ -507,6 +509,7 @@ AdvSceneSwitcher.condition.source.type.showing="Is showing"
 AdvSceneSwitcher.condition.source.type.settingsMatch="Settings match"
 AdvSceneSwitcher.condition.source.type.settingsChanged="Settings changed"
 AdvSceneSwitcher.condition.source.type.individualSettingMatches="Setting value matches"
+AdvSceneSwitcher.condition.source.type.individualSettingListSelectionMatches="Settings value list selection matches"
 AdvSceneSwitcher.condition.source.type.individualSettingChanged="Setting value changed"
 AdvSceneSwitcher.condition.source.type.width="Width"
 AdvSceneSwitcher.condition.source.type.height="Height"
@@ -515,6 +518,7 @@ AdvSceneSwitcher.condition.source.sizeCompare.equal="Equals"
 AdvSceneSwitcher.condition.source.sizeCompare.more="Bigger than"
 AdvSceneSwitcher.condition.source.refresh="Refresh"
 AdvSceneSwitcher.condition.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
+AdvSceneSwitcher.condition.source.includeDefaults="Include default settings values"
 AdvSceneSwitcher.condition.source.sceneVisibilityHint="Scene specific visibility can be checked using the \"Scene item visibility\" condition"
 AdvSceneSwitcher.condition.source.getSettings="Get current settings"
 AdvSceneSwitcher.condition.source.entry.line1="{{sources}}{{conditions}}{{settingSelection}}{{refresh}}{{sizeCompareMethods}}{{size}}"
@@ -530,9 +534,11 @@ AdvSceneSwitcher.condition.filter.type.showing="Is disabled"
 AdvSceneSwitcher.condition.filter.type.settingsMatch="Settings match"
 AdvSceneSwitcher.condition.filter.type.settingsChanged="Settings changed"
 AdvSceneSwitcher.condition.filter.type.individualSettingMatches="Settings value matches"
+AdvSceneSwitcher.condition.filter.type.individualSettingListSelectionMatches="Settings value list selection matches"
 AdvSceneSwitcher.condition.filter.type.individualSettingChanged="Settings value changed"
 AdvSceneSwitcher.condition.filter.refresh="Refresh"
 AdvSceneSwitcher.condition.filter.refresh.tooltip="Repopulate the filter settings selection with the settings of the filter which's name matches the variable value."
+AdvSceneSwitcher.condition.filter.includeDefaults="Include default settings values"
 AdvSceneSwitcher.condition.filter.getSettings="Get current settings"
 AdvSceneSwitcher.condition.filter.entry.line1="On{{sources}}{{filters}}{{conditions}}{{settingSelection}}{{refresh}}"
 AdvSceneSwitcher.condition.filter.entry.line2="{{settings}}"
@@ -730,6 +736,8 @@ AdvSceneSwitcher.condition.twitch.type.polling.channel.live="Stream is currently
 AdvSceneSwitcher.condition.twitch.type.polling.channel.title="Current title matches"
 AdvSceneSwitcher.condition.twitch.type.polling.channel.category="Current category is"
 AdvSceneSwitcher.condition.twitch.type.chat.message="Chat message received"
+AdvSceneSwitcher.condition.twitch.type.chat.messageRemoved="Single chat message removed"
+AdvSceneSwitcher.condition.twitch.type.chat.cleared="All messages of user or channel cleared"
 AdvSceneSwitcher.condition.twitch.type.chat.properties="Chat message properties:"
 AdvSceneSwitcher.condition.twitch.type.chat.properties.select="Select chat message property:"
 AdvSceneSwitcher.condition.twitch.type.chat.properties.firstMessage="Is first message"
@@ -801,6 +809,7 @@ AdvSceneSwitcher.condition.screenshot.entry="A screenshot was taken"
 AdvSceneSwitcher.condition.mqtt="MQTT"
 AdvSceneSwitcher.condition.mqtt.layout.match="Message was received from{{connection}} which matches{{regex}}:"
 AdvSceneSwitcher.condition.mqtt.layout.listen="Set message selection to incoming message:{{listenButton}}"
+AdvSceneSwitcher.condition.script="Script"
 
 # Macro Actions
 AdvSceneSwitcher.action.unknown="Unknown action"
@@ -819,6 +828,7 @@ AdvSceneSwitcher.action.wait.entry.random="Wait for{{waitType}}duration from{{du
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Mute"
 AdvSceneSwitcher.action.audio.type.unmute="Unmute"
+AdvSceneSwitcher.action.audio.type.toggleMute="Toggle mute"
 AdvSceneSwitcher.action.audio.type.sourceVolume="Set source volume"
 AdvSceneSwitcher.action.audio.type.masterVolume="Set master volume"
 AdvSceneSwitcher.action.audio.type.syncOffset="Set sync offset"
@@ -884,6 +894,7 @@ AdvSceneSwitcher.action.filter.entry="On{{sources}}{{actions}}{{filters}}{{refre
 AdvSceneSwitcher.action.filter.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.filter.getSettings="Get current settings"
 AdvSceneSwitcher.action.filter.inputMethod.individualManual="Set to fixed value"
+AdvSceneSwitcher.action.filter.inputMethod.individualListEntryManual="Set to list entry"
 AdvSceneSwitcher.action.filter.inputMethod.individualTempvar="Set to macro property"
 AdvSceneSwitcher.action.filter.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source="Source"
@@ -914,6 +925,7 @@ AdvSceneSwitcher.action.source.deinterlaceMode.yadif2x="Yadif 2x"
 AdvSceneSwitcher.action.source.deinterlaceOrder.topFieldFirst="Top Field First"
 AdvSceneSwitcher.action.source.deinterlaceOrder.bottomFieldFirst="Bottom Field First"
 AdvSceneSwitcher.action.source.inputMethod.individualManual="Set to fixed value"
+AdvSceneSwitcher.action.source.inputMethod.individualListEntryManual="Set to list entry"
 AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro property"
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
@@ -952,6 +964,10 @@ AdvSceneSwitcher.action.macro.type.stop="Stop actions"
 AdvSceneSwitcher.action.macro.type.disableAction="Disable action"
 AdvSceneSwitcher.action.macro.type.enableAction="Enable action"
 AdvSceneSwitcher.action.macro.type.toggleAction="Toggle action"
+AdvSceneSwitcher.action.macro.type.nestedMacro="Nested macro"
+AdvSceneSwitcher.action.macro.type.nestedMacro.conditionHelp="This section allows you to define macro conditions.\n\nClick the plus button below to add a new condition."
+AdvSceneSwitcher.action.macro.type.nestedMacro.actionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nClick the plus button below to add a new action."
+AdvSceneSwitcher.action.macro.type.nestedMacro.elseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nClick the plus button below to add a new action."
 AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}of{{macros}}"
 AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
 AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
@@ -1094,7 +1110,7 @@ AdvSceneSwitcher.action.http.type.post="POST"
 AdvSceneSwitcher.action.http.type.put="PUT"
 AdvSceneSwitcher.action.http.type.patch="PATCH"
 AdvSceneSwitcher.action.http.type.delete="DELETE"
-AdvSceneSwitcher.action.http.layout.method="Send{{method}}to URL{{url}}at path{{path}}"
+AdvSceneSwitcher.action.http.layout.method="Send{{method}}to URL{{url}}"
 AdvSceneSwitcher.action.http.layout.contentType="Content type:{{contentType}}"
 AdvSceneSwitcher.action.http.layout.timeout="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.http.entry.line1="Send{{method}}to{{url}}"
@@ -1250,6 +1266,7 @@ AdvSceneSwitcher.action.obsSetting.action.setOutputCanvasX="Set output resolutio
 AdvSceneSwitcher.action.obsSetting.action.setOutputCanvasY="Set output resolution Y value"
 AdvSceneSwitcher.action.obsSetting.getCurrentValue="Get current value"
 AdvSceneSwitcher.action.obsSettings.layout="{{actions}}{{fpsType}}{{fpsIntValue}}{{fpsStringValue}}{{canvasSizeValue}}{{getCurrentValue}}"
+AdvSceneSwitcher.action.script="Script"
 
 # Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Start the Advanced Scene Switcher"
@@ -1514,6 +1531,17 @@ AdvSceneSwitcher.twitch.selection.points.reward.tooltip.noPermission="Can't sele
 AdvSceneSwitcher.twitch.selection.points.reward.tooltip.noChannel="Can't select points reward without entering a channel first!"
 AdvSceneSwitcher.twitch.selection.points.reward.tooltip.error="Can't select points reward because Twitch responded with an error! Check OBS logs for more details."
 
+AdvSceneSwitcher.script.type.inline="Inline"
+AdvSceneSwitcher.script.type.file="File"
+AdvSceneSwitcher.script.type.layout="Script type:{{scriptType}}"
+AdvSceneSwitcher.script.language.python="Python"
+AdvSceneSwitcher.script.language.lua="LUA"
+AdvSceneSwitcher.script.language.select="--select language--"
+AdvSceneSwitcher.script.language.layout="Script language:{{language}}"
+AdvSceneSwitcher.script.file.open="Open"
+AdvSceneSwitcher.script.file.open.failed="Could not open script file!"
+AdvSceneSwitcher.script.file.layout="Script file:{{path}}{{open}}"
+
 AdvSceneSwitcher.tempVar.select="--select value--"
 AdvSceneSwitcher.tempVar.selectionInfo.lastValues="Last values:"
 
@@ -1907,6 +1935,24 @@ AdvSceneSwitcher.tempVar.twitch.is_turbo.chatReceive.description="'true' if the
 AdvSceneSwitcher.tempVar.twitch.is_vip.chatReceive="Is chatter a VIP"
 AdvSceneSwitcher.tempVar.twitch.is_vip.chatReceive.description="'true' if the chatter is a VIP in the channel, 'false' otherwise."
 
+AdvSceneSwitcher.tempVar.twitch.login.chatRemove="User login"
+AdvSceneSwitcher.tempVar.twitch.login.chatRemove.description="The name of the user who sent the message."
+AdvSceneSwitcher.tempVar.twitch.message.chatRemove="Chat message"
+AdvSceneSwitcher.tempVar.twitch.message_id.chatRemove.description="The chat message that was removed."
+AdvSceneSwitcher.tempVar.twitch.message_id.chatRemove="Chat message ID"
+AdvSceneSwitcher.tempVar.twitch.message_id.chatRemove.description="The ID of the message in UUID format."
+AdvSceneSwitcher.tempVar.twitch.timestamp.chatRemove="Chat message timestamp"
+AdvSceneSwitcher.tempVar.twitch.timestamp.chatRemove.description="The UNIX timestamp."
+
+AdvSceneSwitcher.tempVar.twitch.login.chatClear="User login"
+AdvSceneSwitcher.tempVar.twitch.login.chatClear.description="The login name of the user whose messages were removed from the chat room because they were banned or put in a timeout."
+AdvSceneSwitcher.tempVar.twitch.user_id.chatClear="User ID"
+AdvSceneSwitcher.tempVar.twitch.user_id.chatClear.description="Optional.\nThe User ID of the user that was banned or put in a timeout.\nEmpty in case the complete chat was cleared."
+AdvSceneSwitcher.tempVar.twitch.ban_duration.chatClear="Ban duration"
+AdvSceneSwitcher.tempVar.twitch.ban_duration.chatClear.description="Set to zero if the complete chat was cleared or a user was banned indefinitely.\nIs set to non-zero value, if a user was put in a timeout.\nWill contain the duration of the timeout in seconds."
+AdvSceneSwitcher.tempVar.twitch.timestamp.chatClear="Timestamp"
+AdvSceneSwitcher.tempVar.twitch.timestamp.chatClear.description="The UNIX timestamp."
+
 AdvSceneSwitcher.tempVar.twitch.user_login.chatJoin="User login"
 AdvSceneSwitcher.tempVar.twitch.user_login.chatJoin.description="The user login of the person who joined the chat room."
 

data/locale/es-ES.ini

@@ -38,7 +38,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exportar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exportar los ajustes para Advanced Scene Switcher ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Importar los ajustes para Advanced Scene Switcher ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Archivos de texto (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Archivos de texto (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="La importacion la configuracion de escenas fallo"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Configuración de escenas importada correctamente"
 AdvSceneSwitcher.generalTab.priority.fileContent="Contenido del archivo"

data/locale/fr-FR.ini

@@ -43,7 +43,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exporter"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importer"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exporter les paramètres d'Advanced Scene Switcher vers un fichier ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Importer les paramètres d'Advanced Scene Switcher depuis un fichier ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Fichiers texte (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Fichiers texte (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="L'importation des paramètres d'Advanced Scene Switcher a échoué"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Les paramètres d'Advanced Scene Switcher ont été importés avec succès"
 AdvSceneSwitcher.generalTab.priority.fileContent="Contenu du fichier"

data/locale/pt-BR.ini

@@ -48,7 +48,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exportar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exportar configurações do Advanced Scene Switcher para arquivo ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Importar configurações do Advanced Scene Switcher de arquivo ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Arquivos de texto (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Arquivos de texto (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="O Advanced Scene Switcher falhou ao importar configurações"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Configurações do Advanced Scene Switcher importadas com sucesso"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportSensitiveDataWarning="Aviso:\nOs dados exportados podem conter informações sensíveis!"

data/locale/ru-RU.ini

@@ -36,7 +36,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Экспорт"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Импорт"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Экспортировать настройки расширенного переключателя сцен в файл ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Импортировать настройки Advanced Scene Switcher из файла ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Текстовые файлы (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Текстовые файлы (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Advanced Scene Switcher не удалось импортировать настройки"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Настройки Advanced Scene Switcher импортированы успешно"
 AdvSceneSwitcher.generalTab.priority.fileContent="Содержание файла"

data/locale/tr-TR.ini

@@ -38,7 +38,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Dışa Aktar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="İçe Aktar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Gelişmiş Sahne Değiştirici ayarlarını dosyaya aktar ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Gelişmiş Sahne Değiştirici ayarlarını dosyadan içe aktar ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text dosyası (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text dosyası (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Gelişmiş Sahne Değiştirici ayarları dosyadan içe aktarmakta başarısız oldu"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Gelişmiş Sahne Değiştirici ayarları başarılı bir şekilde dosyadan içe aktarıldı"
 AdvSceneSwitcher.generalTab.priority.fileContent="Dosya İçeriği"

data/locale/zh-CN.ini

@@ -51,7 +51,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="导出设置"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="导入设置"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="导出高级场景切换器到文件..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="导入高级场景切换器到文件..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="文本文件 (*.txt)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="文本文件 (*.txt *.json)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="高级场景切换器导入设置失败"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="高级场景切换器导入设置成功"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportSensitiveDataWarning="警告:\n导出的数据可能包含敏感信息!"

forms/advanced-scene-switcher.ui

@@ -790,7 +790,7 @@
            </item>
           </layout>
          </widget>
-         <widget class="QGroupBox" name="macroEdit">
+         <widget class="QGroupBox" name="macroEditGroup">
           <property name="title">
            <string>AdvSceneSwitcher.macroTab.edit</string>
           </property>
@@ -896,339 +896,7 @@
             </layout>
            </item>
            <item>
-            <widget class="QSplitter" name="macroActionConditionSplitter">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <widget class="QWidget" name="macroConditions" native="true">
-              <layout class="QVBoxLayout" name="macroConditionsLayout">
-               <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="advss::MacroSegmentList" name="conditionsList">
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>1</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="conditionControlsLayout">
-                 <property name="leftMargin">
-                  <number>9</number>
-                 </property>
-                 <item>
-                  <widget class="QToolButton" name="conditionAdd">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionAddButton</string>
-                   </property>
-                   <property name="themeID" stdset="0">
-                    <string notr="true">addIconSmall</string>
-                   </property>
-                   <property name="class" stdset="0">
-                    <string notr="true">icon-plus</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="conditionRemove">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionRemoveButton</string>
-                   </property>
-                   <property name="themeID" stdset="0">
-                    <string notr="true">removeIconSmall</string>
-                   </property>
-                   <property name="class" stdset="0">
-                    <string notr="true">icon-trash</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="conditionTop">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionTopButton</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="conditionUp">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionUpButton</string>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                   <property name="themeID" stdset="0">
-                    <string notr="true">upArrowIconSmall</string>
-                   </property>
-                   <property name="class" stdset="0">
-                    <string notr="true">icon-up</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="conditionDown">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionDownButton</string>
-                   </property>
-                   <property name="themeID" stdset="0">
-                    <string notr="true">downArrowIconSmall</string>
-                   </property>
-                   <property name="class" stdset="0">
-                    <string notr="true">icon-down</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="conditionBottom">
-                   <property name="toolTip">
-                    <string>AdvSceneSwitcher.macroTab.tooltip.conditionBottomButton</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-             <widget class="QSplitter" name="macroElseActionSplitter">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <widget class="QWidget" name="macroActions" native="true">
-               <layout class="QVBoxLayout" name="macroActionsLayout">
-                <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="advss::MacroSegmentList" name="actionsList">
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>1</height>
-                   </size>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout" name="actionControlsLayout">
-                  <property name="leftMargin">
-                   <number>9</number>
-                  </property>
-                  <item>
-                   <widget class="QToolButton" name="actionAdd">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionAddButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">addIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-plus</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="actionRemove">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionRemoveButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">removeIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-trash</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="actionTop">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionTopButton</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="actionUp">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionUpButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">upArrowIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-up</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="actionDown">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionDownButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">downArrowIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-down</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="actionBottom">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.actionBottomButton</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <spacer name="horizontalSpacer_14">
-                    <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                     <size>
-                      <width>40</width>
-                      <height>20</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="toggleElseActions">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.toggleShowElseSection</string>
-                    </property>
-                    <property name="checkable">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-              <widget class="QWidget" name="macroElseActions" native="true">
-               <layout class="QVBoxLayout" name="macroElseActionsLayout">
-                <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="advss::MacroSegmentList" name="elseActionsList">
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>1</height>
-                   </size>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout" name="elseActionControlsLayout">
-                  <property name="leftMargin">
-                   <number>9</number>
-                  </property>
-                  <item>
-                   <widget class="QToolButton" name="elseActionAdd">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionAddButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">addIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-plus</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="elseActionRemove">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionRemoveButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">removeIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-trash</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="elseActionTop">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="elseActionUp">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">upArrowIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-up</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="elseActionDown">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton</string>
-                    </property>
-                    <property name="themeID" stdset="0">
-                     <string notr="true">downArrowIconSmall</string>
-                    </property>
-                    <property name="class" stdset="0">
-                     <string notr="true">icon-down</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QToolButton" name="elseActionBottom">
-                    <property name="toolTip">
-                     <string>AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-             </widget>
-            </widget>
+            <widget class="advss::MacroEdit" name="macroEdit" native="true"/>
            </item>
           </layout>
          </widget>
@@ -4440,12 +4108,6 @@
    <extends>QListView</extends>
    <header>macro-tree.hpp</header>
   </customwidget>
-  <customwidget>
-   <class>advss::MacroSegmentList</class>
-   <extends>QScrollArea</extends>
-   <header>macro-segment-list.hpp</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>advss::MacroRunButton</class>
    <extends>QPushButton</extends>
@@ -4456,6 +4118,12 @@
    <extends>QWidget</extends>
    <header>duration-control.hpp</header>
   </customwidget>
+  <customwidget>
+   <class>advss::MacroEdit</class>
+   <extends>QWidget</extends>
+   <header>macro-edit.hpp</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
@@ -4492,28 +4160,7 @@
   <tabstop>runMacroInParallel</tabstop>
   <tabstop>runMacroOnChange</tabstop>
   <tabstop>macroSettings</tabstop>
-  <tabstop>conditionsList</tabstop>
-  <tabstop>conditionAdd</tabstop>
-  <tabstop>conditionRemove</tabstop>
-  <tabstop>conditionTop</tabstop>
-  <tabstop>conditionUp</tabstop>
-  <tabstop>conditionDown</tabstop>
-  <tabstop>conditionBottom</tabstop>
-  <tabstop>actionsList</tabstop>
-  <tabstop>actionAdd</tabstop>
-  <tabstop>actionRemove</tabstop>
-  <tabstop>actionTop</tabstop>
-  <tabstop>actionUp</tabstop>
-  <tabstop>actionDown</tabstop>
-  <tabstop>actionBottom</tabstop>
-  <tabstop>toggleElseActions</tabstop>
-  <tabstop>elseActionsList</tabstop>
-  <tabstop>elseActionAdd</tabstop>
-  <tabstop>elseActionRemove</tabstop>
-  <tabstop>elseActionTop</tabstop>
-  <tabstop>elseActionUp</tabstop>
-  <tabstop>elseActionDown</tabstop>
-  <tabstop>elseActionBottom</tabstop>
+  <tabstop>macroEdit</tabstop>
   <tabstop>sceneGroups</tabstop>
   <tabstop>sceneGroupAdd</tabstop>
   <tabstop>sceneGroupRemove</tabstop>

forms/macro-edit.ui

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MacroEdit</class>
+ <widget class="QWidget" name="MacroEdit">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QSplitter" name="macroActionConditionSplitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QWidget" name="macroConditions" native="true">
+      <layout class="QVBoxLayout" name="macroConditionsLayout">
+       <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="advss::MacroSegmentList" name="conditionsList">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>1</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="conditionControlsLayout">
+         <property name="leftMargin">
+          <number>9</number>
+         </property>
+         <item>
+          <widget class="QToolButton" name="conditionAdd">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionAddButton</string>
+           </property>
+           <property name="themeID" stdset="0">
+            <string notr="true">addIconSmall</string>
+           </property>
+           <property name="class" stdset="0">
+            <string notr="true">icon-plus</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="conditionRemove">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionRemoveButton</string>
+           </property>
+           <property name="themeID" stdset="0">
+            <string notr="true">removeIconSmall</string>
+           </property>
+           <property name="class" stdset="0">
+            <string notr="true">icon-trash</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="conditionTop">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionTopButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="conditionUp">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionUpButton</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="themeID" stdset="0">
+            <string notr="true">upArrowIconSmall</string>
+           </property>
+           <property name="class" stdset="0">
+            <string notr="true">icon-up</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="conditionDown">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionDownButton</string>
+           </property>
+           <property name="themeID" stdset="0">
+            <string notr="true">downArrowIconSmall</string>
+           </property>
+           <property name="class" stdset="0">
+            <string notr="true">icon-down</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="conditionBottom">
+           <property name="toolTip">
+            <string>AdvSceneSwitcher.macroTab.tooltip.conditionBottomButton</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QSplitter" name="macroElseActionSplitter">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="QWidget" name="macroActions" native="true">
+       <layout class="QVBoxLayout" name="macroActionsLayout">
+        <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="advss::MacroSegmentList" name="actionsList">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>1</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="actionControlsLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <item>
+           <widget class="QToolButton" name="actionAdd">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionAddButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">addIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-plus</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="actionRemove">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionRemoveButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">removeIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-trash</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="actionTop">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionTopButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="actionUp">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionUpButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">upArrowIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-up</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="actionDown">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionDownButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">downArrowIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-down</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="actionBottom">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.actionBottomButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_14">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QToolButton" name="toggleElseActions">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.toggleShowElseSection</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="macroElseActions" native="true">
+       <layout class="QVBoxLayout" name="macroElseActionsLayout">
+        <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="advss::MacroSegmentList" name="elseActionsList">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>1</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="elseActionControlsLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <item>
+           <widget class="QToolButton" name="elseActionAdd">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionAddButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">addIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-plus</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="elseActionRemove">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionRemoveButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">removeIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-trash</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="elseActionTop">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="elseActionUp">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">upArrowIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-up</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="elseActionDown">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton</string>
+            </property>
+            <property name="themeID" stdset="0">
+             <string notr="true">downArrowIconSmall</string>
+            </property>
+            <property name="class" stdset="0">
+             <string notr="true">icon-down</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="elseActionBottom">
+            <property name="toolTip">
+             <string>AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>advss::MacroSegmentList</class>
+   <extends>QScrollArea</extends>
+   <header>macro-segment-list.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>conditionsList</tabstop>
+  <tabstop>conditionAdd</tabstop>
+  <tabstop>conditionRemove</tabstop>
+  <tabstop>conditionTop</tabstop>
+  <tabstop>conditionUp</tabstop>
+  <tabstop>conditionDown</tabstop>
+  <tabstop>conditionBottom</tabstop>
+  <tabstop>actionsList</tabstop>
+  <tabstop>actionAdd</tabstop>
+  <tabstop>actionRemove</tabstop>
+  <tabstop>actionTop</tabstop>
+  <tabstop>actionUp</tabstop>
+  <tabstop>actionDown</tabstop>
+  <tabstop>actionBottom</tabstop>
+  <tabstop>toggleElseActions</tabstop>
+  <tabstop>elseActionsList</tabstop>
+  <tabstop>elseActionAdd</tabstop>
+  <tabstop>elseActionRemove</tabstop>
+  <tabstop>elseActionTop</tabstop>
+  <tabstop>elseActionUp</tabstop>
+  <tabstop>elseActionDown</tabstop>
+  <tabstop>elseActionBottom</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

lib/advanced-scene-switcher.cpp

@@ -146,16 +146,7 @@ void AdvSceneSwitcher::LoadUI()
 bool AdvSceneSwitcher::eventFilter(QObject *obj, QEvent *event)
 {
 	auto eventType = event->type();
-	if (obj == ui->macroElseActions && eventType == QEvent::Resize) {
-		QResizeEvent *resizeEvent = static_cast<QResizeEvent *>(event);
-
-		if (resizeEvent->size().height() == 0) {
-			SetElseActionsStateToHidden();
-			return QDialog::eventFilter(obj, event);
-		}
-
-		SetElseActionsStateToVisible();
-	} else if (eventType == QEvent::KeyPress) {
+	if (eventType == QEvent::KeyPress) {
 		QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
 		auto pressedKey = keyEvent->key();
 
@@ -608,7 +599,7 @@ static void handleSceneCollectionChanging()
 		AdvSceneSwitcher::window->close();
 	}
 	if (!switcher->stop) {
-		switcher->sceneColletionStop = true;
+		switcher->sceneCollectionStop = true;
 		switcher->Stop();
 	}
 }
@@ -744,6 +735,21 @@ void AdvSceneSwitcher::HighlightMacroSettingsButton(bool enable)
 	highlight = HighlightWidget(ui->macroSettings, Qt::green);
 }
 
+void AdvSceneSwitcher::HighlightAction(int idx, QColor color) const
+{
+	ui->macroEdit->HighlightAction(idx, color);
+}
+
+void AdvSceneSwitcher::HighlightElseAction(int idx, QColor color) const
+{
+	ui->macroEdit->HighlightElseAction(idx, color);
+}
+
+void AdvSceneSwitcher::HighlightCondition(int idx, QColor color) const
+{
+	ui->macroEdit->HighlightCondition(idx, color);
+}
+
 void HighlightMacroSettingsButton(bool enable)
 {
 	auto window = GetSettingsWindow();

lib/advanced-scene-switcher.hpp

@@ -11,6 +11,7 @@ namespace advss {
 
 class MacroActionEdit;
 class MacroConditionEdit;
+class MacroSegment;
 class Duration;
 class SequenceWidget;
 struct SceneGroup;
@@ -78,6 +79,7 @@ public slots:
 	/* --- Begin of macro tab section --- */
 public:
 	void SetupMacroTab();
+	bool MacroTabIsInFocus();
 	bool AddNewMacro(std::shared_ptr<Macro> &res, std::string &name,
 			 std::string format = "");
 	void RemoveMacro(std::shared_ptr<Macro> &);
@@ -85,7 +87,6 @@ public:
 	void RenameMacro(std::shared_ptr<Macro> &, const QString &name);
 	std::shared_ptr<Macro> GetSelectedMacro() const;
 	std::vector<std::shared_ptr<Macro>> GetSelectedMacros() const;
-	void SetEditMacro(Macro &m);
 	void SetMacroEditAreaDisabled(bool) const;
 	void HighlightAction(int idx, QColor color = QColor(Qt::green)) const;
 	void HighlightElseAction(int idx,
@@ -110,89 +111,21 @@ public slots:
 	void on_macroName_editingFinished();
 	void on_runMacroInParallel_stateChanged(int value) const;
 	void on_runMacroOnChange_stateChanged(int value) const;
-	void on_conditionAdd_clicked();
-	void on_conditionRemove_clicked();
-	void on_conditionTop_clicked();
-	void on_conditionUp_clicked();
-	void on_conditionDown_clicked();
-	void on_conditionBottom_clicked();
-	void on_actionAdd_clicked();
-	void on_actionRemove_clicked();
-	void on_actionTop_clicked();
-	void on_actionUp_clicked();
-	void on_actionDown_clicked();
-	void on_actionBottom_clicked();
-	void on_toggleElseActions_clicked() const;
-	void on_elseActionAdd_clicked();
-	void on_elseActionRemove_clicked();
-	void on_elseActionTop_clicked();
-	void on_elseActionUp_clicked();
-	void on_elseActionDown_clicked();
-	void on_elseActionBottom_clicked();
-	void MacroSelectionAboutToChange() const;
 	void MacroSelectionChanged();
-	void UpMacroSegementHotkey();
-	void DownMacroSegementHotkey();
-	void DeleteMacroSegementHotkey();
 	void ShowMacroContextMenu(const QPoint &);
-	void ShowMacroActionsContextMenu(const QPoint &);
-	void ShowMacroElseActionsContextMenu(const QPoint &);
-	void ShowMacroConditionsContextMenu(const QPoint &);
 	void CopyMacro();
 	void RenameSelectedMacro();
 	void ExportMacros() const;
 	void ImportMacros();
-	void ExpandAllActions() const;
-	void ExpandAllElseActions() const;
-	void ExpandAllConditions() const;
-	void CollapseAllActions() const;
-	void CollapseAllElseActions() const;
-	void CollapseAllConditions() const;
-	void MinimizeActions() const;
-	void MaximizeActions() const;
-	void MinimizeElseActions() const;
-	void MaximizeElseActions() const;
-	void MinimizeConditions() const;
-	void MaximizeConditions() const;
-	void SetElseActionsStateToHidden() const;
-	void SetElseActionsStateToVisible() const;
-	void MacroActionSelectionChanged(int idx);
-	void MacroActionReorder(int to, int target);
-	void AddMacroAction(Macro *macro, int idx, const std::string &id,
-			    obs_data_t *data);
-	void AddMacroAction(int idx);
-	void RemoveMacroAction(int idx);
-	void MoveMacroActionUp(int idx);
-	void MoveMacroActionDown(int idx);
-	void MacroElseActionSelectionChanged(int idx);
-	void MacroElseActionReorder(int to, int target);
-	void AddMacroElseAction(Macro *macro, int idx, const std::string &id,
-				obs_data_t *data);
-	void AddMacroElseAction(int idx);
-	void RemoveMacroElseAction(int idx);
-	void SwapElseActions(Macro *m, int pos1, int pos2);
-	void MoveMacroElseActionUp(int idx);
-	void MoveMacroElseActionDown(int idx);
-	void MacroConditionSelectionChanged(int idx);
-	void MacroConditionReorder(int to, int target);
-	void AddMacroCondition(int idx);
-	void AddMacroCondition(Macro *macro, int idx, const std::string &id,
-			       obs_data_t *data, Logic::Type logic);
-	void RemoveMacroCondition(int idx);
-	void MoveMacroConditionUp(int idx);
-	void MoveMacroConditionDown(int idx);
-	void HighlightControls() const;
 	void HighlightOnChange() const;
 	void on_macroSettings_clicked();
-	void CopyMacroSegment();
-	void PasteMacroSegment();
 
 signals:
 	void MacroAdded(const QString &name);
 	void MacroRemoved(const QString &name);
 	void MacroRenamed(const QString &oldName, const QString &newName);
 	void MacroSegmentOrderChanged();
-	void SegmentTempVarsChanged();
+	void SegmentTempVarsChanged(MacroSegment *);
 	void HighlightMacrosChanged(bool value);
 
 	void ConnectionAdded(const QString &);
@@ -200,16 +133,7 @@ signals:
 	void ConnectionRemoved(const QString &);
 
 private:
-	enum class MacroSection { CONDITIONS, ACTIONS, ELSE_ACTIONS };
-
-	void SetupMacroSegmentSelection(MacroSection type, int idx);
 	bool ResolveMacroImportNameConflict(std::shared_ptr<Macro> &);
-	bool MacroTabIsInFocus();
-
-	MacroSection lastInteracted = MacroSection::CONDITIONS;
-	int currentConditionIdx = -1;
-	int currentActionIdx = -1;
-	int currentElseActionIdx = -1;
 
 	/* --- End of macro tab section --- */
 

lib/general.cpp

@@ -163,7 +163,7 @@ void AdvSceneSwitcher::closeEvent(QCloseEvent *)
 	switcher->windowSize = this->size();
 	switcher->macroListMacroEditSplitterPosition =
 		ui->macroListMacroEditSplitter->sizes();
-	MacroSelectionAboutToChange(); // Trigger saving of splitter states
+	ui->macroEdit->SetMacro(nullptr); // Trigger saving of splitter states
 
 	obs_frontend_save();
 }
@@ -535,8 +535,8 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	cooldown.Save(obj, "cooldown");
 	obs_data_set_bool(obj, "enableCooldown", enableCooldown);
 
-	obs_data_set_bool(obj, "active", sceneColletionStop ? true : !stop);
-	sceneColletionStop = false;
+	obs_data_set_bool(obj, "active", sceneCollectionStop ? true : !stop);
+	sceneCollectionStop = false;
 	obs_data_set_int(obj, "startup_behavior",
 			 static_cast<int>(startupBehavior));
 

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

@@ -32,6 +32,7 @@
 #endif
 #include <fstream>
 #include <sstream>
+#include "kwin-helpers.h"
 
 namespace advss {
 
@@ -44,6 +45,10 @@ static XScreenSaverAllocInfoFunc allocSSFunc = nullptr;
 static XScreenSaverQueryInfoFunc querySSFunc = nullptr;
 bool canGetIdleTime = false;
 
+static bool KWin = false;
+static FocusNotifier notifier;
+static QString KWinScriptObjectPath;
+
 static QLibrary *libprocps = nullptr;
 #ifdef PROCPS_AVAILABLE
 typedef PROCTAB *(*openproc_func)(int flags);
@@ -275,6 +280,11 @@ int getActiveWindow(Window *&window)
 
 void GetCurrentWindowTitle(std::string &title)
 {
+	if (KWin) {
+		title = FocusNotifier::getActiveWindowTitle();
+		return;
+	}
+
 	Window *data = 0;
 	if (getActiveWindow(data) != Success || !data) {
 		return;
@@ -286,6 +296,7 @@ void GetCurrentWindowTitle(std::string &title)
 
 	auto name = getWindowName(data[0]);
 	XFree(data);
+
 	if (name.empty()) {
 		return;
 	}
@@ -412,6 +423,10 @@ void GetProcessList(QStringList &processes)
 
 long getForegroundProcessPid()
 {
+	if (KWin) {
+		return FocusNotifier::getActiveWindowPID();
+	}
+
 	Window *window;
 	if (getActiveWindow(window) != Success || !window || !*window) {
 		return -1;
@@ -437,6 +452,7 @@ long getForegroundProcessPid()
 
 	pid = *((long *)prop);
 	XFree(prop);
+
 	return pid;
 }
 
@@ -562,6 +578,17 @@ void PlatformInit()
 		return;
 	}
 
+	KWin = isKWinAvailable();
+	if (!(KWin && startKWinScript(KWinScriptObjectPath) &&
+	      registerKWinDBusListener(&notifier))) {
+		// something bad happened while trying to initialize
+		// the KWin script/dbus so disable it
+		KWin = false;
+		blog(LOG_INFO, "not using KWin compat");
+	} else {
+		blog(LOG_INFO, "using KWin compat");
+	}
+
 	initXss();
 	initProcps();
 	initProc2();
@@ -583,6 +610,8 @@ void PlatformCleanup()
 	cleanupHelper(libproc2);
 	cleanupDisplay();
 	XSetErrorHandler(NULL);
+	if (KWin && !KWinScriptObjectPath.isEmpty())
+		stopKWinScript(KWinScriptObjectPath);
 }
 
 } // namespace advss

lib/linux/kwin-helpers.cpp

@@ -0,0 +1,166 @@
+#include "kwin-helpers.h"
+
+#include "log-helper.hpp"
+
+#include <QDir>
+#include <QFile>
+#include <QFileDevice>
+#include <QTextStream>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusReply>
+
+namespace advss {
+
+int FocusNotifier::activePID = -1;
+std::string FocusNotifier::activeTitle = {};
+
+int FocusNotifier::getActiveWindowPID()
+{
+	return activePID;
+}
+
+std::string FocusNotifier::getActiveWindowTitle()
+{
+	return activeTitle;
+}
+
+void FocusNotifier::focusChanged(const int pid)
+{
+	activePID = pid;
+}
+
+void FocusNotifier::focusTitle(const QString &title)
+{
+	activeTitle = title.toStdString();
+}
+
+bool isKWinAvailable()
+{
+	const QDBusConnectionInterface *interface =
+		QDBusConnection::sessionBus().interface();
+	if (!interface)
+		return false;
+
+	const QStringList services =
+		interface->registeredServiceNames().value();
+	return services.contains("org.kde.KWin");
+}
+
+bool startKWinScript(QString &scriptObjectPath)
+{
+	const QString scriptPath =
+		"/tmp/AdvancedSceneSwitcher/KWinFocusNotifier.js";
+
+	const QString script =
+		R"(workspace.windowActivated.connect(function(client) {
+if (!client) return;
+if (!client.pid) return;
+if (!client.caption) return;
+
+callDBus(
+    "com.github.AdvancedSceneSwitcher",
+	"/com/github/AdvancedSceneSwitcher",
+	"com.github.AdvancedSceneSwitcher",
+	"focusChanged",
+	client.pid
+);
+callDBus(
+    "com.github.AdvancedSceneSwitcher",
+	"/com/github/AdvancedSceneSwitcher",
+	"com.github.AdvancedSceneSwitcher",
+	"focusTitle",
+	client.caption
+);
+}))";
+
+	if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {
+		blog(LOG_ERROR, "error creating /tmp/AdvancedSceneSwitcher");
+		return false;
+	}
+
+	QFile scriptFile(scriptPath);
+	if (!scriptFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+		blog(LOG_ERROR,
+		     "error opening KWinFocusNotifier.js for writing");
+		return false;
+	}
+
+	scriptFile.setPermissions(QFileDevice::ReadOwner |
+				  QFileDevice::WriteOwner);
+	QTextStream outputStream(&scriptFile);
+	outputStream << script;
+	scriptFile.close();
+
+	const QDBusConnection bus = QDBusConnection::sessionBus();
+
+	QDBusInterface scriptingIface("org.kde.KWin", "/Scripting",
+				      "org.kde.kwin.Scripting", bus);
+	if (!scriptingIface.isValid()) {
+		return false;
+	}
+
+	const QDBusReply<bool> scriptRunningReply =
+		scriptingIface.call("isScriptLoaded", scriptPath);
+	if (scriptRunningReply.isValid() && scriptRunningReply.value()) {
+		// script already registered and running, don't do it again
+		// this will leave the script running since we do not have
+		// a valid script id anymore, but at the very least this prevents
+		// it from running multiple times
+		return true;
+	}
+
+	const QDBusReply<int> scriptIdReply =
+		scriptingIface.call("loadScript", scriptPath);
+	if (!scriptIdReply.isValid()) {
+		return false;
+	}
+
+	const int scriptId = scriptIdReply.value();
+	scriptObjectPath =
+		QString("/Scripting/Script%1").arg(QString::number(scriptId));
+
+	QDBusInterface scriptRunner("org.kde.KWin", scriptObjectPath,
+				    "org.kde.kwin.Script", bus);
+	if (!scriptRunner.isValid()) {
+		return false;
+	}
+
+	const QDBusReply<void> runReply = scriptRunner.call("run");
+	return runReply.isValid();
+}
+
+bool stopKWinScript(const QString &scriptObjectPath)
+{
+	QDBusInterface scriptRunner("org.kde.KWin", scriptObjectPath,
+				    "org.kde.kwin.Script",
+				    QDBusConnection::sessionBus());
+	if (!scriptRunner.isValid()) {
+		return false;
+	}
+	const QDBusReply<void> stopReply = scriptRunner.call("stop");
+	return stopReply.isValid();
+}
+
+bool registerKWinDBusListener(FocusNotifier *notifier)
+{
+	static const QString serviceName = "com.github.AdvancedSceneSwitcher";
+	static const QString objectPath = "/com/github/AdvancedSceneSwitcher";
+	auto bus = QDBusConnection::sessionBus();
+
+	if (bus.objectRegisteredAt(objectPath)) {
+		// already registered?
+		return true;
+	}
+
+	if (!bus.registerService(serviceName)) {
+		return false;
+	}
+
+	if (!bus.registerObject(objectPath, notifier,
+				QDBusConnection::ExportAllSlots)) {
+		return false;
+	}
+	return true;
+}
+} // namespace advss

lib/linux/kwin-helpers.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <string>
+
+namespace advss {
+
+class FocusNotifier final : public QObject {
+	Q_OBJECT
+	Q_CLASSINFO("D-Bus Interface", "com.github.AdvancedSceneSwitcher")
+
+	static int activePID;
+	static std::string activeTitle;
+
+public:
+	using QObject::QObject;
+
+	static int getActiveWindowPID();
+	static std::string getActiveWindowTitle();
+
+public slots:
+	void focusChanged(const int pid);
+	void focusTitle(const QString &title);
+};
+
+bool isKWinAvailable();
+bool startKWinScript(QString &scriptObjectPath);
+bool stopKWinScript(const QString &scriptObjectPath);
+bool registerKWinDBusListener(FocusNotifier *notifier);
+void printDBusError();
+
+} // namespace advss

lib/macro/macro-action-edit.cpp

@@ -35,12 +35,14 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	  _enable(new SwitchButton()),
 	  _entryData(entryData)
 {
+	auto actionStateTimer = new QTimer(this);
+
 	QWidget::connect(_actionSelection,
 			 SIGNAL(currentTextChanged(const QString &)), this,
 			 SLOT(ActionSelectionChanged(const QString &)));
 	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
 			 SLOT(ActionEnableChanged(bool)));
-	QWidget::connect(&_actionStateTimer, SIGNAL(timeout()), this,
+	QWidget::connect(actionStateTimer, SIGNAL(timeout()), this,
 			 SLOT(UpdateActionState()));
 
 	populateActionSelection(_actionSelection);
@@ -63,7 +65,7 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	_entryData = entryData;
 	SetupWidgets(true);
 
-	_actionStateTimer.start(300);
+	actionStateTimer->start(300);
 	_loading = false;
 }
 
@@ -156,473 +158,4 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }
 
-void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
-				      const std::string &id, obs_data_t *data)
-{
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		macro->Actions().emplace(macro->Actions().begin() + idx,
-					 MacroActionFactory::Create(id, macro));
-		if (data) {
-			macro->Actions().at(idx)->Load(data);
-		}
-		macro->Actions().at(idx)->PostLoad();
-		RunPostLoadSteps();
-		macro->UpdateActionIndices();
-		ui->actionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->Actions()[idx], id));
-		SetActionData(*macro);
-	}
-	HighlightAction(idx);
-	ui->actionsList->SetHelpMsgVisible(false);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::AddMacroAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->Actions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Actions().at(idx - 1)->Save(data);
-	}
-	AddMacroAction(macro.get(), idx, id, data);
-}
-
-void AdvSceneSwitcher::on_actionAdd_clicked()
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (currentActionIdx == -1) {
-		AddMacroAction((int)macro->Actions().size());
-	} else {
-		AddMacroAction(currentActionIdx + 1);
-	}
-	if (currentActionIdx != -1) {
-		MacroActionSelectionChanged(currentActionIdx + 1);
-	}
-}
-
-void AdvSceneSwitcher::RemoveMacroAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->Actions().size()) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		ui->actionsList->Remove(idx);
-		macro->Actions().erase(macro->Actions().begin() + idx);
-		SetMacroAbortWait(true);
-		GetMacroWaitCV().notify_all();
-		macro->UpdateActionIndices();
-		SetActionData(*macro);
-	}
-	MacroActionSelectionChanged(-1);
-	lastInteracted = MacroSection::ACTIONS;
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::on_actionRemove_clicked()
-{
-	if (currentActionIdx == -1) {
-		auto macro = GetSelectedMacro();
-		if (!macro) {
-			return;
-		}
-		RemoveMacroAction((int)macro->Actions().size() - 1);
-	} else {
-		RemoveMacroAction(currentActionIdx);
-	}
-	MacroActionSelectionChanged(-1);
-}
-
-void AdvSceneSwitcher::on_actionTop_clicked()
-{
-	if (currentActionIdx == -1) {
-		return;
-	}
-	MacroActionReorder(0, currentActionIdx);
-	MacroActionSelectionChanged(0);
-}
-
-void AdvSceneSwitcher::on_actionUp_clicked()
-{
-	if (currentActionIdx == -1 || currentActionIdx == 0) {
-		return;
-	}
-	MoveMacroActionUp(currentActionIdx);
-	MacroActionSelectionChanged(currentActionIdx - 1);
-}
-
-void AdvSceneSwitcher::on_actionDown_clicked()
-{
-	if (currentActionIdx == -1 ||
-	    currentActionIdx == ui->actionsList->ContentLayout()->count() - 1) {
-		return;
-	}
-	MoveMacroActionDown(currentActionIdx);
-	MacroActionSelectionChanged(currentActionIdx + 1);
-}
-
-void AdvSceneSwitcher::on_actionBottom_clicked()
-{
-	if (currentActionIdx == -1) {
-		return;
-	}
-	const int newIdx = ui->actionsList->ContentLayout()->count() - 1;
-	MacroActionReorder(newIdx, currentActionIdx);
-	MacroActionSelectionChanged(newIdx);
-}
-
-void AdvSceneSwitcher::on_elseActionAdd_clicked()
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (currentElseActionIdx == -1) {
-		AddMacroElseAction((int)macro->ElseActions().size());
-	} else {
-		AddMacroElseAction(currentElseActionIdx + 1);
-	}
-	if (currentElseActionIdx != -1) {
-		MacroElseActionSelectionChanged(currentElseActionIdx + 1);
-	}
-}
-
-void AdvSceneSwitcher::on_elseActionRemove_clicked()
-{
-	if (currentElseActionIdx == -1) {
-		auto macro = GetSelectedMacro();
-		if (!macro) {
-			return;
-		}
-		RemoveMacroElseAction((int)macro->ElseActions().size() - 1);
-	} else {
-		RemoveMacroElseAction(currentElseActionIdx);
-	}
-	MacroElseActionSelectionChanged(-1);
-}
-
-void AdvSceneSwitcher::on_elseActionTop_clicked()
-{
-	if (currentElseActionIdx == -1) {
-		return;
-	}
-	MacroElseActionReorder(0, currentElseActionIdx);
-	MacroElseActionSelectionChanged(0);
-}
-
-void AdvSceneSwitcher::on_elseActionUp_clicked()
-{
-	if (currentElseActionIdx == -1 || currentElseActionIdx == 0) {
-		return;
-	}
-	MoveMacroElseActionUp(currentElseActionIdx);
-	MacroElseActionSelectionChanged(currentElseActionIdx - 1);
-}
-
-void AdvSceneSwitcher::on_elseActionDown_clicked()
-{
-	if (currentElseActionIdx == -1 ||
-	    currentElseActionIdx ==
-		    ui->elseActionsList->ContentLayout()->count() - 1) {
-		return;
-	}
-	MoveMacroElseActionDown(currentElseActionIdx);
-	MacroElseActionSelectionChanged(currentElseActionIdx + 1);
-}
-
-void AdvSceneSwitcher::on_elseActionBottom_clicked()
-{
-	if (currentElseActionIdx == -1) {
-		return;
-	}
-	const int newIdx = ui->elseActionsList->ContentLayout()->count() - 1;
-	MacroElseActionReorder(newIdx, currentElseActionIdx);
-	MacroElseActionSelectionChanged(newIdx);
-}
-
-void AdvSceneSwitcher::SwapActions(Macro *m, int pos1, int pos2)
-{
-	if (pos1 == pos2) {
-		return;
-	}
-	if (pos1 > pos2) {
-		std::swap(pos1, pos2);
-	}
-
-	auto lock = LockContext();
-	iter_swap(m->Actions().begin() + pos1, m->Actions().begin() + pos2);
-	m->UpdateActionIndices();
-	auto widget1 = static_cast<MacroActionEdit *>(
-		ui->actionsList->ContentLayout()->takeAt(pos1)->widget());
-	auto widget2 = static_cast<MacroActionEdit *>(
-		ui->actionsList->ContentLayout()->takeAt(pos2 - 1)->widget());
-	ui->actionsList->Insert(pos1, widget2);
-	ui->actionsList->Insert(pos2, widget1);
-	SetActionData(*m);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::MoveMacroActionUp(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 1 || idx >= (int)macro->Actions().size()) {
-		return;
-	}
-
-	SwapActions(macro.get(), idx, idx - 1);
-	HighlightAction(idx - 1);
-}
-
-void AdvSceneSwitcher::MoveMacroActionDown(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->Actions().size() - 1) {
-		return;
-	}
-
-	SwapActions(macro.get(), idx, idx + 1);
-	HighlightAction(idx + 1);
-}
-
-void AdvSceneSwitcher::MacroElseActionSelectionChanged(int idx)
-{
-	SetupMacroSegmentSelection(MacroSection::ELSE_ACTIONS, idx);
-}
-
-void AdvSceneSwitcher::MacroElseActionReorder(int to, int from)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (to == from || from < 0 || from > (int)macro->ElseActions().size() ||
-	    to < 0 || to > (int)macro->ElseActions().size()) {
-		return;
-	}
-	{
-		auto lock = LockContext();
-		auto action = macro->ElseActions().at(from);
-		macro->ElseActions().erase(macro->ElseActions().begin() + from);
-		macro->ElseActions().insert(macro->ElseActions().begin() + to,
-					    action);
-		macro->UpdateElseActionIndices();
-		ui->elseActionsList->ContentLayout()->insertItem(
-			to, ui->elseActionsList->ContentLayout()->takeAt(from));
-		SetElseActionData(*macro);
-	}
-	HighlightElseAction(to);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
-					  const std::string &id,
-					  obs_data_t *data)
-{
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		macro->ElseActions().emplace(macro->ElseActions().begin() + idx,
-					     MacroActionFactory::Create(id,
-									macro));
-		if (data) {
-			macro->ElseActions().at(idx)->Load(data);
-		}
-		macro->ElseActions().at(idx)->PostLoad();
-		RunPostLoadSteps();
-		macro->UpdateElseActionIndices();
-		ui->elseActionsList->Insert(
-			idx, new MacroActionEdit(
-				     this, &macro->ElseActions()[idx], id));
-		SetElseActionData(*macro);
-	}
-	HighlightElseAction(idx);
-	ui->elseActionsList->SetHelpMsgVisible(false);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::AddMacroElseAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->ElseActions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->ElseActions().at(idx - 1)->Save(data);
-	}
-	AddMacroElseAction(macro.get(), idx, id, data);
-}
-
-void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->ElseActions().size()) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		ui->elseActionsList->Remove(idx);
-		macro->ElseActions().erase(macro->ElseActions().begin() + idx);
-		SetMacroAbortWait(true);
-		GetMacroWaitCV().notify_all();
-		macro->UpdateElseActionIndices();
-		SetElseActionData(*macro);
-	}
-	MacroElseActionSelectionChanged(-1);
-	lastInteracted = MacroSection::ELSE_ACTIONS;
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::SwapElseActions(Macro *m, int pos1, int pos2)
-{
-	if (pos1 == pos2) {
-		return;
-	}
-	if (pos1 > pos2) {
-		std::swap(pos1, pos2);
-	}
-
-	auto lock = LockContext();
-	iter_swap(m->ElseActions().begin() + pos1,
-		  m->ElseActions().begin() + pos2);
-	m->UpdateElseActionIndices();
-	auto widget1 = static_cast<MacroActionEdit *>(
-		ui->elseActionsList->ContentLayout()->takeAt(pos1)->widget());
-	auto widget2 = static_cast<MacroActionEdit *>(
-		ui->elseActionsList->ContentLayout()
-			->takeAt(pos2 - 1)
-			->widget());
-	ui->elseActionsList->Insert(pos1, widget2);
-	ui->elseActionsList->Insert(pos2, widget1);
-	SetElseActionData(*m);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::MoveMacroElseActionUp(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 1 || idx >= (int)macro->ElseActions().size()) {
-		return;
-	}
-
-	SwapElseActions(macro.get(), idx, idx - 1);
-	HighlightElseAction(idx - 1);
-}
-
-void AdvSceneSwitcher::MoveMacroElseActionDown(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->ElseActions().size() - 1) {
-		return;
-	}
-
-	SwapElseActions(macro.get(), idx, idx + 1);
-	HighlightElseAction(idx + 1);
-}
-
-void AdvSceneSwitcher::MacroActionSelectionChanged(int idx)
-{
-	SetupMacroSegmentSelection(MacroSection::ACTIONS, idx);
-}
-
-void AdvSceneSwitcher::MacroActionReorder(int to, int from)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (to == from || from < 0 || from > (int)macro->Actions().size() ||
-	    to < 0 || to > (int)macro->Actions().size()) {
-		return;
-	}
-	{
-		auto lock = LockContext();
-		auto action = macro->Actions().at(from);
-		macro->Actions().erase(macro->Actions().begin() + from);
-		macro->Actions().insert(macro->Actions().begin() + to, action);
-		macro->UpdateActionIndices();
-		ui->actionsList->ContentLayout()->insertItem(
-			to, ui->actionsList->ContentLayout()->takeAt(from));
-		SetActionData(*macro);
-	}
-	HighlightAction(to);
-	emit(MacroSegmentOrderChanged());
-}
-
 } // namespace advss

lib/macro/macro-action-edit.hpp

@@ -32,7 +32,6 @@ private:
 	SwitchButton *_enable;
 
 	std::shared_ptr<MacroAction> *_entryData;
-	QTimer _actionStateTimer;
 	bool _loading = true;
 };
 

lib/macro/macro-action-factory.hpp

@@ -20,7 +20,7 @@ public:
 	MacroActionFactory() = delete;
 
 	EXPORT static bool Register(const std::string &id, MacroActionInfo);
-	static bool Deregister(const std::string &id);
+	EXPORT static bool Deregister(const std::string &id);
 	static std::shared_ptr<MacroAction> Create(const std::string &id,
 						   Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,

lib/macro/macro-action-macro.cpp

@@ -14,6 +14,11 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
 
 bool MacroActionMacro::PerformAction()
 {
+	if (_action == Action::NESTED_MACRO) {
+		const bool conditionsMatched = _nestedMacro->CheckConditions();
+		return _nestedMacro->PerformActions(conditionsMatched);
+	}
+
 	auto macro = _macro.GetMacro();
 	if (!macro) {
 		return true;
@@ -32,7 +37,7 @@ bool MacroActionMacro::PerformAction()
 	case Action::RESET_COUNTER:
 		macro->ResetRunCount();
 		break;
-	case Action::RUN:
+	case Action::RUN_ACTIONS:
 		RunActions(macro.get());
 		break;
 	case Action::STOP:
@@ -80,7 +85,7 @@ void MacroActionMacro::LogAction() const
 		ablog(LOG_INFO, "reset counter for \"%s\"",
 		      macro->Name().c_str());
 		break;
-	case Action::RUN:
+	case Action::RUN_ACTIONS:
 		ablog(LOG_INFO, "run nested macro \"%s\"",
 		      macro->Name().c_str());
 		break;
@@ -99,6 +104,9 @@ void MacroActionMacro::LogAction() const
 		ablog(LOG_INFO, "toggled action %d of macro \"%s\"",
 		      _actionIndex.GetValue(), macro->Name().c_str());
 		break;
+	case Action::NESTED_MACRO:
+		ablog(LOG_INFO, "run nested macro");
+		break;
 	default:
 		break;
 	}
@@ -111,6 +119,10 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	_runOptions.Save(obj);
+	OBSDataAutoRelease nestedMacroData = obs_data_create();
+	_nestedMacro->Save(nestedMacroData);
+	obs_data_set_obj(obj, "nestedMacro", nestedMacroData);
+	obs_data_set_int(obj, "customWidgetHeight", _customWidgetHeight);
 	return true;
 }
 
@@ -122,6 +134,16 @@ bool MacroActionMacro::Load(obs_data_t *obj)
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
 	_runOptions.Load(obj);
+
+	if (obs_data_has_user_value(obj, "nestedMacro")) {
+		OBSDataAutoRelease nestedMacroData =
+			obs_data_get_obj(obj, "nestedMacro");
+		_nestedMacro->Load(nestedMacroData);
+		_nestedMacro->PostLoad();
+	}
+
+	_customWidgetHeight = obs_data_get_int(obj, "customWidgetHeight");
+
 	return true;
 }
 
@@ -204,7 +226,9 @@ static void populateActionSelection(QComboBox *list)
 			 "AdvSceneSwitcher.action.macro.type.togglePause"},
 			{MacroActionMacro::Action::RESET_COUNTER,
 			 "AdvSceneSwitcher.action.macro.type.resetCounter"},
-			{MacroActionMacro::Action::RUN,
+			{MacroActionMacro::Action::NESTED_MACRO,
+			 "AdvSceneSwitcher.action.macro.type.nestedMacro"},
+			{MacroActionMacro::Action::RUN_ACTIONS,
 			 "AdvSceneSwitcher.action.macro.type.run"},
 			{MacroActionMacro::Action::STOP,
 			 "AdvSceneSwitcher.action.macro.type.stop"},
@@ -242,7 +266,7 @@ static void populateActionTypeSelection(QComboBox *list)
 
 MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget *parent, std::shared_ptr<MacroActionMacro> entryData)
-	: QWidget(parent),
+	: ResizableWidget(parent),
 	  _macros(new MacroSelection(parent)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
@@ -261,7 +285,13 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	  _entryLayout(new QHBoxLayout()),
 	  _conditionLayout(new QHBoxLayout()),
 	  _reevaluateConditionStateLayout(new QHBoxLayout()),
-	  _setInputsLayout(new QHBoxLayout())
+	  _setInputsLayout(new QHBoxLayout()),
+	  _nestedMacro(new MacroEdit(
+		  this,
+		  QStringList()
+			  << "AdvSceneSwitcher.action.macro.type.nestedMacro.conditionHelp"
+			  << "AdvSceneSwitcher.action.macro.type.nestedMacro.actionHelp"
+			  << "AdvSceneSwitcher.action.macro.type.nestedMacro.elseActionHelp"))
 {
 	populateActionSelection(_actions);
 	populateConditionBehaviorSelection(_conditionBehaviors);
@@ -310,6 +340,7 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	layout->addLayout(_setInputsLayout);
 	layout->addWidget(_inputs);
 	layout->addWidget(_skipWhenPaused);
+	layout->addWidget(_nestedMacro);
 	setLayout(layout);
 	_entryData = entryData;
 	UpdateEntryData();
@@ -321,6 +352,12 @@ void HighlightMacroSettingsButton(bool enable);
 MacroActionMacroEdit::~MacroActionMacroEdit()
 {
 	HighlightMacroSettingsButton(false);
+
+	if (!_entryData) {
+		return;
+	}
+	_entryData->_customWidgetHeight = GetCustomHeight();
+	_nestedMacro->SetMacro({}); // Save splitter states
 }
 
 void MacroActionMacroEdit::UpdateEntryData()
@@ -343,9 +380,20 @@ void MacroActionMacroEdit::UpdateEntryData()
 	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
 	_setInputs->setChecked(_entryData->_runOptions.setInputs);
 	SetupMacroInput(_entryData->_macro.GetMacro().get());
+
+	const auto &macro = _entryData->_nestedMacro;
+	_nestedMacro->SetMacro(macro);
+
 	SetWidgetVisibility();
 }
 
+QWidget *MacroActionMacroEdit::Create(QWidget *parent,
+				      std::shared_ptr<MacroAction> action)
+{
+	return new MacroActionMacroEdit(
+		parent, std::dynamic_pointer_cast<MacroActionMacro>(action));
+}
+
 void MacroActionMacroEdit::MacroChanged(const QString &text)
 {
 	GUARD_LOADING_AND_LOCK();
@@ -444,7 +492,8 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 
 	PlaceWidgets(
 		obs_module_text(
-			_entryData->_action == MacroActionMacro::Action::RUN
+			_entryData->_action ==
+					MacroActionMacro::Action::RUN_ACTIONS
 				? "AdvSceneSwitcher.action.macro.entry.run"
 				: "AdvSceneSwitcher.action.macro.entry.other"),
 		_entryLayout, placeholders);
@@ -460,7 +509,7 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 			_conditionLayout, placeholders);
 	}
 
-	if (_entryData->_action == MacroActionMacro::Action::RUN ||
+	if (_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS ||
 	    _entryData->_action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
 	} else {
@@ -476,27 +525,43 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	_actionIndex->setVisible(isModifyingActionState);
 
 	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
+			 _entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
 	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN &&
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.logic !=
 			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
 	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
 	SetLayoutVisible(_reevaluateConditionStateLayout,
 			 needsAdditionalConditionWidgets);
 	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
+			 _entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
 	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN &&
+				    MacroActionMacro::Action::RUN_ACTIONS &&
 			    _entryData->_runOptions.setInputs);
-	HighlightMacroSettingsButton(_entryData->_action ==
-					     MacroActionMacro::Action::RUN &&
-				     _entryData->_runOptions.setInputs &&
-				     !_inputs->HasInputsToSet());
+	HighlightMacroSettingsButton(
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
+		_entryData->_runOptions.setInputs &&
+		!_inputs->HasInputsToSet());
 	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN);
+				 MacroActionMacro::Action::RUN_ACTIONS);
 	_skipWhenPaused->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN);
+				    MacroActionMacro::Action::RUN_ACTIONS);
+
+	_nestedMacro->setVisible(_entryData->_action ==
+				 MacroActionMacro::Action::NESTED_MACRO);
+	_macros->setVisible(_entryData->_action !=
+			    MacroActionMacro::Action::NESTED_MACRO);
+	SetResizingEnabled(_entryData->_action ==
+			   MacroActionMacro::Action::NESTED_MACRO);
+
+	if (_nestedMacro->IsEmpty()) {
+		_nestedMacro->ShowAllMacroSections();
+		// TODO: find a better solution than setting a fixed height
+		_entryData->_customWidgetHeight = 600;
+	}
+	SetCustomHeight(_entryData->_customWidgetHeight);
 
 	adjustSize();
 	updateGeometry();

lib/macro/macro-action-macro.hpp

@@ -1,8 +1,11 @@
 #pragma once
 #include "macro-action-edit.hpp"
+#include "macro.hpp"
+#include "macro-edit.hpp"
 #include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"
+#include "resizable-widget.hpp"
 
 #include <QCheckBox>
 #include <QHBoxLayout>
@@ -44,16 +47,19 @@ public:
 		PAUSE,
 		UNPAUSE,
 		RESET_COUNTER,
-		RUN,
+		RUN_ACTIONS,
 		STOP,
 		DISABLE_ACTION,
 		ENABLE_ACTION,
 		TOGGLE_ACTION,
 		TOGGLE_PAUSE,
+		NESTED_MACRO,
 	};
-	Action _action = Action::RUN;
+	Action _action = Action::NESTED_MACRO;
 	IntVariable _actionIndex = 1;
 	RunOptions _runOptions = {};
+	std::shared_ptr<Macro> _nestedMacro = std::make_shared<Macro>();
+	int _customWidgetHeight = 0;
 
 private:
 	void RunActions(Macro *actionMacro) const;
@@ -62,7 +68,7 @@ private:
 	static const std::string id;
 };
 
-class MacroActionMacroEdit final : public QWidget {
+class MacroActionMacroEdit final : public ResizableWidget {
 	Q_OBJECT
 
 public:
@@ -71,13 +77,7 @@ public:
 		std::shared_ptr<MacroActionMacro> entryData = nullptr);
 	~MacroActionMacroEdit();
 	void UpdateEntryData();
-	static QWidget *Create(QWidget *parent,
-			       std::shared_ptr<MacroAction> action)
-	{
-		return new MacroActionMacroEdit(
-			parent,
-			std::dynamic_pointer_cast<MacroActionMacro>(action));
-	}
+	static QWidget *Create(QWidget *, std::shared_ptr<MacroAction>);
 
 private slots:
 	void MacroChanged(const QString &text);
@@ -112,6 +112,7 @@ private:
 	QHBoxLayout *_conditionLayout;
 	QHBoxLayout *_reevaluateConditionStateLayout;
 	QHBoxLayout *_setInputsLayout;
+	MacroEdit *_nestedMacro;
 
 	std::shared_ptr<MacroActionMacro> _entryData;
 	bool _loading = true;

lib/macro/macro-action-queue.cpp

@@ -170,11 +170,7 @@ void MacroActionQueueEdit::UpdateEntryData()
 
 void MacroActionQueueEdit::MacroChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -182,11 +178,7 @@ void MacroActionQueueEdit::MacroChanged(const QString &text)
 
 void MacroActionQueueEdit::QueueChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_queue = GetWeakActionQueueByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -194,11 +186,7 @@ void MacroActionQueueEdit::QueueChanged(const QString &text)
 
 void MacroActionQueueEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionQueue::Action>(value);
 	SetWidgetVisibility();
 	emit HeaderInfoChanged(

lib/macro/macro-action-variable.cpp

@@ -884,7 +884,8 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	QWidget::connect(_segmentIdx,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(SegmentIndexChanged(const IntVariable &)));
-	QWidget::connect(window(), SIGNAL(MacroSegmentOrderChanged()), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroSegmentOrderChanged()), this,
 			 SLOT(MacroSegmentOrderChanged()));
 	QWidget::connect(
 		_subStringStart,

lib/macro/macro-condition-edit.cpp

@@ -275,289 +275,4 @@ std::shared_ptr<MacroSegment> MacroConditionEdit::Data() const
 	return *_entryData;
 }
 
-void AdvSceneSwitcher::AddMacroCondition(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	Logic::Type logic;
-	if (idx >= 1) {
-		id = macro->Conditions().at(idx - 1)->GetId();
-		if (idx == 1) {
-			logic = Logic::Type::OR;
-		} else {
-			logic = macro->Conditions().at(idx - 1)->GetLogicType();
-		}
-	} else {
-		id = MacroCondition::GetDefaultID();
-		logic = Logic::Type::ROOT_NONE;
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Conditions().at(idx - 1)->Save(data);
-	}
-	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
-}
-
-void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
-					 const std::string &id,
-					 obs_data_t *data, Logic::Type logic)
-{
-	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		auto cond = macro->Conditions().emplace(
-			macro->Conditions().begin() + idx,
-			MacroConditionFactory::Create(id, macro));
-		if (data) {
-			macro->Conditions().at(idx)->Load(data);
-		}
-		macro->Conditions().at(idx)->PostLoad();
-		RunPostLoadSteps();
-		(*cond)->SetLogicType(logic);
-		macro->UpdateConditionIndices();
-		ui->conditionsList->Insert(
-			idx,
-			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       id, idx == 0));
-		SetConditionData(*macro);
-	}
-	HighlightCondition(idx);
-	ui->conditionsList->SetHelpMsgVisible(false);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::on_conditionAdd_clicked()
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (currentConditionIdx == -1) {
-		AddMacroCondition((int)macro->Conditions().size());
-	} else {
-		AddMacroCondition(currentConditionIdx + 1);
-	}
-	if (currentConditionIdx != -1) {
-		MacroConditionSelectionChanged(currentConditionIdx + 1);
-	}
-}
-
-void AdvSceneSwitcher::RemoveMacroCondition(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->Conditions().size()) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		ui->conditionsList->Remove(idx);
-		macro->Conditions().erase(macro->Conditions().begin() + idx);
-		macro->UpdateConditionIndices();
-		if (idx == 0 && macro->Conditions().size() > 0) {
-			auto newRoot = macro->Conditions().at(0);
-			newRoot->SetLogicType(Logic::Type::ROOT_NONE);
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(0))
-				->SetRootNode(true);
-		}
-		SetConditionData(*macro);
-	}
-	MacroConditionSelectionChanged(-1);
-	lastInteracted = MacroSection::CONDITIONS;
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::on_conditionRemove_clicked()
-{
-	if (currentConditionIdx == -1) {
-		auto macro = GetSelectedMacro();
-		if (!macro) {
-			return;
-		}
-		RemoveMacroCondition((int)macro->Conditions().size() - 1);
-	} else {
-		RemoveMacroCondition(currentConditionIdx);
-	}
-	MacroConditionSelectionChanged(-1);
-}
-
-void AdvSceneSwitcher::on_conditionTop_clicked()
-{
-	if (currentConditionIdx == -1) {
-		return;
-	}
-	MacroConditionReorder(0, currentConditionIdx);
-	MacroConditionSelectionChanged(0);
-}
-
-void AdvSceneSwitcher::on_conditionUp_clicked()
-{
-	if (currentConditionIdx == -1 || currentConditionIdx == 0) {
-		return;
-	}
-	MoveMacroConditionUp(currentConditionIdx);
-	MacroConditionSelectionChanged(currentConditionIdx - 1);
-}
-
-void AdvSceneSwitcher::on_conditionDown_clicked()
-{
-	if (currentConditionIdx == -1 ||
-	    currentConditionIdx ==
-		    ui->conditionsList->ContentLayout()->count() - 1) {
-		return;
-	}
-	MoveMacroConditionDown(currentConditionIdx);
-	MacroConditionSelectionChanged(currentConditionIdx + 1);
-}
-
-void AdvSceneSwitcher::on_conditionBottom_clicked()
-{
-	if (currentConditionIdx == -1) {
-		return;
-	}
-	const int newIdx = ui->conditionsList->ContentLayout()->count() - 1;
-	MacroConditionReorder(newIdx, currentConditionIdx);
-	MacroConditionSelectionChanged(newIdx);
-}
-
-void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
-{
-	if (pos1 == pos2) {
-		return;
-	}
-	if (pos1 > pos2) {
-		std::swap(pos1, pos2);
-	}
-
-	bool root = pos1 == 0;
-	auto lock = LockContext();
-	iter_swap(m->Conditions().begin() + pos1,
-		  m->Conditions().begin() + pos2);
-	m->UpdateConditionIndices();
-
-	auto c1 = m->Conditions().begin() + pos1;
-	auto c2 = m->Conditions().begin() + pos2;
-	if (root) {
-		auto logic1 = (*c1)->GetLogicType();
-		auto logic2 = (*c2)->GetLogicType();
-		(*c1)->SetLogicType(logic2);
-		(*c2)->SetLogicType(logic1);
-	}
-
-	auto widget1 = static_cast<MacroConditionEdit *>(
-		ui->conditionsList->ContentLayout()->takeAt(pos1)->widget());
-	auto widget2 = static_cast<MacroConditionEdit *>(
-		ui->conditionsList->ContentLayout()->takeAt(pos2 - 1)->widget());
-	ui->conditionsList->Insert(pos1, widget2);
-	ui->conditionsList->Insert(pos2, widget1);
-	SetConditionData(*m);
-	widget2->SetRootNode(root);
-	widget1->SetRootNode(false);
-	emit(MacroSegmentOrderChanged());
-}
-
-void AdvSceneSwitcher::MoveMacroConditionUp(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 1 || idx >= (int)macro->Conditions().size()) {
-		return;
-	}
-
-	SwapConditions(macro.get(), idx, idx - 1);
-	HighlightCondition(idx - 1);
-}
-
-void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx >= (int)macro->Conditions().size() - 1) {
-		return;
-	}
-
-	SwapConditions(macro.get(), idx, idx + 1);
-	HighlightCondition(idx + 1);
-}
-
-void AdvSceneSwitcher::MacroConditionSelectionChanged(int idx)
-{
-	SetupMacroSegmentSelection(MacroSection::CONDITIONS, idx);
-}
-
-void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (to == from || from < 0 || from > (int)macro->Conditions().size() ||
-	    to < 0 || to > (int)macro->Conditions().size()) {
-		return;
-	}
-	{
-		auto lock = LockContext();
-		auto condition = macro->Conditions().at(from);
-		if (to == 0) {
-			condition->SetLogicType(Logic::Type::ROOT_NONE);
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(from))
-				->SetRootNode(true);
-			macro->Conditions().at(0)->SetLogicType(
-				Logic::Type::AND);
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(0))
-				->SetRootNode(false);
-		}
-		if (from == 0) {
-			condition->SetLogicType(Logic::Type::AND);
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(from))
-				->SetRootNode(false);
-			macro->Conditions().at(1)->SetLogicType(
-				Logic::Type::ROOT_NONE);
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(1))
-				->SetRootNode(true);
-		}
-		macro->Conditions().erase(macro->Conditions().begin() + from);
-		macro->Conditions().insert(macro->Conditions().begin() + to,
-					   condition);
-		macro->UpdateConditionIndices();
-		ui->conditionsList->ContentLayout()->insertItem(
-			to, ui->conditionsList->ContentLayout()->takeAt(from));
-		SetConditionData(*macro);
-	}
-	HighlightCondition(to);
-	emit(MacroSegmentOrderChanged());
-}
-
 } // namespace advss

lib/macro/macro-condition-factory.hpp

@@ -20,7 +20,7 @@ class MacroConditionFactory {
 public:
 	MacroConditionFactory() = delete;
 	EXPORT static bool Register(const std::string &, MacroConditionInfo);
-	static bool Deregister(const std::string &);
+	EXPORT static bool Deregister(const std::string &);
 	static std::shared_ptr<MacroCondition> Create(const std::string &,
 						      Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,

lib/macro/macro-condition-macro.cpp

@@ -538,11 +538,7 @@ void MacroConditionMacroEdit::UpdateEntryData()
 
 void MacroConditionMacroEdit::MacroChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_macro = text;
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	emit HeaderInfoChanged(
@@ -551,21 +547,13 @@ void MacroConditionMacroEdit::MacroChanged(const QString &text)
 
 void MacroConditionMacroEdit::CountChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_count = value;
 }
 
 void MacroConditionMacroEdit::CountConditionChanged(int cond)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_counterCondition =
 		static_cast<MacroConditionMacro::CounterCondition>(cond);
 }
@@ -590,11 +578,7 @@ void MacroConditionMacroEdit::MacroRemove(const QString &)
 
 void MacroConditionMacroEdit::TypeChanged(int type)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->SetType(static_cast<MacroConditionMacro::Type>(type));
 	SetupWidgets();
 }
@@ -640,11 +624,7 @@ void MacroConditionMacroEdit::UpdatePaused()
 
 void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_multiSateCondition =
 		static_cast<MacroConditionMacro::MultiStateCondition>(cond);
 }
@@ -652,21 +632,13 @@ void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 void MacroConditionMacroEdit::MultiStateCountChanged(
 	const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_multiSateCount = value;
 }
 
 void MacroConditionMacroEdit::Add(const std::string &name)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -675,11 +647,7 @@ void MacroConditionMacroEdit::Add(const std::string &name)
 
 void MacroConditionMacroEdit::Remove(int idx)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 	updateGeometry();
@@ -687,12 +655,8 @@ void MacroConditionMacroEdit::Remove(int idx)
 
 void MacroConditionMacroEdit::Replace(int idx, const std::string &name)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
+	GUARD_LOADING_AND_LOCK();
 	MacroRef macro(name);
-	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 	updateGeometry();
@@ -700,11 +664,7 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name)
 
 void MacroConditionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_actionIndex = value;
 }
 

lib/macro/macro-condition-queue.cpp

@@ -115,11 +115,7 @@ MacroConditionQueueEdit::MacroConditionQueueEdit(
 
 void MacroConditionQueueEdit::ConditionChanged(int condition)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_condition =
 		static_cast<MacroConditionQueue::Condition>(condition);
 	emit HeaderInfoChanged(
@@ -129,11 +125,7 @@ void MacroConditionQueueEdit::ConditionChanged(int condition)
 
 void MacroConditionQueueEdit::QueueChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_queue = GetWeakActionQueueByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -141,11 +133,7 @@ void MacroConditionQueueEdit::QueueChanged(const QString &text)
 
 void MacroConditionQueueEdit::SizeChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_size = value;
 }
 

lib/macro/macro-condition-tempvar.cpp

@@ -264,32 +264,19 @@ void MacroConditionTempVarEdit::UpdateEntryData()
 
 void MacroConditionTempVarEdit::VariableChanged(const TempVariableRef &var)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_tempVar = var;
 }
 
 void MacroConditionTempVarEdit::Variable2Changed(const QString &text)
 {
-
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }
 
 void MacroConditionTempVarEdit::ConditionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_type =
 		static_cast<MacroConditionTempVar::Condition>(value);
 	SetWidgetVisibility();
@@ -297,11 +284,7 @@ void MacroConditionTempVarEdit::ConditionChanged(int value)
 
 void MacroConditionTempVarEdit::StrValueChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -309,21 +292,13 @@ void MacroConditionTempVarEdit::StrValueChanged()
 
 void MacroConditionTempVarEdit::NumValueChanged(double val)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_numValue = val;
 }
 
 void MacroConditionTempVarEdit::RegexChanged(const RegexConfig &conf)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();

lib/macro/macro-condition-variable.cpp

@@ -236,11 +236,7 @@ void MacroConditionVariableEdit::UpdateEntryData()
 
 void MacroConditionVariableEdit::VariableChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_variable = GetWeakVariableByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -248,22 +244,13 @@ void MacroConditionVariableEdit::VariableChanged(const QString &text)
 
 void MacroConditionVariableEdit::Variable2Changed(const QString &text)
 {
-
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }
 
 void MacroConditionVariableEdit::ConditionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_type =
 		static_cast<MacroConditionVariable::Condition>(value);
 	SetWidgetVisibility();
@@ -271,11 +258,7 @@ void MacroConditionVariableEdit::ConditionChanged(int value)
 
 void MacroConditionVariableEdit::StrValueChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -283,21 +266,13 @@ void MacroConditionVariableEdit::StrValueChanged()
 
 void MacroConditionVariableEdit::NumValueChanged(double val)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_numValue = val;
 }
 
 void MacroConditionVariableEdit::RegexChanged(const RegexConfig &conf)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();

lib/macro/macro-edit.hpp

@@ -0,0 +1,144 @@
+#pragma once
+#include "condition-logic.hpp"
+
+#include <ui_macro-edit.h>
+
+namespace advss {
+
+class Macro;
+class MacroSegment;
+
+/*******************************************************************************
+ * Advanced Scene Switcher window
+ *******************************************************************************/
+class MacroEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroEdit(QWidget *parent, QStringList helpMsg = {});
+	void SetMacro(const std::shared_ptr<Macro> &);
+	void ClearSegmentWidgetCacheFor(Macro *) const;
+	void SetControlsDisabled(bool disable) const;
+	void HighlightAction(int idx, QColor color = QColor(Qt::green)) const;
+	void HighlightElseAction(int idx,
+				 QColor color = QColor(Qt::green)) const;
+	void HighlightCondition(int idx,
+				QColor color = QColor(Qt::green)) const;
+	void ResetConditionHighlights();
+	void ResetActionHighlights();
+	void SetActionData(Macro &m) const;
+	void SetElseActionData(Macro &m) const;
+	void SetConditionData(Macro &m) const;
+	void SwapActions(Macro *m, int pos1, int pos2);
+	void SwapElseActions(Macro *m, int pos1, int pos2);
+	void SwapConditions(Macro *m, int pos1, int pos2);
+	void CopyMacroSegment();
+	void PasteMacroSegment();
+	bool IsEmpty() const;
+	void ShowAllMacroSections();
+
+private slots:
+	void on_conditionAdd_clicked();
+	void on_conditionRemove_clicked();
+	void on_conditionTop_clicked();
+	void on_conditionUp_clicked();
+	void on_conditionDown_clicked();
+	void on_conditionBottom_clicked();
+	void on_actionAdd_clicked();
+	void on_actionRemove_clicked();
+	void on_actionTop_clicked();
+	void on_actionUp_clicked();
+	void on_actionDown_clicked();
+	void on_actionBottom_clicked();
+	void on_toggleElseActions_clicked() const;
+	void on_elseActionAdd_clicked();
+	void on_elseActionRemove_clicked();
+	void on_elseActionTop_clicked();
+	void on_elseActionUp_clicked();
+	void on_elseActionDown_clicked();
+	void on_elseActionBottom_clicked();
+	void UpMacroSegmentHotkey();
+	void DownMacroSegmentHotkey();
+	void DeleteMacroSegmentHotkey();
+	void ShowMacroActionsContextMenu(const QPoint &);
+	void ShowMacroElseActionsContextMenu(const QPoint &);
+	void ShowMacroConditionsContextMenu(const QPoint &);
+	void ExpandAllActions() const;
+	void ExpandAllElseActions() const;
+	void ExpandAllConditions() const;
+	void CollapseAllActions() const;
+	void CollapseAllElseActions() const;
+	void CollapseAllConditions() const;
+	void MinimizeActions() const;
+	void MaximizeActions() const;
+	void MinimizeElseActions() const;
+	void MaximizeElseActions() const;
+	void MinimizeConditions() const;
+	void MaximizeConditions() const;
+	void SetElseActionsStateToHidden() const;
+	void SetElseActionsStateToVisible() const;
+	void MacroActionSelectionChanged(int idx);
+	void MacroActionReorder(int to, int target);
+	void AddMacroAction(Macro *macro, int idx, const std::string &id,
+			    obs_data_t *data);
+	void AddMacroAction(int idx);
+	void RemoveMacroAction(int idx);
+	void MoveMacroActionUp(int idx);
+	void MoveMacroActionDown(int idx);
+	void MacroElseActionSelectionChanged(int idx);
+	void MacroElseActionReorder(int to, int target);
+	void AddMacroElseAction(Macro *macro, int idx, const std::string &id,
+				obs_data_t *data);
+	void AddMacroElseAction(int idx);
+	void RemoveMacroElseAction(int idx);
+	void MoveMacroElseActionUp(int idx);
+	void MoveMacroElseActionDown(int idx);
+	void MacroConditionSelectionChanged(int idx);
+	void MacroConditionReorder(int to, int target);
+	void AddMacroCondition(int idx);
+	void AddMacroCondition(Macro *macro, int idx, const std::string &id,
+			       obs_data_t *data, Logic::Type logic);
+	void RemoveMacroCondition(int idx);
+	void MoveMacroConditionUp(int idx);
+	void MoveMacroConditionDown(int idx);
+	void HighlightControls() const;
+
+signals:
+	void MacroAdded(const QString &name);
+	void MacroRemoved(const QString &name);
+	void MacroRenamed(const QString &oldName, const QString &newName);
+	void MacroSegmentOrderChanged();
+	void SegmentTempVarsChanged(MacroSegment *);
+
+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 SetupMacroSegmentSelection(MacroSection type, int idx);
+	void
+	SetupContextMenu(const QPoint &pos,
+			 const std::function<void(MacroEdit *, int)> &remove,
+			 const std::function<void(MacroEdit *)> &expand,
+			 const std::function<void(MacroEdit *)> &collapse,
+			 const std::function<void(MacroEdit *)> &maximize,
+			 const std::function<void(MacroEdit *)> &minimize,
+			 MacroSegmentList *list);
+	void RunSegmentHighlightChecks();
+	bool ElseSectionIsVisible() const;
+
+	MacroSection lastInteracted = MacroSection::CONDITIONS;
+	int currentConditionIdx = -1;
+	int currentActionIdx = -1;
+	int currentElseActionIdx = -1;
+
+	std::shared_ptr<Macro> _currentMacro;
+
+	std::unique_ptr<Ui_MacroEdit> ui;
+};
+
+} // namespace advss

lib/macro/macro-helpers.cpp

@@ -78,36 +78,36 @@ bool MacroSwitchedScene()
 	return macroSceneSwitched;
 }
 
-std::string GetMacroName(Macro *macro)
+std::string GetMacroName(const Macro *macro)
 {
 	return macro ? macro->Name() : "";
 }
 
 std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(Macro *macro)
+LastMacroConditionCheckTime(const Macro *macro)
 {
 	return macro ? macro->LastConditionCheckTime()
 		     : std::chrono::high_resolution_clock::time_point{};
 }
 
-bool MacroIsStopped(Macro *macro)
+bool MacroIsStopped(const Macro *macro)
 {
 	return macro ? macro->GetStop() : true;
 }
 
-bool MacroIsPaused(Macro *macro)
+bool MacroIsPaused(const Macro *macro)
 {
 	return macro ? macro->Paused() : true;
 }
 
 bool MacroWasPausedSince(
-	Macro *macro,
+	const Macro *macro,
 	const std::chrono::high_resolution_clock::time_point &time)
 {
 	return macro ? macro->WasPausedSince(time) : false;
 }
 
-bool MacroWasCheckedSinceLastStart(Macro *macro)
+bool MacroWasCheckedSinceLastStart(const Macro *macro)
 {
 	if (!macro) {
 		return false;
@@ -144,7 +144,7 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }
 
-bool IsValidMacroSegmentIndex(Macro *m, const int idx, bool isCondition)
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
 {
 	if (!m || idx < 0) {
 		return false;

lib/macro/macro-helpers.hpp

@@ -41,17 +41,17 @@ EXPORT std::atomic_int &GetShutdownConditionCount();
 EXPORT void SetMacroSwitchedScene(bool value);
 EXPORT bool MacroSwitchedScene();
 
-EXPORT std::string GetMacroName(Macro *);
+EXPORT std::string GetMacroName(const Macro *);
 
 EXPORT std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(Macro *);
+LastMacroConditionCheckTime(const Macro *);
 
-EXPORT bool MacroIsStopped(Macro *);
-EXPORT bool MacroIsPaused(Macro *);
+EXPORT bool MacroIsStopped(const Macro *);
+EXPORT bool MacroIsPaused(const Macro *);
 EXPORT bool
-MacroWasPausedSince(Macro *,
+MacroWasPausedSince(const Macro *,
 		    const std::chrono::high_resolution_clock::time_point &);
-EXPORT bool MacroWasCheckedSinceLastStart(Macro *);
+EXPORT bool MacroWasCheckedSinceLastStart(const Macro *);
 
 EXPORT void AddMacroHelperThread(Macro *, std::thread &&);
 
@@ -68,6 +68,6 @@ EXPORT void InvalidateMacroTempVarValues();
 EXPORT void ResetMacroConditionTimers(Macro *);
 EXPORT void ResetMacroRunCount(Macro *);
 
-bool IsValidMacroSegmentIndex(Macro *m, const int idx, bool isCondition);
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition);
 
 } // namespace advss

lib/macro/macro-list.cpp

@@ -10,11 +10,12 @@ MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
 	: ListEditor(parent, reorder),
 	  _allowDuplicates(allowDuplicates)
 {
-	QWidget::connect(window(),
+	QWidget::connect(GetSettingsWindow(),
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));
-	QWidget::connect(window(), SIGNAL(MacroRemoved(const QString &)), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
 	UpdateListSize();
 }

lib/macro/macro-run-button.cpp

@@ -11,10 +11,14 @@ namespace advss {
 MacroRunButton::MacroRunButton(QWidget *parent) : QPushButton(parent)
 {
 	installEventFilter(this);
-	auto parentWindow = window();
-	if (parentWindow) {
-		parentWindow->installEventFilter(this);
-	}
+
+	// GetSettingsWindow() might still return null while this constructor is called
+	QTimer::singleShot(0, this, [this]() {
+		auto parentWindow = GetSettingsWindow();
+		if (parentWindow) {
+			parentWindow->installEventFilter(this);
+		}
+	});
 
 	setToolTip(obs_module_text("AdvSceneSwitcher.macroTab.run.tooltip"));
 

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

@@ -13,7 +13,7 @@ struct MacroSegmentCopyInfo {
 };
 static MacroSegmentCopyInfo copyInfo;
 
-void AdvSceneSwitcher::CopyMacroSegment()
+void MacroEdit::CopyMacroSegment()
 {
 	copyInfo.segment.reset();
 	copyInfo.type = MacroSegmentCopyInfo::Type::NONE;
@@ -23,7 +23,7 @@ void AdvSceneSwitcher::CopyMacroSegment()
 		return;
 	}
 
-	auto macro = GetSelectedMacro();
+	auto macro = _currentMacro;
 	if (!macro) {
 		return;
 	}
@@ -43,13 +43,13 @@ void AdvSceneSwitcher::CopyMacroSegment()
 	}
 }
 
-void AdvSceneSwitcher::PasteMacroSegment()
+void MacroEdit::PasteMacroSegment()
 {
 	if (copyInfo.type == MacroSegmentCopyInfo::Type::NONE) {
 		return;
 	}
 
-	auto macro = GetSelectedMacro();
+	auto macro = _currentMacro;
 	if (!macro || !copyInfo.segment) {
 		return;
 	}
@@ -113,14 +113,14 @@ void SetCopySegmentTargetActionType(bool setToElseAction)
 	}
 }
 
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window)
+void SetupSegmentCopyPasteShortcutHandlers(MacroEdit *edit)
 {
-	auto copyShortcut = new QShortcut(QKeySequence("Ctrl+C"), window);
-	QWidget::connect(copyShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::CopyMacroSegment);
-	auto pasteShortcut = new QShortcut(QKeySequence("Ctrl+V"), window);
-	QWidget::connect(pasteShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::PasteMacroSegment);
+	auto copyShortcut = new QShortcut(QKeySequence("Ctrl+C"), edit);
+	QWidget::connect(copyShortcut, &QShortcut::activated, edit,
+			 &MacroEdit::CopyMacroSegment);
+	auto pasteShortcut = new QShortcut(QKeySequence("Ctrl+V"), edit);
+	QWidget::connect(pasteShortcut, &QShortcut::activated, edit,
+			 &MacroEdit::PasteMacroSegment);
 }
 
 } // namespace advss

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

@@ -1,10 +1,10 @@
 namespace advss {
 
-class AdvSceneSwitcher;
+class MacroEdit;
 
 bool MacroSegmentIsInClipboard();
 bool MacroActionIsInClipboard();
 void SetCopySegmentTargetActionType(bool setToElseAction);
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window);
+void SetupSegmentCopyPasteShortcutHandlers(MacroEdit *edit);
 
 } // namespace advss

lib/macro/macro-segment-list.cpp

@@ -17,31 +17,50 @@ bool MacroSegmentList::_useCache = true;
 
 MacroSegmentList::MacroSegmentList(QWidget *parent)
 	: QScrollArea(parent),
+	  _stackedWidget(new QStackedWidget(this)),
 	  _layout(new QVBoxLayout),
 	  _contentLayout(new QVBoxLayout),
-	  _helpMsg(new QLabel)
+	  _helpMsg(new QLabel(this))
 {
 	_helpMsg->setWordWrap(true);
 	_helpMsg->setAlignment(Qt::AlignCenter);
+	auto helpWidget = new QWidget(this);
+	auto helpLayout = new QVBoxLayout(helpWidget);
+	helpLayout->addWidget(_helpMsg);
+	helpLayout->setAlignment(Qt::AlignCenter);
+
+	auto contentWidget = new QWidget(this);
+	contentWidget->setLayout(_contentLayout);
 	_contentLayout->setSpacing(0);
-	auto helperLayout = new QGridLayout();
-	helperLayout->addWidget(_helpMsg, 0, 0,
-				Qt::AlignHCenter | Qt::AlignVCenter);
-	helperLayout->addLayout(_contentLayout, 0, 0);
-	helperLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
-	_layout->addLayout(helperLayout, 10);
-	_layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding,
-					 QSizePolicy::Expanding));
-	auto wrapper = new QWidget;
-	wrapper->setLayout(_layout);
-	setWidget(wrapper);
+
+	auto contentWrapper = new QWidget(this);
+	auto wrapperLayout = new QVBoxLayout(contentWrapper);
+	wrapperLayout->setContentsMargins(0, 0, 0, 0);
+	wrapperLayout->addWidget(contentWidget);
+	// Move macro segments to the top of the list
+	wrapperLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding,
+					       QSizePolicy::Expanding));
+
+	_stackedWidget->addWidget(helpWidget);
+	_stackedWidget->addWidget(contentWrapper);
+
+	setWidget(_stackedWidget);
 	setWidgetResizable(true);
 	setAcceptDrops(true);
 
+	SetHelpMsgVisible(true);
+
 	connect(verticalScrollBar(), &QScrollBar::valueChanged, this,
 		[this]() { SetupVisibleMacroSegmentWidgets(); });
 }
 
+static void clearWidgetVector(const std::vector<QWidget *> &widgets)
+{
+	for (auto widget : widgets) {
+		widget->deleteLater();
+	}
+};
+
 MacroSegmentList::~MacroSegmentList()
 {
 	if (_autoScrollThread.joinable()) {
@@ -49,16 +68,7 @@ MacroSegmentList::~MacroSegmentList()
 		_autoScrollThread.join();
 	}
 
-	const auto clearWidgetVector =
-		[](const std::vector<QWidget *> &widgets) {
-			for (auto widget : widgets) {
-				widget->deleteLater();
-			}
-		};
-
-	for (const auto &[_, widgets] : _widgetCache) {
-		clearWidgetVector(widgets);
-	}
+	ClearWidgetCache();
 }
 
 static bool posIsInScrollbar(const QScrollBar *scrollbar, const QPoint &pos)
@@ -109,9 +119,11 @@ void MacroSegmentList::SetHelpMsg(const QString &msg) const
 	_helpMsg->setText(msg);
 }
 
-void MacroSegmentList::SetHelpMsgVisible(bool visible) const
+void MacroSegmentList::SetHelpMsgVisible(bool visible)
 {
-	_helpMsg->setVisible(visible);
+	_stackedWidget->setCurrentIndex(visible ? 0 : 1);
+	adjustSize();
+	updateGeometry();
 }
 
 void MacroSegmentList::Insert(int idx, QWidget *widget)
@@ -119,23 +131,33 @@ void MacroSegmentList::Insert(int idx, QWidget *widget)
 	widget->installEventFilter(this);
 	_contentLayout->insertWidget(idx, widget);
 	SetupVisibleMacroSegmentWidgets();
+	SetHelpMsgVisible(false);
+	adjustSize();
+	updateGeometry();
 }
 
 void MacroSegmentList::Add(QWidget *widget)
 {
-	widget->installEventFilter(this);
-	_contentLayout->addWidget(widget);
-	SetupVisibleMacroSegmentWidgets();
+	Insert(_contentLayout->count(), widget);
 }
 
-void MacroSegmentList::Remove(int idx) const
+void MacroSegmentList::Remove(int idx)
 {
 	DeleteLayoutItemWidget(_contentLayout->takeAt(idx));
+	adjustSize();
+	updateGeometry();
+	if (IsEmpty()) {
+		SetHelpMsgVisible(true);
+	}
 }
 
-void MacroSegmentList::Clear(int idx) const
+void MacroSegmentList::Clear(int idx)
 {
 	ClearLayout(_contentLayout, idx);
+	adjustSize();
+	updateGeometry();
+
+	SetHelpMsgVisible(true);
 }
 
 void MacroSegmentList::SetCachingEnabled(bool enable)
@@ -146,7 +168,6 @@ void MacroSegmentList::SetCachingEnabled(bool enable)
 void MacroSegmentList::CacheCurrentWidgetsFor(const Macro *macro)
 {
 	if (!_useCache) {
-		_widgetCache.clear();
 		return;
 	}
 
@@ -168,7 +189,6 @@ void MacroSegmentList::CacheCurrentWidgetsFor(const Macro *macro)
 bool MacroSegmentList::PopulateWidgetsFromCache(const Macro *macro)
 {
 	if (!_useCache) {
-		_widgetCache.clear();
 		return false;
 	}
 
@@ -182,9 +202,21 @@ bool MacroSegmentList::PopulateWidgetsFromCache(const Macro *macro)
 		widget->show();
 	}
 
+	adjustSize();
+	updateGeometry();
 	return true;
 }
 
+void MacroSegmentList::ClearWidgetsFromCacheFor(const Macro *macro)
+{
+	auto it = _widgetCache.find(macro);
+	if (it == _widgetCache.end()) {
+		return;
+	}
+	clearWidgetVector(it->second);
+	_widgetCache.erase(it);
+}
+
 void MacroSegmentList::Highlight(int idx, QColor color)
 {
 	auto item = _contentLayout->itemAt(idx);
@@ -330,6 +362,13 @@ void MacroSegmentList::HideLastDropLine()
 	_dropLineIdx = -1;
 }
 
+void MacroSegmentList::ClearWidgetCache()
+{
+	for (const auto &[_, widgets] : _widgetCache) {
+		clearWidgetVector(widgets);
+	}
+}
+
 static bool isInUpperHalfOf(const QPoint &pos, const QRect &rect)
 {
 	return QRect(rect.topLeft(),
@@ -398,6 +437,24 @@ void MacroSegmentList::SetVisibilityCheckEnable(bool enable)
 	}
 }
 
+bool MacroSegmentList::IsEmpty() const
+{
+	return _contentLayout->count() == 0;
+}
+
+QSize MacroSegmentList::minimumSizeHint() const
+{
+	return _stackedWidget->currentWidget()->minimumSizeHint();
+}
+
+QSize MacroSegmentList::sizeHint() const
+{
+	const auto contentSize = _stackedWidget->currentWidget()->sizeHint();
+	const auto hint =
+		QSize(width(), contentSize.height() + 2 * frameWidth());
+	return hint;
+}
+
 void MacroSegmentList::SetupVisibleMacroSegmentWidgets()
 {
 	if (!_checkVisibility) {
@@ -415,6 +472,7 @@ void MacroSegmentList::SetupVisibleMacroSegmentWidgets()
 
 		segment->SetupWidgets();
 	}
+	updateGeometry();
 }
 
 int MacroSegmentList::GetSegmentIndexFromPos(const QPoint &pos) const

lib/macro/macro-segment-list.hpp

@@ -1,12 +1,14 @@
 #pragma once
 #include "macro-segment.hpp"
 
-#include <QWidget>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QLabel>
 #include <thread>
 
+#include <QLabel>
+#include <QScrollArea>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+#include <QWidget>
+
 namespace advss {
 
 class Macro;
@@ -17,48 +19,62 @@ class MacroSegmentList : public QScrollArea {
 public:
 	MacroSegmentList(QWidget *parent = nullptr);
 	~MacroSegmentList();
+
 	void SetHelpMsg(const QString &msg) const;
-	void SetHelpMsgVisible(bool visible) const;
+	void SetHelpMsgVisible(bool visible);
+
 	MacroSegmentEdit *WidgetAt(int idx) const;
 	MacroSegmentEdit *WidgetAt(const QPoint &) const;
+
 	int IndexAt(const QPoint &) const;
 	void Insert(int idx, QWidget *widget);
 	void Add(QWidget *widget);
-	void Remove(int idx) const;
-	void Clear(int idx = 0) const; // Clear all elements >= idx
+	void Remove(int idx);
+	void Clear(int idx = 0); // Clear all elements >= idx
+	bool IsEmpty() const;
+
 	static void SetCachingEnabled(bool enable);
 	void CacheCurrentWidgetsFor(const Macro *);
 	bool PopulateWidgetsFromCache(const Macro *);
+	void ClearWidgetsFromCacheFor(const Macro *);
+	void SetVisibilityCheckEnable(bool enable);
+
 	void Highlight(int idx, QColor color = QColor(Qt::green));
+
 	void SetCollapsed(bool) const;
 	void SetSelection(int idx) const;
 	QVBoxLayout *ContentLayout() const { return _contentLayout; }
-	void SetVisibilityCheckEnable(bool enable);
+
+	QSize minimumSizeHint() const override;
+	QSize sizeHint() const override;
 
 signals:
 	void SelectionChanged(int idx);
 	void Reorder(int source, int target);
 
 protected:
-	bool eventFilter(QObject *object, QEvent *event);
-	void mousePressEvent(QMouseEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
-	void mouseReleaseEvent(QMouseEvent *event);
-	void dragLeaveEvent(QDragLeaveEvent *event);
-	void dragEnterEvent(QDragEnterEvent *event);
-	void dragMoveEvent(QDragMoveEvent *event);
-	void dropEvent(QDropEvent *event);
-	void resizeEvent(QResizeEvent *event);
+	bool eventFilter(QObject *object, QEvent *event) override;
+	void mousePressEvent(QMouseEvent *event) override;
+	void mouseMoveEvent(QMouseEvent *event) override;
+	void mouseReleaseEvent(QMouseEvent *event) override;
+	void dragLeaveEvent(QDragLeaveEvent *event) override;
+	void dragEnterEvent(QDragEnterEvent *event) override;
+	void dragMoveEvent(QDragMoveEvent *event) override;
+	void dropEvent(QDropEvent *event) override;
+	void resizeEvent(QResizeEvent *event) override;
 
 private:
 	void SetupVisibleMacroSegmentWidgets();
+	void ClearWidgetCache();
+
 	int GetSegmentIndexFromPos(const QPoint &) const;
+	bool IsInListArea(const QPoint &) const;
+	QRect GetContentItemRectWithPadding(int idx) const;
+
 	int GetDragIndex(const QPoint &) const;
 	int GetDropIndex(const QPoint &) const;
 	void CheckScroll() const;
 	void CheckDropLine(const QPoint &);
-	bool IsInListArea(const QPoint &) const;
-	QRect GetContentItemRectWithPadding(int idx) const;
 	void HideLastDropLine();
 
 	int _dragPosition = -1;
@@ -67,6 +83,7 @@ private:
 	std::thread _autoScrollThread;
 	std::atomic_bool _autoScroll{false};
 
+	QStackedWidget *_stackedWidget;
 	QVBoxLayout *_layout;
 	QVBoxLayout *_contentLayout;
 	QLabel *_helpMsg;

lib/macro/macro-segment-selection.cpp

@@ -31,7 +31,8 @@ MacroSegmentSelection::MacroSegmentSelection(QWidget *parent, Type type,
 		_index,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(IndexChanged(const NumberVariable<int> &)));
-	QWidget::connect(window(), SIGNAL(MacroSegmentOrderChanged()), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroSegmentOrderChanged()), this,
 			 SLOT(MacroSegmentOrderChanged()));
 
 	auto layout = new QHBoxLayout;

lib/macro/macro-segment.cpp

@@ -107,7 +107,7 @@ void MacroSegment::SetupTempVars()
 void MacroSegment::ClearAvailableTempvars()
 {
 	_tempVariables.clear();
-	NotifyUIAboutTempVarChange();
+	NotifyUIAboutTempVarChange(this);
 }
 
 static std::shared_ptr<MacroSegment>
@@ -149,7 +149,7 @@ void MacroSegment::AddTempvar(const std::string &id, const std::string &name,
 
 	TempVariable var(id, name, description, sharedSegment);
 	_tempVariables.emplace_back(std::move(var));
-	NotifyUIAboutTempVarChange();
+	NotifyUIAboutTempVarChange(this);
 }
 
 void MacroSegment::SetTempVarValue(const std::string &id,
@@ -257,20 +257,25 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 	QWidget::connect(_section, &Section::Collapsed, this,
 			 &MacroSegmentEdit::Collapsed);
 	// Macro signals
-	QWidget::connect(parent, SIGNAL(MacroAdded(const QString &)), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroAdded(const QString &)), this,
 			 SIGNAL(MacroAdded(const QString &)));
-	QWidget::connect(parent, SIGNAL(MacroRemoved(const QString &)), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroRemoved(const QString &)), this,
 			 SIGNAL(MacroRemoved(const QString &)));
 	QWidget::connect(
-		parent, SIGNAL(MacroRenamed(const QString &, const QString &)),
-		this, SIGNAL(MacroRenamed(const QString &, const QString &)));
+		GetSettingsWindow(),
+		SIGNAL(MacroRenamed(const QString &, const QString &)), this,
+		SIGNAL(MacroRenamed(const QString &, const QString &)));
 	// Scene group signals
-	QWidget::connect(parent, SIGNAL(SceneGroupAdded(const QString &)), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(SceneGroupAdded(const QString &)), this,
 			 SIGNAL(SceneGroupAdded(const QString &)));
-	QWidget::connect(parent, SIGNAL(SceneGroupRemoved(const QString &)),
-			 this, SIGNAL(SceneGroupRemoved(const QString &)));
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(SceneGroupRemoved(const QString &)), this,
+			 SIGNAL(SceneGroupRemoved(const QString &)));
 	QWidget::connect(
-		parent,
+		GetSettingsWindow(),
 		SIGNAL(SceneGroupRenamed(const QString &, const QString)), this,
 		SIGNAL(SceneGroupRenamed(const QString &, const QString)));
 

lib/macro/macro-segment.hpp

@@ -19,7 +19,7 @@ namespace advss {
 
 class Macro;
 
-class EXPORT MacroSegment {
+class EXPORT MacroSegment : public Lockable {
 public:
 	MacroSegment(Macro *m, bool supportsVariableValue);
 	virtual ~MacroSegment() = default;

lib/macro/macro-selection.cpp

@@ -49,7 +49,7 @@ void MacroSelection::SetCurrentMacro(const MacroRef &macro)
 
 void MacroSelection::HideSelectedMacro()
 {
-	auto ssWindow = static_cast<AdvSceneSwitcher *>(window());
+	auto ssWindow = static_cast<AdvSceneSwitcher *>(GetSettingsWindow());
 	if (!ssWindow) {
 		return;
 	}
@@ -76,12 +76,16 @@ void MacroSelection::ShowAllMacros()
 
 void MacroSelection::MacroRemove(const QString &name)
 {
+	const bool currentSelectionWasRemoved = name == currentText();
+
 	int idx = findText(name);
 	if (idx == -1) {
 		return;
 	}
 	removeItem(idx);
-	setCurrentIndex(-1);
+	if (currentSelectionWasRemoved) {
+		setCurrentIndex(-1);
+	}
 }
 
 void MacroSelection::MacroRename(const QString &oldName, const QString &newName)

lib/macro/macro-settings.cpp

@@ -478,7 +478,14 @@ bool MacroSettingsDialog::AskForSettings(QWidget *parent,
 	macro->SetSkipExecOnStart(dialog._currentSkipOnStartup->isChecked());
 	macro->SetStopActionsIfNotDone(
 		dialog._currentStopActionsIfNotDone->isChecked());
-	macro->EnableDock(dialog._currentMacroRegisterDock->isChecked());
+
+	// Only apply "on change" to avoid recreation of the dock widget
+	const bool enableDock = dialog._currentMacroRegisterDock->isChecked();
+	if (macro->DockEnabled() != enableDock) {
+		macro->EnableDock(
+			dialog._currentMacroRegisterDock->isChecked());
+	}
+
 	macro->SetDockHasRunButton(
 		dialog._currentMacroDockAddRunButton->isChecked());
 	macro->SetDockHasPauseButton(

lib/macro/macro-tree.cpp

@@ -414,6 +414,20 @@ void MacroTreeModel::Add(std::shared_ptr<Macro> item)
 				      QItemSelectionModel::Select);
 }
 
+void MacroTreeModel::MoveToBeginningOfGroup(std::shared_ptr<Macro> item,
+					    std::shared_ptr<Macro> group)
+{
+	auto it = std::find(_macros.begin(), _macros.end(), item);
+	assert(it != _macros.end());
+	std::shared_ptr<Macro> tmp = *it;
+	_macros.erase(it);
+	it = std::find(_macros.begin(), _macros.end(), group);
+	assert(it != _macros.end());
+	_macros.insert(std::next(it), tmp);
+
+	Reset(_macros);
+}
+
 void MacroTreeModel::Remove(std::shared_ptr<Macro> item)
 {
 	auto lock = LockContext();
@@ -789,6 +803,13 @@ void MacroTree::Add(std::shared_ptr<Macro> item,
 	assert(GetModel()->IsInValidState());
 }
 
+void MacroTree::AddToGroup(std::shared_ptr<Macro> item,
+			   std::shared_ptr<Macro> group) const
+{
+	GetModel()->Add(item);
+	GetModel()->MoveToBeginningOfGroup(item, group);
+}
+
 std::shared_ptr<Macro> MacroTree::GetCurrentMacro() const
 {
 	return GetModel()->GetCurrentMacro();
@@ -1160,6 +1181,28 @@ bool MacroTree::SelectionEmpty() const
 	return selectedIndexes().empty();
 }
 
+bool MacroTree::GroupsExist() const
+{
+	for (const auto &macro : GetMacros()) {
+		if (macro->IsGroup()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void MacroTree::ExpandGroup(std::shared_ptr<Macro> item) const
+{
+	auto *mtm = GetModel();
+	mtm->ExpandGroup(item);
+}
+
+void MacroTree::CollapseGroup(std::shared_ptr<Macro> item) const
+{
+	auto *mtm = GetModel();
+	mtm->CollapseGroup(item);
+}
+
 void MacroTree::MoveItemBefore(const std::shared_ptr<Macro> &item,
 			       const std::shared_ptr<Macro> &after) const
 {
@@ -1260,6 +1303,26 @@ void MacroTree::UngroupSelectedGroups()
 	assert(GetModel()->IsInValidState());
 }
 
+void MacroTree::ExpandAll()
+{
+	for (const auto &macro : GetMacros()) {
+		if (!macro->IsGroup()) {
+			continue;
+		}
+		ExpandGroup(macro);
+	}
+}
+
+void MacroTree::CollapseAll()
+{
+	for (const auto &macro : GetMacros()) {
+		if (!macro->IsGroup()) {
+			continue;
+		}
+		CollapseGroup(macro);
+	}
+}
+
 void MacroTree::SelectionChangedHelper(const QItemSelection &,
 				       const QItemSelection &)
 {
@@ -1301,10 +1364,10 @@ QSize MacroTreeDelegate::sizeHint(const QStyleOptionViewItem &option,
 	QWidget *item = tree->indexWidget(index);
 
 	if (!item) {
-		return (QSize(0, 0));
+		return QStyledItemDelegate::sizeHint(option, index);
 	}
 
-	return (QSize(option.widget->minimumWidth(), item->height()));
+	return QSize(item->sizeHint());
 }
 
 } // namespace advss

lib/macro/macro-tree.hpp

@@ -91,6 +91,8 @@ private:
 	void MoveItemAfter(const std::shared_ptr<Macro> &item,
 			   const std::shared_ptr<Macro> &after);
 	void Add(std::shared_ptr<Macro> item);
+	void MoveToBeginningOfGroup(std::shared_ptr<Macro> item,
+				    std::shared_ptr<Macro>);
 	void Remove(std::shared_ptr<Macro> item);
 	std::shared_ptr<Macro> Neighbor(const std::shared_ptr<Macro> &m,
 					bool above) const;
@@ -126,6 +128,8 @@ public:
 	void Reset(std::deque<std::shared_ptr<Macro>> &, bool highlight);
 	void Add(std::shared_ptr<Macro> item,
 		 std::shared_ptr<Macro> after = {}) const;
+	void AddToGroup(std::shared_ptr<Macro> item,
+			std::shared_ptr<Macro> group) const;
 	void Remove(std::shared_ptr<Macro> item) const;
 	void Up(std::shared_ptr<Macro> item) const;
 	void Down(std::shared_ptr<Macro> item) const;
@@ -135,10 +139,15 @@ public:
 	bool GroupedItemsSelected() const;
 	bool SingleItemSelected() const;
 	bool SelectionEmpty() const;
+	bool GroupsExist() const;
+	void ExpandGroup(std::shared_ptr<Macro> item) const;
+	void CollapseGroup(std::shared_ptr<Macro> item) const;
 
 public slots:
 	void GroupSelectedItems();
 	void UngroupSelectedGroups();
+	void ExpandAll();
+	void CollapseAll();
 	void SelectionChangedHelper(const QItemSelection &,
 				    const QItemSelection &);
 

lib/macro/macro.cpp

@@ -173,7 +173,10 @@ static bool checkCondition(const std::shared_ptr<MacroCondition> &condition)
 	static constexpr auto perfLogThreshold = 300ms;
 
 	const auto startTime = std::chrono::high_resolution_clock::now();
-	const bool conditionMatched = condition->CheckCondition();
+	bool conditionMatched = false;
+	condition->WithLock([&condition, &conditionMatched]() {
+		conditionMatched = condition->CheckCondition();
+	});
 	const auto endTime = std::chrono::high_resolution_clock::now();
 	const auto timeSpent = endTime - startTime;
 
@@ -444,9 +447,12 @@ bool Macro::RunActionsHelper(
 		}
 		if (action->Enabled()) {
 			action->LogAction();
+			bool actionResult = false;
+			action->WithLock([&action, &actionResult]() {
+				actionResult = action->PerformAction();
+			});
 			actionsExecutedSuccessfully =
-				actionsExecutedSuccessfully &&
-				action->PerformAction();
+				actionsExecutedSuccessfully && actionResult;
 		} else {
 			vblog(LOG_INFO, "skipping disabled action %s",
 			      action->GetId().c_str());
@@ -724,16 +730,31 @@ std::deque<std::shared_ptr<MacroCondition>> &Macro::Conditions()
 	return _conditions;
 }
 
+const std::deque<std::shared_ptr<MacroCondition>> &Macro::Conditions() const
+{
+	return _conditions;
+}
+
 std::deque<std::shared_ptr<MacroAction>> &Macro::Actions()
 {
 	return _actions;
 }
 
+const std::deque<std::shared_ptr<MacroAction>> &Macro::Actions() const
+{
+	return _actions;
+}
+
 std::deque<std::shared_ptr<MacroAction>> &Macro::ElseActions()
 {
 	return _elseActions;
 }
 
+const std::deque<std::shared_ptr<MacroAction>> &Macro::ElseActions() const
+{
+	return _elseActions;
+}
+
 static void updateIndicesHelper(std::deque<std::shared_ptr<MacroSegment>> &list)
 {
 	int idx = 0;
@@ -918,9 +939,12 @@ bool Macro::Load(obs_data_t *obj)
 		auto newEntry = MacroConditionFactory::Create(id, this);
 		if (newEntry) {
 			_conditions.emplace_back(newEntry);
-			auto c = _conditions.back().get();
-			c->Load(arrayObj);
-			c->ValidateLogicSelection(root, Name().c_str());
+			auto condition = _conditions.back().get();
+			condition->WithLock([&]() {
+				condition->Load(arrayObj);
+				condition->ValidateLogicSelection(
+					root, Name().c_str());
+			});
 		} else {
 			blog(LOG_WARNING,
 			     "discarding condition entry with unknown id (%s) for macro %s",
@@ -933,12 +957,15 @@ bool Macro::Load(obs_data_t *obj)
 	OBSDataArrayAutoRelease actions = obs_data_get_array(obj, "actions");
 	count = obs_data_array_count(actions);
 	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease array_obj = obs_data_array_item(actions, i);
-		std::string id = obs_data_get_string(array_obj, "id");
+		OBSDataAutoRelease arrayObj = obs_data_array_item(actions, i);
+		std::string id = obs_data_get_string(arrayObj, "id");
 		auto newEntry = MacroActionFactory::Create(id, this);
 		if (newEntry) {
 			_actions.emplace_back(newEntry);
-			_actions.back()->Load(array_obj);
+			auto action = _actions.back().get();
+			action->WithLock([action, &arrayObj]() {
+				action->Load(arrayObj);
+			});
 		} else {
 			blog(LOG_WARNING,
 			     "discarding action entry with unknown id (%s) for macro %s",
@@ -951,13 +978,16 @@ bool Macro::Load(obs_data_t *obj)
 		obs_data_get_array(obj, "elseActions");
 	count = obs_data_array_count(elseActions);
 	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease array_obj =
+		OBSDataAutoRelease arrayObj =
 			obs_data_array_item(elseActions, i);
-		std::string id = obs_data_get_string(array_obj, "id");
+		std::string id = obs_data_get_string(arrayObj, "id");
 		auto newEntry = MacroActionFactory::Create(id, this);
 		if (newEntry) {
 			_elseActions.emplace_back(newEntry);
-			_elseActions.back()->Load(array_obj);
+			auto action = _elseActions.back().get();
+			action->WithLock([action, &arrayObj]() {
+				action->Load(arrayObj);
+			});
 		} else {
 			blog(LOG_WARNING,
 			     "discarding elseAction entry with unknown id (%s) for macro %s",
@@ -974,13 +1004,13 @@ bool Macro::Load(obs_data_t *obj)
 bool Macro::PostLoad()
 {
 	for (auto &c : _conditions) {
-		c->PostLoad();
+		c->WithLock([c]() { c->PostLoad(); });
 	}
 	for (auto &a : _actions) {
-		a->PostLoad();
+		a->WithLock([a]() { a->PostLoad(); });
 	}
 	for (auto &a : _elseActions) {
-		a->PostLoad();
+		a->WithLock([a]() { a->PostLoad(); });
 	}
 	return true;
 }

lib/macro/macro.hpp

@@ -95,8 +95,11 @@ public:
 
 	// Macro segments
 	std::deque<std::shared_ptr<MacroCondition>> &Conditions();
+	const std::deque<std::shared_ptr<MacroCondition>> &Conditions() const;
 	std::deque<std::shared_ptr<MacroAction>> &Actions();
+	const std::deque<std::shared_ptr<MacroAction>> &Actions() const;
 	std::deque<std::shared_ptr<MacroAction>> &ElseActions();
+	const std::deque<std::shared_ptr<MacroAction>> &ElseActions() const;
 	void UpdateActionIndices();
 	void UpdateElseActionIndices();
 	void UpdateConditionIndices();

lib/switcher-data.cpp

@@ -325,11 +325,27 @@ static void loadHotkey(obs_data_t *obj, obs_hotkey_id id, const char *name)
 	obs_data_array_release(a);
 }
 
+static void setDefaultHotkeyBinding(obs_data_t *data, const char *name,
+				    const char *value)
+{
+	OBSDataAutoRelease hotkeyData = obs_data_create_from_json(value);
+	OBSDataArrayAutoRelease hotkeyArray = obs_data_array_create();
+	obs_data_array_push_back(hotkeyArray, hotkeyData);
+	obs_data_set_default_array(data, name, hotkeyArray);
+}
+
 void SwitcherData::LoadHotkeys(obs_data_t *obj)
 {
 	if (!hotkeysRegistered) {
 		registerHotkeys();
 	}
+
+	setDefaultHotkeyBinding(obj, "newMacroHotkey",
+				"{"
+				"\"control\": true,"
+				"\"key\": \"OBS_KEY_N\""
+				"}");
+
 	loadHotkey(obj, startHotkey, "startHotkey");
 	loadHotkey(obj, stopHotkey, "stopHotkey");
 	loadHotkey(obj, toggleHotkey, "toggleHotkey");

lib/switcher-data.hpp

@@ -101,7 +101,7 @@ public:
 
 	bool firstBoot = true;
 	bool transitionActive = false;
-	bool sceneColletionStop = false;
+	bool sceneCollectionStop = false;
 	bool obsIsShuttingDown = false;
 	bool firstInterval = true;
 	bool firstIntervalAfterStop = true;

lib/utils/double-slider.hpp

@@ -7,7 +7,7 @@
 
 namespace advss {
 
-class SliderIgnoreScroll : public QSlider {
+class ADVSS_EXPORT SliderIgnoreScroll : public QSlider {
 	Q_OBJECT
 
 public:

lib/utils/duration-control.hpp

@@ -9,15 +9,14 @@
 
 namespace advss {
 
-class DurationSelection : public QWidget {
+class ADVSS_EXPORT DurationSelection : public QWidget {
 	Q_OBJECT
 public:
-	EXPORT DurationSelection(QWidget *parent = nullptr,
-				 bool showUnitSelection = true,
-				 double minValue = 0.0);
-	EXPORT void SetDuration(const Duration &);
+	DurationSelection(QWidget *parent = nullptr,
+			  bool showUnitSelection = true, double minValue = 0.0);
+	void SetDuration(const Duration &);
 	Duration GetDuration() const { return _current; }
-	EXPORT QDoubleSpinBox *SpinBox() { return _duration->SpinBox(); }
+	QDoubleSpinBox *SpinBox() { return _duration->SpinBox(); }
 
 private slots:
 	void _DurationChanged(const NumberVariable<double> &value);

lib/utils/plugin-state-helpers.hpp

@@ -25,8 +25,8 @@ EXPORT void StopPlugin();
 EXPORT void StartPlugin();
 EXPORT bool PluginIsRunning();
 EXPORT int GetIntervalValue();
-void AddStartStep(std::function<void()>);
-void AddStopStep(std::function<void()>);
+EXPORT void AddStartStep(std::function<void()>);
+EXPORT void AddStopStep(std::function<void()>);
 void RunStartSteps();
 void RunStopSteps();
 void RunIntervalResetSteps();

lib/utils/resizable-widget.cpp

@@ -0,0 +1,106 @@
+#include "resizable-widget.hpp"
+
+namespace advss {
+
+ResizableWidget::ResizableWidget(QWidget *parent) : QWidget(parent) {}
+
+void ResizableWidget::SetResizingEnabled(bool enable)
+{
+	setMouseTracking(enable);
+	_customHeight = enable ? sizeHint().height() : 0;
+	auto pol = sizePolicy();
+	pol.setVerticalPolicy(enable ? QSizePolicy::Fixed
+				     : QSizePolicy::Preferred);
+	_resizingEnabled = enable;
+}
+
+void ResizableWidget::mousePressEvent(QMouseEvent *event)
+{
+	if (!_resizingEnabled) {
+		QWidget::mousePressEvent(event);
+		return;
+	}
+
+	if (IsInResizeArea(event->pos())) {
+		_resizing = true;
+		_lastMousePos = event->globalPosition().toPoint();
+		event->accept();
+	} else {
+		QWidget::mousePressEvent(event);
+	}
+}
+
+void ResizableWidget::mouseMoveEvent(QMouseEvent *event)
+{
+	if (!_resizingEnabled) {
+		QWidget::mouseMoveEvent(event);
+		return;
+	}
+
+	if (_resizing) {
+		const int dy = event->globalPosition().toPoint().y() -
+			       _lastMousePos.y();
+		const int baseHeight = _customHeight == 0 ? height()
+							  : _customHeight;
+		const int newHeight = baseHeight + dy;
+		_customHeight =
+			std::clamp(newHeight, minimumHeight(), maximumHeight());
+		updateGeometry();
+		_lastMousePos = event->globalPosition().toPoint();
+		event->accept();
+	} else {
+		setCursor(IsInResizeArea(event->pos()) ? Qt::SizeVerCursor
+						       : Qt::ArrowCursor);
+		QWidget::mouseMoveEvent(event);
+	}
+}
+
+void ResizableWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+	if (_resizing) {
+		event->accept();
+		_resizing = false;
+	} else {
+		QWidget::mouseReleaseEvent(event);
+	}
+}
+
+void ResizableWidget::paintEvent(QPaintEvent *event)
+{
+	QWidget::paintEvent(event);
+
+	if (!_resizingEnabled) {
+		return;
+	}
+
+	// Draw a triangle in bottom-right as resize indicator
+	QPainter painter(this);
+	QPolygon triangle;
+	triangle << QPoint(width() - 1, height() - _gripSize)
+		 << QPoint(width() - _gripSize, height() - 1)
+		 << QPoint(width() - 1, height() - 1);
+	painter.setBrush(Qt::gray);
+	painter.drawPolygon(triangle);
+}
+
+QSize ResizableWidget::sizeHint() const
+{
+	if (!_resizingEnabled) {
+		return QWidget::sizeHint();
+	}
+
+	if (_customHeight == 0) {
+		return QWidget::sizeHint();
+	}
+
+	return QSize(width(), _customHeight);
+}
+
+bool ResizableWidget::IsInResizeArea(const QPoint &pos) const
+{
+	return QRect(width() - _gripSize, height() - _gripSize, _gripSize,
+		     _gripSize)
+		.contains(pos);
+}
+
+} // namespace advss

lib/utils/resizable-widget.hpp

@@ -0,0 +1,34 @@
+#pragma once
+#include <QMouseEvent>
+#include <QPainter>
+#include <QWidget>
+
+namespace advss {
+
+class ResizableWidget : public QWidget {
+	Q_OBJECT
+
+public:
+	ResizableWidget(QWidget *parent = nullptr);
+
+protected:
+	void SetResizingEnabled(bool enable);
+	void mousePressEvent(QMouseEvent *event) override;
+	void mouseMoveEvent(QMouseEvent *event) override;
+	void mouseReleaseEvent(QMouseEvent *event) override;
+	void paintEvent(QPaintEvent *event) override;
+	QSize sizeHint() const override;
+	int GetCustomHeight() const { return _customHeight; }
+	void SetCustomHeight(int value) { _customHeight = value; }
+
+private:
+	bool IsInResizeArea(const QPoint &pos) const;
+
+	bool _resizingEnabled = false;
+	bool _resizing = false;
+	QPoint _lastMousePos;
+	int _customHeight = 0;
+	const int _gripSize = 15;
+};
+
+} // namespace advss

lib/utils/resizing-text-edit.hpp

@@ -5,15 +5,15 @@
 
 namespace advss {
 
-class ResizingPlainTextEdit : public QPlainTextEdit {
+class ADVSS_EXPORT ResizingPlainTextEdit : public QPlainTextEdit {
 	Q_OBJECT
 public:
 	ResizingPlainTextEdit(QWidget *parent, const int scrollAt = 10,
 			      const int minLines = 3,
 			      const int paddingLines = 2);
 	virtual ~ResizingPlainTextEdit(){};
-	EXPORT int maxLength();
-	EXPORT void setMaxLength(int maxLength);
+	int maxLength();
+	void setMaxLength(int maxLength);
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;

lib/utils/resource-table-hotkey-handler.cpp

@@ -1,70 +0,0 @@
-#include "resource-table-hotkey-handler.hpp"
-
-#include <QKeyEvent>
-#include <QWidget>
-#include <unordered_map>
-
-namespace advss {
-
-void RegisterHotkeyFunction(QWidget *widget, Qt::Key key,
-			    std::function<void()> func)
-{
-	ResourceTabHotkeyHandler::Instance()->RegisterHandler(widget, key,
-							      func);
-}
-
-void DeregisterHotkeyFunctions(QWidget *widget)
-{
-	ResourceTabHotkeyHandler::Instance()->Deregister(widget);
-}
-
-ResourceTabHotkeyHandler *ResourceTabHotkeyHandler::Instance()
-{
-	static ResourceTabHotkeyHandler handler;
-	return &handler;
-}
-
-void ResourceTabHotkeyHandler::RegisterHandler(QWidget *widget, Qt::Key key,
-					       std::function<void()> func)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	_callbacks.emplace(widget, CallbackData{key, func});
-	widget->installEventFilter(this);
-}
-
-void ResourceTabHotkeyHandler::Deregister(QWidget *widget)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	_callbacks.erase(widget);
-}
-
-bool ResourceTabHotkeyHandler::eventFilter(QObject *obj, QEvent *event)
-{
-	if (event->type() != QEvent::KeyPress) {
-		return QObject::eventFilter(obj, event);
-	}
-	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-	auto pressedKey = keyEvent->key();
-
-	std::lock_guard<std::mutex> lock(_mutex);
-	auto it = _callbacks.find(obj);
-	if (it == _callbacks.end()) {
-		return QObject::eventFilter(obj, event);
-	}
-
-	auto current = it;
-	while (current != _callbacks.end() && current->first == it->first) {
-		auto &[_, cbData] = *current;
-		if (pressedKey != cbData.key) {
-			++current;
-			continue;
-		}
-		cbData.func();
-		++current;
-		continue;
-	}
-
-	return QObject::eventFilter(obj, event);
-}
-
-} // namespace advss

lib/utils/resource-table-hotkey-handler.hpp

@@ -1,37 +0,0 @@
-#pragma once
-#include "export-symbol-helper.hpp"
-
-#include <map>
-#include <mutex>
-#include <QEvent>
-#include <QObject>
-
-namespace advss {
-
-EXPORT void RegisterHotkeyFunction(QWidget *, Qt::Key,
-				   std::function<void()> func);
-EXPORT void DeregisterHotkeyFunctions(QWidget *);
-
-class ResourceTabHotkeyHandler : public QObject {
-	Q_OBJECT
-public:
-	static ResourceTabHotkeyHandler *Instance();
-	void RegisterHandler(QWidget *, Qt::Key, std::function<void()> func);
-	void Deregister(QWidget *);
-
-protected:
-	bool eventFilter(QObject *obj, QEvent *event) override;
-
-private:
-	struct CallbackData {
-		Qt::Key key;
-		std::function<void()> func;
-	};
-
-	ResourceTabHotkeyHandler() : QObject(){};
-
-	std::multimap<QObject *, CallbackData> _callbacks;
-	std::mutex _mutex;
-};
-
-} // namespace advss

lib/utils/resource-table.cpp

@@ -1,10 +1,10 @@
 #include "resource-table.hpp"
 #include "plugin-state-helpers.hpp"
-#include "resource-table-hotkey-handler.hpp"
 #include "ui-helpers.hpp"
 
 #include <QGridLayout>
 #include <QHeaderView>
+#include <QShortcut>
 
 namespace advss {
 
@@ -64,13 +64,16 @@ ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
 	QWidget::connect(_table, &QTableWidget::cellDoubleClicked,
 			 [openSettings]() { openSettings(); });
 
-	RegisterHotkeyFunction(this, Qt::Key_F2, openSettings);
-	RegisterHotkeyFunction(this, Qt::Key_Delete, [this]() { Remove(); });
-}
+	auto settingsShortcut = new QShortcut(QKeySequence("F2"), this);
+	QWidget::connect(settingsShortcut, &QShortcut::activated, this,
+			 openSettings);
+	auto removeShortcut = new QShortcut(QKeySequence("Del"), this);
+	QWidget::connect(removeShortcut, &QShortcut::activated, this,
+			 [this]() { Remove(); });
 
-ResourceTable::~ResourceTable()
-{
-	DeregisterHotkeyFunctions(this);
+	auto newShortcut = new QShortcut(QKeySequence("Ctrl+N"), this);
+	QWidget::connect(newShortcut, &QShortcut::activated, this,
+			 [this]() { Add(); });
 }
 
 void ResourceTable::SetHelpVisible(bool visible) const

lib/utils/resource-table.hpp

@@ -18,7 +18,6 @@ public:
 		      const QString &addToolTip, const QString &removeToolTip,
 		      const QStringList &headers,
 		      const std::function<void()> &openSettings);
-	virtual ~ResourceTable();
 
 	QTableWidget *Table() const { return _table; }
 	void SetHelpVisible(bool) const;

lib/utils/scene-selection.cpp

@@ -314,12 +314,14 @@ SceneSelectionWidget::SceneSelectionWidget(QWidget *parent, bool variables,
 			 SLOT(SelectionChanged(int)));
 
 	// Scene groups
-	QWidget::connect(window(), SIGNAL(SceneGroupAdded(const QString &)),
-			 this, SLOT(ItemAdd(const QString &)));
-	QWidget::connect(window(), SIGNAL(SceneGroupRemoved(const QString &)),
-			 this, SLOT(ItemRemove(const QString &)));
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(SceneGroupAdded(const QString &)), this,
+			 SLOT(ItemAdd(const QString &)));
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(SceneGroupRemoved(const QString &)), this,
+			 SLOT(ItemRemove(const QString &)));
 	QWidget::connect(
-		window(),
+		GetSettingsWindow(),
 		SIGNAL(SceneGroupRenamed(const QString &, const QString &)),
 		this, SLOT(ItemRename(const QString &, const QString &)));
 

lib/utils/section.cpp

@@ -44,6 +44,11 @@ Section::Section(const int animationDuration, QWidget *parent)
 
 void Section::Collapse(bool collapse)
 {
+	if (_contentHeight != _content->sizeHint().height()) {
+		_contentHeight = _content->sizeHint().height();
+	}
+	SetupAnimations();
+
 	_toggleButton->setChecked(collapse);
 	_toggleButton->setArrowType(collapse ? Qt::ArrowType::RightArrow
 					     : Qt::ArrowType::DownArrow);
@@ -72,7 +77,7 @@ void Section::SetContent(QWidget *w, bool collapsed)
 	delete _contentArea;
 
 	// Setup contentArea
-	_contentArea = new QScrollArea(this);
+	_contentArea = new QWidget(this);
 	_contentArea->setObjectName("macroSegmentContent");
 	_contentArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 	_contentArea->setStyleSheet(
@@ -93,12 +98,11 @@ void Section::SetContent(QWidget *w, bool collapsed)
 
 	SetupAnimations();
 
+	setMinimumHeight(_headerHeight);
 	if (collapsed) {
-		this->setMinimumHeight(_headerHeight);
 		_contentArea->setMaximumHeight(0);
 	} else {
-		this->setMinimumHeight(_headerHeight + _contentHeight);
-		_contentArea->setMaximumHeight(_contentHeight);
+		_contentArea->setMaximumHeight(QWIDGETSIZE_MAX);
 	}
 	const QSignalBlocker b(_toggleButton);
 	_toggleButton->setChecked(collapsed);
@@ -120,23 +124,6 @@ void Section::SetCollapsed(bool collapsed)
 	Collapse(collapsed);
 }
 
-bool Section::eventFilter(QObject *obj, QEvent *event)
-{
-	if (event->type() == QEvent::Resize && !_transitioning && !_collapsed) {
-		if (_contentHeight != _content->sizeHint().height()) {
-			_contentHeight = _content->sizeHint().height();
-			setMaximumHeight(_headerHeight + _contentHeight);
-			setMinimumHeight(_headerHeight + _contentHeight);
-			_contentArea->setMaximumHeight(_contentHeight);
-			// Note: Calling this too frequently inside this event
-			// filter will cause a segfault for some reason
-			SetupAnimations();
-		}
-		setMinimumWidth(_content->sizeHint().width());
-	}
-	return QObject::eventFilter(obj, event);
-}
-
 void Section::SetupAnimations()
 {
 	if (_toggleAnimation) {
@@ -160,7 +147,7 @@ void Section::SetupAnimations()
 		SectionAnimation->setEndValue(_headerHeight + _contentHeight);
 	}
 
-	QPropertyAnimation *contentAnimation =
+	auto contentAnimation =
 		static_cast<QPropertyAnimation *>(_toggleAnimation->animationAt(
 			_toggleAnimation->animationCount() - 1));
 	contentAnimation->setDuration(_animationDuration);
@@ -185,6 +172,14 @@ void Section::CleanUpPreviousContent()
 void Section::AnimationFinish()
 {
 	_transitioning = false;
+
+	// Allow resizing if we are not currently transitioning or collapsed
+	if (!_collapsed) {
+		setMinimumHeight(0);
+		setMaximumHeight(QWIDGETSIZE_MAX);
+		_contentArea->setMaximumHeight(QWIDGETSIZE_MAX);
+	}
+
 	emit AnimationFinished();
 }
 

lib/utils/section.hpp

@@ -3,7 +3,6 @@
 #include <QFrame>
 #include <QGridLayout>
 #include <QParallelAnimationGroup>
-#include <QScrollArea>
 #include <QToolButton>
 #include <QWidget>
 
@@ -21,9 +20,6 @@ public:
 	void AddHeaderWidget(QWidget *);
 	void SetCollapsed(bool);
 
-protected:
-	bool eventFilter(QObject *obj, QEvent *event) override;
-
 private slots:
 	void AnimationFinish();
 	void Collapse(bool collapse);
@@ -41,7 +37,7 @@ private:
 	QFrame *_headerLine;
 	QParallelAnimationGroup *_toggleAnimation = nullptr;
 	QParallelAnimationGroup *_contentAnimation = nullptr;
-	QScrollArea *_contentArea = nullptr;
+	QWidget *_contentArea = nullptr;
 	QWidget *_content = nullptr;
 	int _animationDuration;
 	std::atomic_bool _transitioning = {false};

lib/utils/splitter-helpers.cpp

@@ -30,4 +30,36 @@ void LoadSplitterPos(QList<int> &sizes, obs_data_t *obj,
 	obs_data_array_release(array);
 }
 
+void CenterSplitterPosition(QSplitter *splitter)
+{
+	SetSplitterPositionByFraction(splitter, 0.5);
+}
+
+void SetSplitterPositionByFraction(QSplitter *splitter, double fraction)
+{
+	int value1 = (double)QWIDGETSIZE_MAX * fraction;
+	int value2 = (double)QWIDGETSIZE_MAX * (1.0 - fraction);
+	splitter->setSizes(QList<int>() << value1 << value2);
+}
+
+void MaximizeFirstSplitterEntry(QSplitter *splitter)
+{
+	QList<int> newSizes;
+	newSizes << QWIDGETSIZE_MAX;
+	for (int i = 0; i < splitter->sizes().size() - 1; i++) {
+		newSizes << 0;
+	}
+	splitter->setSizes(newSizes);
+}
+
+void ReduceSizeOfSplitterIdx(QSplitter *splitter, int idx)
+{
+	auto sizes = splitter->sizes();
+	int sum = sizes[0] + sizes[1];
+	int reducedSize = sum / 10;
+	sizes[idx] = reducedSize;
+	sizes[(idx + 1) % 2] = sum - reducedSize;
+	splitter->setSizes(sizes);
+}
+
 } // namespace advss

lib/utils/splitter-helpers.hpp

@@ -2,7 +2,10 @@
 #include "export-symbol-helper.hpp"
 
 #include <obs-data.h>
+
 #include <QList>
+#include <QSplitter>
+
 #include <string>
 
 namespace advss {
@@ -12,4 +15,9 @@ void SaveSplitterPos(const QList<int> &sizes, obs_data_t *obj,
 void LoadSplitterPos(QList<int> &sizes, obs_data_t *obj,
 		     const std::string &name);
 
+void CenterSplitterPosition(QSplitter *splitter);
+void SetSplitterPositionByFraction(QSplitter *splitter, double fraction);
+void MaximizeFirstSplitterEntry(QSplitter *splitter);
+void ReduceSizeOfSplitterIdx(QSplitter *splitter, int idx);
+
 } // namespace advss

lib/utils/sync-helpers.cpp

@@ -20,4 +20,36 @@ std::unique_lock<std::mutex> *GetLoopLock()
 	return GetSwitcherLoopLock();
 }
 
+PerInstanceMutex::PerInstanceMutex() {}
+
+PerInstanceMutex::~PerInstanceMutex(){};
+
+PerInstanceMutex::PerInstanceMutex(const PerInstanceMutex &) {}
+
+PerInstanceMutex &PerInstanceMutex::operator=(const PerInstanceMutex &)
+{
+	return *this;
+}
+
+PerInstanceMutex::operator std::mutex &()
+{
+	return _mtx;
+}
+
+PerInstanceMutex::operator const std::mutex &() const
+{
+	return _mtx;
+}
+
+std::lock_guard<std::mutex> Lockable::Lock()
+{
+	return std::lock_guard<std::mutex>(_mtx);
+}
+
+void Lockable::WithLock(const std::function<void()> &func)
+{
+	const auto lock = Lock();
+	func();
+}
+
 } // namespace advss

lib/utils/sync-helpers.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "export-symbol-helper.hpp"
 
+#include <functional>
+#include <memory>
 #include <mutex>
 
 namespace advss {
@@ -10,10 +12,46 @@ namespace advss {
 	if (_loading || !_entryData) { \
 		return;                \
 	}                              \
-	auto lock = LockContext();
+	auto lock = _entryData->Lock();
 
 [[nodiscard]] EXPORT std::mutex *GetMutex();
 [[nodiscard]] EXPORT std::lock_guard<std::mutex> LockContext();
 [[nodiscard]] EXPORT std::unique_lock<std::mutex> *GetLoopLock();
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4251)
+#endif
+
+// std::mutex wrapper with no-op copy constructor and assignment operator
+class EXPORT PerInstanceMutex {
+public:
+	PerInstanceMutex();
+	~PerInstanceMutex();
+	PerInstanceMutex(const PerInstanceMutex &);
+	PerInstanceMutex &operator=(const PerInstanceMutex &);
+
+	operator std::mutex &();
+	operator const std::mutex &() const;
+
+private:
+	std::mutex _mtx;
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+class EXPORT Lockable {
+public:
+	Lockable() = default;
+	virtual ~Lockable() = default;
+
+	[[nodiscard]] std::lock_guard<std::mutex> Lock();
+	void WithLock(const std::function<void()> &func);
+
+private:
+	PerInstanceMutex _mtx;
+};
+
 } // namespace advss

lib/utils/tab-helpers.cpp

@@ -17,7 +17,11 @@ static std::vector<std::string> tabNames = {
 	"videoTab",        "sceneGroupTab", "transitionsTab",   "pauseTab",
 };
 
-static std::vector<int> tabOrder = std::vector<int>(tabNames.size());
+static std::vector<int> &getTabOrderVector()
+{
+	static std::vector<int> tabOrder = std::vector<int>(tabNames.size());
+	return tabOrder;
+}
 
 namespace {
 struct TabCallbacks {
@@ -65,19 +69,14 @@ void ResetLastOpenedTab()
 	lastOpenedTab = -1;
 }
 
-void SaveTabOrder(obs_data_t *obj)
-{
-	OBSDataArrayAutoRelease tabWidgetOrder = obs_data_array_create();
-	for (size_t i = 0; i < tabNames.size(); i++) {
-		OBSDataAutoRelease entry = obs_data_create();
-		obs_data_set_int(entry, tabNames[i].c_str(), tabOrder[i]);
-		obs_data_array_push_back(tabWidgetOrder, entry);
-	}
-	obs_data_set_array(obj, "tabWidgetOrder", tabWidgetOrder);
-}
-
 static bool tabWidgetOrderValid()
 {
+	auto &tabOrder = getTabOrderVector();
+
+	if (tabNames.size() != tabOrder.size()) {
+		return false;
+	}
+
 	auto tmp = std::vector<int>(tabNames.size());
 	std::iota(tmp.begin(), tmp.end(), 0);
 
@@ -92,10 +91,29 @@ static bool tabWidgetOrderValid()
 
 static void resetTabWidgetOrder()
 {
+	auto &tabOrder = getTabOrderVector();
 	tabOrder = std::vector<int>(tabNames.size());
 	std::iota(tabOrder.begin(), tabOrder.end(), 0);
 }
 
+void SaveTabOrder(obs_data_t *obj)
+{
+	auto &tabOrder = getTabOrderVector();
+
+	// Can happen when corrupting settings files
+	if (!tabWidgetOrderValid()) {
+		resetTabWidgetOrder();
+	}
+
+	OBSDataArrayAutoRelease tabWidgetOrder = obs_data_array_create();
+	for (size_t i = 0; i < tabNames.size(); i++) {
+		OBSDataAutoRelease entry = obs_data_create();
+		obs_data_set_int(entry, tabNames[i].c_str(), tabOrder[i]);
+		obs_data_array_push_back(tabWidgetOrder, entry);
+	}
+	obs_data_set_array(obj, "tabWidgetOrder", tabWidgetOrder);
+}
+
 void LoadTabOrder(obs_data_t *obj)
 {
 	OBSDataArrayAutoRelease defaultTabWidgetOrder = obs_data_array_create();
@@ -107,6 +125,7 @@ void LoadTabOrder(obs_data_t *obj)
 	obs_data_set_default_array(obj, "tabWidgetOrder",
 				   defaultTabWidgetOrder);
 
+	auto &tabOrder = getTabOrderVector();
 	tabOrder.clear();
 	OBSDataArrayAutoRelease tabWidgetOrder =
 		obs_data_get_array(obj, "tabWidgetOrder");
@@ -144,6 +163,8 @@ void SetTabOrder(QTabWidget *tabWidget)
 		resetTabWidgetOrder();
 	}
 
+	auto &tabOrder = getTabOrderVector();
+
 	auto bar = tabWidget->tabBar();
 	for (int i = 0; i < bar->count(); ++i) {
 		int curPos = findTabIndex(tabWidget, tabOrder[i]);
@@ -153,9 +174,10 @@ void SetTabOrder(QTabWidget *tabWidget)
 		}
 	}
 
-	QWidget::connect(bar, &QTabBar::tabMoved, [](int from, int to) {
-		std::swap(tabOrder[from], tabOrder[to]);
-	});
+	QWidget::connect(bar, &QTabBar::tabMoved,
+			 [&tabOrder](int from, int to) {
+				 std::swap(tabOrder[from], tabOrder[to]);
+			 });
 }
 
 void SetCurrentTab(QTabWidget *tabWidget)

lib/utils/tab-helpers.hpp

@@ -18,5 +18,6 @@ void SetCurrentTab(QTabWidget *tabWidget);
 void SetupOtherTabs(QTabWidget *tabWidget);
 void SaveTabOrder(obs_data_t *obj);
 void LoadTabOrder(obs_data_t *obj);
+bool MacroTabIsInFocus();
 
 } // namespace advss

lib/utils/temp-variable.cpp

@@ -272,10 +272,12 @@ TempVariableSelection::TempVariableSelection(QWidget *parent)
 			 SLOT(SelectionIdxChanged(int)));
 	QWidget::connect(_selection, SIGNAL(highlighted(int)), this,
 			 SLOT(HighlightChanged(int)));
-	QWidget::connect(window(), SIGNAL(MacroSegmentOrderChanged()), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroSegmentOrderChanged()), this,
 			 SLOT(MacroSegmentsChanged()));
-	QWidget::connect(window(), SIGNAL(SegmentTempVarsChanged()), this,
-			 SLOT(SegmentTempVarsChanged()));
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(SegmentTempVarsChanged(MacroSegment *)), this,
+			 SLOT(SegmentTempVarsChanged(MacroSegment *)));
 
 	auto layout = new QHBoxLayout();
 	layout->setContentsMargins(0, 0, 0, 0);
@@ -314,9 +316,15 @@ void TempVariableSelection::MacroSegmentsChanged()
 	SetVariable(currentSelection);
 }
 
-void TempVariableSelection::SegmentTempVarsChanged()
+void TempVariableSelection::SegmentTempVarsChanged(MacroSegment *segment)
 {
-	MacroSegmentsChanged();
+	const auto currentSegment = GetSegment();
+	const auto currentMacro = currentSegment ? currentSegment->GetMacro()
+						 : nullptr;
+	const auto changeMacro = segment ? segment->GetMacro() : nullptr;
+	if (currentMacro == changeMacro) {
+		MacroSegmentsChanged();
+	}
 }
 
 void TempVariableSelection::HighlightChanged(int idx)
@@ -327,7 +335,8 @@ void TempVariableSelection::HighlightChanged(int idx)
 
 void TempVariableSelection::PopulateSelection()
 {
-	auto advssWindow = qobject_cast<AdvSceneSwitcher *>(window());
+	auto advssWindow =
+		qobject_cast<AdvSceneSwitcher *>(GetSettingsWindow());
 	if (!advssWindow) {
 		return;
 	}
@@ -360,7 +369,8 @@ void TempVariableSelection::PopulateSelection()
 
 void TempVariableSelection::HighlightSelection(const TempVariableRef &var)
 {
-	auto advssWindow = qobject_cast<AdvSceneSwitcher *>(window());
+	auto advssWindow =
+		qobject_cast<AdvSceneSwitcher *>(GetSettingsWindow());
 	if (!advssWindow) {
 		return;
 	}
@@ -387,7 +397,8 @@ QString TempVariableSelection::SetupInfoLabel()
 {
 	auto currentSelection = _selection->itemData(_selection->currentIndex())
 					.value<TempVariableRef>();
-	auto advssWindow = qobject_cast<AdvSceneSwitcher *>(window());
+	auto advssWindow =
+		qobject_cast<AdvSceneSwitcher *>(GetSettingsWindow());
 	if (!advssWindow) {
 		_info->setToolTip("");
 		_info->hide();
@@ -427,13 +438,11 @@ QString TempVariableSelection::SetupInfoLabel()
 MacroSegment *TempVariableSelection::GetSegment() const
 {
 	const QWidget *widget = this;
-	{
-		while (widget) {
-			if (qobject_cast<const MacroSegmentEdit *>(widget)) {
-				break;
-			}
-			widget = widget->parentWidget();
+	while (widget) {
+		if (qobject_cast<const MacroSegmentEdit *>(widget)) {
+			break;
 		}
+		widget = widget->parentWidget();
 	}
 	if (!widget) {
 		return nullptr;
@@ -442,17 +451,18 @@ MacroSegment *TempVariableSelection::GetSegment() const
 	return segmentWidget->Data().get();
 }
 
-void NotifyUIAboutTempVarChange()
+void NotifyUIAboutTempVarChange(MacroSegment *segment)
 {
 	obs_queue_task(
 		OBS_TASK_UI,
-		[](void *) {
+		[](void *segment) {
 			if (!SettingsWindowIsOpened()) {
 				return;
 			}
-			AdvSceneSwitcher::window->SegmentTempVarsChanged();
+			AdvSceneSwitcher::window->SegmentTempVarsChanged(
+				(MacroSegment *)segment);
 		},
-		nullptr, false);
+		segment, false);
 }
 
 } // namespace advss

lib/utils/temp-variable.hpp

@@ -88,7 +88,7 @@ public:
 private slots:
 	void SelectionIdxChanged(int);
 	void MacroSegmentsChanged();
-	void SegmentTempVarsChanged();
+	void SegmentTempVarsChanged(MacroSegment *);
 	void HighlightChanged(int);
 
 signals:
@@ -104,6 +104,6 @@ private:
 	AutoUpdateTooltipLabel *_info;
 };
 
-void NotifyUIAboutTempVarChange();
+void NotifyUIAboutTempVarChange(MacroSegment *);
 
 } // namespace advss

lib/utils/ui-helpers.cpp

@@ -6,6 +6,7 @@
 
 #include <obs-frontend-api.h>
 #include <QGraphicsColorizeEffect>
+#include <QListView>
 #include <QMainWindow>
 #include <QPropertyAnimation>
 #include <QScrollBar>
@@ -104,6 +105,19 @@ int FindIdxInRagne(QComboBox *list, int start, int stop,
 	return foundIdx;
 }
 
+void SetRowVisibleByValue(QComboBox *list, const QString &value, bool show)
+{
+	int index = list->findText(value);
+	if (index == -1) {
+		return;
+	}
+
+	auto view = qobject_cast<QListView *>(list->view());
+	if (view) {
+		view->setRowHidden(index, !show);
+	}
+}
+
 QWidget *GetSettingsWindow()
 {
 	return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;

lib/utils/ui-helpers.hpp

@@ -20,9 +20,12 @@ EXPORT QObject *HighlightWidget(QWidget *widget, QColor startColor,
 
 EXPORT void SetHeightToContentHeight(QListWidget *list);
 EXPORT void SetButtonIcon(QAbstractButton *button, const char *path);
+
 EXPORT int
 FindIdxInRagne(QComboBox *list, int start, int stop, const std::string &value,
 	       Qt::MatchFlags = Qt::MatchExactly | Qt::MatchCaseSensitive);
+EXPORT void SetRowVisibleByValue(QComboBox *list, const QString &value,
+				 bool show);
 
 EXPORT bool DisplayMessage(const QString &msg, bool question = false,
 			   bool modal = true);

lib/variables/variable-text-edit.hpp

@@ -4,15 +4,15 @@
 
 namespace advss {
 
-class VariableTextEdit : public ResizingPlainTextEdit {
+class ADVSS_EXPORT VariableTextEdit : public ResizingPlainTextEdit {
 	Q_OBJECT
 public:
-	EXPORT VariableTextEdit(QWidget *parent, const int scrollAt = 10,
-				const int minLines = 3,
-				const int paddingLines = 2);
-	EXPORT void setPlainText(const QString &);
-	EXPORT void setPlainText(const StringVariable &);
-	EXPORT void setToolTip(const QString &string);
+	VariableTextEdit(QWidget *parent, const int scrollAt = 10,
+			 const int minLines = 3, const int paddingLines = 2);
+	virtual ~VariableTextEdit(){};
+	void setPlainText(const QString &);
+	void setPlainText(const StringVariable &);
+	void setToolTip(const QString &string);
 
 private:
 };

plugins/CMakeLists.txt

@@ -32,6 +32,7 @@ add_plugin(http)
 add_plugin(midi)
 add_plugin(mqtt)
 add_plugin(openvr)
+add_plugin(scripting)
 add_plugin(stream-deck)
 add_plugin(twitch)
 add_plugin(usb)

plugins/base/macro-action-audio.cpp

@@ -16,25 +16,28 @@ bool MacroActionAudio::_registered = MacroActionFactory::Register(
 	{MacroActionAudio::Create, MacroActionAudioEdit::Create,
 	 "AdvSceneSwitcher.action.audio"});
 
-static const std::map<MacroActionAudio::Action, std::string> actionTypes = {
-	{MacroActionAudio::Action::MUTE,
-	 "AdvSceneSwitcher.action.audio.type.mute"},
-	{MacroActionAudio::Action::UNMUTE,
-	 "AdvSceneSwitcher.action.audio.type.unmute"},
-	{MacroActionAudio::Action::SOURCE_VOLUME,
-	 "AdvSceneSwitcher.action.audio.type.sourceVolume"},
-	{MacroActionAudio::Action::MASTER_VOLUME,
-	 "AdvSceneSwitcher.action.audio.type.masterVolume"},
-	{MacroActionAudio::Action::SYNC_OFFSET,
-	 "AdvSceneSwitcher.action.audio.type.syncOffset"},
-	{MacroActionAudio::Action::MONITOR,
-	 "AdvSceneSwitcher.action.audio.type.monitor"},
-	{MacroActionAudio::Action::BALANCE,
-	 "AdvSceneSwitcher.action.audio.type.balance"},
-	{MacroActionAudio::Action::ENABLE_ON_TRACK,
-	 "AdvSceneSwitcher.action.audio.type.enableOnTrack"},
-	{MacroActionAudio::Action::DISABLE_ON_TRACK,
-	 "AdvSceneSwitcher.action.audio.type.disableOnTrack"},
+static const std::vector<std::pair<MacroActionAudio::Action, std::string>>
+	actionTypes = {
+		{MacroActionAudio::Action::MUTE,
+		 "AdvSceneSwitcher.action.audio.type.mute"},
+		{MacroActionAudio::Action::UNMUTE,
+		 "AdvSceneSwitcher.action.audio.type.unmute"},
+		{MacroActionAudio::Action::TOGGLE_MUTE,
+		 "AdvSceneSwitcher.action.audio.type.toggleMute"},
+		{MacroActionAudio::Action::SOURCE_VOLUME,
+		 "AdvSceneSwitcher.action.audio.type.sourceVolume"},
+		{MacroActionAudio::Action::MASTER_VOLUME,
+		 "AdvSceneSwitcher.action.audio.type.masterVolume"},
+		{MacroActionAudio::Action::SYNC_OFFSET,
+		 "AdvSceneSwitcher.action.audio.type.syncOffset"},
+		{MacroActionAudio::Action::MONITOR,
+		 "AdvSceneSwitcher.action.audio.type.monitor"},
+		{MacroActionAudio::Action::BALANCE,
+		 "AdvSceneSwitcher.action.audio.type.balance"},
+		{MacroActionAudio::Action::ENABLE_ON_TRACK,
+		 "AdvSceneSwitcher.action.audio.type.enableOnTrack"},
+		{MacroActionAudio::Action::DISABLE_ON_TRACK,
+		 "AdvSceneSwitcher.action.audio.type.disableOnTrack"},
 };
 
 static const std::map<MacroActionAudio::FadeType, std::string> fadeTypes = {
@@ -255,6 +258,9 @@ bool MacroActionAudio::PerformAction()
 	case Action::UNMUTE:
 		obs_source_set_muted(s, false);
 		break;
+	case Action::TOGGLE_MUTE:
+		obs_source_set_muted(s, !obs_source_muted(s));
+		break;
 	case Action::SOURCE_VOLUME:
 	case Action::MASTER_VOLUME:
 		if (_fade) {
@@ -287,7 +293,10 @@ bool MacroActionAudio::PerformAction()
 
 void MacroActionAudio::LogAction() const
 {
-	auto it = actionTypes.find(_action);
+	auto it = std::find_if(
+		actionTypes.begin(), actionTypes.end(),
+		[this](const std::pair<MacroActionAudio::Action, std::string>
+			       &item) { return item.first == _action; });
 	if (it != actionTypes.end()) {
 		auto &[_, action] = *it;
 		ablog(LOG_INFO,
@@ -632,8 +641,7 @@ void MacroActionAudioEdit::SetWidgetVisibility()
 	if (_entryData->_action != MacroActionAudio::Action::MASTER_VOLUME &&
 	    obs_get_version() >= MAKE_SEMANTIC_VERSION(29, 0, 0)) {
 		_actions->removeItem(_actions->findText(obs_module_text(
-			actionTypes.at(MacroActionAudio::Action::MASTER_VOLUME)
-				.c_str())));
+			"AdvSceneSwitcher.action.audio.type.masterVolume")));
 	}
 
 	updateGeometry();
@@ -666,11 +674,7 @@ void MacroActionAudioEdit::UpdateEntryData()
 
 void MacroActionAudioEdit::SourceChanged(const SourceSelection &source)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_audioSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -678,11 +682,7 @@ void MacroActionAudioEdit::SourceChanged(const SourceSelection &source)
 
 void MacroActionAudioEdit::ActionChanged(int idx)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionAudio::Action>(
 		_actions->itemData(idx).toInt());
 	SetWidgetVisibility();
@@ -690,133 +690,81 @@ void MacroActionAudioEdit::ActionChanged(int idx)
 
 void MacroActionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_syncOffset = value;
 }
 
 void MacroActionAudioEdit::MonitorTypeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
 }
 
 void MacroActionAudioEdit::BalanceChanged(const NumberVariable<double> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_balance = value;
 }
 
 void MacroActionAudioEdit::TrackChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_track = value;
 }
 
 void MacroActionAudioEdit::VolumeDBChanged(const NumberVariable<double> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_volumeDB = value;
 }
 
 void MacroActionAudioEdit::PercentDBClicked()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_useDb = !_entryData->_useDb;
 	SetWidgetVisibility();
 }
 
 void MacroActionAudioEdit::VolumeChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_volume = value;
 }
 
 void MacroActionAudioEdit::FadeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_fade = value;
 	SetWidgetVisibility();
 }
 
 void MacroActionAudioEdit::DurationChanged(const Duration &dur)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_duration = dur;
 }
 
 void MacroActionAudioEdit::RateChanged(const NumberVariable<double> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_rate = value;
 }
 
 void MacroActionAudioEdit::WaitChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_wait = value;
 }
 
 void MacroActionAudioEdit::AbortActiveFadeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_abortActiveFade = value;
 }
 
 void MacroActionAudioEdit::FadeTypeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_fadeType = static_cast<MacroActionAudio::FadeType>(value);
 	SetWidgetVisibility();
 }

plugins/base/macro-action-audio.hpp

@@ -34,6 +34,7 @@ public:
 		BALANCE,
 		ENABLE_ON_TRACK,
 		DISABLE_ON_TRACK,
+		TOGGLE_MUTE,
 	};
 
 	enum class FadeType {

plugins/base/macro-action-clipboard.cpp

@@ -214,11 +214,7 @@ MacroActionClipboardEdit::MacroActionClipboardEdit(
 
 void MacroActionClipboardEdit::ActionChanged(int index)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionClipboard::Action>(
 		_actions->itemData(index).toInt());
 
@@ -227,21 +223,13 @@ void MacroActionClipboardEdit::ActionChanged(int index)
 
 void MacroActionClipboardEdit::TextChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_text = _text->text().toStdString();
 }
 
 void MacroActionClipboardEdit::UrlChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_url = _url->text().toStdString();
 }
 

plugins/base/macro-action-file.cpp

@@ -153,11 +153,7 @@ void MacroActionFileEdit::UpdateEntryData()
 
 void MacroActionFileEdit::PathChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -165,11 +161,7 @@ void MacroActionFileEdit::PathChanged(const QString &text)
 
 void MacroActionFileEdit::TextChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_text = _text->toPlainText().toStdString();
 
 	adjustSize();
@@ -178,11 +170,7 @@ void MacroActionFileEdit::TextChanged()
 
 void MacroActionFileEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionFile::Action>(value);
 }
 

plugins/base/macro-action-filter.cpp

@@ -3,6 +3,7 @@
 #include "json-helpers.hpp"
 #include "source-settings-helpers.hpp"
 #include "selection-helpers.hpp"
+#include "ui-helpers.hpp"
 
 namespace advss {
 
@@ -26,10 +27,13 @@ const static std::map<MacroActionFilter::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.filter.type.pressSettingsButton"},
 };
 
-const static std::map<MacroActionFilter::SettingsInputMethod, std::string>
+const static std::vector<
+	std::pair<MacroActionFilter::SettingsInputMethod, std::string>>
 	inputMethods = {
 		{MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL,
 		 "AdvSceneSwitcher.action.filter.inputMethod.individualManual"},
+		{MacroActionFilter::SettingsInputMethod::INDIVIDUAL_LIST_ENTRY,
+		 "AdvSceneSwitcher.action.filter.inputMethod.individualListEntryManual"},
 		{MacroActionFilter::SettingsInputMethod::INDIVIDUAL_TEMPVAR,
 		 "AdvSceneSwitcher.action.filter.inputMethod.individualTempvar"},
 		{MacroActionFilter::SettingsInputMethod::JSON_STRING,
@@ -59,6 +63,10 @@ static void performActionHelper(
 		case MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL:
 			SetSourceSetting(source, setting, manualSettingValue);
 			break;
+		case MacroActionFilter::SettingsInputMethod::INDIVIDUAL_LIST_ENTRY:
+			SetSourceSettingListEntryValueByName(
+				source, setting, manualSettingValue);
+			break;
 		case MacroActionFilter::SettingsInputMethod::INDIVIDUAL_TEMPVAR: {
 			auto var = tempVar.GetTempVariable(macro);
 			if (!var) {
@@ -373,14 +381,25 @@ void MacroActionFilterEdit::GetSettingsClicked()
 				.value_or(""));
 		break;
 	}
+	case MacroActionFilter::SettingsInputMethod::INDIVIDUAL_LIST_ENTRY: {
+		const auto filters =
+			_entryData->_filter.GetFilters(_entryData->_source);
+		_manualSettingValue->setPlainText(
+			GetSourceSettingListEntryName(
+				filters.empty() ? nullptr : filters.at(0),
+				_entryData->_setting)
+				.value_or(""));
+		break;
+	}
 	case MacroActionFilter::SettingsInputMethod::INDIVIDUAL_TEMPVAR:
 		break;
 	case MacroActionFilter::SettingsInputMethod::JSON_STRING: {
 		const auto filters =
 			_entryData->_filter.GetFilters(_entryData->_source);
+		const auto settings = GetSourceSettings(
+			filters.empty() ? nullptr : filters.at(0), true);
 		_settingsString->setPlainText(
-			FormatJsonString(GetSourceSettings(
-				filters.empty() ? nullptr : filters.at(0))));
+			FormatJsonString(settings ? *settings : ""));
 		break;
 	}
 	}
@@ -415,6 +434,7 @@ void MacroActionFilterEdit::SelectionChanged(const SourceSetting &setting)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_setting = setting;
+	SetWidgetVisibility();
 }
 
 void MacroActionFilterEdit::ManualSettingsValueChanged()
@@ -440,6 +460,22 @@ void MacroActionFilterEdit::ButtonChanged(const SourceSettingButton &button)
 	_entryData->_button = button;
 }
 
+static QString GetIndividualListEntryName()
+{
+	static const auto matchesInput =
+		[](const std::pair<MacroActionFilter::SettingsInputMethod,
+				   std::string> &p) {
+			return p.first ==
+			       MacroActionFilter::SettingsInputMethod::
+				       INDIVIDUAL_LIST_ENTRY;
+		};
+	static const QString listValueText(
+		obs_module_text(std::find_if(inputMethods.begin(),
+					     inputMethods.end(), matchesInput)
+					->second.c_str()));
+	return listValueText;
+}
+
 void MacroActionFilterEdit::SetWidgetVisibility()
 {
 	SetLayoutVisible(_settingsLayout,
@@ -464,9 +500,16 @@ void MacroActionFilterEdit::SetWidgetVisibility()
 				      MacroActionFilter::SettingsInputMethod::
 					      INDIVIDUAL_TEMPVAR);
 
+	SetRowVisibleByValue(_settingsInputMethods,
+			     GetIndividualListEntryName(),
+			     _entryData->_setting.IsList());
+
 	if (_entryData->_action == MacroActionFilter::Action::SETTINGS &&
-	    _entryData->_settingsInputMethod ==
-		    MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL) {
+	    (_entryData->_settingsInputMethod ==
+		     MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL ||
+	     _entryData->_settingsInputMethod ==
+		     MacroActionFilter::SettingsInputMethod::
+			     INDIVIDUAL_LIST_ENTRY)) {
 		RemoveStretchIfPresent(_settingsLayout);
 		_manualSettingValue->show();
 	} else {
@@ -475,8 +518,12 @@ void MacroActionFilterEdit::SetWidgetVisibility()
 	}
 
 	_refreshSettingSelection->setVisible(
-		_entryData->_settingsInputMethod ==
-			MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL &&
+		(_entryData->_settingsInputMethod ==
+			 MacroActionFilter::SettingsInputMethod::
+				 INDIVIDUAL_MANUAL ||
+		 _entryData->_settingsInputMethod ==
+			 MacroActionFilter::SettingsInputMethod::
+				 INDIVIDUAL_LIST_ENTRY) &&
 		(_entryData->_source.GetType() ==
 			 SourceSelection::Type::VARIABLE ||
 		 _entryData->_filter.GetType() ==

plugins/base/macro-action-filter.hpp

@@ -36,6 +36,7 @@ public:
 		INDIVIDUAL_MANUAL,
 		INDIVIDUAL_TEMPVAR,
 		JSON_STRING,
+		INDIVIDUAL_LIST_ENTRY,
 	};
 	SettingsInputMethod _settingsInputMethod =
 		SettingsInputMethod::INDIVIDUAL_MANUAL;

plugins/base/macro-action-hotkey.cpp

@@ -788,133 +788,82 @@ void MacroActionHotkeyEdit::UpdateEntryData()
 
 void MacroActionHotkeyEdit::LShiftChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_leftShift = state;
 }
 
 void MacroActionHotkeyEdit::RShiftChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_rightShift = state;
 }
 
 void MacroActionHotkeyEdit::LCtrlChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_leftCtrl = state;
 }
 
 void MacroActionHotkeyEdit::RCtrlChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_rightCtrl = state;
 }
 
 void MacroActionHotkeyEdit::LAltChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_leftAlt = state;
 }
 
 void MacroActionHotkeyEdit::RAltChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_rightAlt = state;
 }
 
 void MacroActionHotkeyEdit::LMetaChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_leftMeta = state;
 }
 
 void MacroActionHotkeyEdit::RMetaChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_rightMeta = state;
 }
 
 void MacroActionHotkeyEdit::DurationChanged(const Duration &dur)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_duration = dur;
 }
 
 void MacroActionHotkeyEdit::OnlySendToOBSChanged(int state)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_onlySendToObs = state;
 	SetWidgetVisibility();
 }
 
 void MacroActionHotkeyEdit::KeyChanged(int key)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_key = static_cast<HotkeyType>(key);
 }
 
 void MacroActionHotkeyEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionHotkey::Action>(value);
 	SetWidgetVisibility();
 }
 
 void MacroActionHotkeyEdit::HotkeyTypeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
 	{
-		auto lock = LockContext();
+		GUARD_LOADING_AND_LOCK();
 		_entryData->_hotkeyType =
 			static_cast<obs_hotkey_registerer_type>(value);
 	}
@@ -923,11 +872,7 @@ void MacroActionHotkeyEdit::HotkeyTypeChanged(int value)
 
 void MacroActionHotkeyEdit::OBSHotkeyChanged(int idx)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	if (idx == -1) {
 		_entryData->_hotkeyName = "";
 		return;

plugins/base/macro-action-http-legacy.cpp

@@ -238,54 +238,34 @@ void MacroActionHttpEdit::UpdateEntryData()
 
 void MacroActionHttpEdit::URLChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_url = _url->text().toStdString();
 	emit(HeaderInfoChanged(_url->text()));
 }
 
 void MacroActionHttpEdit::MethodChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_method = static_cast<MacroActionHttp::Method>(value);
 	SetWidgetVisibility();
 }
 
 void MacroActionHttpEdit::TimeoutChanged(const Duration &dur)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_timeout = dur;
 }
 
 void MacroActionHttpEdit::SetHeadersChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_setHeaders = value;
 	SetWidgetVisibility();
 }
 
 void MacroActionHttpEdit::HeadersChanged(const StringList &headers)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_headers = headers;
 	adjustSize();
 	updateGeometry();
@@ -302,11 +282,7 @@ void MacroActionHttpEdit::SetWidgetVisibility()
 
 void MacroActionHttpEdit::DataChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_data = _data->toPlainText().toUtf8().constData();
 
 	adjustSize();

plugins/base/macro-action-log.cpp

@@ -75,11 +75,7 @@ void MacroActionLogEdit::UpdateEntryData()
 
 void MacroActionLogEdit::LogMessageChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_logMessage = _logMessage->toPlainText().toStdString();
 
 	adjustSize();

plugins/base/macro-action-media.cpp

@@ -286,22 +286,14 @@ MacroActionMediaEdit::MacroActionMediaEdit(
 
 void MacroActionMediaEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionMedia::Action>(value);
 	SetWidgetVisibility();
 }
 
 void MacroActionMediaEdit::SelectionTypeChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_selection =
 		static_cast<MacroActionMedia::SelectionType>(value);
 	SetWidgetVisibility();
@@ -309,32 +301,20 @@ void MacroActionMediaEdit::SelectionTypeChanged(int value)
 
 void MacroActionMediaEdit::SeekDurationChanged(const Duration &seekDuration)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_seekDuration = seekDuration;
 }
 
 void MacroActionMediaEdit::SeekPercentageChanged(
 	const NumberVariable<double> &seekPercentage)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_seekPercentage = seekPercentage;
 }
 
 void MacroActionMediaEdit::SourceChanged(const SourceSelection &source)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_mediaSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -342,11 +322,7 @@ void MacroActionMediaEdit::SourceChanged(const SourceSelection &source)
 
 void MacroActionMediaEdit::SourceChanged(const SceneItemSelection &item)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_sceneItem = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -356,11 +332,7 @@ void MacroActionMediaEdit::SourceChanged(const SceneItemSelection &item)
 
 void MacroActionMediaEdit::SceneChanged(const SceneSelection &scene)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_scene = scene;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

plugins/base/macro-action-osc.cpp

@@ -296,41 +296,25 @@ void MacroActionOSCEdit::UpdateEntryData()
 
 void MacroActionOSCEdit::IpChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->SetIP(_ip->text().toStdString());
 }
 
 void MacroActionOSCEdit::ProtocolChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->SetProtocol(static_cast<MacroActionOSC::Protocol>(value));
 }
 
 void MacroActionOSCEdit::PortChanged(const NumberVariable<int> &value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->SetPortNr(value);
 }
 
 void MacroActionOSCEdit::MessageChanged(const OSCMessage &m)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_message = m;
 
 	adjustSize();

plugins/base/macro-action-plugin-state.cpp

@@ -300,12 +300,8 @@ void MacroActionPluginStateEdit::UpdateEntryData()
 
 void MacroActionPluginStateEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
 	{
-		auto lock = LockContext();
+		GUARD_LOADING_AND_LOCK();
 		_entryData->_action = static_cast<PluginStateAction>(value);
 		SetWidgetVisibility();
 	}
@@ -316,32 +312,20 @@ void MacroActionPluginStateEdit::ActionChanged(int value)
 
 void MacroActionPluginStateEdit::ValueChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_value = value;
 	SetWidgetVisibility();
 }
 
 void MacroActionPluginStateEdit::SceneChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_scene = GetWeakSourceByQString(text);
 }
 
 void MacroActionPluginStateEdit::PathChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_settingsPath = text.toStdString();
 }
 

plugins/base/macro-action-projector.cpp

@@ -242,9 +242,9 @@ MacroActionProjectorEdit::MacroActionProjectorEdit(
 	  _actions(new QComboBox()),
 	  _types(new QComboBox()),
 	  _windowTypes(new QComboBox()),
-	  _scenes(new SceneSelectionWidget(window(), true, false, true, true,
+	  _scenes(new SceneSelectionWidget(this, true, false, true, true,
 					   true)),
-	  _sources(new SourceSelectionWidget(window(), getSourcesList, true)),
+	  _sources(new SourceSelectionWidget(this, getSourcesList, true)),
 	  _monitors(new MonitorSelectionWidget(this)),
 	  _projectorWindowName(new VariableLineEdit(this)),
 	  _regex(new RegexConfigWidget(this)),

plugins/base/macro-action-random.cpp

@@ -1,6 +1,7 @@
 #include "macro-action-random.hpp"
 #include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
+#include "ui-helpers.hpp"
 
 #include <cstdlib>
 
@@ -105,7 +106,8 @@ MacroActionRandomEdit::MacroActionRandomEdit(
 	QWidget::connect(_list, SIGNAL(Removed(int)), this, SLOT(Remove(int)));
 	QWidget::connect(_list, SIGNAL(Replaced(int, const std::string &)),
 			 this, SLOT(Replace(int, const std::string &)));
-	QWidget::connect(window(), SIGNAL(MacroRemoved(const QString &)), this,
+	QWidget::connect(GetSettingsWindow(),
+			 SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
 	QWidget::connect(_allowRepeat, SIGNAL(stateChanged(int)), this,
 			 SLOT(AllowRepeatChanged(int)));
@@ -157,11 +159,7 @@ void MacroActionRandomEdit::MacroRemove(const QString &)
 
 void MacroActionRandomEdit::Add(const std::string &name)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
@@ -170,11 +168,7 @@ void MacroActionRandomEdit::Add(const std::string &name)
 
 void MacroActionRandomEdit::Remove(int idx)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
 	adjustSize();
@@ -182,23 +176,15 @@ void MacroActionRandomEdit::Remove(int idx)
 
 void MacroActionRandomEdit::Replace(int idx, const std::string &name)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
+	GUARD_LOADING_AND_LOCK();
 	MacroRef macro(name);
-	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
 
 void MacroActionRandomEdit::AllowRepeatChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_allowRepeat = value;
 }
 

plugins/base/macro-action-recording.cpp

@@ -199,21 +199,13 @@ static bool isPauseAction(MacroActionRecord::Action a)
 
 void MacroActionRecordEdit::FolderChanged(const QString &folder)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_folder = folder.toStdString();
 }
 
 void MacroActionRecordEdit::FormatStringChanged()
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_fileFormat = _recordFileFormat->text().toStdString();
 }
 
@@ -230,11 +222,7 @@ void MacroActionRecordEdit::SetWidgetVisibility()
 
 void MacroActionRecordEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionRecord::Action>(value);
 	SetWidgetVisibility();
 }

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

@@ -121,11 +121,7 @@ void MacroActionSceneCollectionEdit::UpdateEntryData()
 
 void MacroActionSceneCollectionEdit::SceneCollectionChanged(const QString &text)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_sceneCollection = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

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

@@ -112,7 +112,7 @@ void MacroActionSceneLock::ResolveVariablesToFixedValues()
 MacroActionSceneLockEdit::MacroActionSceneLockEdit(
 	QWidget *parent, std::shared_ptr<MacroActionSceneLock> entryData)
 	: QWidget(parent),
-	  _scenes(new SceneSelectionWidget(window(), true, false, true, true)),
+	  _scenes(new SceneSelectionWidget(this, true, false, true, true)),
 	  _sources(new SceneItemSelectionWidget(parent)),
 	  _actions(new QComboBox())
 {
@@ -156,21 +156,13 @@ void MacroActionSceneLockEdit::UpdateEntryData()
 
 void MacroActionSceneLockEdit::SceneChanged(const SceneSelection &s)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_scene = s;
 }
 
 void MacroActionSceneLockEdit::SourceChanged(const SceneItemSelection &item)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -180,11 +172,7 @@ void MacroActionSceneLockEdit::SourceChanged(const SceneItemSelection &item)
 
 void MacroActionSceneLockEdit::ActionChanged(int value)
 {
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
+	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionSceneLock::Action>(value);
 }