From 8f77b6cbd7f002bd2d440c5220975d8c9744943c Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 7 Jan 2024 14:04:54 +0100 Subject: [PATCH] Set sensible tab order --- forms/advanced-scene-switcher.ui | 192 +++++++++++++++++++++++++++++++ lib/general.cpp | 15 ++- 2 files changed, 201 insertions(+), 6 deletions(-) diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index 4445b496..9b1ef626 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -377,6 +377,22 @@ + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -4952,7 +4968,183 @@ QPushButton
macro-run-button.hpp
+ + advss::DurationSelection + QWidget +
duration-control.hpp
+ + + tabWidget + scrollArea + checkInterval + startupBehavior + autoStartEvent + verboseLogging + saveWindowGeo + showTrayNotifications + uiHintsDisable + disableComboBoxFilter + warnPluginLoadFailure + hideLegacyTabs + exportSettings + importSettings + noMatchDontSwitch + noMatchRandomSwitch + noMatchSwitch + noMatchSwitchScene + adjustActiveTransitionType + transitionOverridecheckBox + priorityList + priorityUp + priorityDown + threadPriority + macros + macroAdd + macroRemove + macroUp + macroDown + macroName + runMacro + runMacroInParallel + runMacroOnChange + macroProperties + conditionsList + conditionAdd + conditionRemove + conditionTop + conditionUp + conditionDown + conditionBottom + actionsList + actionAdd + actionRemove + actionTop + actionUp + actionDown + actionBottom + toggleElseActions + elseActionsList + elseActionAdd + elseActionRemove + elseActionTop + elseActionUp + elseActionDown + elseActionBottom + serverSettings + restrictSend + serverPort + lockToIPv4 + sendPreview + sendSceneChange + serverRestart + clientSettings + clientHostname + clientPort + clientReconnect + sceneGroups + sceneGroupAdd + sceneGroupRemove + sceneGroupUp + sceneGroupDown + sceneGroupName + sceneGroupSceneSelection + sceneGroupScenes + sceneGroupSceneAdd + sceneGroupSceneRemove + sceneGroupSceneUp + sceneGroupSceneDown + sceneTransitions + transitionsAdd + transitionsRemove + transitionsUp + transitionsDown + defaultTransitions + defaultTransitionsAdd + defaultTransitionsRemove + defaultTransitionsUp + defaultTransitionsDown + pauseEntries + pauseAdd + pauseRemove + pauseUp + pauseDown + windowSwitches + windowAdd + windowRemove + windowUp + windowDown + ignoreWindowsWindows + ignoreWindows + ignoreWindowsAdd + ignoreWindowsRemove + executables + executableAdd + executableRemove + executableUp + executableDown + cursorXPosition + cursorYPosition + showFrame + screenRegionSwitches + screenRegionAdd + screenRegionRemove + screenRegionUp + screenRegionDown + mediaSwitches + mediaAdd + mediaRemove + mediaUp + mediaDown + writePathLineEdit + browseButton + readFileCheckBox + readPathLineEdit + browseButton_2 + fileSwitches + fileAdd + fileRemove + fileUp + fileDown + randomSwitches + randomAdd + randomRemove + timeSwitches + timeAdd + timeRemove + timeUp + timeDown + idleCheckBox + ignoreIdleWindowsWindows + ignoreIdleWindows + ignoreIdleAdd + ignoreIdleRemove + sceneSequenceSwitches + sceneSequenceAdd + sceneSequenceRemove + sceneSequenceUp + sceneSequenceDown + sequenceEdit + sceneSequenceSave + sceneSequenceLoad + audioSwitches + audioAdd + audioRemove + audioUp + audioDown + audioFallback + videoSwitches + videoAdd + videoRemove + videoUp + videoDown + getScreenshot + sceneTriggers + triggerAdd + triggerRemove + triggerUp + triggerDown + diff --git a/lib/general.cpp b/lib/general.cpp index 52427ce7..72bdd854 100644 --- a/lib/general.cpp +++ b/lib/general.cpp @@ -996,13 +996,10 @@ void AdvSceneSwitcher::SetupGeneralTab() ui->checkInterval->setValue(switcher->interval); - DurationSelection *cooldownTime = new DurationSelection(); - cooldownTime->SetDuration(switcher->cooldown); - cooldownTime->setToolTip(obs_module_text( + ui->cooldownTime->SetDuration(switcher->cooldown); + ui->cooldownTime->setToolTip(obs_module_text( "AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint")); - ui->cooldownLayout->addWidget(cooldownTime); - ui->cooldownLayout->addStretch(); - QWidget::connect(cooldownTime, + QWidget::connect(ui->cooldownTime, SIGNAL(DurationChanged(const Duration &)), this, SLOT(CooldownDurationChanged(const Duration &))); @@ -1042,6 +1039,12 @@ void AdvSceneSwitcher::SetupGeneralTab() statusControl->hide(); setupGeneralTabInactiveWarning(ui->tabWidget); + // Adjust tab order + setTabOrder(ui->checkInterval, statusControl->Button()); + setTabOrder(statusControl->Button(), ui->startupBehavior); + setTabOrder(ui->importSettings, ui->cooldownTime); + setTabOrder(ui->cooldownTime, ui->noMatchDontSwitch); + MinimizeSizeOfColumn(ui->statusLayout, 0); setWindowTitle(windowTitle() + " - " + g_GIT_TAG); }