From 189fa5c314844112513bc632ba9558b2dc589fda Mon Sep 17 00:00:00 2001
From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com>
Date: Tue, 20 Jan 2026 19:17:41 +0100
Subject: [PATCH] toolbar
---
forms/advanced-scene-switcher.ui | 152 +++++++++++++++++++------------
lib/advanced-scene-switcher.hpp | 8 +-
lib/macro/macro-tab.cpp | 20 ++--
3 files changed, 107 insertions(+), 73 deletions(-)
diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index 39dcd32d..67933a14 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -686,60 +686,28 @@
-
-
-
-
-
-
- AdvSceneSwitcher.macroTab.tooltip.macroAddButton
-
-
- addIconSmall
-
-
- icon-plus
-
-
-
- -
-
-
- AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton
-
-
- removeIconSmall
-
-
- icon-trash
-
-
-
- -
-
-
- AdvSceneSwitcher.macroTab.tooltip.macroUpButton
-
-
- upArrowIconSmall
-
-
- icon-up
-
-
-
- -
-
-
- AdvSceneSwitcher.macroTab.tooltip.macroDownButton
-
-
- downArrowIconSmall
-
-
- icon-down
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16
+ 16
+
+
+
+ false
+
+
+
+
+
+
+
@@ -4054,6 +4022,78 @@
+
+
+
+ :/res/images/plus.svg:/res/images/plus.svg
+
+
+ Add
+
+
+ AdvSceneSwitcher.macroTab.tooltip.macroAddButton
+
+
+ icon-plus
+
+
+ addIconSmall
+
+
+
+
+
+ :/res/images/minus.svg:/res/images/minus.svg
+
+
+ Remove
+
+
+ AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton
+
+
+ Del
+
+
+ Qt::WidgetWithChildrenShortcut
+
+
+ false
+
+
+ icon-trash
+
+
+
+
+
+ :/res/images/up.svg:/res/images/up.svg
+
+
+ MoveUp
+
+
+ AdvSceneSwitcher.macroTab.tooltip.macroUpButton
+
+
+ icon-up
+
+
+
+
+
+ :/res/images/down.svg:/res/images/down.svg
+
+
+ MoveDown
+
+
+ AdvSceneSwitcher.macroTab.tooltip.macroDownButton
+
+
+ icon-down
+
+
@@ -4119,10 +4159,6 @@
priorityUp
priorityDown
threadPriority
- macroAdd
- macroRemove
- macroUp
- macroDown
macroName
runMacro
runMacroInParallel
diff --git a/lib/advanced-scene-switcher.hpp b/lib/advanced-scene-switcher.hpp
index f3bdaff9..a399ccb5 100644
--- a/lib/advanced-scene-switcher.hpp
+++ b/lib/advanced-scene-switcher.hpp
@@ -101,10 +101,10 @@ public:
void HighlightMacroSettingsButton(bool enable = true);
public slots:
- void on_macroAdd_clicked();
- void on_macroRemove_clicked();
- void on_macroUp_clicked() const;
- void on_macroDown_clicked() const;
+ void on_macroAdd_triggered();
+ void on_macroRemove_triggered();
+ void on_macroUp_triggered() const;
+ void on_macroDown_triggered() const;
void on_macroName_editingFinished();
void on_runMacroInParallel_stateChanged(int value) const;
void on_runMacroOnChange_stateChanged(int value) const;
diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp
index 4a8b8ce9..2edcf0b8 100644
--- a/lib/macro/macro-tab.cpp
+++ b/lib/macro/macro-tab.cpp
@@ -97,7 +97,7 @@ bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr &res,
return true;
}
-void AdvSceneSwitcher::on_macroAdd_clicked()
+void AdvSceneSwitcher::on_macroAdd_triggered()
{
// Hotkey to add new macro will also use this function.
// Since we don't want the hotkey to have an effect if the macro tab is
@@ -247,12 +247,12 @@ void AdvSceneSwitcher::RenameMacro(std::shared_ptr ¯o,
MacroSignalManager::Instance()->Rename(oldName, name);
}
-void AdvSceneSwitcher::on_macroRemove_clicked()
+void AdvSceneSwitcher::on_macroRemove_triggered()
{
RemoveSelectedMacros();
}
-void AdvSceneSwitcher::on_macroUp_clicked() const
+void AdvSceneSwitcher::on_macroUp_triggered() const
{
auto macro = GetSelectedMacro();
if (!macro) {
@@ -261,7 +261,7 @@ void AdvSceneSwitcher::on_macroUp_clicked() const
ui->macros->Up(macro);
}
-void AdvSceneSwitcher::on_macroDown_clicked() const
+void AdvSceneSwitcher::on_macroDown_triggered() const
{
auto macro = GetSelectedMacro();
if (!macro) {
@@ -632,13 +632,11 @@ void AdvSceneSwitcher::SetupMacroTab()
auto ¯os = GetTopLevelMacros();
if (macros.size() == 0 && !switcher->disableHints) {
- addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
+ addPulse = HighlightWidget(
+ ui->macrosToolbar->widgetForAction(ui->macroAdd),
+ QColor(Qt::green));
}
- auto macroControls = setupToolBar({{ui->macroAdd, ui->macroRemove},
- {ui->macroUp, ui->macroDown}});
- ui->macroControlLayout->addWidget(macroControls);
-
ui->macros->Reset(macros, GetGlobalMacroSettings()._highlightExecuted);
connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
SLOT(MacroSelectionChanged()));
@@ -683,7 +681,7 @@ void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
menu.addAction(
obs_module_text("AdvSceneSwitcher.macroTab.contextMenuAdd"),
- this, &AdvSceneSwitcher::on_macroAdd_clicked);
+ this, &AdvSceneSwitcher::on_macroAdd_triggered);
auto copy = menu.addAction(
obs_module_text("AdvSceneSwitcher.macroTab.copy"), this,
@@ -699,7 +697,7 @@ void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
auto remove = menu.addAction(
obs_module_text("AdvSceneSwitcher.macroTab.remove"), this,
- &AdvSceneSwitcher::on_macroRemove_clicked);
+ &AdvSceneSwitcher::on_macroRemove_triggered);
remove->setDisabled(ui->macros->SelectionEmpty());
menu.addSeparator();