Merge branch 'development' of https://github.com/fdorg/flashdevelop into ImageManager

# Conflicts:
#	PluginCore/PluginCore/Interfaces.cs

Author: wise0704

External/Plugins/ProjectManager/Helpers/LineEntryDialog.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Drawing;
-using System.Collections;
 using System.ComponentModel;
 using System.Windows.Forms;
 using PluginCore;
@@ -13,13 +10,11 @@ namespace ProjectManager.Helpers
     /// </summary>
     public class LineEntryDialog : Form
     {
-        readonly Keys shortcutToLowercase;
-        readonly Keys shortcutToUppercase;
         string line;
 
         #region Form Designer Components
 
-        protected System.Windows.Forms.TextBox lineBox;
+        private System.Windows.Forms.TextBox lineBox;
         private System.Windows.Forms.Button btnOK;
         private System.Windows.Forms.Button btnCancel;
         /// <summary>
@@ -40,8 +35,6 @@ public string Line
 
         public LineEntryDialog(string captionText, string labelText, string defaultLine)
         {
-            shortcutToLowercase = PluginBase.MainForm.GetShortcutItemKeys("EditMenu.ToLowercase");
-            shortcutToUppercase = PluginBase.MainForm.GetShortcutItemKeys("EditMenu.ToUppercase");
             InitializeComponent();
             InititalizeLocalization();
             this.Font = PluginBase.Settings.DefaultFont;
@@ -174,16 +167,22 @@ private void btnCancel_Click(object sender, System.EventArgs e)
 
         void OnLineBoxOnKeyDown(object sender, KeyEventArgs args)
         {
-            string selectedText = lineBox.SelectedText;
-            if (string.IsNullOrEmpty(selectedText)) return;
-            Keys keys = args.KeyData;
-            if (keys == shortcutToLowercase) selectedText = selectedText.ToLower();
-            else if (keys == shortcutToUppercase) selectedText = selectedText.ToUpper();
-            else return;
-            int selectionStart = lineBox.SelectionStart;
-            int selectionLength = lineBox.SelectionLength;
-            lineBox.Paste(selectedText);
-            SelectRange(selectionStart, selectionLength);
+            string shortcutId = PluginBase.MainForm.GetShortcutItemId(args.KeyData);
+            if (string.IsNullOrEmpty(shortcutId)) return;
+
+            switch (shortcutId)
+            {
+                case "EditMenu.ToLowercase":
+                case "EditMenu.ToUppercase":
+                    string selectedText = lineBox.SelectedText;
+                    if (string.IsNullOrEmpty(selectedText)) break;
+                    selectedText = shortcutId == "EditMenu.ToLowercase" ? selectedText.ToLower() : selectedText.ToUpper();
+                    int selectionStart = lineBox.SelectionStart;
+                    int selectionLength = lineBox.SelectionLength;
+                    lineBox.Paste(selectedText);
+                    SelectRange(selectionStart, selectionLength);
+                    break;
+            }
         }
 
         public void SelectRange(int start, int length)

External/Plugins/ProjectManager/PluginMain.cs

@@ -561,19 +561,21 @@ private bool HandleKeyEvent(KeyEvent ke)
         {
             if (activeProject == null) return false;
 
-            if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys("ProjectMenu.ConfigurationSelector"))
+            string shortcutId = PluginBase.MainForm.GetShortcutItemId(ke.Value);
+
+            if (shortcutId == "ProjectMenu.ConfigurationSelector")
             {
                 pluginUI.menus.ConfigurationSelector.Focus();
             }
-            else if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys("ProjectMenu.ConfigurationSelectorToggle"))
+            else if (shortcutId == "ProjectMenu.ConfigurationSelectorToggle")
             {
                 pluginUI.menus.ToggleDebugRelease();
             }
-            else if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys("ProjectMenu.TargetBuildSelector"))
+            else if (shortcutId == "ProjectMenu.TargetBuildSelector")
             {
                 pluginUI.menus.TargetBuildSelector.Focus();
             }
