ShortcutDialog update 5

Author: wise0704

FlashDevelop/Dialogs/ShortcutDialog.cs

@@ -295,7 +295,14 @@ void InitializeShortcutListItems()
                 this.shortcutListItems[counter++] = new ShortcutListItem(item);
             }
             Array.Sort(this.shortcutListItems, new ShorcutListItemComparer());
+            this.UpdateAllShortcutsConflicts();
+        }
 
+        /// <summary>
+        /// Update conflicts statuses of all shortcut items.
+        /// </summary>
+        void UpdateAllShortcutsConflicts()
+        {
             bool conflicts = false;
             for (int i = 0; i < this.shortcutListItems.Length; i++)
             {
@@ -400,7 +407,7 @@ void ListViewKeyDown(object sender, KeyEventArgs e)
         /// <summary>
         /// Assign the new shortcut.
         /// </summary>
-        void AssignNewShortcut(ShortcutListItem item, Keys shortcut, bool suppressWarning = false)
+        void AssignNewShortcut(ShortcutListItem item, Keys shortcut)
         {
             if (shortcut == 0 || shortcut == Keys.Delete) shortcut = 0;
             else if (!ToolStripManager.IsValidShortcut(shortcut)) return;
@@ -412,7 +419,6 @@ void AssignNewShortcut(ShortcutListItem item, Keys shortcut, bool suppressWarnin
             this.GetConflictItems(item);
             if (item.HasConflicts)
             {
-                if (suppressWarning) return;
                 ErrorManager.ShowWarning(TextHelper.GetString("Info.ShortcutIsAlreadyUsed"), null);
                 this.filterTextBox.Focus(); // Set focus to filter...
                 this.filterTextBox.Text = ViewConflictsKey + item.KeysString;
@@ -552,16 +558,10 @@ void SelectCustomShortcut(object sender, EventArgs e)
                 string extension = Path.GetExtension(dialog.FileName);
                 if (extension.Equals(".fda", StringComparison.OrdinalIgnoreCase))
                 {
-                    var shortcuts = ShortcutManager.LoadCustomShortcuts(dialog.FileName, this.shortcutListItems);
-                    if (shortcuts != null)
-                    {
-                        this.listView.BeginUpdate();
-                        for (int i = 0; i < shortcuts.Length; i++)
-                        {
-                            this.AssignNewShortcut(this.shortcutListItems[i], shortcuts[i], true);
-                        }
-                        this.listView.EndUpdate();
-                    }
+                    this.listView.BeginUpdate();
+                    ShortcutManager.LoadCustomShortcuts(dialog.FileName, this.shortcutListItems);
+                    this.UpdateAllShortcutsConflicts();
+                    this.listView.EndUpdate();
                 }
             }
         }

FlashDevelop/Managers/ShortcutManager.cs

@@ -211,45 +211,41 @@ public static void SaveCustomShortcuts()
         }
 
         /// <summary>
-        /// Loads the custom shortcuts from a file and returns an array of new shortcut keys
-        /// corresponding to the shortcut items in the specified array.
+        /// Loads the custom shortcuts from a file to a list.
         /// </summary>
-        public static Keys[] LoadCustomShortcuts(String file, IShortcutItem[] items)
+        public static void LoadCustomShortcuts(String file, IEnumerable<IShortcutItem> items)
         {
             if (File.Exists(file))
             {
                 try
                 {
-                    Keys[] newShortcuts = new Keys[items.Length];
-
                     List<Argument> customShortcuts = new List<Argument>();
                     customShortcuts = (List<Argument>) ObjectSerializer.Deserialize(file, customShortcuts, false);
-                    Int32 customCount = customShortcuts.Count;
+                    Int32 count = customShortcuts.Count;
 
-                    for (int i = 0; i < items.Length; i++)
+                    foreach (IShortcutItem item in items)
                     {
-                        IShortcutItem item = items[i];
-                        newShortcuts[i] = item.Default;
-                        for (int j = 0; j < customCount; j++)
+                        Keys newShortcut = item.Default;
+                        for (int i = 0; i < count; i++)
                         {
-                            Argument arg = customShortcuts[j];
+                            Argument arg = customShortcuts[i];
                             if (arg.Key == item.Id)
                             {
-                                newShortcuts[i] = (Keys) Enum.Parse(typeof(Keys), arg.Value);
+                                newShortcut = (Keys) Enum.Parse(typeof(Keys), arg.Value);
+                                customShortcuts.RemoveAt(i);
                                 break;
                             }
                         }
+                        item.Custom = newShortcut;
                     }
-                    return newShortcuts;
                 }
                 catch (Exception e)
                 {
                     ErrorManager.ShowError(e);
                 }
             }
-            return null;
         }
-        
+
         /// <summary>
         /// Saves the list of custom shortcuts to a file.
         /// </summary>
@@ -304,7 +300,7 @@ public interface IShortcutItem
     {
         String Id { get; }
         Keys Default { get; }
-        Keys Custom { get; }
+        Keys Custom { get; set; }
         Boolean IsModified { get; }
     }