Added more theme settings...

Meychi · Meychi · commit 648b0685d7d8 · 2015-10-15T23:37:11.000+03:00
diff --git a/External/Plugins/ASCompletion/Completion/ASComplete.cs b/External/Plugins/ASCompletion/Completion/ASComplete.cs
@@ -3906,7 +3906,9 @@ static private string MemberTooltipText(MemberModel member, ClassModel inClass)
             string foundIn = "";
             if (inClass != ClassModel.VoidClass)
             {
-                foundIn = "\n[COLOR=#666666:MULTIPLY]in " + MemberModel.FormatType(inClass.QualifiedName) + "[/COLOR]";
+                Color themeForeColor = PluginBase.MainForm.GetThemeColor("MethodCallTip.InfoColor");
+                string foreColorString = themeForeColor != Color.Empty ? ColorTranslator.ToHtml(themeForeColor) : "#666666:MULTIPLY";
+                foundIn = "\n[COLOR=" + foreColorString + "]in " + MemberModel.FormatType(inClass.QualifiedName) + "[/COLOR]";
             }
             if ((ft & (FlagType.Getter | FlagType.Setter)) > 0)
                 return String.Format("{0}property {1}{2}", modifiers, member.ToString(), foundIn);
diff --git a/External/Plugins/ASCompletion/Completion/ASDocumentation.cs b/External/Plugins/ASCompletion/Completion/ASDocumentation.cs
@@ -456,7 +456,7 @@ static public string GetTipShortDetails(CommentBlock cb, string highlightParam)
 
         static private string GetShortcutDocs()
         {
-            Color themeForeColor = PluginBase.MainForm.GetThemeColor("RichToolTip.ForeColor");
+            Color themeForeColor = PluginBase.MainForm.GetThemeColor("MethodCallTip.InfoColor");
             string foreColorString = themeForeColor != Color.Empty ? ColorTranslator.ToHtml(themeForeColor) : "#666666:MULTIPLY";
             return "\n[COLOR=" + foreColorString + "][i](" + TextHelper.GetString("Info.ShowDetails") + ")[/i][/COLOR]";
         }
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi
@@ -8,13 +8,20 @@
 #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
+#OutputPanel.InfoColor=#808080
+#OutputPanel.DebugColor=#000000
+#OutputPanel.WarningColor=#ffa500
+#OutputPanel.ErrorColor=#ff0000
+#OutputPanel.FatalColor=#ff00ff
+#OutputPanel.ProcessStartColor=#ff0000
+#OutputPanel.ProcessEndColor=ff0000
+
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#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
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -16,6 +16,13 @@
 #OutputPanel.ProcessStartColor=#ff0000
 #OutputPanel.ProcessEndColor=ff0000
 
+#QuickFind.ErrorBack=#ff0000
+#CompletionList.SelectedTextColor=#ff0000
+#CompletionList.SelectedBackColor=#ff0000
+#CompletionList.PackageColor=#ff0000
+#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.InfoColor=#ff0000
+
 # FD UI THEME (5.0+)
 
 # Use inherited base styles?
