- Theming helper methods added

Meychi · Meychi · commit 81fa0befac53 · 2015-10-15T02:09:01.000+03:00
- New global theme settings added
diff --git a/External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs b/External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs
@@ -484,8 +484,8 @@ private void SetMatch(TreeNode node)
             lastMatch = node;
             if (lastMatch != null)
             {
-                lastMatch.BackColor = SystemColors.Highlight;
-                lastMatch.ForeColor = SystemColors.HighlightText;
+                lastMatch.BackColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);
+                lastMatch.ForeColor = PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);
                 outlineTreeView.SelectedNode = node;
             }
         }
diff --git a/External/Plugins/ASCompletion/PluginUI.cs b/External/Plugins/ASCompletion/PluginUI.cs
@@ -1036,8 +1036,8 @@ private void ShowAndHilightNode(TreeNode node, bool hilight)
             if (hilight)
             {
                 node.EnsureVisible();
-                node.ForeColor = SystemColors.HighlightText;
-                node.BackColor = SystemColors.Highlight;
+                node.BackColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);
+                node.ForeColor = PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);
             }
             else
             {
diff --git a/External/Plugins/ProjectManager/Helpers/TreeViews/DragDropTreeView.cs b/External/Plugins/ProjectManager/Helpers/TreeViews/DragDropTreeView.cs
@@ -194,8 +194,8 @@ private void HighlightTarget(TreeNode node)
                 originalColor = node.BackColor;
                 originalText = node.ForeColor;
                 highlightedNode = node;
-                highlightedNode.BackColor = SystemColors.Highlight;
-                highlightedNode.ForeColor = SystemColors.HighlightText;
+                highlightedNode.BackColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);
+                highlightedNode.ForeColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);
             }
         }
 
diff --git a/External/Plugins/ProjectManager/Helpers/TreeViews/MultiSelectTreeView.cs b/External/Plugins/ProjectManager/Helpers/TreeViews/MultiSelectTreeView.cs
@@ -290,9 +290,8 @@ private void PaintNode(TreeNode node)
             if (!originalColor.Contains(node))
             {
                 originalColor[node] = node.ForeColor;
-                node.BackColor = SystemColors.Highlight;
-                node.ForeColor = SystemColors.HighlightText;
-
+                node.BackColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);
+                node.ForeColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);
                 MultiSelectTreeNode mNode = node as MultiSelectTreeNode;
                 if (mNode != null) mNode.Painted = true;
             }
diff --git a/External/Plugins/ResultsPanel/PluginUI.cs b/External/Plugins/ResultsPanel/PluginUI.cs
@@ -947,7 +947,7 @@ public void NextEntry(Object sender, System.EventArgs e)
             this.entryIndex = (this.entryIndex + 1) % this.entriesView.Items.Count;
             this.entriesView.SelectedItems.Clear();
             this.entriesView.Items[this.entryIndex].Selected = true;
-            this.entriesView.Items[this.entryIndex].ForeColor = Color.Blue;
+            this.entriesView.Items[this.entryIndex].ForeColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", Color.Blue);
             this.entriesView.EnsureVisible(this.entryIndex);
             this.EntriesViewDoubleClick(null, null);
         }
@@ -965,7 +965,7 @@ public void PreviousEntry(Object sender, System.EventArgs e)
             if (--this.entryIndex < 0) this.entryIndex = this.entriesView.Items.Count - 1;
             this.entriesView.SelectedItems.Clear();
             this.entriesView.Items[this.entryIndex].Selected = true;
-            this.entriesView.Items[this.entryIndex].ForeColor = Color.Blue;
+            this.entriesView.Items[this.entryIndex].ForeColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", Color.Blue);
             this.entriesView.EnsureVisible(this.entryIndex);
             this.EntriesViewDoubleClick(null, null);
         }
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DefaultTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DefaultTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DimGrayTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DimGrayTheme.fdz
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/Obsidian.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -2,6 +2,10 @@
 
 # FD UI THEME (5.1+)
 
+# In: Projects, Results, Outline, Models
+#Global.Highlight=#3399ff
+#Global.HighlightText=#ffffff
+
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
 #OutputPanel.WarningColor=#ffa500
