diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 7f955d40..77541aad 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -578,6 +578,7 @@ AdvSceneSwitcher.selectPreviousScene="Previous Scene" AdvSceneSwitcher.selectCurrentScene="Current Scene" AdvSceneSwitcher.selectAnyScene="Any Scene" AdvSceneSwitcher.currentTransition="Current Transition" +AdvSceneSwitcher.anyTransition="Any Transition" AdvSceneSwitcher.selectTransition="--select transition--" AdvSceneSwitcher.selectWindow="--select window--" AdvSceneSwitcher.selectSource="--select source--" diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp index ae73a73f..bc5d4aff 100644 --- a/src/headers/utility.hpp +++ b/src/headers/utility.hpp @@ -58,8 +58,7 @@ bool DisplayMessage(const QString &msg, bool question = false); void addSelectionEntry(QComboBox *sel, const char *description, bool selectable = false, const char *tooltip = ""); void populateTransitionSelection(QComboBox *sel, bool addCurrent = true, - bool addSelect = true, - bool selectable = false); + bool addAny = false); void populateWindowSelection(QComboBox *sel, bool addSelect = true); void populateAudioSelection(QComboBox *sel, bool addSelect = true); void populateVideoSelection(QComboBox *sel, bool addSelect = true); diff --git a/src/utility.cpp b/src/utility.cpp index f2162033..65bc9058 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -485,8 +485,7 @@ void populateSourceSelection(QComboBox *list, bool addSelect) list->setCurrentIndex(0); } -void populateTransitionSelection(QComboBox *sel, bool addCurrent, - bool addSelect, bool selectable) +void populateTransitionSelection(QComboBox *sel, bool addCurrent, bool addAny) { obs_frontend_source_list *transitions = new obs_frontend_source_list(); @@ -502,19 +501,19 @@ void populateTransitionSelection(QComboBox *sel, bool addCurrent, sel->model()->sort(0); + addSelectionEntry(sel, + obs_module_text("AdvSceneSwitcher.selectTransition")); + sel->setCurrentIndex(0); + if (addCurrent) { sel->insertItem( - 0, + 1, obs_module_text("AdvSceneSwitcher.currentTransition")); } - - if (addSelect) { - addSelectionEntry( - sel, - obs_module_text("AdvSceneSwitcher.selectTransition"), - selectable); + if (addAny) { + sel->insertItem( + 1, obs_module_text("AdvSceneSwitcher.anyTransition")); } - sel->setCurrentIndex(0); } void populateWindowSelection(QComboBox *sel, bool addSelect)