-            else if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys("ProjectTree.LocateActiveFile"))
+            else if (shortcutId == "ProjectTree.LocateActiveFile")
             {
                 ToggleTrackActiveDocument();
             }

FlashDevelop/Bin/Debug/Library/AS3/intrinsic/FP11/Vector.as

@@ -27,6 +27,9 @@ package
 		/// [FP10] Searches for an item in the Vector and returns the index position of the item.
 		public function indexOf (searchElement:T, fromIndex:int = 0) : int;
 
+		/// [FP19] Insert a single element into the Vector.
+		public function insertAt (index:int, element:T) : void;
+
 		/// [FP10] Converts the elements in the Vector to strings.
 		public function join (sep:String = ",") : String;
 
@@ -42,6 +45,9 @@ package
 		/// [FP10] Adds one or more elements to the end of the Vector and returns the new length of the Vector.
 		public function push (...args) : uint;
 
+		/// [FP19] Remove a single element from the Vector.
+		public function removeAt (index:int) : T;
+
 		/// [FP10] Reverses the order of the elements in the Vector.
 		public function reverse () : Vector.<T>;
 

FlashDevelop/Dialogs/ShortcutDialog.cs

@@ -16,6 +16,7 @@ namespace FlashDevelop.Dialogs
 {
     public class ShortcutDialog : SmartForm
     {
+        private Timer updateTimer;
         private ToolStripMenuItem removeShortcut;
         private ToolStripMenuItem revertToDefault;
         private ToolStripMenuItem revertAllToDefault;
@@ -41,6 +42,7 @@ public ShortcutDialog()
             this.InitializeGraphics();
             this.PopulateListView("", false);
             this.ApplyScaling();
+            this.SetupUpdateTimer();
         }
 
         #region Windows Form Designer Generated Code
@@ -284,11 +286,11 @@ private void PopulateListView(String filter, Boolean viewCustom)
             this.listView.BeginUpdate();
             this.listView.Items.Clear();
             this.listView.ListViewItemSorter = new ListViewComparer();
-            foreach (ShortcutItem item in ShortcutManager.RegisteredItems)
+            foreach (ShortcutItem item in ShortcutManager.RegisteredItems.Values)
             {
                 if (!this.listView.Items.ContainsKey(item.Id) && 
-                    (item.Id.ToLower().Contains(filter.ToLower()) || 
-                    GetKeysAsString(item.Custom).ToLower().Contains(filter.ToLower())))
+                    (item.Id.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0 || 
+                    GetKeysAsString(item.Custom).IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0))
                 {
                     if (viewCustom && item.Custom == item.Default) continue;
                     ListViewItem lvi = new ListViewItem();
@@ -439,14 +441,35 @@ private void ClearFilterClick(Object sender, EventArgs e)
         }
 
         /// <summary>
-        /// Updated the list with the filter
+        /// Set up the timer for delayed list update with filters.
         /// </summary>
-        private void FilterTextChanged(Object sender, EventArgs e)
+        private void SetupUpdateTimer()
+        {
+            updateTimer = new Timer();
+            updateTimer.Enabled = false;
+            updateTimer.Interval = 200;
+            updateTimer.Tick += UpdateTimer_Tick;
+        }
+
+        /// <summary>
+        /// Update the list with filter.
+        /// </summary>
+        private void UpdateTimer_Tick(Object sender, EventArgs e)
         {
+            updateTimer.Enabled = false;
             String searchText = this.filterTextBox.Text.Trim();
             this.PopulateListView(searchText, viewCustom.Checked);
         }
 
+        /// <summary>
+        /// Restart the timer for updating the list.
+        /// </summary>
+        private void FilterTextChanged(Object sender, EventArgs e)
+        {
+            updateTimer.Stop();
+            updateTimer.Start();
+        }
+
         /// <summary>
         /// Closes the shortcut dialog
         /// </summary>