diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 6d379741..bd6f6442 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -31,6 +31,7 @@ AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Save window position
AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Show system tray notifications"
AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Disable UI hints"
AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can be represented via macros"
+AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
AdvSceneSwitcher.generalTab.priority="Priority"
AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
AdvSceneSwitcher.generalTab.priority.threadPriority="Use thread priority"
diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index bc9441f9..e5bb7cdc 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -6,7 +6,7 @@
0
0
- 1100
+ 1000
600
@@ -18,8 +18,8 @@
- 1100
- 600
+ 500
+ 300
@@ -44,95 +44,281 @@
AdvSceneSwitcher.generalTab.title
-
+
-
-
-
-
-
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 1024
+ 817
+
+
+
-
-
+
+
-
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.status
+
+
+
-
+
+
-
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.status.onStartup
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.status.autoStart
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ ms
+
+
+ 50
+
+
+ 20000
+
+
+ 300
+
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.status.hotkeytips
+
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.status.checkInterval
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior
+
+
+
-
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.saveOrLoadsettings
+
+
+
-
+
+
+ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export
+
+
+
+ -
+
+
+ AdvSceneSwitcher.generalTab.saveOrLoadsettings.import
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- AdvSceneSwitcher.generalTab.status
+ AdvSceneSwitcher.generalTab.matchBehavior
-
-
-
-
-
-
-
-
- -
-
+
+
-
+
+
-
+
- AdvSceneSwitcher.generalTab.status.onStartup
+ AdvSceneSwitcher.generalTab.generalBehavior.cooldown
- -
-
-
- -
-
-
- -
-
-
- AdvSceneSwitcher.generalTab.status.autoStart
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- ms
-
-
- 50
-
-
- 20000
-
-
- 300
-
-
-
- -
-
-
- AdvSceneSwitcher.generalTab.status.hotkeytips
-
-
-
- -
-
-
- AdvSceneSwitcher.generalTab.status.checkInterval
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.generalTab.generalBehavior
-
-
-
-
@@ -218,144 +404,9 @@
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.cooldown
-
-
-
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
- -
-
-
@@ -437,19 +488,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
@@ -500,32 +538,9 @@
- -
-
-
- AdvSceneSwitcher.generalTab.saveOrLoadsettings
-
-
-
-
-
-
- AdvSceneSwitcher.generalTab.saveOrLoadsettings.export
-
-
-
- -
-
-
- AdvSceneSwitcher.generalTab.saveOrLoadsettings.import
-
-
-
-
-
-
-
-
+
+
diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp
index 161df01f..e88925f2 100644
--- a/src/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -76,9 +76,6 @@ void AdvSceneSwitcher::loadUI()
(void)DisplayMessage(msg);
}
-#if __APPLE__
- setMinimumHeight(700);
-#endif
setupGeneralTab();
setupTitleTab();
setupExecutableTab();
diff --git a/src/general.cpp b/src/general.cpp
index 2ab7255b..489351da 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -194,7 +194,8 @@ void AdvSceneSwitcher::on_uiHintsDisable_stateChanged(int state)
bool isLegacyTab(const QString &name)
{
- return name == obs_module_text(
+ return name == obs_module_text("AdvSceneSwitcher.networkTab.title") ||
+ name == obs_module_text(
"AdvSceneSwitcher.transitionTab.title") ||
name == obs_module_text(
"AdvSceneSwitcher.windowTitleTab.title") ||