Add option to use transition overrides for transition changes (#164 )

* Adjust switchScene() signature to support adjustActiveTransitionType and verbose parameters and only change the transition type if adjustActiveTransitionType, otherwise rely on transition overrides * Add new adjustActiveTransitionType checkbox * save and load adjustActiveTransitionType * Add check to either enable transition type change or use of transition overrides * Add locale * Adjust layout and locale
CI: Fix macOS build by disabling browser build (#163 )
2026-08-29 04:36:21 -05:00 · 2021-04-10 19:58:17 +02:00 · 2021-04-09 20:57:35 +02:00 · 2021-04-07 21:03:54 +02:00 · 2021-04-03 22:02:42 +02:00
13 changed files with 183 additions and 159 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
          echo "add_subdirectory(${{ env.PLUGIN_NAME }})" >> UI/frontend-plugins/CMakeLists.txt
          mkdir ./build
          cd ./build
-          cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DDISABLE_PYTHON=ON -DDepsPath="/tmp/obsdeps" -DQTDIR="/tmp/obsdeps" ..
+          cmake -DBUILD_BROWSER=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DDISABLE_PYTHON=ON -DDepsPath="/tmp/obsdeps" -DQTDIR="/tmp/obsdeps" ..
          cd -
      - name: Build
        shell: bash
--- a/data/locale/de-DE.ini
+++ b/data/locale/de-DE.ini
@@ -54,7 +54,10 @@ AdvSceneSwitcher.generalTab.priority.video="Video"

 ; Transition Tab
 AdvSceneSwitcher.transitionTab.title="Szenenübergänge"
-AdvSceneSwitcher.transitionTab.transitionOverride="Szenenübergänge, die im Szenenwechsler konfiguriert werden, haben Vorrang vor Übergangsüberschreibung"
+AdvSceneSwitcher.transitionTab.setTransitionBy="Beim Ändern des Szenenübergangs:"
+AdvSceneSwitcher.transitionTab.transitionOverride="Verwende Übergangsüberschreibungen"
+AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Wechsle den aktiven Szenenübergangtyp"
+AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="Mindestens eine Option muss aktiv sein:\n\n - Verwende Übergangsüberschreibungen\n\n - Wechsle den aktiven Szenenübergangtyp"
 AdvSceneSwitcher.transitionTab.transitionForAToB="Szenenübergänge für automatisierte Szenenwechsel von Szene A zu Szene B"
 AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>Diese Einstellungen beeinflussen <span style=\"font-style:italic;\">nur</span> vom Szenenwechsler ausgelöste Szenenübergänge - Siehe <a href=\"https://obsproject.com/forum/resources/transition-table.1174/\"><span style=\" text-decoration: underline; color:#268bd2;\">Transition Table</span></a> um auch manuelle Szenenübergänge zu konfigurieren.<br/>Einstellungen auf diesem Tab haben Vorrang, vor denen welche auf den übrigen Tabs konfiguriert wurden.<br/><br/>Klicke auf das Plus Symbol, um einen neuen Eintrag hinzuzufügen.</p></body></html>"
 AdvSceneSwitcher.transitionTab.defaultTransition="Ändere den Szenenübergang wenn eine Szene aktiv ist"
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -54,7 +54,10 @@ AdvSceneSwitcher.generalTab.priority.video="Video"

 ; Transition Tab
 AdvSceneSwitcher.transitionTab.title="Transition"
-AdvSceneSwitcher.transitionTab.transitionOverride="Scene transitions defined in the scene switcher take priority over Transition Overrides defined per scene"
+AdvSceneSwitcher.transitionTab.setTransitionBy="When changing transitions:"
+AdvSceneSwitcher.transitionTab.transitionOverride="Set transition overrides"
+AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Change active transition type"
+AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
 AdvSceneSwitcher.transitionTab.transitionForAToB="Use transition for automated scene switch from scene A to scene B"
 AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>These settings <span style=\"font-style:italic;\">only</span> affect transitions caused by the scene switcher - Check out <a href=\"https://obsproject.com/forum/resources/transition-table.1174/\"><span style=\" text-decoration: underline; color:#268bd2;\">Transition Table</span></a> if you want to configure this for manual scene changes.<br/>Settings defined here take priority over transition settings configured elsewhere in the scene switcher.<br/><br/>Click the plus symbol below to add a new entry.</p></body></html>"
 AdvSceneSwitcher.transitionTab.defaultTransition="Change transition if scene is active"
--- a/deps/asio
+++ b/deps/asio
--- a/deps/websocketpp
+++ b/deps/websocketpp
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -566,18 +566,42 @@
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_15">
       <item>
-        <widget class="QCheckBox" name="transitionOverridecheckBox">
-         <property name="text">
-          <string>AdvSceneSwitcher.transitionTab.transitionOverride</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Line" name="line_17">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="adjustActiveTransitionType">
+           <property name="text">
+            <string>AdvSceneSwitcher.transitionTab.adjustActiveTransitionType</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_12">
+           <property name="text">
+            <string>AdvSceneSwitcher.transitionTab.setTransitionBy</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="transitionOverridecheckBox">
+           <property name="text">
+            <string>AdvSceneSwitcher.transitionTab.transitionOverride</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <spacer name="horizontalSpacer_9">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
       </item>
       <item>
        <widget class="QGroupBox" name="transitionsGroup">
--- a/src/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -552,7 +552,8 @@ void SwitcherData::Thread()
 				server.sendMessage(scene, transition);
 			}
 			switchScene(scene, transition,
-				    tansitionOverrideOverride);
+				    tansitionOverrideOverride,
+				    adjustActiveTransitionType, verbose);
 		}

 		writeSceneInfoToFile();
