Skip to content

Commit 9bcced5

Browse files
WarmUpTillWarmUpTill
committed
Move transition behaviour related settings to General tab
1 parent 3bb2ddf commit 9bcced5

File tree

9 files changed

+113
-107
lines changed

9 files changed

+113
-107
lines changed

‎data/locale/de-DE.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ AdvSceneSwitcher.generalTab.priority.media="Medien"
5151
AdvSceneSwitcher.generalTab.priority.time="Zeit"
5252
AdvSceneSwitcher.generalTab.priority.audio="Audio"
5353
AdvSceneSwitcher.generalTab.priority.video="Video"
54+
AdvSceneSwitcher.generalTab.setTransitionBy="Beim Ändern des Szenenübergangs:"
55+
AdvSceneSwitcher.generalTab.transitionOverride="Verwende Übergangsüberschreibungen"
56+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Wechsle den aktiven Szenenübergangtyp"
57+
AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="Mindestens eine Option muss aktiv sein:\n\n - Verwende Übergangsüberschreibungen\n\n - Wechsle den aktiven Szenenübergangtyp"
5458

5559
; Transition Tab
5660
AdvSceneSwitcher.transitionTab.title="Szenenübergänge"
57-
AdvSceneSwitcher.transitionTab.setTransitionBy="Beim Ändern des Szenenübergangs:"
58-
AdvSceneSwitcher.transitionTab.transitionOverride="Verwende Übergangsüberschreibungen"
59-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Wechsle den aktiven Szenenübergangtyp"
60-
AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="Mindestens eine Option muss aktiv sein:\n\n - Verwende Übergangsüberschreibungen\n\n - Wechsle den aktiven Szenenübergangtyp"
6161
AdvSceneSwitcher.transitionTab.transitionForAToB="Szenenübergänge für automatisierte Szenenwechsel von Szene A zu Szene B"
6262
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>"
6363
AdvSceneSwitcher.transitionTab.defaultTransition="Ändere den Szenenübergang wenn eine Szene aktiv ist"

‎data/locale/en-US.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ AdvSceneSwitcher.generalTab.priority.time="Time"
5555
AdvSceneSwitcher.generalTab.priority.audio="Audio"
5656
AdvSceneSwitcher.generalTab.priority.video="Video"
5757
AdvSceneSwitcher.generalTab.priority.macro="Macro"
58+
AdvSceneSwitcher.generalTab.transition="Transitions"
59+
AdvSceneSwitcher.generalTab.setTransitionBy="When changing transitions:"
60+
AdvSceneSwitcher.generalTab.transitionOverride="Set transition overrides"
61+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Change active transition type"
62+
AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
5863

5964
; Macro Tab
6065
AdvSceneSwitcher.macroTab.title="Macro"
@@ -543,10 +548,6 @@ AdvSceneSwitcher.action.variable.entry="{{actions}}{{variables}}{{variables2}}{{
543548

544549
; Transition Tab
545550
AdvSceneSwitcher.transitionTab.title="Transition"
546-
AdvSceneSwitcher.transitionTab.setTransitionBy="When changing transitions:"
547-
AdvSceneSwitcher.transitionTab.transitionOverride="Set transition overrides"
548-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Change active transition type"
549-
AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
550551
AdvSceneSwitcher.transitionTab.transitionForAToB="Use transition for automated scene switch from scene A to scene B"
551552
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>"
552553
AdvSceneSwitcher.transitionTab.defaultTransition="Change transition if scene is active"

‎data/locale/es-ES.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ AdvSceneSwitcher.generalTab.priority.time="Tiempo"
5454
AdvSceneSwitcher.generalTab.priority.audio="Audio"
5555
AdvSceneSwitcher.generalTab.priority.video="Video"
5656
AdvSceneSwitcher.generalTab.priority.macro="Macro"
57+
AdvSceneSwitcher.generalTab.setTransitionBy="Al cambiar las transiciones:"
58+
AdvSceneSwitcher.generalTab.transitionOverride="Establecer anulaciones de transición"
59+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Cambiar tipo de transición activa"
60+
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"
5761

5862
; Macro Tab
5963
AdvSceneSwitcher.macroTab.title="Macro"
@@ -478,10 +482,6 @@ AdvSceneSwitcher.action.sequence.continueFrom="Continuar con el elemento selecci
478482