diff --git a/FlashDevelop/MainForm.cs b/FlashDevelop/MainForm.cs
@@ -1707,6 +1707,16 @@ public Color GetThemeColor(String id)
             return ThemeManager.GetThemeColor(id);
         }
 
+        /// <summary>
+        /// Gets a theme property color with a fallback
+        /// </summary>
+        public Color GetThemeColor(String id, Color fallback)
+        {
+            Color color = ThemeManager.GetThemeColor(id);
+            if (color != Color.Empty) return color;
+            else return fallback;
+        }
+
         /// <summary>
         /// Gets a theme property value
         /// </summary>
@@ -1715,6 +1725,16 @@ public String GetThemeValue(String id)
             return ThemeManager.GetThemeValue(id);
         }
 
+        /// <summary>
+        /// Gets a theme property value with a fallback
+        /// </summary>
+        public String GetThemeValue(String id, String fallback)
+        {
+            String value = ThemeManager.GetThemeValue(id);
+            if (!String.IsNullOrEmpty(value)) return value;
+            else return fallback;
+        }
+
         /// <summary>
         /// Finds the specified menu item by name
         /// </summary>
diff --git a/PluginCore/PluginCore/Interfaces.cs b/PluginCore/PluginCore/Interfaces.cs
@@ -123,6 +123,8 @@ public interface IMainForm : IContainerControl, IWin32Window
         Keys GetShortcutItemKeys(String id);
         String GetThemeValue(String id);
         Color GetThemeColor(String id);
+        String GetThemeValue(String id, String fallback);
+        Color GetThemeColor(String id, Color fallback);
         IPlugin FindPlugin(String guid);
         Image ImageSetAdjust(Image image);
         Image FindImage(String data);

Original file line number	Diff line number	Diff line change
`@@ -484,8 +484,8 @@ private void SetMatch(TreeNode node)`
`484`	`484`	`lastMatch = node;`
`485`	`485`	`if (lastMatch != null)`
`486`	`486`	`{`
`487`		`- lastMatch.BackColor = SystemColors.Highlight;`
`488`		`- lastMatch.ForeColor = SystemColors.HighlightText;`
	`487`	`+ lastMatch.BackColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);`
	`488`	`+ lastMatch.ForeColor = PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);`
`489`	`489`	`outlineTreeView.SelectedNode = node;`
`490`	`490`	`}`
`491`	`491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1036,8 +1036,8 @@ private void ShowAndHilightNode(TreeNode node, bool hilight)`
`1036`	`1036`	`if (hilight)`
`1037`	`1037`	`{`
`1038`	`1038`	`node.EnsureVisible();`
`1039`		`- node.ForeColor = SystemColors.HighlightText;`
`1040`		`- node.BackColor = SystemColors.Highlight;`
	`1039`	`+ node.BackColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);`
	`1040`	`+ node.ForeColor = PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);`
`1041`	`1041`	`}`
`1042`	`1042`	`else`
`1043`	`1043`	`{`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ private void HighlightTarget(TreeNode node)`
`194`	`194`	`originalColor = node.BackColor;`
`195`	`195`	`originalText = node.ForeColor;`
`196`	`196`	`highlightedNode = node;`
`197`		`- highlightedNode.BackColor = SystemColors.Highlight;`
`198`		`- highlightedNode.ForeColor = SystemColors.HighlightText;`
	`197`	`+ highlightedNode.BackColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);`
	`198`	`+ highlightedNode.ForeColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -290,9 +290,8 @@ private void PaintNode(TreeNode node)`
`290`	`290`	`if (!originalColor.Contains(node))`
`291`	`291`	`{`
`292`	`292`	`originalColor[node] = node.ForeColor;`
`293`		`- node.BackColor = SystemColors.Highlight;`
`294`		`- node.ForeColor = SystemColors.HighlightText;`
`295`		`-`
	`293`	`+ node.BackColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);`
	`294`	`+ node.ForeColor = PluginCore.PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);`
`296`	`295`	`MultiSelectTreeNode mNode = node as MultiSelectTreeNode;`
`297`	`296`	`if (mNode != null) mNode.Painted = true;`
`298`	`297`	`}`