diff --git a/FlashDevelop/Controls/QuickFind.cs b/FlashDevelop/Controls/QuickFind.cs
@@ -456,7 +456,7 @@ private void FindCorrect(String text, Boolean refreshHighlights)
             }
             else
             {
-                this.findTextBox.BackColor = Color.Salmon;
+                this.findTextBox.BackColor = Globals.MainForm.GetThemeColor("QuickFind.ErrorBack", Color.Salmon);
                 sci.SetSel(sci.SelectionStart, sci.SelectionStart);
                 String message = TextHelper.GetString("Info.NoMatchesFound");
                 this.infoLabel.Text = message;
@@ -484,7 +484,7 @@ private void FindNext(String text, Boolean refreshHighlights)
             }
             else
             {
-                this.findTextBox.BackColor = Color.Salmon;
+                this.findTextBox.BackColor = Globals.MainForm.GetThemeColor("QuickFind.ErrorBack", Color.Salmon);
                 sci.SetSel(sci.SelectionStart, sci.SelectionStart);
                 String message = TextHelper.GetString("Info.NoMatchesFound");
                 this.infoLabel.Text = message;
@@ -512,7 +512,7 @@ private void FindPrev(String text, Boolean refreshHighlights)
             }
             else
             {
-                this.findTextBox.BackColor = Color.Salmon;
+                this.findTextBox.BackColor = Globals.MainForm.GetThemeColor("QuickFind.ErrorBack", Color.Salmon);
                 sci.SetSel(sci.SelectionStart, sci.SelectionStart);
                 String message = TextHelper.GetString("Info.NoMatchesFound");
                 this.infoLabel.Text = message;
diff --git a/PluginCore/PluginCore/Controls/CompletionList.cs b/PluginCore/PluginCore/Controls/CompletionList.cs
@@ -353,10 +353,11 @@ static private void CLDrawListItem(Object sender, System.Windows.Forms.DrawItemE
         {
             ICompletionListItem item = completionList.Items[e.Index] as ICompletionListItem;
             e.DrawBackground();
-            Color fore = PluginBase.MainForm.GetThemeColor("CompletionList.ForeColor");
+            Color fore = PluginBase.MainForm.GetThemeColor("CompletionList.ForeColor", SystemColors.WindowText);
+            Color sel = PluginBase.MainForm.GetThemeColor("CompletionList.SelectedTextColor", SystemColors.HighlightText);
             bool selected = (e.State & DrawItemState.Selected) > 0;
-            Brush textBrush = (selected) ? SystemBrushes.HighlightText : fore == Color.Empty ? SystemBrushes.WindowText : new SolidBrush(fore);
-            Brush packageBrush = Brushes.Gray;
+            Brush textBrush = (selected) ? new SolidBrush(sel) : new SolidBrush(fore);
+            Brush packageBrush = new SolidBrush(PluginBase.MainForm.GetThemeColor("CompletionList.PackageColor", Color.Gray));
             Rectangle tbounds = new Rectangle(ScaleHelper.Scale(18), e.Bounds.Top, e.Bounds.Width, e.Bounds.Height);
             if (item != null)
             {
diff --git a/PluginCore/PluginCore/Controls/MethodCallTip.cs b/PluginCore/PluginCore/Controls/MethodCallTip.cs
@@ -15,7 +15,7 @@ public class MethodCallTip: RichToolTip
 
         public static string HLTextStyleBeg = "[B]";
         public static string HLTextStyleEnd = "[/B]";
-        public static string HLBgStyleBeg = "[BGCOLOR=#000:OVERLAY]";
+        public static string HLBgStyleBeg = "[BGCOLOR=" + ColorTranslator.ToHtml(PluginBase.MainForm.GetThemeColor("MethodCallTip.SelectedBack", Color.Black)) + ":OVERLAY]";
         public static string HLBgStyleEnd = "[/BGCOLOR]";
 
 

Original file line number	Diff line number	Diff line change
`@@ -3906,7 +3906,9 @@ static private string MemberTooltipText(MemberModel member, ClassModel inClass)`
`3906`	`3906`	`string foundIn = "";`
`3907`	`3907`	`if (inClass != ClassModel.VoidClass)`
`3908`	`3908`	`{`
`3909`		`- foundIn = "\n[COLOR=#666666:MULTIPLY]in " + MemberModel.FormatType(inClass.QualifiedName) + "[/COLOR]";`
	`3909`	`+ Color themeForeColor = PluginBase.MainForm.GetThemeColor("MethodCallTip.InfoColor");`
	`3910`	`+ string foreColorString = themeForeColor != Color.Empty ? ColorTranslator.ToHtml(themeForeColor) : "#666666:MULTIPLY";`
	`3911`	`+ foundIn = "\n[COLOR=" + foreColorString + "]in " + MemberModel.FormatType(inClass.QualifiedName) + "[/COLOR]";`
`3910`	`3912`	`}`
`3911`	`3913`	`if ((ft & (FlagType.Getter \| FlagType.Setter)) > 0)`
`3912`	`3914`	`return String.Format("{0}property {1}{2}", modifiers, member.ToString(), foundIn);`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ static public string GetTipShortDetails(CommentBlock cb, string highlightParam)`
`456`	`456`
`457`	`457`	`static private string GetShortcutDocs()`
`458`	`458`	`{`
`459`		`- Color themeForeColor = PluginBase.MainForm.GetThemeColor("RichToolTip.ForeColor");`
	`459`	`+ Color themeForeColor = PluginBase.MainForm.GetThemeColor("MethodCallTip.InfoColor");`
`460`	`460`	`string foreColorString = themeForeColor != Color.Empty ? ColorTranslator.ToHtml(themeForeColor) : "#666666:MULTIPLY";`
`461`	`461`	`return "\n[COLOR=" + foreColorString + "][i](" + TextHelper.GetString("Info.ShowDetails") + ")[/i][/COLOR]";`
`462`	`462`	`}`