@@ -619,9 +620,10 @@ bool SwitcherData::checkForMatch(OBSWeakSource &scene,
 }

 void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
-		 bool &transitionOverrideOverride)
+		 bool transitionOverrideOverride,
+		 bool adjustActiveTransitionType, bool verbose)
 {
-	if (!scene && switcher->verbose) {
+	if (!scene && verbose) {
 		blog(LOG_INFO, "nothing to switch to");
 		return;
 	}
@@ -632,13 +634,14 @@ void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
 	if (source && source != currentSource) {
 		transitionData td;
 		setNextTransition(scene, currentSource, transition,
-				  transitionOverrideOverride, td);
+				  transitionOverrideOverride,
+				  adjustActiveTransitionType, td);
 		obs_frontend_set_current_scene(source);
 		if (transitionOverrideOverride) {
 			restoreTransitionOverride(source, td);
 		}

-		if (switcher->verbose) {
+		if (verbose) {
 			blog(LOG_INFO, "switched scene");
 		}
 	}
--- a/src/headers/advanced-scene-switcher.hpp
+++ b/src/headers/advanced-scene-switcher.hpp
@@ -166,6 +166,7 @@ public slots:
 	void on_defaultTransitionsUp_clicked();
 	void on_defaultTransitionsDown_clicked();
 	void on_transitionOverridecheckBox_stateChanged(int state);
+	void on_adjustActiveTransitionType_stateChanged(int state);
 	void defTransitionDelayValueChanged(int value);

 	void on_browseButton_clicked();
@@ -287,12 +288,14 @@ bool isInFocus(const QString &executable);

 void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
 		       OBSWeakSource &transition,
-		       bool &transitionOverrideOverride, transitionData &td);
+		       bool transitionOverrideOverride,
+		       bool adjustActiveTransitionType, transitionData &td);
 void overwriteTransitionOverride(obs_weak_source_t *sceneWs,
 				 obs_source_t *transition, transitionData &td);
 void restoreTransitionOverride(obs_source_t *scene, transitionData td);
 void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
