Merge pull request #214 from smasherprog/TriggerTree

user defined trigger names in UI trigger list

Author: ewjax

EQTool/Services/Handlers/UserDefinedTriggerHandler.cs

@@ -13,7 +13,17 @@ public class UserDefinedTriggerHandler : BaseHandler
         // UserTriggers file and the corresponding Triggers
         private const string userTriggerFileName = "UserTriggers.txt";
         private static readonly List<string> triggerFileContents = new List<string>();          // the raw file contents
-        public static List<UserDefinedTrigger> triggerList = new List<UserDefinedTrigger>();    // the corresponding UserDefinedTriggers from the file
+        private static List<UserDefinedTrigger> triggerList = new List<UserDefinedTrigger>();    // the corresponding UserDefinedTriggers from the file
+        public static List<UserDefinedTrigger> TriggerList
+        {
+            get
+            {
+                // there should always be >0 triggers, so if this is true, they haven't been loaded yet.
+                if (triggerList.Count == 0)
+                    ReadTriggers();
+                return triggerList;
+            }
+        }
 
         // watcher for the UserTriggers.txt file changed
         private readonly FileSystemWatcher watcher;

EQTool/ViewModels/MobInfoComponents/PetViewModel.cs

@@ -213,8 +213,11 @@ public List<PetRank> PetRankList
 
 
         // data to support dynamic highlighting of any given row
-        private readonly System.Windows.Media.Brush _HighLightColor = System.Windows.Media.Brushes.DarkGreen;
+        // pick a highlight color that is reasonably visible for both black and white font
+        private readonly System.Windows.Media.Brush _HighLightColor = System.Windows.Media.Brushes.LightSlateGray;
         private readonly System.Windows.Media.Brush _NormalColor = System.Windows.Media.Brushes.Transparent;
+        //private readonly System.Windows.Media.Brush _HighLightColor = System.Windows.Media.Brushes.DarkGreen;
+        //private readonly System.Windows.Media.Brush _HighLightColor = System.Windows.Media.Brushes.LightGreen;
 
         public List<System.Windows.Media.Brush> RowColor { get; } = new List<System.Windows.Media.Brush>();
 
@@ -224,7 +227,7 @@ private void ResetRowBackgrounds()
             for (var ndx = 0; ndx < RankRowsCount; ndx++)
             {
                 RowColor[ndx] = _NormalColor;
-                //_RowColor[ndx] = _HighLightColor;
+                //RowColor[ndx] = _HighLightColor;
 
                 // force the changed property to match what the XAML field is binding to
                 OnPropertyChanged(nameof(RowColor));

EQTool/ViewModels/SettingsComponents/SettingsManagementViewModel.cs

@@ -1,5 +1,7 @@
 using EQTool.Models;
 using EQTool.Services;
+using EQTool.Services.Handlers;
+
 using EQToolShared.Enums;
 using System;
 using System.Collections.ObjectModel;
@@ -34,12 +36,12 @@ public SettingsManagementViewModel(UserComponentSettingsManagementFactory userCo
             };
             _TreeItems.Add(triggerTree);
 
-            // add some bogus examples just for testing
-            for (int i = 10; i < 15; i++)
+            //add the user defined triggers
+            foreach (var trigger in UserDefinedTriggerHandler.TriggerList)
             {
                 triggerTree.Children.Add(new TreeTrigger
                 {
-                    Name = i.ToString(),
+                    Name = trigger.TriggerName,
                 });
             }
 

EQtoolsTests/UserDefinedTriggerTests.cs

@@ -23,7 +23,7 @@ public UserDefinedTriggerTests()
         public void ZeroNamedGroups()
         {
             // add in a testing trigger to the list of user defined triggers
-            var theList = UserDefinedTriggerHandler.triggerList;
+            var theList = UserDefinedTriggerHandler.TriggerList;
             theList.Add(new UserDefinedTrigger { TriggerID = -1, TriggerEnabled = true, TriggerName = "Test Trigger1", SearchText = "^Can you hear me now?", TextEnabled = true, DisplayText = "I can hear you", AudioEnabled = true, AudioText = "I can hear you" });
 
             var called = false;
@@ -41,7 +41,7 @@ public void ZeroNamedGroups()
         public void ThreeNamedGroups()
         {
             // add in a testing trigger to the list of user defined triggers
-            var theList = UserDefinedTriggerHandler.triggerList;
+            var theList = UserDefinedTriggerHandler.TriggerList;
             theList.Add(new UserDefinedTrigger { TriggerID = -2, TriggerEnabled = true, TriggerName = "Test Trigger2", SearchText = "^{count} {containers} of {beverage} on the wall", TextEnabled = true, DisplayText = "{count} {containers} of {beverage}", AudioEnabled = true, AudioText = "{count} {containers} of {beverage}" });
 
             var called = false;