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

Author: SlavaRa

.gitignore

@@ -22,3 +22,5 @@ PluginCore/Bin
 /FlashDevelop/Bin/Debug/Settings/FileStates
 /FlashDevelop/Bin/Debug/Settings/Recovery
 /FlashDevelop/Bin/Debug/Exceptions.log
+/FlashDevelop/Bin/Debug/Tools/fdbuild/fdbuild.exe
+FlashDevelop/Bin/Debug/Settings/Themes/CURRENT

CI/buildl.cmd

@@ -2,9 +2,11 @@
 
 :: Set paths
 set PATH=%PATH%;C:\Windows\Microsoft.NET\Framework\v4.0.30319\
+set PATH=%PATH%;C:\Program Files\Git\bin\
 set PATH=%PATH%;C:\Program Files (x86)\Git\bin\
-set PATH=%PATH%;C:\Program Files (x86)\NSIS
 set PATH=%PATH%;C:\Program Files\7-Zip\
+set PATH=%PATH%;C:\Program Files (x86)\7-Zip\
+set PATH=%PATH%;C:\Program Files (x86)\NSIS
 
 :: Need path up
 cd ..

CONTRIBUTING.md

@@ -0,0 +1,208 @@
+# AppMan entries
+
+If you want to add your plugin, theme or extension to AppMan, you need to do a pull request to the appman.xml file adding a new entry inside the FD5 comments. Requirements for the offered plugins, themes or extensions are:
+
+* Code needs to be opensource and reviewable in a public repository
+* The item needs to be packaged into a FDZ file and provide a MD5 checksum for verification
+* The FDZ needs to extract the files to the user app data directory
+
+# Coding style
+
+##### Use spaces instead of tabs with a width of 4
+
+```c#
+public bool IsMember()
+{
+    if (this.value > 2)
+    {
+        return false;
+    }
+    else return true;
+}
+```
+
+##### Naming should be in English and clear
+
+```c#
+private int memberProperty = 0;
+```
+
+##### Use camelCase for private members and uppercase for public properties, methods and types:
+
+```c#
+private int memberProperty = 0;
+
+public string MemberName = "MemberName";
+
+public bool IsMember()
+{
+	return true;
+}
+```
+
+##### Use types without explicit path:
+
+```c#
+private void OnFormActivate(object sender, /*System.*/EventArgs e)
+{
+	// Do something...
+}
+```
+
+##### Do not use extensive extra empty lines and keep the code clean, not like:
+
+```c#
+// Comment...	
+private int MemberMethod(int value)
+{
+	
+	
+	
+	// Comment for something...
+	
+	
+	if (value > 2))
+	{
+		
+		//this.oldCode = 0;
+		
+		
+		// Random notes here
+		
+		
+		
+		return -1;
+	}
+	
+	
+	
+	// Something here too...
+	else return value;
+	
+	
+	
+	
+	//Little bit here too...
+}
+```
+
+##### Use brackets and parenthesis for easier readability:
+
+```c#
+if ((val1 > val2) && (val1 > val3))
+{
+	if (val2 > val3)
+	{
+		doThing();
+	}
+}
+```
+
+##### Do not nest expressions without brackets:
+
+```c#
+if (val1 > val2 && val1 > val3)
+
+	if (val2 > val3)
+	
+		doThing();
+
+```
+
+##### Use can use one liners to shorten the code:
+
+```c#
+if (val1 > val2 && val1 > val3)
+{
+	if (val2 > val3) doThing();
+}
+```
+
+##### Use explicit types:
+
+```c#
+int myValue = 0;
+Point[] myPoints = new Point[]
+{
+	new Point(1, 1),
+	new Point(2, 2)
+}
+```
+
+##### Code example:
+
+```c#
+import System;
+
+namespace MyNameSpace
+{
+	class MyClass
+	{
+		// Comment here...
+		private int memberProperty = 0;
+		private int memberProperty2 = 1;
+		private int memberProperty3 = 2;
+		
+		// Comment here...
+		public string MemberName = "MemberName";
+		
+		// Comment here...
+		public static bool IsMemberProperty = false;
+		
+		// Comment here...
+		public const int CONSTANT = 1;
+		
+		/// <summary>
+		/// Comment here...
+		/// </summary> 
+		public bool IsMember()
+		{
+			return true;
+		}
+		
+		/// <summary>
+		/// Comment here...
+		/// </summary> 
+		public void MemberMethod(int value)
+		{
+			int temp = CONSTANT;
+			if (value > 2)
+			{
+				this.memberProperty2 = temp;
+				this.memberProperty3 = temp;
+			}
+			else this.memberProperty3 = value;
+		}
+		
+		/// <summary>
+		/// Comment here...
+		/// </summary> 
+		private int MemberMethodEx(int value)
+		{
+			int temp = CONSTANT;
+			this.memberProperty3 = temp;
+			switch (value)
+			{
+				case 1: return 1;
+				case 2:
+				{
+					return -1;
+				}
+				default: return value;
+			}
+		}
+		
+		/// <summary>
+		/// Comment here...
+		/// </summary> 
+		private void OnFormActivate(object sender, EventArgs e)
+		{
+			this.MemberMethod(null, null);
+		}
+
+	}
+	
+}
+```
+
+##### More generally, be consistent and keep the code clean!

