Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-22 01:44:49 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add any transition selection in populate function

Browse Source
This commit is contained in:
WarmUpTill 2021-09-30 21:41:51 +02:00 committed by WarmUpTill
parent 79c659b4fa
commit d3220c40dc
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/en-US.ini
View File

@ -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--"

3
src/headers/utility.hpp
View File

@ -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);

19
src/utility.cpp
View File

@ -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)