diff --git a/data/locale/de-DE.ini b/data/locale/de-DE.ini index f0b54c39..39952a05 100644 --- a/data/locale/de-DE.ini +++ b/data/locale/de-DE.ini @@ -51,13 +51,13 @@ AdvSceneSwitcher.generalTab.priority.media="Medien" AdvSceneSwitcher.generalTab.priority.time="Zeit" AdvSceneSwitcher.generalTab.priority.audio="Audio" AdvSceneSwitcher.generalTab.priority.video="Video" +AdvSceneSwitcher.generalTab.setTransitionBy="Beim Ändern des Szenenübergangs:" +AdvSceneSwitcher.generalTab.transitionOverride="Verwende Übergangsüberschreibungen" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Wechsle den aktiven Szenenübergangtyp" +AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="Mindestens eine Option muss aktiv sein:\n\n - Verwende Übergangsüberschreibungen\n\n - Wechsle den aktiven Szenenübergangtyp" ; Transition Tab AdvSceneSwitcher.transitionTab.title="Szenenübergänge" -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="

Diese Einstellungen beeinflussen nur vom Szenenwechsler ausgelöste Szenenübergänge - Siehe Transition Table um auch manuelle Szenenübergänge zu konfigurieren.
Einstellungen auf diesem Tab haben Vorrang, vor denen welche auf den übrigen Tabs konfiguriert wurden.

Klicke auf das Plus Symbol, um einen neuen Eintrag hinzuzufügen.

