diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index a00e604d..bc9441f9 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -1087,6 +1087,579 @@
+
+
+ AdvSceneSwitcher.networkTab.title
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.description
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.warning
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server
+
+
+ true
+
+
+ false
+
+
+
-
+
+
-
+
+
+ AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.status.currentStatus
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.status.notRunning
+
+
+
+ -
+
+
+ 1024
+
+
+ 65535
+
+
+ 55555
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.port
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.lockToIPv4
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.sendPreview
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.sendSceneChange
+
+
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.server.restart
+
+
+
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.client
+
+
+ true
+
+
+ false
+
+
+
-
+
+
-
+
+
+ AdvSceneSwitcher.networkTab.client.port
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.client.address
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ 1024
+
+
+ 65535
+
+
+ 55555
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.client.status.disconnected
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.client.status.currentStatus
+
+
+
+
+
+ -
+
+
+ AdvSceneSwitcher.networkTab.client.reconnect
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ AdvSceneSwitcher.sceneGroupTab.title
+
+
+ -
+
+
+ AdvSceneSwitcher.sceneGroupTab.list
+
+
+
-
+
+
-
+
+
+ -
+
+
+ AdvSceneSwitcher.sceneGroupTab.help
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 22
+ 22
+
+
+
+ true
+
+
+ addIconSmall
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+ true
+
+
+ removeIconSmall
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+
+
+
+ true
+
+
+ upArrowIconSmall
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+
+
+
+ true
+
+
+ downArrowIconSmall
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ -
+
+
+ AdvSceneSwitcher.sceneGroupTab.edit
+
+
+
-
+
+
-
+
+
+ AdvSceneSwitcher.sceneGroupTab.edit.name
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ -
+
+
-
+
+
+ AdvSceneSwitcher.sceneGroupTab.edit.addScene
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ AdvSceneSwitcher.sceneGroupTab.scenes.help
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 22
+ 22
+
+
+
+ true
+
+
+ addIconSmall
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+ true
+
+
+ removeIconSmall
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+
+
+
+ true
+
+
+ upArrowIconSmall
+
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+
+
+
+ true
+
+
+ downArrowIconSmall
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
AdvSceneSwitcher.transitionTab.title
@@ -3751,579 +4324,6 @@
-
-
- AdvSceneSwitcher.networkTab.title
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.description
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.warning
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
- AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.status.currentStatus
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.status.notRunning
-
-
-
- -
-
-
- 1024
-
-
- 65535
-
-
- 55555
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.port
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.lockToIPv4
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.sendPreview
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.sendSceneChange
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.server.restart
-
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.client
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
- AdvSceneSwitcher.networkTab.client.port
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.client.address
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- 1024
-
-
- 65535
-
-
- 55555
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.client.status.disconnected
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.client.status.currentStatus
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.networkTab.client.reconnect
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
- AdvSceneSwitcher.sceneGroupTab.title
-
-
- -
-
-
- AdvSceneSwitcher.sceneGroupTab.list
-
-
-
-
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.sceneGroupTab.help
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
-
- 22
- 22
-
-
-
- true
-
-
- addIconSmall
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
- true
-
-
- removeIconSmall
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
-
-
-
- true
-
-
- upArrowIconSmall
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
-
-
-
- true
-
-
- downArrowIconSmall
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.sceneGroupTab.edit
-
-
-
-
-
-
-
-
-
- AdvSceneSwitcher.sceneGroupTab.edit.name
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- -
-
-
-
-
-
- AdvSceneSwitcher.sceneGroupTab.edit.addScene
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
- AdvSceneSwitcher.sceneGroupTab.scenes.help
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
-
- 22
- 22
-
-
-
- true
-
-
- addIconSmall
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
- true
-
-
- removeIconSmall
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
-
-
-
- true
-
-
- upArrowIconSmall
-
-
-
- -
-
-
-
- 22
- 22
-
-
-
-
-
-
- true
-
-
- downArrowIconSmall
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
-
-
AdvSceneSwitcher.sceneTriggerTab.title
diff --git a/src/general.cpp b/src/general.cpp
index 8529d303..a90d9e74 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -651,6 +651,7 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
showSystemTrayNotifications =
obs_data_get_bool(obj, "showSystemTrayNotifications");
disableHints = obs_data_get_bool(obj, "disableHints");
+ obs_data_set_default_bool(obj, "hideLegacyTabs", true);
hideLegacyTabs = obs_data_get_bool(obj, "hideLegacyTabs");
obs_data_set_default_int(obj, "priority0", default_priority_0);
@@ -694,21 +695,21 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
obs_data_set_default_int(obj, "generalTabPos", 0);
obs_data_set_default_int(obj, "macroTabPos", 1);
- obs_data_set_default_int(obj, "transitionTabPos", 2);
- obs_data_set_default_int(obj, "pauseTabPos", 3);
- obs_data_set_default_int(obj, "titleTabPos", 4);
- obs_data_set_default_int(obj, "exeTabPos", 5);
- obs_data_set_default_int(obj, "regionTabPos", 6);
- obs_data_set_default_int(obj, "mediaTabPos", 7);
- obs_data_set_default_int(obj, "fileTabPos", 8);
- obs_data_set_default_int(obj, "randomTabPos", 9);
- obs_data_set_default_int(obj, "timeTabPos", 10);
- obs_data_set_default_int(obj, "idleTabPos", 11);
- obs_data_set_default_int(obj, "sequenceTabPos", 12);
- obs_data_set_default_int(obj, "audioTabPos", 13);
- obs_data_set_default_int(obj, "videoTabPos", 14);
- obs_data_set_default_int(obj, "networkTabPos", 15);
- obs_data_set_default_int(obj, "sceneGroupTabPos", 16);
+ obs_data_set_default_int(obj, "networkTabPos", 13);
+ obs_data_set_default_int(obj, "sceneGroupTabPos", 14);
+ obs_data_set_default_int(obj, "transitionTabPos", 15);
+ obs_data_set_default_int(obj, "pauseTabPos", 16);
+ obs_data_set_default_int(obj, "titleTabPos", 2);
+ obs_data_set_default_int(obj, "exeTabPos", 3);
+ obs_data_set_default_int(obj, "regionTabPos", 4);
+ obs_data_set_default_int(obj, "mediaTabPos", 5);
+ obs_data_set_default_int(obj, "fileTabPos", 6);
+ obs_data_set_default_int(obj, "randomTabPos", 7);
+ obs_data_set_default_int(obj, "timeTabPos", 8);
+ obs_data_set_default_int(obj, "idleTabPos", 9);
+ obs_data_set_default_int(obj, "sequenceTabPos", 10);
+ obs_data_set_default_int(obj, "audioTabPos", 11);
+ obs_data_set_default_int(obj, "videoTabPos", 12);
obs_data_set_default_int(obj, "triggerTabPos", 17);
tabOrder.clear();
diff --git a/src/headers/switcher-data-structs.hpp b/src/headers/switcher-data-structs.hpp
index 307e3578..f9653a36 100644
--- a/src/headers/switcher-data-structs.hpp
+++ b/src/headers/switcher-data-structs.hpp
@@ -88,7 +88,7 @@ struct SwitcherData {
bool stop = false;
bool verbose = false;
bool disableHints = false;
- bool hideLegacyTabs = false;
+ bool hideLegacyTabs = true;
bool showSystemTrayNotifications = false;
bool showFrame = false;
bool transitionOverrideOverride = false;