Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-21 09:37:26 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Selection idx handling was moved to macro segment list widget

Browse Source
This commit is contained in:
WarmUpTill 2022-03-19 22:05:36 +01:00 committed by WarmUpTill
parent a6ca266dab
commit 1ab9a38914
6 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/headers/advanced-scene-switcher.hpp
View File

@ -58,8 +58,6 @@ public:
void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
void SetActionData(Macro &m);
void SetConditionData(Macro &m);
void ConnectControlSignals(MacroActionEdit *);
void ConnectControlSignals(MacroConditionEdit *);
void SwapActions(Macro *m, int pos1, int pos2);
void SwapConditions(Macro *m, int pos1, int pos2);

3
src/headers/macro-segment.hpp
View File

@ -58,11 +58,8 @@ signals:
void SceneGroupAdded(const QString &name);
void SceneGroupRemoved(const QString &name);
void SceneGroupRenamed(const QString &oldName, const QString newName);
void SelectionChagned(int idx);
protected:
void mousePressEvent(QMouseEvent *event);
Section *_section;
QLabel *_headerInfo;
QFrame *_frame;

2
src/macro-action-edit.cpp
View File

@ -275,8 +275,6 @@ void AdvSceneSwitcher::SwapActions(Macro *m, int pos1, int pos2)
actionsList->Remove(pos2 - 1);
auto widget1 = new MacroActionEdit(this, &(*a1), (*a1)->GetId());
auto widget2 = new MacroActionEdit(this, &(*a2), (*a2)->GetId());
ConnectControlSignals(widget1);
ConnectControlSignals(widget2);
actionsList->Insert(pos1, widget1);
actionsList->Insert(pos2, widget2);
}

2
src/macro-condition-edit.cpp
View File

@ -419,8 +419,6 @@ void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
new MacroConditionEdit(this, &(*c1), (*c1)->GetId(), root);
auto widget2 =
new MacroConditionEdit(this, &(*c2), (*c2)->GetId(), false);
ConnectControlSignals(widget1);
ConnectControlSignals(widget2);
conditionsList->Insert(pos1, widget1);
conditionsList->Insert(pos2, widget2);
}

7
src/macro-segment.cpp
View File

@ -132,13 +132,6 @@ void MacroSegmentEdit::EnableHighlight(bool value)
_showHighlight = value;
}
void MacroSegmentEdit::mousePressEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton && Data()) {
emit SelectionChagned(Data()->GetIndex());
}
}
void MacroSegmentEdit::SetFocusPolicyOfWidgets()
{
QList<QWidget *> widgets = this->findChildren<QWidget *>();

14
src/macro-tab.cpp
View File

@ -243,7 +243,6 @@ void AdvSceneSwitcher::PopulateMacroActions(Macro &m, uint32_t afterIdx)
for (; afterIdx < actions.size(); afterIdx++) {
auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
actions[afterIdx]->GetId());
ConnectControlSignals(newEntry);
actionsList->Add(newEntry);
}
actionsList->SetHelpMsgVisible(actions.size() == 0);
@ -257,7 +256,6 @@ void AdvSceneSwitcher::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
auto newEntry = new MacroConditionEdit(
this, &conditions[afterIdx],
conditions[afterIdx]->GetId(), root);
ConnectControlSignals(newEntry);
conditionsList->Add(newEntry);
root = false;
}
@ -331,18 +329,6 @@ void AdvSceneSwitcher::HighlightCondition(int idx)
conditionsList->Highlight(idx);
}
void AdvSceneSwitcher::ConnectControlSignals(MacroActionEdit *a)
{
connect(a, &MacroActionEdit::SelectionChagned, this,
&AdvSceneSwitcher::MacroActionSelectionChanged);
}
void AdvSceneSwitcher::ConnectControlSignals(MacroConditionEdit *c)
{
connect(c, &MacroActionEdit::SelectionChagned, this,
&AdvSceneSwitcher::MacroConditionSelectionChanged);
}
Macro *AdvSceneSwitcher::getSelectedMacro()
{
QListWidgetItem *item = ui->macros->currentItem();