" AdvSceneSwitcher.transitionTab.defaultTransition="Ändere den Szenenübergang wenn eine Szene aktiv ist" diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index f5abf564..54580c0e 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -55,6 +55,11 @@ AdvSceneSwitcher.generalTab.priority.time="Time" AdvSceneSwitcher.generalTab.priority.audio="Audio" AdvSceneSwitcher.generalTab.priority.video="Video" AdvSceneSwitcher.generalTab.priority.macro="Macro" +AdvSceneSwitcher.generalTab.transition="Transitions" +AdvSceneSwitcher.generalTab.setTransitionBy="When changing transitions:" +AdvSceneSwitcher.generalTab.transitionOverride="Set transition overrides" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Change active transition type" +AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type" ; Macro Tab AdvSceneSwitcher.macroTab.title="Macro" @@ -543,10 +548,6 @@ AdvSceneSwitcher.action.variable.entry="{{actions}}{{variables}}{{variables2}}{{ ; Transition Tab AdvSceneSwitcher.transitionTab.title="Transition" -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="

These settings only affect transitions caused by the scene switcher - Check out Transition Table if you want to configure this for manual scene changes.
Settings defined here take priority over transition settings configured elsewhere in the scene switcher.

Click the plus symbol below to add a new entry.

" AdvSceneSwitcher.transitionTab.defaultTransition="Change transition if scene is active" diff --git a/data/locale/es-ES.ini b/data/locale/es-ES.ini index 93b8649e..e89a0444 100644 --- a/data/locale/es-ES.ini +++ b/data/locale/es-ES.ini @@ -54,6 +54,10 @@ AdvSceneSwitcher.generalTab.priority.time="Tiempo" AdvSceneSwitcher.generalTab.priority.audio="Audio" AdvSceneSwitcher.generalTab.priority.video="Video" AdvSceneSwitcher.generalTab.priority.macro="Macro" +AdvSceneSwitcher.generalTab.setTransitionBy="Al cambiar las transiciones:" +AdvSceneSwitcher.generalTab.transitionOverride="Establecer anulaciones de transición" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Cambiar tipo de transición activa" +AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="Al menos una opción debe estar habilitada:\n\n - Usar anulaciones de transición\n\n - Cambiar el tipo de transición activo" ; Macro Tab AdvSceneSwitcher.macroTab.title="Macro" @@ -478,10 +482,6 @@ AdvSceneSwitcher.action.sequence.continueFrom="Continuar con el elemento selecci ; Transition Tab AdvSceneSwitcher.transitionTab.title="Transición" -AdvSceneSwitcher.transitionTab.setTransitionBy="Al cambiar las transiciones:" -AdvSceneSwitcher.transitionTab.transitionOverride="Establecer anulaciones de transición" -AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Cambiar tipo de transición activa" -AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="Al menos una opción debe estar habilitada:\n\n - Usar anulaciones de transición\n\n - Cambiar el tipo de transición activo" AdvSceneSwitcher.transitionTab.transitionForAToB="Utiliza la transición para el cambio de escena automatizado de la escena A a la escena B" AdvSceneSwitcher.transitionTab.transitionsHelp="

Estos ajustes solo surgió a las transiciones causadas por el selector de escenas - Echa un vistazo a Tabla de transición si desea configurar esto para cambios de escena manuales.
Los definiciones definidos aquí tienen prioridad sobre los ajustes de transición configurados en cualquier otro lugar del selector de escenas. < br/>
Haz clic en el símbolo más a continuación para agregar una nueva entrada.

" AdvSceneSwitcher.transitionTab.defaultTransition="Cambiar transición si la escena está activa" diff --git a/data/locale/ru-RU.ini b/data/locale/ru-RU.ini index 02b0edcc..087a1d3d 100644 --- a/data/locale/ru-RU.ini +++ b/data/locale/ru-RU.ini @@ -52,6 +52,10 @@ AdvSceneSwitcher.generalTab.priority.time="Время" AdvSceneSwitcher.generalTab.priority.audio="Аудио" AdvSceneSwitcher.generalTab.priority.video="Видео" AdvSceneSwitcher.generalTab.priority.macro="Макрос" +AdvSceneSwitcher.generalTab.setTransitionBy="При изменении переходов:" +AdvSceneSwitcher.generalTab.transitionOverride="Установить переопределение переходов" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Изменить тип активного перехода" +AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="Должна быть включена хотя бы одна опция:\n\n - Использовать переопределения переходов\n\n - Изменить тип активного перехода" ; Macro Tab AdvSceneSwitcher.macroTab.title="Макрос" @@ -147,10 +151,6 @@ AdvSceneSwitcher.action.run="Запустить" ; Transition Tab AdvSceneSwitcher.transitionTab.title="Переход" -AdvSceneSwitcher.transitionTab.setTransitionBy="При изменении переходов:" -AdvSceneSwitcher.transitionTab.transitionOverride="Установить переопределение переходов" -AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Изменить тип активного перехода" -AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="Должна быть включена хотя бы одна опция:\n\n - Использовать переопределения переходов\n\n - Изменить тип активного перехода" AdvSceneSwitcher.transitionTab.transitionForAToB="Использовать переход для автоматического переключения сцены со сцены A на сцену B" AdvSceneSwitcher.transitionTab.transitionsHelp="

Эти настройки только влияют на переходы, вызванные переключателем сцен - Проверьте Transition Table если вы хотите настроить его для ручного изменения сцены.
Настройки, определенные здесь, имеют приоритет над настройками перехода, сконфигурированными в других местах переключателя сцен.

Нажмите на символ плюса ниже, чтобы добавить новую запись.

" AdvSceneSwitcher.transitionTab.defaultTransition="Изменить переход, если сцена активна" diff --git a/data/locale/tr-TR.ini b/data/locale/tr-TR.ini index 27aea664..8f782867 100644 --- a/data/locale/tr-TR.ini +++ b/data/locale/tr-TR.ini @@ -53,6 +53,10 @@ AdvSceneSwitcher.generalTab.priority.time="Zaman" AdvSceneSwitcher.generalTab.priority.audio="Ses" AdvSceneSwitcher.generalTab.priority.video="Video" AdvSceneSwitcher.generalTab.priority.macro="Makro" +AdvSceneSwitcher.generalTab.setTransitionBy="Geçişleri değiştirirken:" +AdvSceneSwitcher.generalTab.transitionOverride="Geçiş geçersiz kılmaları ayarla" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Etkin geçiş türünü değiştir" +AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="En az bir seçenek etkinleştirilmelidir: \n\n - Geçiş geçersiz kılmalarını kullan \n\n - Etkin geçiş türünü değiştir" ; Macro Tab AdvSceneSwitcher.macroTab.title="Makro" @@ -391,10 +395,6 @@ AdvSceneSwitcher.action.sceneCollection.warning="Not: Değişen sahne koleksiyon ; Transition Tab AdvSceneSwitcher.transitionTab.title="Geçiş" -AdvSceneSwitcher.transitionTab.setTransitionBy="Geçişleri değiştirirken:" -AdvSceneSwitcher.transitionTab.transitionOverride="Geçiş geçersiz kılmaları ayarla" -AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Etkin geçiş türünü değiştir" -AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="En az bir seçenek etkinleştirilmelidir: \n\n - Geçiş geçersiz kılmalarını kullan \n\n - Etkin geçiş türünü değiştir" AdvSceneSwitcher.transitionTab.transitionForAToB="Sahne A'dan sahne B'ye otomatik sahne geçişi için geçişi kullanın" AdvSceneSwitcher.transitionTab.transitionsHelp="

Bu ayarlar yalnızca, sahne değiştiricinin neden olduğu geçişleri etkiler - Geçiş Tablosu bunu manuel sahne değişiklikleri için yapılandırmak istiyorsanız.
Burada tanımlanan ayarlar, sahne değiştiricide başka bir yerde yapılandırılmış geçiş ayarlarına göre önceliklidir.

Yeni bir giriş eklemek için aşağıdaki artı simgesini tıklayın. .

" AdvSceneSwitcher.transitionTab.defaultTransition="Sahne aktifse geçişi değiştir" diff --git a/data/locale/zh-CN.ini b/data/locale/zh-CN.ini index 85c91edb..885b1fe4 100644 --- a/data/locale/zh-CN.ini +++ b/data/locale/zh-CN.ini @@ -54,6 +54,9 @@ AdvSceneSwitcher.generalTab.priority.time="时间" AdvSceneSwitcher.generalTab.priority.audio="音频" AdvSceneSwitcher.generalTab.priority.video="视频" AdvSceneSwitcher.generalTab.priority.macro="宏" +AdvSceneSwitcher.generalTab.setTransitionBy="更改转场特效时:" +AdvSceneSwitcher.generalTab.transitionOverride="在场景切换器中设定的转场特效优先级高于场景设定的转场特效" +AdvSceneSwitcher.generalTab.adjustActiveTransitionType="更改激活转场特效类型" ; Macro Tab AdvSceneSwitcher.macroTab.title="宏" @@ -437,9 +440,6 @@ AdvSceneSwitcher.action.sequence.continueFrom="继续所选项目" ; Transition Tab AdvSceneSwitcher.transitionTab.title="转场特效" -AdvSceneSwitcher.transitionTab.setTransitionBy="更改转场特效时:" -AdvSceneSwitcher.transitionTab.transitionOverride="在场景切换器中设定的转场特效优先级高于场景设定的转场特效" -AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="更改激活转场特效类型" AdvSceneSwitcher.transitionTab.transitionForAToB="当自动从场景A切换到场景B时使用的转场特效" AdvSceneSwitcher.transitionTab.transitionsHelp="

这里的设定只影响由场景切换器引起的转场有效，不影响你手动的引起的转场。
在这里设定的转场特效优先级高于场景切换器其他地方设置的

单击加号添加项目.

" AdvSceneSwitcher.transitionTab.defaultTransition="当切换到这个场景时修改默认转场特效" diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index a64c41c7..1cf0228c 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -68,7 +68,7 @@ 0 0 957 - 817 + 905 @@ -419,6 +419,49 @@ + + + + AdvSceneSwitcher.generalTab.transition + + + + + + AdvSceneSwitcher.generalTab.adjustActiveTransitionType + + + + + + + AdvSceneSwitcher.generalTab.setTransitionBy + + + + + + + AdvSceneSwitcher.generalTab.transitionOverride + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + @@ -1730,44 +1773,6 @@ AdvSceneSwitcher.transitionTab.title - - - - - - AdvSceneSwitcher.transitionTab.adjustActiveTransitionType - - - - - - - AdvSceneSwitcher.transitionTab.setTransitionBy - - - - - - - AdvSceneSwitcher.transitionTab.transitionOverride - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - diff --git a/src/general.cpp b/src/general.cpp index ec631885..8ac1c465 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -496,6 +496,39 @@ void AdvSceneSwitcher::on_tabWidget_currentChanged(int) SetShowFrames(); } +void AdvSceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state) +{ + if (loading) { + return; + } + + if (!state && !switcher->adjustActiveTransitionType) { + DisplayMessage(obs_module_text( + "AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError")); + ui->adjustActiveTransitionType->setChecked(true); + } + + std::lock_guard lock(switcher->m); + switcher->transitionOverrideOverride = 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->transitionOverrideOverride) { + DisplayMessage(obs_module_text( + "AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError")); + ui->transitionOverridecheckBox->setChecked(true); + } + + std::lock_guard lock(switcher->m); + switcher->adjustActiveTransitionType = state; +} + void SwitcherData::loadSettings(obs_data_t *obj) { if (!obj) { @@ -599,6 +632,13 @@ void SwitcherData::saveGeneralSettings(obs_data_t *obj) obs_data_set_int(obj, "priority10", functionNamesByPriority[10]); obs_data_set_int(obj, "threadPriority", threadPriority); + + obs_data_set_bool(obj, "tansitionOverrideOverride", + transitionOverrideOverride); + obs_data_set_default_bool(obj, "adjustActiveTransitionType", + adjustActiveTransitionType); + obs_data_set_bool(obj, "adjustActiveTransitionType", + adjustActiveTransitionType); } void SwitcherData::loadGeneralSettings(obs_data_t *obj) @@ -674,6 +714,11 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj) obs_data_set_default_int(obj, "threadPriority", QThread::NormalPriority); threadPriority = obs_data_get_int(obj, "threadPriority"); + + transitionOverrideOverride = + obs_data_get_bool(obj, "tansitionOverrideOverride"); + adjustActiveTransitionType = + obs_data_get_bool(obj, "adjustActiveTransitionType"); } void saveSplitterPos(QList &sizes, obs_data_t *obj, const std::string name) diff --git a/src/legacy/switch-transitions.cpp b/src/legacy/switch-transitions.cpp index 0c65f79f..b4bf8da2 100644 --- a/src/legacy/switch-transitions.cpp +++ b/src/legacy/switch-transitions.cpp @@ -169,39 +169,6 @@ void SwitcherData::checkDefaultSceneTransitions() } } -void AdvSceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state) -{ - if (loading) { - return; - } - - if (!state && !switcher->adjustActiveTransitionType) { - DisplayMessage(obs_module_text( - "AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError")); - ui->adjustActiveTransitionType->setChecked(true); - } - - std::lock_guard lock(switcher->m); - switcher->transitionOverrideOverride = 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->transitionOverrideOverride) { - DisplayMessage(obs_module_text( - "AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError")); - ui->transitionOverridecheckBox->setChecked(true); - } - - std::lock_guard lock(switcher->m); - switcher->adjustActiveTransitionType = state; -} - void AdvSceneSwitcher::defTransitionDelayValueChanged(int value) { if (loading) { @@ -335,13 +302,6 @@ void SwitcherData::saveSceneTransitions(obs_data_t *obj) } obs_data_set_array(obj, "defaultTransitions", defaultTransitionsArray); obs_data_array_release(defaultTransitionsArray); - - obs_data_set_bool(obj, "tansitionOverrideOverride", - transitionOverrideOverride); - obs_data_set_default_bool(obj, "adjustActiveTransitionType", - adjustActiveTransitionType); - obs_data_set_bool(obj, "adjustActiveTransitionType", - adjustActiveTransitionType); obs_data_set_default_int(obj, "defTransitionDelay", default_def_transition_dealy); obs_data_set_int(obj, "defTransitionDelay", @@ -380,11 +340,6 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj) } obs_data_array_release(defaultTransitionsArray); - transitionOverrideOverride = - obs_data_get_bool(obj, "tansitionOverrideOverride"); - adjustActiveTransitionType = - obs_data_get_bool(obj, "adjustActiveTransitionType"); - // Check for invalid config if (!transitionOverrideOverride && !adjustActiveTransitionType) { adjustActiveTransitionType = true;