-		 bool &transitionOverrideOverride);
+		 bool transitionOverrideOverride,
+		 bool adjustActiveTransitionType, bool verbose);

 /******************************************************************************
 * Main SwitcherData
--- a/src/headers/switch-network.hpp
+++ b/src/headers/switch-network.hpp
@@ -4,9 +4,6 @@ Most of this code is based on https://github.com/Palakis/obs-websocket

 #pragma once

-// Due to iussues with asio the network functionality will be disabled on macOS
-#if !(__APPLE__)
-
 #include <set>
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
@@ -16,16 +13,36 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #include <mutex>
 #include <condition_variable>

+#include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/config/asio_no_tls.hpp>
 #include <websocketpp/server.hpp>
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>

 using websocketpp::connection_hdl;
 typedef websocketpp::server<websocketpp::config::asio> server;
 typedef websocketpp::client<websocketpp::config::asio_client> client;

+class NetworkConfig {
+public:
+	NetworkConfig();
+	void Load(obs_data_t *obj);
+	void Save(obs_data_t *obj);
+	void SetDefaults(obs_data_t *obj);
+
+	std::string GetClientUri();
+
+	// Server
+	bool ServerEnabled;
+	uint64_t ServerPort;
+	bool LockToIPv4;
+
+	// Client
+	bool ClientEnabled;
+	std::string Address;
+	uint64_t ClientPort;
+	bool SendAll;
+};
+
 class WSServer : public QObject {
 	Q_OBJECT

@@ -52,6 +69,12 @@ private:
 	QThreadPool _threadPool;
 };

+enum class ServerStatus {
+	NOT_RUNNING,
+	STARTING,
+	RUNNING,
+};
+
 class WSClient : public QObject {
 	Q_OBJECT

@@ -80,62 +103,6 @@ private:
 	std::string _failMsg;
 };

-#else
-
-class WSServer : public QObject {
-	Q_OBJECT
-
-public:
-	explicit WSServer(){};
-	virtual ~WSServer(){};
-	void start(quint16 port, bool lockToIPv4){};
-	void stop(){};
-	void sendMessage(OBSWeakSource scene, OBSWeakSource transition){};
-};
-
-class WSClient : public QObject {
-	Q_OBJECT
-
-public:
-	explicit WSClient(){};
-	virtual ~WSClient(){};
-	void connect(std::string uri){};
-	void disconnect(){};
-	std::string getFail() { return _failMsg; }
-
-private:
-	std::string _failMsg;
-};
-
-#endif
-
-class NetworkConfig {
-public:
-	NetworkConfig();
-	void Load(obs_data_t *obj);
-	void Save(obs_data_t *obj);
-	void SetDefaults(obs_data_t *obj);
-
-	std::string GetClientUri();
-
-	// Server
-	bool ServerEnabled;
-	uint64_t ServerPort;
-	bool LockToIPv4;
-
-	// Client
-	bool ClientEnabled;
-	std::string Address;
-	uint64_t ClientPort;
-	bool SendAll;
-};
-
-enum class ServerStatus {
-	NOT_RUNNING,
-	STARTING,
-	RUNNING,
-};
-
 enum class ClientStatus {
 	DISCONNECTED,
 	CONNECTING,
--- a/src/headers/switcher-data-structs.hpp
+++ b/src/headers/switcher-data-structs.hpp
@@ -62,6 +62,7 @@ struct SwitcherData {
 	bool disableHints = false;
 	bool showFrame = false;
 	bool tansitionOverrideOverride = false;
+	bool adjustActiveTransitionType = true;

 	int interval = default_interval;

--- a/src/linux/advanced-scene-switcher-nix.cpp
+++ b/src/linux/advanced-scene-switcher-nix.cpp
@@ -203,6 +203,10 @@ void GetCurrentWindowTitle(std::string &title)
 					 &format, &num, &bytes,
 					 (uint8_t **)&data);

+	if (data == nullptr) {
+		return;
+	}
+
 	int status = 0;
 	XTextProperty text;
 	if (xstatus == Success) {
@@ -386,4 +390,4 @@ int secondsSinceLastInput()
 	XCloseDisplay(display);

 	return idle_time;
-}
+}
--- a/src/switch-network.cpp
+++ b/src/switch-network.cpp
@@ -24,12 +24,64 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #define SCENE_ENTRY "scene"
 #define TRANSITION_ENTRY "transition"

-#if !(__APPLE__)
-
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
 using websocketpp::lib::bind;

+NetworkConfig::NetworkConfig()
+	: ServerEnabled(false),
+	  ServerPort(55555),
+	  LockToIPv4(false),
+	  ClientEnabled(false),
+	  Address(""),
+	  ClientPort(55555),
+	  SendAll(true)
+{
+}
+
+void NetworkConfig::Load(obs_data_t *obj)
+{
+	SetDefaults(obj);
+
+	ServerEnabled = obs_data_get_bool(obj, PARAM_SERVER_ENABLE);
+	ServerPort = obs_data_get_int(obj, PARAM_SERVER_PORT);
+	LockToIPv4 = obs_data_get_bool(obj, PARAM_LOCKTOIPV4);
+
+	ClientEnabled = obs_data_get_bool(obj, PARAM_CLIENT_ENABLE);
+	Address = obs_data_get_string(obj, PARAM_ADDRESS);
+	ClientPort = obs_data_get_int(obj, PARAM_CLIENT_PORT);
+	SendAll = obs_data_get_bool(obj, PARAM_CLIENT_SENDALL);
+}
+
+void NetworkConfig::Save(obs_data_t *obj)
+{
+	obs_data_set_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
+	obs_data_set_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
+	obs_data_set_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_bool(obj, PARAM_CLIENT_SENDALL, SendAll);
+}
+
+void NetworkConfig::SetDefaults(obs_data_t *obj)
+{
+	obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
+	obs_data_set_default_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_default_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
+	obs_data_set_default_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_default_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SENDALL, SendAll);
+}
+
+std::string NetworkConfig::GetClientUri()
+{
+	return "ws://" + Address + ":" + std::to_string(ClientPort);
+}
+
 WSServer::WSServer()
 	: QObject(nullptr), _connections(), _clMutex(QMutex::Recursive)
 {
@@ -216,7 +268,8 @@ std::string processMessage(std::string payload)
 		       "'";
 	}

-	switchScene(scene, transition, switcher->tansitionOverrideOverride);
+	switchScene(scene, transition, switcher->tansitionOverrideOverride,
+		    switcher->adjustActiveTransitionType, switcher->verbose);
 	return ret;
 }

@@ -400,62 +453,6 @@ void WSClient::onClose(connection_hdl hdl)
 	switcher->clientStatus = ClientStatus::DISCONNECTED;
 }

-#endif
-
-NetworkConfig::NetworkConfig()
-	: ServerEnabled(false),
-	  ServerPort(55555),
-	  LockToIPv4(false),
-	  ClientEnabled(false),
-	  Address(""),
-	  ClientPort(55555),
-	  SendAll(true)
-{
-}
-
-void NetworkConfig::Load(obs_data_t *obj)
-{
-	SetDefaults(obj);
-
-	ServerEnabled = obs_data_get_bool(obj, PARAM_SERVER_ENABLE);
-	ServerPort = obs_data_get_int(obj, PARAM_SERVER_PORT);
-	LockToIPv4 = obs_data_get_bool(obj, PARAM_LOCKTOIPV4);
-
-	ClientEnabled = obs_data_get_bool(obj, PARAM_CLIENT_ENABLE);
-	Address = obs_data_get_string(obj, PARAM_ADDRESS);
-	ClientPort = obs_data_get_int(obj, PARAM_CLIENT_PORT);
-	SendAll = obs_data_get_bool(obj, PARAM_CLIENT_SENDALL);
-}
-
-void NetworkConfig::Save(obs_data_t *obj)
-{
-	obs_data_set_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
-	obs_data_set_int(obj, PARAM_SERVER_PORT, ServerPort);
-	obs_data_set_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
-
-	obs_data_set_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
-	obs_data_set_string(obj, PARAM_ADDRESS, Address.c_str());
-	obs_data_set_int(obj, PARAM_CLIENT_PORT, ClientPort);
-	obs_data_set_bool(obj, PARAM_CLIENT_SENDALL, SendAll);
-}
-
-void NetworkConfig::SetDefaults(obs_data_t *obj)
-{
-	obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
-	obs_data_set_default_int(obj, PARAM_SERVER_PORT, ServerPort);
-	obs_data_set_default_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
-
-	obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
-	obs_data_set_default_string(obj, PARAM_ADDRESS, Address.c_str());
-	obs_data_set_default_int(obj, PARAM_CLIENT_PORT, ClientPort);
-	obs_data_set_default_bool(obj, PARAM_CLIENT_SENDALL, SendAll);
-}
-
-std::string NetworkConfig::GetClientUri()
-{
-	return "ws://" + Address + ":" + std::to_string(ClientPort);
-}
-
 void SwitcherData::loadNetworkSettings(obs_data_t *obj)
 {
 	networkConfig.Load(obj);
@@ -471,13 +468,6 @@ void SwitcherData::saveNetworkSwitches(obs_data_t *obj)

 void AdvSceneSwitcher::setupNetworkTab()
 {
-#if __APPLE__
-	ui->clientSettings->setDisabled(true);
-	ui->serverSettings->setDisabled(true);
-	ui->networkTabWarningLabel->setText(
-		obs_module_text("AdvSceneSwitcher.networkTab.DisabledWarning"));
-#endif
-
 	ui->serverSettings->setChecked(switcher->networkConfig.ServerEnabled);
 	ui->serverPort->setValue(switcher->networkConfig.ServerPort);
 	ui->lockToIPv4->setChecked(switcher->networkConfig.LockToIPv4);
--- a/src/switch-transitions.cpp
+++ b/src/switch-transitions.cpp
@@ -182,12 +182,31 @@ void AdvSceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state)
 		return;
 	}

-	std::lock_guard<std::mutex> lock(switcher->m);
-	if (!state) {
-		switcher->tansitionOverrideOverride = false;
-	} else {
-		switcher->tansitionOverrideOverride = true;
+	if (!state && !switcher->adjustActiveTransitionType) {
+		DisplayMessage(obs_module_text(
+			"AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError"));
+		ui->adjustActiveTransitionType->setChecked(true);
 	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->tansitionOverrideOverride = state;
+}
+
+void AdvSceneSwitcher::on_adjustActiveTransitionType_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	// This option only makes sense if we are allowed to use transition overrides
+	if (!state && !switcher->tansitionOverrideOverride) {
+		DisplayMessage(obs_module_text(
+			"AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError"));
+		ui->transitionOverridecheckBox->setChecked(true);
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->adjustActiveTransitionType = state;
 }

 void AdvSceneSwitcher::defTransitionDelayValueChanged(int value)
@@ -251,7 +270,8 @@ void restoreTransitionOverride(obs_source_t *scene, transitionData td)

 void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
 		       OBSWeakSource &transition,
-		       bool &transitionOverrideOverride, transitionData &td)
+		       bool transitionOverrideOverride,
+		       bool adjustActiveTransitionType, transitionData &td)
 {
 	obs_weak_source_t *currentScene =
 		obs_source_get_weak_source(currentSource);
@@ -266,7 +286,7 @@ void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
 		nextTransition = obs_weak_source_get_source(transition);
 	}

-	if (nextTransition) {
+	if (nextTransition && adjustActiveTransitionType) {
 		obs_frontend_set_current_transition(nextTransition);
 	}

@@ -334,6 +354,8 @@ void SwitcherData::saveSceneTransitions(obs_data_t *obj)

 	obs_data_set_bool(obj, "tansitionOverrideOverride",
 			  switcher->tansitionOverrideOverride);
+	obs_data_set_bool(obj, "adjustActiveTransitionType",
+			  switcher->adjustActiveTransitionType);
 	obs_data_set_default_int(obj, "defTransitionDelay",
 				 default_def_transition_dealy);
 	obs_data_set_int(obj, "defTransitionDelay",
@@ -390,6 +412,8 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)

 	switcher->tansitionOverrideOverride =
 		obs_data_get_bool(obj, "tansitionOverrideOverride");
+	switcher->adjustActiveTransitionType =
+		obs_data_get_bool(obj, "adjustActiveTransitionType");
 	DefaultSceneTransition::delay =
 		obs_data_get_int(obj, "defTransitionDelay");
 }
@@ -430,6 +454,8 @@ void AdvSceneSwitcher::setupTransitionsTab()

 	ui->transitionOverridecheckBox->setChecked(
 		switcher->tansitionOverrideOverride);
+	ui->adjustActiveTransitionType->setChecked(
+		switcher->adjustActiveTransitionType);

 	QSpinBox *defTransitionDelay = new QSpinBox();
 	defTransitionDelay->setSuffix("ms");
Author	SHA1	Message	Date
WarmUpTill	e4bf5fa749	Add option to use transition overrides for transition changes (#164 ) * Adjust switchScene() signature to support adjustActiveTransitionType and verbose parameters and only change the transition type if adjustActiveTransitionType, otherwise rely on transition overrides * Add new adjustActiveTransitionType checkbox * save and load adjustActiveTransitionType * Add check to either enable transition type change or use of transition overrides * Add locale * Adjust layout and locale	2021-04-10 19:58:17 +02:00
WarmUpTill	eb346da6f4	CI: Fix macOS build by disabling browser build (#163 )	2021-04-09 20:57:35 +02:00
WarmUpTill	866480cde6	Fix crash on Linux if no ewmh is available (#159 )	2021-04-07 21:03:54 +02:00
WarmUpTill	10e1c7b3a3	Resolve asio network crashes on macOS (#157 ) * Reenable network tab functionality for macOS * Set asio to b73dc1d and websocketpp to c6d7e29	2021-04-03 22:02:42 +02:00