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

Cleanup

Browse Source 
* Use GetSettingsWindow() instead of window() to avoid connecting to the
  wrong widget
* Fix typos
This commit is contained in:
WarmUpTill
2025-06-22 20:08:21 +02:00
committed by WarmUpTill
parent be8f7bd70f
commit 0b774c171d
26 changed files with 75 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/base/macro-action-studio-mode.cpp
View File

@@ -9,7 +9,7 @@ const std::string MacroActionSudioMode::id = "studio_mode";
bool MacroActionSudioMode::_registered = MacroActionFactory::Register(
MacroActionSudioMode::id,
{MacroActionSudioMode::Create, MacroActionSudioModeEdit::Create,
{MacroActionSudioMode::Create, MacroActionStudioModeEdit::Create,
"AdvSceneSwitcher.action.studioMode"});
const static std::map<MacroActionSudioMode::Action, std::string> actionTypes = {
@@ -124,11 +124,11 @@ static inline void populateActionSelection(QComboBox *list)
}
}
MacroActionSudioModeEdit::MacroActionSudioModeEdit(
MacroActionStudioModeEdit::MacroActionStudioModeEdit(
QWidget *parent, std::shared_ptr<MacroActionSudioMode> entryData)
: QWidget(parent),
_actions(new QComboBox()),
_scenes(new SceneSelectionWidget(window(), true, true, true, true))
_scenes(new SceneSelectionWidget(this, true, true, true, true))
{
populateActionSelection(_actions);
QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
@@ -151,7 +151,7 @@ MacroActionSudioModeEdit::MacroActionSudioModeEdit(
_loading = false;
}
void MacroActionSudioModeEdit::UpdateEntryData()
void MacroActionStudioModeEdit::UpdateEntryData()
{
if (!_entryData) {
return;
@@ -162,7 +162,7 @@ void MacroActionSudioModeEdit::UpdateEntryData()
SetWidgetVisibility();
}
void MacroActionSudioModeEdit::SceneChanged(const SceneSelection &s)
void MacroActionStudioModeEdit::SceneChanged(const SceneSelection &s)
{
GUARD_LOADING_AND_LOCK();
_entryData->_scene = s;
@@ -170,7 +170,7 @@ void MacroActionSudioModeEdit::SceneChanged(const SceneSelection &s)
QString::fromStdString(_entryData->GetShortDesc()));
}
void MacroActionSudioModeEdit::SetWidgetVisibility()
void MacroActionStudioModeEdit::SetWidgetVisibility()
{
_scenes->setVisible(_entryData->_action ==
MacroActionSudioMode::Action::SET_SCENE);
@@ -181,7 +181,7 @@ void MacroActionSudioModeEdit::SetWidgetVisibility()
}
}
void MacroActionSudioModeEdit::ActionChanged(int index)
void MacroActionStudioModeEdit::ActionChanged(int index)
{
GUARD_LOADING_AND_LOCK();
_entryData->_action = static_cast<MacroActionSudioMode::Action>(