Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-30 13:15:43 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use FilterComboBox instead of regular QComboBox

Browse Source 
This required the following adjustments:

Instead of having a dedicated entry indicating the empty selection the
setPlaceholderText() mechanism is used.
Thus the locations where the 1st entry was assumed to be the empty
selection would have to be adjusted.

Additional checks for the empty string / index -1 have been added.

FindIdxInRagne() was adjusted to return -1 instead of 0 in case the
given string was not found.

Switched to index based singal instead of text based signal to be
notified about selection changes.
This commit is contained in:
WarmUpTill
2023-07-12 21:14:10 +02:00
committed by WarmUpTill
parent 0b2e1b88cc
commit d759ded64d
19 changed files with 120 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils/source-selection.cpp
View File

@@ -125,6 +125,9 @@ SourceSelection SourceSelectionWidget::CurrentSelection()
SourceSelection s;
const int idx = currentIndex();
const auto name = currentText();
if (idx == -1 || name.isEmpty()) {
return s;
}
if (idx < _variablesEndIdx) {
s._type = SourceSelection::Type::VARIABLE;
@@ -146,10 +149,6 @@ void SourceSelectionWidget::Reset()
void SourceSelectionWidget::PopulateSelection()
{
clear();
AddSelectionEntry(this,
obs_module_text("AdvSceneSwitcher.selectSource"));
insertSeparator(count());
if (_addVariables) {
const QStringList variables = GetVariablesNameList();
AddSelectionGroup(this, variables);
@@ -161,21 +160,22 @@ void SourceSelectionWidget::PopulateSelection()
// Remove last separator
removeItem(count() - 1);
setCurrentIndex(0);
setCurrentIndex(-1);
}
SourceSelectionWidget::SourceSelectionWidget(QWidget *parent,
const QStringList &sourceNames,
bool addVariables)
: QComboBox(parent),
: FilterComboBox(parent,
obs_module_text("AdvSceneSwitcher.selectSource")),
_addVariables(addVariables),
_sourceNames(sourceNames)
{
setDuplicatesEnabled(true);
PopulateSelection();
QWidget::connect(this, SIGNAL(currentTextChanged(const QString &)),
this, SLOT(SelectionChanged(const QString &)));
QWidget::connect(this, SIGNAL(currentIndexChanged(int)), this,
SLOT(SelectionChanged(int)));
// Variables
QWidget::connect(window(), SIGNAL(VariableAdded(const QString &)), this,
@@ -190,12 +190,12 @@ SourceSelectionWidget::SourceSelectionWidget(QWidget *parent,
void SourceSelectionWidget::SetSource(const SourceSelection &s)
{
int idx = 0;
int idx = -1;
switch (s.GetType()) {
case SourceSelection::Type::SOURCE: {
if (_sourcesEndIdx == -1) {
idx = 0;
idx = -1;
break;
}
idx = FindIdxInRagne(this, _variablesEndIdx, _sourcesEndIdx,
@@ -204,14 +204,14 @@ void SourceSelectionWidget::SetSource(const SourceSelection &s)
}
case SourceSelection::Type::VARIABLE: {
if (_variablesEndIdx == -1) {
idx = 0;
idx = -1;
break;
}
idx = FindIdxInRagne(this, _selectIdx, _variablesEndIdx,
s.ToString());
break;
default:
idx = 0;
idx = -1;
break;
}
}
@@ -225,7 +225,7 @@ void SourceSelectionWidget::SetSourceNameList(const QStringList &list)
Reset();
}
void SourceSelectionWidget::SelectionChanged(const QString &)
void SourceSelectionWidget::SelectionChanged(int)
{
_currentSelection = CurrentSelection();
emit SourceChanged(_currentSelection);