External/3rdParty/Aga-1.7/Aga.Controls/Tree/Input/ReorderColumnState.cs

@@ -41,7 +41,7 @@ public ReorderColumnState(TreeViewAdv tree, TreeColumn column, Point initialMous
 		{
 			_location = new Point(initialMouseLocation.X + Tree.OffsetX, 0);
 			_dragOffset = tree.GetColumnX(column) - initialMouseLocation.X;
-			_ghostImage = column.CreateGhostImage(new Rectangle(0, 0, column.Width, tree.ActualColumnHeaderHeight), tree.Font);
+			_ghostImage = column.CreateGhostImage(new Rectangle(0, 0, column.Width, tree.ActualColumnHeaderHeight), tree.Font, tree.ForeColor);
 		}
 
 		public override void KeyDown(KeyEventArgs args)

External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeColumn.cs

@@ -288,23 +288,22 @@ private static void CreateRenderers()
 			}
 		}
 
-		internal Bitmap CreateGhostImage(Rectangle bounds, Font font)
+		internal Bitmap CreateGhostImage(Rectangle bounds, Font font, Color color)
 		{
 			Bitmap b = new Bitmap(bounds.Width, bounds.Height, PixelFormat.Format32bppArgb);
 			Graphics gr = Graphics.FromImage(b);
 			gr.FillRectangle(SystemBrushes.ControlDark, bounds);
-			DrawContent(gr, bounds, font);
+			DrawContent(gr, bounds, font, color);
 			BitmapHelper.SetAlphaChanelValue(b, 150);
 			return b;
 		}
 
-		internal void Draw(Graphics gr, Rectangle bounds, Font font, bool pressed, bool hot)
+		internal void Draw(Graphics gr, Rectangle bounds, Font font, bool pressed, bool hot, Color color)
 		{
-			DrawBackground(gr, bounds, pressed, hot);
-			DrawContent(gr, bounds, font);
+			DrawContent(gr, bounds, font, color);
 		}
 
-        private void DrawContent(Graphics gr, Rectangle bounds, Font font)
+        private void DrawContent(Graphics gr, Rectangle bounds, Font font, Color color)
         {
             Rectangle innerBounds = new Rectangle(bounds.X + HeaderLeftMargin, bounds.Y,
                                    bounds.Width - HeaderLeftMargin - HeaderRightMargin,
@@ -331,9 +330,9 @@ private void DrawContent(Graphics gr, Rectangle bounds, Font font)
 			}
 
 			if (textSize.Width < maxTextSize.Width)
-				TextRenderer.DrawText(gr, Header, font, innerBounds, SystemColors.ControlText, _baseHeaderFlags | TextFormatFlags.Left);
+				TextRenderer.DrawText(gr, Header, font, innerBounds, color, _baseHeaderFlags | TextFormatFlags.Left);
             else
-				TextRenderer.DrawText(gr, Header, font, innerBounds, SystemColors.ControlText, _headerFlags);
+				TextRenderer.DrawText(gr, Header, font, innerBounds, color, _headerFlags);
         }
 
 		private void DrawSortMark(Graphics gr, Rectangle bounds, int x)
@@ -391,11 +390,20 @@ internal static void DrawBackground(Graphics gr, Rectangle bounds, bool pressed,
 			}
 		}
 