479483
; Transition Tab
480484
AdvSceneSwitcher.transitionTab.title="Transición"
481-
AdvSceneSwitcher.transitionTab.setTransitionBy="Al cambiar las transiciones:"
482-
AdvSceneSwitcher.transitionTab.transitionOverride="Establecer anulaciones de transición"
483-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Cambiar tipo de transición activa"
484-
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"
485485
AdvSceneSwitcher.transitionTab.transitionForAToB="Utiliza la transición para el cambio de escena automatizado de la escena A a la escena B"
486486
AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body> <p> Estos ajustes <span style =\"font-style: italic; \"> solo </span> surgió a las transiciones causadas por el selector de escenas - Echa un vistazo a <a href =\"https://obsproject.com/forum/resources/transition-table.1174/\"> <span style=\" texto-decoración: subrayado; color: # 268bd2; \"> Tabla de transición </span> </a> si desea configurar esto para cambios de escena manuales. <br/> Los definiciones definidos aquí tienen prioridad sobre los ajustes de transición configurados en cualquier otro lugar del selector de escenas. < br/> <br/> Haz clic en el símbolo más a continuación para agregar una nueva entrada. </p></body></html>"
487487
AdvSceneSwitcher.transitionTab.defaultTransition="Cambiar transición si la escena está activa"

‎data/locale/ru-RU.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ AdvSceneSwitcher.generalTab.priority.time="Время"
5252
AdvSceneSwitcher.generalTab.priority.audio="Аудио"
5353
AdvSceneSwitcher.generalTab.priority.video="Видео"
5454
AdvSceneSwitcher.generalTab.priority.macro="Макрос"
55+
AdvSceneSwitcher.generalTab.setTransitionBy="При изменении переходов:"
56+
AdvSceneSwitcher.generalTab.transitionOverride="Установить переопределение переходов"
57+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Изменить тип активного перехода"
58+
AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="Должна быть включена хотя бы одна опция:\n\n - Использовать переопределения переходов\n\n - Изменить тип активного перехода"
5559

5660
; Macro Tab
5761
AdvSceneSwitcher.macroTab.title="Макрос"
@@ -147,10 +151,6 @@ AdvSceneSwitcher.action.run="Запустить"
147151

148152
; Transition Tab
149153
AdvSceneSwitcher.transitionTab.title="Переход"
150-
AdvSceneSwitcher.transitionTab.setTransitionBy="При изменении переходов:"
151-
AdvSceneSwitcher.transitionTab.transitionOverride="Установить переопределение переходов"
152-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Изменить тип активного перехода"
153-
AdvSceneSwitcher.transitionTab.transitionBehaviorSelectionError="Должна быть включена хотя бы одна опция:\n\n - Использовать переопределения переходов\n\n - Изменить тип активного перехода"
154154
AdvSceneSwitcher.transitionTab.transitionForAToB="Использовать переход для автоматического переключения сцены со сцены A на сцену B"
155155
AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>Эти настройки <span style=\"font-style:italic;\">только</span> влияют на переходы, вызванные переключателем сцен - Проверьте <a href=\"https://obsproject.com/forum/resources/transition-table.1174/\"><span style=\" text-decoration: underline; color:#268bd2;\">Transition Table</span></a> если вы хотите настроить его для ручного изменения сцены.<br/>Настройки, определенные здесь, имеют приоритет над настройками перехода, сконфигурированными в других местах переключателя сцен.<br/><br/>Нажмите на символ плюса ниже, чтобы добавить новую запись.</p></body></html>"
156156
AdvSceneSwitcher.transitionTab.defaultTransition="Изменить переход, если сцена активна"

‎data/locale/tr-TR.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ AdvSceneSwitcher.generalTab.priority.time="Zaman"
5353
AdvSceneSwitcher.generalTab.priority.audio="Ses"
5454
AdvSceneSwitcher.generalTab.priority.video="Video"
5555
AdvSceneSwitcher.generalTab.priority.macro="Makro"
56+
AdvSceneSwitcher.generalTab.setTransitionBy="Geçişleri değiştirirken:"
57+
AdvSceneSwitcher.generalTab.transitionOverride="Geçiş geçersiz kılmaları ayarla"
58+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Etkin geçiş türünü değiştir"
59+
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"
5660

5761
; Macro Tab
5862
AdvSceneSwitcher.macroTab.title="Makro"
@@ -391,10 +395,6 @@ AdvSceneSwitcher.action.sceneCollection.warning="Not: Değişen sahne koleksiyon
391395

