Merge branch 'development' into watches_saving

hector.espeso · hector.espeso · commit 82a0d949867f · 2015-11-02T09:17:47.000+01:00
diff --git a/External/Plugins/OutputPanel/PluginUI.cs b/External/Plugins/OutputPanel/PluginUI.cs
@@ -549,7 +549,7 @@ private void ClearButtonClick(Object sender, EventArgs e)
         {
             this.findTextBox.Text = "";
             this.ClearCurrentSelection();
-            this.FindTextBoxLeave(null, null);
+            this.findTextBox.Focus();
         }
 
         /// <summary>
diff --git a/External/Plugins/StartPage/PluginMain.cs b/External/Plugins/StartPage/PluginMain.cs
@@ -249,7 +249,7 @@ public void CreateStartPage()
         public void ShowStartPage()
         {
             if (this.startPage == null) this.CreateStartPage();
-            else this.startPage.Show();
+            else this.startPage.Show(PluginBase.MainForm.DockPanel);
         }
 
         #endregion
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -99,7 +99,7 @@ VS2005DockPaneStrip.DocTabActiveBorder=#2F393C
 VS2005DockPaneStrip.DocTabActiveForeColor=#D1D1D1
 VS2005DockPaneStrip.DocTabInactiveBorder=#666D73
 VS2005DockPaneStrip.ToolActiveBorderColor=#6D767C
-VS2005DockPaneStrip.ToolBorderColor=#6D767C
+VS2005DockPaneStrip.ToolBorderColor=#8D9494
 VS2005DockPaneStrip.ToolActiveForeColor=#333333
 VS2005DockPaneStrip.ToolSeparatorColor=#CCCCCC
 VS2005DockPaneStrip.ImageColor=#3A4345
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -99,7 +99,7 @@ VS2005DockPaneStrip.DocTabActiveBorder=#2F393C
 VS2005DockPaneStrip.DocTabActiveForeColor=#D1D1D1
 VS2005DockPaneStrip.DocTabInactiveBorder=#666D73
 VS2005DockPaneStrip.ToolActiveBorderColor=#6D767C
-VS2005DockPaneStrip.ToolBorderColor=#6D767C
+VS2005DockPaneStrip.ToolBorderColor=#8D9494
 VS2005DockPaneStrip.ToolActiveForeColor=#333333
 VS2005DockPaneStrip.ToolSeparatorColor=#CCCCCC
 VS2005DockPaneStrip.ImageColor=#3A4345
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -99,7 +99,7 @@ VS2005DockPaneStrip.DocTabActiveBorder=#ABA8A5
 VS2005DockPaneStrip.DocTabActiveForeColor=#333333
 VS2005DockPaneStrip.DocTabInactiveBorder=#ABA8A5
 VS2005DockPaneStrip.ToolActiveBorderColor=#7B7675
-VS2005DockPaneStrip.ToolBorderColor=#7B7675
+VS2005DockPaneStrip.ToolBorderColor=#94918D
 VS2005DockPaneStrip.ToolActiveForeColor=#333333
 VS2005DockPaneStrip.ToolSeparatorColor=#BBBBB0
 VS2005DockPaneStrip.ImageColor=#333333
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -99,7 +99,7 @@ VS2005DockPaneStrip.DocTabActiveBorder=#ABA8A5
 VS2005DockPaneStrip.DocTabActiveForeColor=#333333
 VS2005DockPaneStrip.DocTabInactiveBorder=#ABA8A5
 VS2005DockPaneStrip.ToolActiveBorderColor=#7B7675
-VS2005DockPaneStrip.ToolBorderColor=#7B7675
+VS2005DockPaneStrip.ToolBorderColor=#94918D
 VS2005DockPaneStrip.ToolActiveForeColor=#333333
 VS2005DockPaneStrip.ToolSeparatorColor=#BBBBB0
 VS2005DockPaneStrip.ImageColor=#333333
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ObsidianTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ObsidianTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ThyleusTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ThyleusTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -99,7 +99,7 @@ VS2005DockPaneStrip.DocTabActiveBorder=#ABA8A5
 VS2005DockPaneStrip.DocTabActiveForeColor=#333333
 VS2005DockPaneStrip.DocTabInactiveBorder=#ABA8A5
 VS2005DockPaneStrip.ToolActiveBorderColor=#7B7675
