More global settings...

Meychi · Meychi · commit 2aaaa3808d18 · 2015-10-15T10:45:07.000+03:00
diff --git a/External/Plugins/ASCompletion/PluginUI.cs b/External/Plugins/ASCompletion/PluginUI.cs
@@ -504,7 +504,8 @@ private void SetHighlight(TreeNode node)
                     outlineTree.State.highlight = currentHighlight.FullPath;
 
                 //currentHighlight.BackColor = System.Drawing.Color.LightGray;
-                currentHighlight.ForeColor = System.Drawing.Color.Blue;
+                currentHighlight.ForeColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", Color.Blue);
+
             }
         }
 
@@ -1107,7 +1108,7 @@ void FindProcTxtLeave(object sender, System.EventArgs e)
             if (findProcTxt.Text == "")
             {
                 findProcTxt.Text = searchInvitation;
-                findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;
+                findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
                 clearButton.Enabled = false;
             }
         }
@@ -1126,7 +1127,7 @@ private void clearButton_Click(object sender, EventArgs e)
         // Update colors on start after theme engine
         public void UpdateAfterTheme()
         {
-            findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;
+            findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
         }
 
         protected override Boolean ProcessDialogKey(Keys keyData)
@@ -1176,7 +1177,7 @@ private TreeNode FindMatch(TreeNodeCollection nodes)
         {
             foreach (TreeNode node in nodes)
             {
-                if (node.BackColor == SystemColors.Highlight) return node;
+                if (node.BackColor == PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight)) return node;
                 if (node.Nodes.Count > 0)
                 {
                     TreeNode subnode = FindMatch(node.Nodes);
diff --git a/External/Plugins/FlashDebugger/Controls/StackframeUI.cs b/External/Plugins/FlashDebugger/Controls/StackframeUI.cs
@@ -406,7 +406,7 @@ private void FilterResults()
             string filterText = toolStripTextBoxFilter.Text.Trim();
             lv.Items.Clear();
             Regex regex = null;
-            Color color = System.Drawing.SystemColors.GrayText;
+            Color color = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
             if (toolStripItemRegEx.Checked)
             {
                 try
diff --git a/External/Plugins/FlashLogViewer/PluginUI.cs b/External/Plugins/FlashLogViewer/PluginUI.cs
@@ -544,7 +544,7 @@ private void FilterTextBoxTextChanged(Object sender, EventArgs e)
                 try
                 {
                     this.reFilter = new Regex(filterComboBox.Text, RegexOptions.IgnoreCase);
-                    this.filterComboBox.ForeColor = SystemColors.ControlText;
+                    this.filterComboBox.ForeColor = PluginBase.MainForm.GetThemeColor("Global.ControlText", SystemColors.ControlText);
                 }
                 catch { this.filterComboBox.ForeColor = Color.Red; }
             }
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi
@@ -2,17 +2,19 @@
 
 # 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
-#OutputPanel.ErrorColor=#ff0000
-#OutputPanel.FatalColor=#ff00ff
-#OutputPanel.ProcessStartColor=#ff0000
-#OutputPanel.ProcessEndColor=ff0000
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
+
+OutputPanel.InfoColor=#808080
+OutputPanel.DebugColor=#000000
+OutputPanel.WarningColor=#ffa500
+OutputPanel.ErrorColor=#ff0000
+OutputPanel.FatalColor=#ff00ff
+OutputPanel.ProcessStartColor=#ff0000
+OutputPanel.ProcessEndColor=ff0000
 
 # FD UI THEME (5.0+)
 
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,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -2,9 +2,11 @@
 
 # FD UI THEME (5.1+)
 
-# In: Projects, Results, Outline, Models
-#Global.Highlight=#3399ff
-#Global.HighlightText=#ffffff
+# In: Projects, Results, Outline, Models, Logs
+#Global.Highlight=#ff99ff
+#Global.HighlightText=#ff00ff
+#Global.ControlText=#ff3333
+#Global.GrayText=#0033ff
 
 #OutputPanel.InfoColor=#808080
 #OutputPanel.DebugColor=#000000
diff --git a/PluginCore/DockPanelSuite/Customization/VS2005DockPaneCaption.cs b/PluginCore/DockPanelSuite/Customization/VS2005DockPaneCaption.cs
@@ -343,7 +343,7 @@ private static Color ActiveTextColor
 
         private static Color InactiveTextColor
         {
-            get {   return SystemColors.ControlText;    }
+            get {   return PluginCore.PluginBase.MainForm.GetThemeColor("Global.ControlText", SystemColors.ControlText); }
         }
 
         private Color TextColor

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,8 @@ private void SetHighlight(TreeNode node)`
`504`	`504`	`outlineTree.State.highlight = currentHighlight.FullPath;`
`505`	`505`
`506`	`506`	`//currentHighlight.BackColor = System.Drawing.Color.LightGray;`
`507`		`- currentHighlight.ForeColor = System.Drawing.Color.Blue;`
	`507`	`+ currentHighlight.ForeColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", Color.Blue);`
	`508`	`+`
`508`	`509`	`}`
`509`	`510`	`}`
`510`	`511`
`@@ -1107,7 +1108,7 @@ void FindProcTxtLeave(object sender, System.EventArgs e)`
`1107`	`1108`	`if (findProcTxt.Text == "")`
`1108`	`1109`	`{`
`1109`	`1110`	`findProcTxt.Text = searchInvitation;`
`1110`		`- findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;`
	`1111`	`+ findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);`
`1111`	`1112`	`clearButton.Enabled = false;`
`1112`	`1113`	`}`
`1113`	`1114`	`}`
`@@ -1126,7 +1127,7 @@ private void clearButton_Click(object sender, EventArgs e)`
`1126`	`1127`	`// Update colors on start after theme engine`
`1127`	`1128`	`public void UpdateAfterTheme()`
`1128`	`1129`	`{`
`1129`		`- findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;`
	`1130`	`+ findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);`
`1130`	`1131`	`}`
`1131`	`1132`
`1132`	`1133`	`protected override Boolean ProcessDialogKey(Keys keyData)`
`@@ -1176,7 +1177,7 @@ private TreeNode FindMatch(TreeNodeCollection nodes)`
`1176`	`1177`	`{`
`1177`	`1178`	`foreach (TreeNode node in nodes)`
`1178`	`1179`	`{`
`1179`		`- if (node.BackColor == SystemColors.Highlight) return node;`
	`1180`	`+ if (node.BackColor == PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight)) return node;`
`1180`	`1181`	`if (node.Nodes.Count > 0)`
`1181`	`1182`	`{`
`1182`	`1183`	`TreeNode subnode = FindMatch(node.Nodes);`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ private void FilterResults()`
`406`	`406`	`string filterText = toolStripTextBoxFilter.Text.Trim();`
`407`	`407`	`lv.Items.Clear();`
`408`	`408`	`Regex regex = null;`
`409`		`- Color color = System.Drawing.SystemColors.GrayText;`
	`409`	`+ Color color = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);`
`410`	`410`	`if (toolStripItemRegEx.Checked)`
`411`	`411`	`{`
`412`	`412`	`try`
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ private void FilterTextBoxTextChanged(Object sender, EventArgs e)`
`544`	`544`	`try`
`545`	`545`	`{`
`546`	`546`	`this.reFilter = new Regex(filterComboBox.Text, RegexOptions.IgnoreCase);`
`547`		`- this.filterComboBox.ForeColor = SystemColors.ControlText;`
	`547`	`+ this.filterComboBox.ForeColor = PluginBase.MainForm.GetThemeColor("Global.ControlText", SystemColors.ControlText);`
`548`	`548`	`}`
`549`	`549`	`catch { this.filterComboBox.ForeColor = Color.Red; }`
`550`	`550`	`}`