392396
; Transition Tab
393397
AdvSceneSwitcher.transitionTab.title="Geçiş"
394-
AdvSceneSwitcher.transitionTab.setTransitionBy="Geçişleri değiştirirken:"
395-
AdvSceneSwitcher.transitionTab.transitionOverride="Geçiş geçersiz kılmaları ayarla"
396-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="Etkin geçiş türünü değiştir"
397-
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"
398398
AdvSceneSwitcher.transitionTab.transitionForAToB="Sahne A'dan sahne B'ye otomatik sahne geçişi için geçişi kullanın"
399399
AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>Bu ayarlar <span style=\"font-style:italic;\">yalnızca</span>, sahne değiştiricinin neden olduğu geçişleri etkiler - <a href=\ Göz atın "https://obsproject.com/forum/resources/transition-table.1174/\"><span style=\" text-decoration: underline; color:#268bd2;\">Geçiş Tablosu</span></ a> bunu manuel sahne değişiklikleri için yapılandırmak istiyorsanız.<br/>Burada tanımlanan ayarlar, sahne değiştiricide başka bir yerde yapılandırılmış geçiş ayarlarına göre önceliklidir.<br/><br/>Yeni bir giriş eklemek için aşağıdaki artı simgesini tıklayın. .</p></body></html>"
400400
AdvSceneSwitcher.transitionTab.defaultTransition="Sahne aktifse geçişi değiştir"

‎data/locale/zh-CN.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ AdvSceneSwitcher.generalTab.priority.time="时间"
5454
AdvSceneSwitcher.generalTab.priority.audio="音频"
5555
AdvSceneSwitcher.generalTab.priority.video="视频"
5656
AdvSceneSwitcher.generalTab.priority.macro="宏"
57+
AdvSceneSwitcher.generalTab.setTransitionBy="更改转场特效时:"
58+
AdvSceneSwitcher.generalTab.transitionOverride="在场景切换器中设定的转场特效优先级高于场景设定的转场特效"
59+
AdvSceneSwitcher.generalTab.adjustActiveTransitionType="更改激活转场特效类型"
5760

5861
; Macro Tab
5962
AdvSceneSwitcher.macroTab.title="宏"
@@ -437,9 +440,6 @@ AdvSceneSwitcher.action.sequence.continueFrom="继续所选项目"
437440

438441
; Transition Tab
439442
AdvSceneSwitcher.transitionTab.title="转场特效"
440-
AdvSceneSwitcher.transitionTab.setTransitionBy="更改转场特效时:"
441-
AdvSceneSwitcher.transitionTab.transitionOverride="在场景切换器中设定的转场特效优先级高于场景设定的转场特效"
442-
AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="更改激活转场特效类型"
443443
AdvSceneSwitcher.transitionTab.transitionForAToB="当自动从场景A切换到场景B时使用的转场特效"
444444
AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>这里的设定<span style=\"font-style:bold;\">只影响由场景切换器引起的转场有效</span>，不影响你手动的引起的转场。<br/>在这里设定的转场特效优先级高于场景切换器其他地方设置的<br/><br/>单击加号添加项目.</p></body></html>"
445445
AdvSceneSwitcher.transitionTab.defaultTransition="当切换到这个场景时修改默认转场特效"

