Merge branch 'Shortcuts' into ShortcutDialog

# Conflicts:
#	FlashDevelop/Dialogs/ShortcutDialog.cs

Author: wise0704

FlashDevelop/Dialogs/ShortcutDialog.cs

@@ -216,9 +216,9 @@ void InitializeGraphics()
             using (var imageList = new ImageList())
             {
                 imageList.ColorDepth = ColorDepth.Depth32Bit;
-                imageList.ImageSize = new Size(16, 16);
-                imageList.Images.Add(ScaleHelper.Scale((Bitmap) Globals.MainForm.FindImage("229", false)));
-                imageList.Images.Add(ScaleHelper.Scale((Bitmap) Globals.MainForm.FindImage("153", false)));
+                imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
+                imageList.Images.Add(Globals.MainForm.FindImage("229", false));
+                imageList.Images.Add(Globals.MainForm.FindImage("153", false));
                 this.pictureBox.Image = imageList.Images[0];
                 this.clearButton.Image = imageList.Images[1];
             }
@@ -432,6 +432,7 @@ void AssignNewShortcut(ShortcutListItem item, Keys shortcut)
 
             if (item.Custom == shortcut) return;
             this.listView.BeginUpdate();
+            var oldShortcut = item.Custom;
             item.Custom = shortcut;
             item.Selected = true;
             this.GetConflictItems(item);
@@ -440,12 +441,20 @@ void AssignNewShortcut(ShortcutListItem item, Keys shortcut)
             {
                 string text = TextHelper.GetString("Info.ShortcutIsAlreadyUsed");
                 string caption = TextHelper.GetString("Title.WarningDialog");
-                if (MessageBox.Show(Globals.MainForm, text, " " + caption, MessageBoxButtons.RetryCancel, MessageBoxIcon.Warning) == DialogResult.Yes)
+                switch (MessageBox.Show(Globals.MainForm, text, " " + caption, MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Warning))
                 {
-                    this.filterTextBox.Text = ViewConflictsKey + item.KeysString;
-                    this.filterTextBox.SelectAll();
+                    case DialogResult.Abort:
+                        this.listView.BeginUpdate();
+                        item.Custom = oldShortcut;
+                        this.GetConflictItems(item);
+                        this.listView.EndUpdate();
+                        break;
+                    case DialogResult.Retry:
+                        this.filterTextBox.Text = ViewConflictsKey + item.KeysString;
+                        this.filterTextBox.SelectAll();
+                        this.filterTextBox.Focus(); // Set focus to filter...
+                        break;
                 }
-                this.filterTextBox.Focus(); // Set focus to filter...
             }
         }