Merge branch 'fd5' into 64bits

Conflicts:
	FlashDevelop/Bin/Debug/Aga.dll

Author: Neverbirth

External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeViewAdv.Properties.cs

@@ -170,6 +170,27 @@ internal int FirstVisibleRow
 			}
 		}
 
+	    public TreeNodeAdv FirstVisibleNode
+	    {
+	        get
+	        {
+	            if (_firstVisibleRow >= 0 && _firstVisibleRow < RowMap.Count)
+	                return RowMap[_firstVisibleRow];
+                return null;
+	        }
+	    }
+
+	    public TreeNodeAdv LastVisibleNode
+	    {
+	        get
+	        {
+	            int lastVisibleRow = _firstVisibleRow + CurrentPageSize - 1;
+	            if (lastVisibleRow >= 0 && lastVisibleRow < RowMap.Count)
+	                return RowMap[lastVisibleRow];
+                return null;
+	        }
+	    }
+
 		private int _offsetX;
 		public int OffsetX
 		{

External/Plugins/FlashDebugger/Controls/BreakPointUI.cs

@@ -74,11 +74,11 @@ private void init()
             {
                 imageList = new ImageList();
                 imageList.ColorDepth = ColorDepth.Depth32Bit;
-                imageList.Images.Add("DeleteBreakpoint", PluginBase.MainForm.ImageSetAdjust(Resource.DeleteBreakpoint));
-                imageList.Images.Add("DeleteBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.DeleteBreakpoints));
-                imageList.Images.Add("ToggleBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ToggleBreakpoints));
-                imageList.Images.Add("ExportBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ExportBreakpoints));
-                imageList.Images.Add("ImportBreakpoints", PluginBase.MainForm.ImageSetAdjust(Resource.ImportBreakpoints));
+                imageList.Images.Add("DeleteBreakpoint", PluginBase.MainForm.FindImage("548|27|5|5"));
+                imageList.Images.Add("DeleteBreakpoints", PluginBase.MainForm.FindImage("549|27|5|5"));
+                imageList.Images.Add("ToggleBreakpoints", PluginBase.MainForm.FindImage("136|23|5|5"));
+                imageList.Images.Add("ExportBreakpoints", PluginBase.MainForm.FindImage("549|22|4|4"));
+                imageList.Images.Add("ImportBreakpoints", PluginBase.MainForm.FindImage("549|8|4|4"));
             }
 
             this.dgv = new DataGridView();
@@ -260,7 +260,6 @@ private int ItemIndex(string filename, int line)
 
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BreakPointUI));
             this.tsActions = new System.Windows.Forms.ToolStrip();
             this.tsbRemoveSelected = new System.Windows.Forms.ToolStripButton();
             this.tsbRemoveFiltered = new System.Windows.Forms.ToolStripButton();
@@ -294,7 +293,6 @@ private void InitializeComponent()
             // tsbRemoveSelected
             // 
             this.tsbRemoveSelected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tsbRemoveSelected.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveSelected.Image")));
             this.tsbRemoveSelected.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbRemoveSelected.Name = "tsbRemoveSelected";
             this.tsbRemoveSelected.Size = new System.Drawing.Size(23, 24);
@@ -304,7 +302,6 @@ private void InitializeComponent()
             // tsbRemoveFiltered
             // 
             this.tsbRemoveFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tsbRemoveFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveFiltered.Image")));
             this.tsbRemoveFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbRemoveFiltered.Name = "tsbRemoveFiltered";
             this.tsbRemoveFiltered.Size = new System.Drawing.Size(23, 24);
@@ -314,7 +311,6 @@ private void InitializeComponent()
             // tsbAlternateFiltered
             // 
             this.tsbAlternateFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tsbAlternateFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbAlternateFiltered.Image")));
             this.tsbAlternateFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbAlternateFiltered.Name = "tsbAlternateFiltered";
             this.tsbAlternateFiltered.Size = new System.Drawing.Size(23, 24);
@@ -329,7 +325,6 @@ private void InitializeComponent()
             // tsbExportFiltered
             // 
             this.tsbExportFiltered.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tsbExportFiltered.Image = ((System.Drawing.Image)(resources.GetObject("tsbExportFiltered.Image")));
             this.tsbExportFiltered.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbExportFiltered.Name = "tsbExportFiltered";
             this.tsbExportFiltered.Size = new System.Drawing.Size(23, 24);
@@ -339,7 +334,6 @@ private void InitializeComponent()
             // tsbImport
             // 
             this.tsbImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tsbImport.Image = ((System.Drawing.Image)(resources.GetObject("tsbImport.Image")));
             this.tsbImport.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbImport.Name = "tsbImport";
             this.tsbImport.Size = new System.Drawing.Size(23, 24);
@@ -463,10 +457,7 @@ private void TsbAlternateFiltered_Click(object sender, EventArgs e)
                     if (!m)
                     {
                         doc.SciControl.MarkerAdd(line, newMarker);
-                        doc.SciControl.MarkerDelete(line,
-                                                    value
-                                                        ? ScintillaHelper.markerBPDisabled
-                                                        : ScintillaHelper.markerBPEnabled);
+                        doc.SciControl.MarkerDelete(line, value ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
                     }
                 }
                 else
@@ -563,8 +554,7 @@ private void TstxtFilter_KeyDown(object sender, KeyEventArgs e)
                 }
                 catch (Exception ex)
                 {
-                    ErrorManager.ShowWarning(
-                        "Error filtering list, please, ensure you've entered a valid RegEx pattern", ex);
+                    ErrorManager.ShowWarning("Error filtering list, please ensure you've entered a valid RegEx pattern", ex);
                 }
             }
         }

External/Plugins/FlashDebugger/Controls/BreakPointUI.resx

@@ -0,0 +1,29 @@
+using System;
+using PluginCore.Localization;
+using flash.tools.debugger.expression;
+
+namespace FlashDebugger.Controls.DataTree
+{
+    public class ErrorNode : DataNode
+    {
+
+        private string _value;
+        public override string Value
+        {
+            get { return _value; }
+            set { throw new NotSupportedException(); }
+        }
+
+        public override bool IsLeaf
+        {
+            get { return true; }
+        }
+
+        public ErrorNode(string text, Exception ex)
+            : base(text)
+        {
+            _value = ex.Message;
+        }
+
+    }
+}

External/Plugins/FlashDebugger/Controls/DataTree/ErrorNode.cs

@@ -15,18 +15,15 @@ public override string Value
             set { throw new NotSupportedException(); }
         }
 
-        public ScalarNode(string text, string value)
-            : base(text)
+        public override bool IsLeaf
         {
-            m_Value = value;
+            get { return true; }
         }
 
-        public override bool IsLeaf
+        public ScalarNode(string text, string value)
+            : base(text)
         {
-            get
-            {
-                return true;
-            }
+            m_Value = value;
         }
 
     }