Fix UI for #637

RetailCoder.VBE/Rubberduck.csproj

@@ -283,6 +283,13 @@
     <Compile Include="Inspections\VariableNotAssignedInspection.cs" />
     <Compile Include="Inspections\IdentifierNotAssignedInspectionResult.cs" />
     <Compile Include="UI\FolderBrowser.cs" />
+    <Compile Include="UI\Settings\AddMarkerForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UI\Settings\AddMarkerForm.Designer.cs">
+      <DependentUpon>AddMarkerForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Settings\IAddTodoSettingsView.cs" />
     <Compile Include="UI\SourceControl\App.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -591,6 +598,9 @@
       <DependentUpon>FindSymbolDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\RubberduckUI.sv.resx" />
+    <EmbeddedResource Include="UI\Settings\AddMarkerForm.resx">
+      <DependentUpon>AddMarkerForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\SimpleListControl.resx">
       <DependentUpon>SimpleListControl.cs</DependentUpon>
     </EmbeddedResource>

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -113,7 +113,7 @@ public Configuration GetDefaultConfiguration()
         public ToDoMarker[] GetDefaultTodoMarkers()
         {
             var note = new ToDoMarker(RubberduckUI.ToDoMarkerNote, TodoPriority.Low);
-            var todo = new ToDoMarker(RubberduckUI.ToDoMarkerToDo, TodoPriority.Normal);
+            var todo = new ToDoMarker(RubberduckUI.ToDoMarkerToDo, TodoPriority.Medium);
             var bug = new ToDoMarker(RubberduckUI.ToDoMarkerBug, TodoPriority.High);
 
             return new[] { note, todo, bug };

RetailCoder.VBE/Settings/ToDoMarkers.cs

@@ -1,11 +1,13 @@
-using System.Xml.Serialization;
+using System;
+using System.Xml.Serialization;
+using Rubberduck.UI;
 
 namespace Rubberduck.Settings
 {
     public enum TodoPriority
     {
         Low, 
-        Normal,
+        Medium,
         High
     }
 
@@ -25,6 +27,23 @@ public class ToDoMarker : IToDoMarker
         [XmlAttribute]
         public TodoPriority Priority { get; set; }
 
+        [XmlIgnore]
+        public string PriorityLabel
+        {
+            get { return RubberduckUI.ResourceManager.GetString("ToDoPriority_" + Priority, RubberduckUI.Culture); }
+            set
+            {
+                foreach (var priority in Enum.GetValues(typeof(TodoPriority)))
+                {
+                    if (value == RubberduckUI.ResourceManager.GetString("ToDoPriority_" + priority, RubberduckUI.Culture))
+                    {
+                        Priority = (TodoPriority)priority;
+                        return;
+                    }
+                }
+            }
+        }
+
         /// <summary>   Default constructor is required for serialization. DO NOT USE. </summary>
         public ToDoMarker()
         {

RetailCoder.VBE/UI/Settings/AddMarkerForm.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Rubberduck.Settings;
+
+namespace Rubberduck.UI.Settings
+{
+    public partial class AddMarkerForm : Form, IAddTodoMarkerView
+    {
+        public AddMarkerForm()
+        {
+            InitializeComponent();
+
+            IsValidMarker = false;
+
+            OkButton.Click += OKButtonClick;
+            CancelButton.Click += CancelButtonClick;
+            TodoMarkerTextBox.TextChanged += MarkerTextChanged;
+            TodoMarkerPriorityComboBox.DataSource = TodoLabels();
+        }
+
+        public List<ToDoMarker> TodoMarkers { get; set; }
+
+        public string MarkerText
+        {
+            get { return TodoMarkerTextBox.Text; }
+            set { TodoMarkerTextBox.Text = value; }
+        }
+
+        private bool _isValidMarker;
+        public bool IsValidMarker
+        {
+            get { return _isValidMarker; }
+            set
+            {
+                _isValidMarker = value;
+
+                InvalidNameValidationIcon.Visible = !_isValidMarker;
+                OkButton.Enabled = _isValidMarker;
+            }
+        }
+
+        private List<string> TodoLabels()
+        {
+            return (from object priority in Enum.GetValues(typeof(TodoPriority))
+                    select
+                    RubberduckUI.ResourceManager.GetString("ToDoPriority_" + priority, RubberduckUI.Culture))
+                    .ToList();
+        }
+
+        public TodoPriority MarkerPriority
+        {
+            get
+            {
+                return Enum.GetValues(typeof (TodoPriority))
+                    .Cast<TodoPriority>()
+                    .FirstOrDefault(
+                        p =>
+                            Equals(TodoMarkerPriorityComboBox.SelectedItem, RubberduckUI.ResourceManager.GetString("ToDoPriority_" + p, RubberduckUI.Culture)));
+            }
+            set
+            {
+                TodoMarkerPriorityComboBox.SelectedItem = RubberduckUI.ResourceManager.GetString("ToDoPriority_" + value, RubberduckUI.Culture);
+
+            }
+        }
+
+        public event EventHandler AddMarker;
+        private void OKButtonClick(object sender, EventArgs e)
+        {
+            var handler = AddMarker;
+            if (handler != null)
+            {
+                handler(sender, e);
+            }
+        }
+
+        public event EventHandler Cancel;
+        private void CancelButtonClick(object sender, EventArgs e)
+        {
+            var handler = Cancel;
+            if (handler != null)
+            {
+                handler(sender, e);
+            }
+        }
+
+        public event EventHandler TextChanged;
+        private void MarkerTextChanged(object sender, EventArgs e)
+        {
+            var handler = TextChanged;
+            if (handler != null)
+            {
+                handler(sender, e);
+            }
+        }
+    }
+}

RetailCoder.VBE/UI/Settings/IAddTodoSettingsView.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using Rubberduck.Settings;
+
+namespace Rubberduck.UI.Settings
+{
+    public interface IAddTodoMarkerView
+    {
+        /// <summary>
+        /// List of all current TodoMarkers.
+        /// </summary>
+        List<ToDoMarker> TodoMarkers { get; set; }
+
+        /// <summary>
+        /// Current text of new marker.
+        /// </summary>
+        string MarkerText { get; set; }
+
+        /// <summary>
+        /// Current priority of new marker.
+        /// </summary>
+        TodoPriority MarkerPriority { get; set; }
+
+        /// <summary>
+        /// Sets UI display based on validity of marker.
+        /// </summary>
+        bool IsValidMarker { get; set; }
+
+        /// <summary>
+        /// Request to add the currently active marker to BindingList{TodoMarker}.
+        /// </summary>
+        event EventHandler AddMarker;
+
+        /// <summary>
+        /// Cancel adding marker.
+        /// </summary>
+        event EventHandler Cancel;
+
+        /// <summary>
+        /// Cancel adding marker.
+        /// </summary>
+        event EventHandler TextChanged;
+
+        void Show();
+        void Hide();
+        void Close();
+    }
+}