-VS2005DockPaneStrip.ToolBorderColor=#7B7675
+VS2005DockPaneStrip.ToolBorderColor=#94918D
 VS2005DockPaneStrip.ToolActiveForeColor=#333333
 VS2005DockPaneStrip.ToolSeparatorColor=#BBBBB0
 VS2005DockPaneStrip.ImageColor=#333333
diff --git a/FlashDevelop/Controls/QuickFind.cs b/FlashDevelop/Controls/QuickFind.cs
@@ -372,8 +372,11 @@ private void TypingTimerTick(Object sender, EventArgs e)
             }
             else
             {
-                this.findTextBox.BackColor = this.backColor;
                 this.infoLabel.Text = "";
+                this.findTextBox.BackColor = this.backColor;
+                ScintillaControl sci = Globals.SciControl;
+                sci.SetSel(sci.CurrentPos, sci.CurrentPos);
+                sci.RemoveHighlights();
             }
             Globals.MainForm.SetFindText(this, this.findTextBox.Text);
         }
diff --git a/PluginCore/PluginCore/Controls/Common.cs b/PluginCore/PluginCore/Controls/Common.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.IO;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.ComponentModel.Design;
@@ -276,6 +277,115 @@ protected override void WndProc(ref Message message)
         }
 
     }
+
+    public class TreeViewEx : TreeView
+    {
+        private static Int32 SIZE1 = ScaleHelper.Scale(1);
+        private static Int32 SIZE2 = ScaleHelper.Scale(2);
+        private static Int32 SIZE3 = ScaleHelper.Scale(3);
+
+        public TreeViewEx() : base()
+        {
+            this.DrawMode = TreeViewDrawMode.OwnerDrawAll;
+            this.DrawNode += OnDrawNode;
+            this.DragOver += OnDragOver;
+            this.ShowPlusMinus = true;
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000; // WS_CLIPCHILDREN
+                return cp;
+            }
+        }
+
+        private void OnDragOver(Object sender, DragEventArgs e)
+        {
+            Point point = this.PointToClient(new Point(e.X, e.Y));
+            TreeViewHitTestInfo hit = this.HitTest(point);
+            if (hit.Node != null) this.SelectedNode = hit.Node;
+        }
+
+        private void OnDrawNode(Object sender, DrawTreeNodeEventArgs e)
+        {
+            e.DrawDefault = false;
+            Rectangle bounds = e.Node.Bounds;
+            Color backHl = PluginBase.MainForm.GetThemeColor("TreeView.Highlight", SystemColors.Highlight);
+            Color foreHl = PluginBase.MainForm.GetThemeColor("TreeView.HighlightText", SystemColors.HighlightText);
+            SolidBrush brushFore = new SolidBrush(e.Node.TreeView.LineColor);
+            SolidBrush brushBack = new SolidBrush(e.Node.TreeView.BackColor);
+            if (bounds.IsEmpty || !e.Node.IsVisible) return;
+            if ((e.State & TreeNodeStates.Focused) != 0)
+            {
+                e.Graphics.FillRectangle(new SolidBrush(backHl), Rectangle.Inflate(bounds, 1, 0));
+            }
+            else if ((e.State & TreeNodeStates.Selected) != 0)
+            {
+                e.Graphics.FillRectangle(new SolidBrush(Color.Gray), Rectangle.Inflate(bounds, 1, 0));
+            }
+            else e.Graphics.FillRectangle(brushBack, bounds);
+            if (e.Node.Nodes.Count > 0)
+            {
+                Point[] arrow;
+                Point middle = new Point(bounds.Left - 28, bounds.Top + bounds.Height / 2);
+                if (e.Node.IsExpanded)
+                {
+                    arrow = new Point[]
+                    {
+                        new Point(middle.X - SIZE3, middle.Y - 1),
+                        new Point(middle.X + SIZE3 + 1, middle.Y - 1),
+                        new Point(middle.X, middle.Y + SIZE3)
+                    };
+                    e.Graphics.FillPolygon(brushFore, arrow);
+                    arrow = new Point[]
+                    {
+                        new Point(middle.X - SIZE1, middle.Y - 1),
+                        new Point(middle.X + SIZE1 + 1, middle.Y - 1),
+                        new Point(middle.X, middle.Y + SIZE1)
+                    };
+                    e.Graphics.FillPolygon(brushBack, arrow);
+                }
+                else
+                {
+                    arrow = new Point[]
+                    {
+                        new Point(middle.X - SIZE2, middle.Y - 2 * SIZE2),
+                        new Point(middle.X - SIZE2, middle.Y + 2 * SIZE2),
+                        new Point(middle.X + SIZE2, middle.Y)
+                    };
+                    e.Graphics.FillPolygon(brushFore, arrow);
+                    arrow = new Point[]
+                    {
+                        new Point(middle.X - SIZE1 - 1, middle.Y - 2 * SIZE1),
+                        new Point(middle.X - SIZE1 - 1, middle.Y + 2 * SIZE1),
+                        new Point(middle.X + SIZE1 - 1, middle.Y)
+                    };
+                    e.Graphics.FillPolygon(brushBack, arrow);
+                }
+            }
+            if (e.Node.ImageIndex != -1)
+            {
+                Point nodePt = new Point(bounds.Location.X - 20, bounds.Location.Y + 1);
+                Image nodeImg = e.Node.TreeView.ImageList.Images[e.Node.ImageIndex];
+                e.Graphics.DrawImage(nodeImg, nodePt);
+            }
+            Rectangle textRect = bounds;
+            Font nodeFont = e.Node.NodeFont;
+            Color textColor = e.Node.ForeColor;
+            textRect = Rectangle.Inflate(textRect, 2, 0);
+            if (nodeFont == null) nodeFont = ((TreeView)sender).Font;
+            if (nodeFont.Bold) textRect.X += 1;
+            if ((e.State & TreeNodeStates.Focused) != 0) textColor = foreHl;
+            if ((e.State & TreeNodeStates.Selected) != 0) textColor = foreHl;
+            if ((e.State & TreeNodeStates.Hot) != 0) nodeFont = new Font(nodeFont, FontStyle.Underline);
+            TextRenderer.DrawText(e.Graphics, e.Node.Text, nodeFont, textRect, textColor);
+        }
+
+    }
+
     public class ToolStripComboBoxEx : ToolStripControlHost
     {
         public ToolStripComboBoxEx() : base(new FlatCombo())
diff --git a/appman.xml b/appman.xml
@@ -479,6 +479,19 @@
 			<Url>https://github.com/JoeRobich/fd-vink/releases/download/v1.4/VinkSyntaxTheme.fdz</Url>
 		</Urls>
 	</Entry>
+	<Entry>
+		<Id>solarizedfulltheme</Id>
+		<Name>Solarized Full Theme</Name>
+		<Version>1.0</Version>
+		<Build>1</Build>
+		<Checksum>0EFDD1753EB7C4D42607B52BF296624B</Checksum>
+		<Desc>Adds Solarized light and dark ui themes and syntax themes, based on Solarized by Ethan Schoonover.</Desc>
+		<Group>Themes</Group>
+		<Info>http://www.flashdevelop.org/community/viewtopic.php?f=20&amp;t=12399</Info>
+		<Urls>
+			<Url>https://github.com/gene-pavlovsky/flashdevelop-colors-solarized/raw/v1.0/dist/SolarizedThemes.fdz</Url>
+		</Urls>
+	</Entry>
 	<Entry>
 		<Id>findandreplaceadvance</Id>
 		<Name>FindAndReplaceAdvance</Name>

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ private void ClearButtonClick(Object sender, EventArgs e)`
`549`	`549`	`{`
`550`	`550`	`this.findTextBox.Text = "";`
`551`	`551`	`this.ClearCurrentSelection();`
`552`		`- this.FindTextBoxLeave(null, null);`
	`552`	`+ this.findTextBox.Focus();`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public void CreateStartPage()`
`249`	`249`	`public void ShowStartPage()`
`250`	`250`	`{`
`251`	`251`	`if (this.startPage == null) this.CreateStartPage();`
`252`		`- else this.startPage.Show();`
	`252`	`+ else this.startPage.Show(PluginBase.MainForm.DockPanel);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -372,8 +372,11 @@ private void TypingTimerTick(Object sender, EventArgs e)`
`372`	`372`	`}`
`373`	`373`	`else`
`374`	`374`	`{`
`375`		`- this.findTextBox.BackColor = this.backColor;`
`376`	`375`	`this.infoLabel.Text = "";`
	`376`	`+ this.findTextBox.BackColor = this.backColor;`
	`377`	`+ ScintillaControl sci = Globals.SciControl;`
	`378`	`+ sci.SetSel(sci.CurrentPos, sci.CurrentPos);`
	`379`	`+ sci.RemoveHighlights();`
`377`	`380`	`}`
`378`	`381`	`Globals.MainForm.SetFindText(this, this.findTextBox.Text);`
`379`	`382`	`}`