‎forms/advanced-scene-switcher.ui

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<x>0</x>
6969
<y>0</y>
7070
<width>957</width>
71-
<height>817</height>
71+
<height>905</height>
7272
</rect>
7373
</property>
7474
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -419,6 +419,49 @@
419419
</layout>
420420
</widget>
421421
</item>
422+
<item>
423+
<widget class="QGroupBox" name="transitionBox">
424+
<property name="title">
425+
<string>AdvSceneSwitcher.generalTab.transition</string>
426+
</property>
427+
<layout class="QGridLayout" name="transitionLayout">
428+
<item row="1" column="1">
429+
<widget class="QCheckBox" name="adjustActiveTransitionType">
430+
<property name="text">
431+
<string>AdvSceneSwitcher.generalTab.adjustActiveTransitionType</string>
432+
</property>
433+
</widget>
434+
</item>
435+
<item row="0" column="0">
436+
<widget class="QLabel" name="label_12">
437+
<property name="text">
438+
<string>AdvSceneSwitcher.generalTab.setTransitionBy</string>
439+
</property>
440+
</widget>
441+
</item>
442+
<item row="0" column="1">
443+
<widget class="QCheckBox" name="transitionOverridecheckBox">
444+
<property name="text">
445+
<string>AdvSceneSwitcher.generalTab.transitionOverride</string>
446+
</property>
447+
</widget>
448+
</item>
449+
<item row="0" column="2">
450+
<spacer name="horizontalSpacer_9">
451+
<property name="orientation">
452+
<enum>Qt::Horizontal</enum>
453+
</property>
454+
<property name="sizeHint" stdset="0">
455+
<size>
456+
<width>40</width>
457+
<height>20</height>
458+
</size>
459+
</property>
460+
</spacer>
461+
</item>
462+
</layout>
463+
</widget>
464+
</item>
422465
<item>
423466
<widget class="QGroupBox" name="priorityBox">
424467
<property name="title">
@@ -1730,44 +1773,6 @@
17301773
<string>AdvSceneSwitcher.transitionTab.title</string>
17311774
</attribute>
17321775
<layout class="QVBoxLayout" name="verticalLayout_15">
1733-
<item>
1734-
<layout class="QGridLayout" name="gridLayout_5">
1735-
<item row="1" column="1">
1736-
<widget class="QCheckBox" name="adjustActiveTransitionType">
1737-
<property name="text">
1738-
<string>AdvSceneSwitcher.transitionTab.adjustActiveTransitionType</string>
1739-
</property>
1740-
</widget>
1741-
</item>
1742-
<item row="0" column="0">
1743-
<widget class="QLabel" name="label_12">
1744-
<property name="text">
1745-
<string>AdvSceneSwitcher.transitionTab.setTransitionBy</string>
1746-
</property>
1747-
</widget>
1748-
</item>
1749-
<item row="0" column="1">
1750-
<widget class="QCheckBox" name="transitionOverridecheckBox">
1751-
<property name="text">
1752-
<string>AdvSceneSwitcher.transitionTab.transitionOverride</string>
1753-
</property>
1754-
</widget>
1755-
</item>
1756-
<item row="0" column="2">
1757-
<spacer name="horizontalSpacer_9">
1758-
<property name="orientation">
1759-
<enum>Qt::Horizontal</enum>
1760-
</property>
1761-
<property name="sizeHint" stdset="0">
1762-
<size>
1763-
<width>40</width>
1764-
<height>20</height>
1765-
</size>
1766-
</property>
1767-
</spacer>
1768-
</item>
1769-
</layout>
1770-
</item>
17711776
<item>
17721777
<widget class="QGroupBox" name="transitionsGroup">
17731778
<property name="title">

‎src/general.cpp

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,39 @@ void AdvSceneSwitcher::on_tabWidget_currentChanged(int)
496496
SetShowFrames();
497497
}
498498

499+
void AdvSceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state)
500+
{
501+
if (loading) {
502+
return;
503+
}
504+
505+
if (!state && !switcher->adjustActiveTransitionType) {
506+
DisplayMessage(obs_module_text(
507+
"AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError"));
508+
ui->adjustActiveTransitionType->setChecked(true);
509+
}
510+
511+
std::lock_guard<std::mutex> lock(switcher->m);
512+
switcher->transitionOverrideOverride = state;
513+
}
514+
515+
void AdvSceneSwitcher::on_adjustActiveTransitionType_stateChanged(int state)
516+
{
517+
if (loading) {
518+
return;
519+
}
520+
521+
// This option only makes sense if we are allowed to use transition overrides
522+
if (!state && !switcher->transitionOverrideOverride) {
523+
DisplayMessage(obs_module_text(
524+
"AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError"));
525+
ui->transitionOverridecheckBox->setChecked(true);
526+
}
527+
528+
std::lock_guard<std::mutex> lock(switcher->m);
529+
switcher->adjustActiveTransitionType = state;
530+
}
531+
499532
void SwitcherData::loadSettings(obs_data_t *obj)
500533
{
501534
if (!obj) {
@@ -599,6 +632,13 @@ void SwitcherData::saveGeneralSettings(obs_data_t *obj)
599632
obs_data_set_int(obj, "priority10", functionNamesByPriority[10]);
600633

601634
obs_data_set_int(obj, "threadPriority", threadPriority);
635+
636+
obs_data_set_bool(obj, "tansitionOverrideOverride",
637+
transitionOverrideOverride);
638+
obs_data_set_default_bool(obj, "adjustActiveTransitionType",
639+
adjustActiveTransitionType);
640+
obs_data_set_bool(obj, "adjustActiveTransitionType",
641+
adjustActiveTransitionType);
602642
}
603643

604644
void SwitcherData::loadGeneralSettings(obs_data_t *obj)
@@ -674,6 +714,11 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
674714
obs_data_set_default_int(obj, "threadPriority",
675715
QThread::NormalPriority);
676716
threadPriority = obs_data_get_int(obj, "threadPriority");
717+
718+
transitionOverrideOverride =
719+
obs_data_get_bool(obj, "tansitionOverrideOverride");
720+
adjustActiveTransitionType =
721+
obs_data_get_bool(obj, "adjustActiveTransitionType");
677722
}
678723

679724
void saveSplitterPos(QList<int> &sizes, obs_data_t *obj, const std::string name)

0 commit comments

Comments
 (0)