-		#endregion
+        internal static void DrawCustomBackground(Graphics gr, Color back, Color fore, Rectangle bounds, bool pressed, bool hot)
+        {
+            gr.FillRectangle(new SolidBrush(back), bounds);
+            Pen p1 = new Pen(fore);
+            gr.DrawLine(p1, bounds.X, bounds.Y - 1, bounds.Right, bounds.Y - 1);
+            gr.DrawLine(p1, bounds.Right - 1, bounds.Y + 3, bounds.Right - 1, bounds.Bottom - 4);
+            gr.DrawLine(p1, bounds.X, bounds.Bottom, bounds.Right, bounds.Bottom);
+        }
+
+        #endregion
 
-		#region Events
+        #region Events
 
-		public event EventHandler HeaderChanged;
+        public event EventHandler HeaderChanged;
 		private void OnHeaderChanged()
 		{
 			if (HeaderChanged != null)

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

@@ -40,7 +40,8 @@ public void AutoSizeColumn(TreeColumn column)
 		private void CreatePens()
 		{
 			CreateLinePen();
-			CreateMarkPen();
+            CreateMarkPen();
+            CreateLine2Pen();
 		}
 
 		private void CreateMarkPen()
@@ -61,6 +62,11 @@ private void CreateLinePen()
 			_linePen.DashStyle = DashStyle.Dot;
 		}
 
+        private void CreateLine2Pen()
+        {
+            _line2Pen = new Pen(_lineColor);
+        }
+
         protected override void OnPaintBackground(PaintEventArgs pevent)
         {
             if (this.BackgroundPaintMode == Tree.BackgroundPaintMode.Gradiant)
@@ -90,7 +96,7 @@ protected override void OnPaint(PaintEventArgs e)
 
             if (UseColumns)
             {
-				DrawColumnHeaders(e.Graphics);
+				DrawColumnHeaders(e.Graphics, this.ColumnHeaderBackColor, this.ColumnHeaderBorderColor, this.ColumnHeaderTextColor);
 				y += ActualColumnHeaderHeight;
                 if (Columns.Count == 0 || e.ClipRectangle.Height + e.ClipRectangle.Top <= y)
                     return;
@@ -169,7 +175,7 @@ private void DrawRow(PaintEventArgs e, ref DrawContext context, int row, Rectang
 			}
 
             if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal)
-				e.Graphics.DrawLine(SystemPens.InactiveBorder, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
+				e.Graphics.DrawLine(_line2Pen, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
 
 			if (ShowLines)
 				DrawLines(e.Graphics, node, rowRect);
@@ -185,18 +191,21 @@ private void DrawVerticalGridLines(Graphics gr, int y)
 				if (c.IsVisible)
 				{
 					x += c.Width;
-					gr.DrawLine(SystemPens.InactiveBorder, x - 1, y, x - 1, gr.ClipBounds.Bottom);
+					gr.DrawLine(_line2Pen, x - 1, y, x - 1, gr.ClipBounds.Bottom);
 				}
 			}
 		}
 
-		private void DrawColumnHeaders(Graphics gr)
+		private void DrawColumnHeaders(Graphics gr, Color back, Color fore, Color text)
 		{
 			PerformanceAnalyzer.Start("DrawColumnHeaders");
 			ReorderColumnState reorder = Input as ReorderColumnState;
 			int x = 0;
-			TreeColumn.DrawBackground(gr, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
-			gr.TranslateTransform(-OffsetX, 0);
+
+            if (this.CustomDrawHeaders) TreeColumn.DrawCustomBackground(gr, back, fore, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
+            else TreeColumn.DrawBackground(gr, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
+
+            gr.TranslateTransform(-OffsetX, 0);
 			foreach (TreeColumn c in Columns)
 			{
 				if (c.IsVisible)
@@ -206,7 +215,12 @@ private void DrawColumnHeaders(Graphics gr)
 						Rectangle rect = new Rectangle(x, 0, c.Width, ActualColumnHeaderHeight - 1);
 						gr.SetClip(rect);
 						bool pressed = ((Input is ClickColumnState || reorder != null) && ((Input as ColumnState).Column == c));
-						c.Draw(gr, rect, Font, pressed, _hotColumn == c);
+
+                        if (this.CustomDrawHeaders) TreeColumn.DrawCustomBackground(gr, back, fore, rect, pressed, _hotColumn == c);
+                        else TreeColumn.DrawBackground(gr, rect, pressed, _hotColumn == c);
+
+                        c.Draw(gr, rect, Font, pressed, _hotColumn == c, text);
+
 						gr.ResetClip();
 
 						if (reorder != null && reorder.DropColumn == c)