From 8d83df903401f989474b82e321489238b5501319 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sun, 5 Dec 2021 22:03:37 +0100
Subject: [PATCH] Add warning if macro functionality is not running with
 highest priority

---
 data/locale/en-US.ini            | 1 +
 forms/advanced-scene-switcher.ui | 7 +++++++
 src/macro-tab.cpp                | 3 +++
 src/switch-priority.cpp          | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 686e78b5..bd248d32 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -57,6 +57,7 @@ AdvSceneSwitcher.generalTab.priority.macro="Macro"
 ; Macro Tab
 AdvSceneSwitcher.macroTab.title="Macro"
 AdvSceneSwitcher.macroTab.macros="Macros"
+AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
 AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define Macro conditions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new condition."
 AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define Macro actions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new action."
diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index 72619507..7a96810b 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -545,6 +545,13 @@
           <string>AdvSceneSwitcher.macroTab.macros</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_36">
+          <item>
+           <widget class="QLabel" name="macroPriorityWarning">
+            <property name="text">
+             <string>AdvSceneSwitcher.macroTab.priorityWarning</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QGridLayout" name="gridLayout_26">
             <item row="0" column="0">
diff --git a/src/macro-tab.cpp b/src/macro-tab.cpp
index 79a3e37f..88d530f5 100644
--- a/src/macro-tab.cpp
+++ b/src/macro-tab.cpp
@@ -373,6 +373,9 @@ void AdvSceneSwitcher::setupMacroTab()
 		&AdvSceneSwitcher::ShowMacroConditionsContextMenu);
 
 	ui->macroEdit->setDisabled(true);
+
+	ui->macroPriorityWarning->setVisible(
+		switcher->functionNamesByPriority[0] != macro_func);
 }
 
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
diff --git a/src/switch-priority.cpp b/src/switch-priority.cpp
index 2e720925..4f5f7422 100644
--- a/src/switch-priority.cpp
+++ b/src/switch-priority.cpp
@@ -33,6 +33,8 @@ void AdvSceneSwitcher::on_priorityUp_clicked()
 			  switcher->functionNamesByPriority.begin() +
 				  currentIndex - 1);
 	}
+	ui->macroPriorityWarning->setVisible(
+		switcher->functionNamesByPriority[0] != macro_func);
 }
 
 void AdvSceneSwitcher::on_priorityDown_clicked()
@@ -51,6 +53,8 @@ void AdvSceneSwitcher::on_priorityDown_clicked()
 			  switcher->functionNamesByPriority.begin() +
 				  currentIndex + 1);
 	}
+	ui->macroPriorityWarning->setVisible(
+		switcher->functionNamesByPriority[0] != macro_func);
 }
 
 bool SwitcherData::prioFuncsValid()