1.1 --- a/Server/FormMain.cs	Tue Aug 30 11:04:40 2016 +0200
     1.2 +++ b/Server/FormMain.cs	Tue Aug 30 16:50:37 2016 +0200
     1.3 @@ -233,7 +233,7 @@
     1.4              ResetHarmonyAsync();
     1.5  
     1.6              //Setup Events
     1.7 -            PopulateEventsTreeView();
     1.8 +            PopulateTreeViewEvents();
     1.9  
    1.10              //Setup notification icon
    1.11              SetupTrayIcon();
    1.12 @@ -312,7 +312,7 @@
    1.13          /// <summary>
    1.14          /// Populate tree view with events and actions
    1.15          /// </summary>
    1.16 -        private void PopulateEventsTreeView()
    1.17 +        private void PopulateTreeViewEvents()
    1.18          {
    1.19              //Disable action buttons
    1.20              buttonActionAdd.Enabled = false;
    1.21 @@ -328,7 +328,20 @@
    1.22              foreach (Ear.Event e in Properties.Settings.Default.EarManager.Events)
    1.23              {
    1.24                  //Create our event node
    1.25 -                TreeNode eventNode = iTreeViewEvents.Nodes.Add(e.Brief());
    1.26 +                //Work out the name of our node
    1.27 +                string eventNodeName = "";
    1.28 +                if (!string.IsNullOrEmpty(e.Name))
    1.29 +                {
    1.30 +                    //That event has a proper name, use it then
    1.31 +                    eventNodeName = $"{e.Name} - {e.Brief()}";
    1.32 +                }
    1.33 +                else
    1.34 +                {
    1.35 +                    //Unnamed events just use brief
    1.36 +                    eventNodeName = e.Brief();
    1.37 +                }
    1.38 +                
    1.39 +                TreeNode eventNode = iTreeViewEvents.Nodes.Add(eventNodeName);
    1.40                  eventNode.Tag = e; //For easy access to our event
    1.41                  if (!e.Enabled)
    1.42                  {
    1.43 @@ -337,7 +350,7 @@
    1.44                  }
    1.45  
    1.46                  //Add event description as child node
    1.47 -                eventNode.Nodes.Add(e.Description).ForeColor = eventNode.ForeColor; 
    1.48 +                eventNode.Nodes.Add(e.AttributeDescription).ForeColor = eventNode.ForeColor; 
    1.49                  //Create child node for actions root
    1.50                  TreeNode actionsNodes = eventNode.Nodes.Add("Actions");
    1.51                  actionsNodes.ForeColor = eventNode.ForeColor;
    1.52 @@ -2717,7 +2730,7 @@
    1.53              {
    1.54                  selectedEvent.Actions.Add(ea.Object);               
    1.55                  Properties.Settings.Default.Save();
    1.56 -                PopulateEventsTreeView();
    1.57 +                PopulateTreeViewEvents();
    1.58              }
    1.59          }
    1.60  
    1.61 @@ -2747,7 +2760,7 @@
    1.62                  selectedEvent.Actions[actionIndex]=ea.Object;
    1.63                  //Save and rebuild our event tree view
    1.64                  Properties.Settings.Default.Save();
    1.65 -                PopulateEventsTreeView();
    1.66 +                PopulateTreeViewEvents();
    1.67              }
    1.68          }
    1.69  
    1.70 @@ -2768,7 +2781,7 @@
    1.71  
    1.72              Properties.Settings.Default.EarManager.RemoveAction(action);
    1.73              Properties.Settings.Default.Save();
    1.74 -            PopulateEventsTreeView();
    1.75 +            PopulateTreeViewEvents();
    1.76          }
    1.77  
    1.78          /// <summary>
    1.79 @@ -2811,7 +2824,7 @@
    1.80  
    1.81              //Save and populate our tree again
    1.82              Properties.Settings.Default.Save();
    1.83 -            PopulateEventsTreeView();
    1.84 +            PopulateTreeViewEvents();
    1.85  
    1.86          }
    1.87  
    1.88 @@ -2840,7 +2853,7 @@
    1.89  
    1.90              //Save and populate our tree again
    1.91              Properties.Settings.Default.Save();
    1.92 -            PopulateEventsTreeView();
    1.93 +            PopulateTreeViewEvents();
    1.94          }
    1.95  
    1.96  
    1.97 @@ -2915,7 +2928,7 @@
    1.98              {
    1.99                  Properties.Settings.Default.EarManager.Events.Add(ea.Object);
   1.100                  Properties.Settings.Default.Save();
   1.101 -                PopulateEventsTreeView();
   1.102 +                PopulateTreeViewEvents();
   1.103                  SelectEvent(ea.Object);
   1.104              }
   1.105          }
   1.106 @@ -2936,7 +2949,7 @@
   1.107  
   1.108              Properties.Settings.Default.EarManager.Events.Remove(currentEvent);
   1.109              Properties.Settings.Default.Save();
   1.110 -            PopulateEventsTreeView();
   1.111 +            PopulateTreeViewEvents();
   1.112          }
   1.113  
   1.114          /// <summary>
   1.115 @@ -2966,7 +2979,7 @@
   1.116                  Properties.Settings.Default.EarManager.Events[index] = ea.Object;
   1.117                  //Save and rebuild our event tree view
   1.118                  Properties.Settings.Default.Save();
   1.119 -                PopulateEventsTreeView();
   1.120 +                PopulateTreeViewEvents();
   1.121              }
   1.122          }
   1.123  
   1.124 @@ -3043,7 +3056,7 @@
   1.125              Program.HarmonyConfig = await Program.HarmonyClient.GetConfigAsync();
   1.126              PopulateTreeViewHarmony(Program.HarmonyConfig);
   1.127              //Make sure harmony command actions are showing device name instead of device id
   1.128 -            PopulateEventsTreeView();
   1.129 +            PopulateTreeViewEvents();
   1.130          }
   1.131  
   1.132          /// <summary>