Skip to content

Commit baf5729

Browse files
NeverbirthNeverbirth
committed
Merge branch 'development' into watches_saving
2 parents 22bc933 + 43307c0 commit baf5729

File tree

111 files changed

+9992
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+9992
-175
lines changed

‎CI/buildl.cmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
:: Set paths
44
set PATH=%PATH%;C:\Windows\Microsoft.NET\Framework\v4.0.30319\
5+
set PATH=%PATH%;C:\Program Files\Git\bin\
56
set PATH=%PATH%;C:\Program Files (x86)\Git\bin\
6-
set PATH=%PATH%;C:\Program Files (x86)\NSIS
77
set PATH=%PATH%;C:\Program Files\7-Zip\
8+
set PATH=%PATH%;C:\Program Files (x86)\7-Zip\
9+
set PATH=%PATH%;C:\Program Files (x86)\NSIS
810

911
:: Need path up
1012
cd ..

‎External/Plugins/AS3Context/AbcConverter.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,17 @@ public static void Convert(ContentParser parser, PathModel path, IASContext cont
129129
type.Flags = FlagType.Class;
130130
conflicts.Add(type.Name, type.QualifiedName);
131131

132-
if (instance.flags == TraitMember.Function)
132+
if ((instance.flags & TraitFlag.Interface) > 0)
133133
type.Flags |= FlagType.Interface;
134+
else
135+
{
136+
if ((instance.flags & TraitFlag.Final) > 0)
137+
type.Flags |= FlagType.Final;
138+
139+
if ((instance.flags & TraitFlag.Sealed) == 0)
140+
type.Flags |= FlagType.Dynamic;
141+
142+
}
134143

135144
thisDocs = GetDocs(model.Package);
136145
if (thisDocs != null)

‎External/Plugins/ASCompletion/Completion/ASComplete.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,9 @@ static private string MemberTooltipText(MemberModel member, ClassModel inClass)
39063906
string foundIn = "";
39073907
if (inClass != ClassModel.VoidClass)
39083908
{
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]";
39103912
}
39113913
if ((ft & (FlagType.Getter | FlagType.Setter)) > 0)
39123914
return String.Format("{0}property {1}{2}", modifiers, member.ToString(), foundIn);

‎External/Plugins/ASCompletion/Completion/ASDocumentation.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using PluginCore.Managers;
1717
using PluginCore.Utilities;
1818
using ScintillaNet;
19-
using System.Drawing;
2019

2120
namespace ASCompletion.Completion
2221
{
@@ -457,7 +456,7 @@ static public string GetTipShortDetails(CommentBlock cb, string highlightParam)
457456

458457
static private string GetShortcutDocs()
459458
{
460-
Color themeForeColor = PluginBase.MainForm.GetThemeColor("RichToolTip.ForeColor");
459+
Color themeForeColor = PluginBase.MainForm.GetThemeColor("MethodCallTip.InfoColor");
461460
string foreColorString = themeForeColor != Color.Empty ? ColorTranslator.ToHtml(themeForeColor) : "#666666:MULTIPLY";
462461
return "\n[COLOR=" + foreColorString + "][i](" + TextHelper.GetString("Info.ShowDetails") + ")[/i][/COLOR]";
463462
}

‎External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ private void SetMatch(TreeNode node)
484484
lastMatch = node;
485485
if (lastMatch != null)
486486
{
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);
489489
outlineTreeView.SelectedNode = node;
490490
}
491491
}

‎External/Plugins/ASCompletion/PluginUI.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,8 @@ private void SetHighlight(TreeNode node)
504504
outlineTree.State.highlight = currentHighlight.FullPath;
505505

506506
//currentHighlight.BackColor = System.Drawing.Color.LightGray;
507-
currentHighlight.ForeColor = System.Drawing.Color.Blue;
507+
currentHighlight.ForeColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", Color.Blue);
508+
508509
}
509510
}
510511

@@ -1036,8 +1037,8 @@ private void ShowAndHilightNode(TreeNode node, bool hilight)
10361037
if (hilight)
10371038
{
10381039
node.EnsureVisible();
1039-
node.ForeColor = SystemColors.HighlightText;
1040-
node.BackColor = SystemColors.Highlight;
1040+
node.BackColor = PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight);
1041+
node.ForeColor = PluginBase.MainForm.GetThemeColor("Global.HighlightText", SystemColors.HighlightText);
10411042
}
10421043
else
10431044
{
@@ -1107,7 +1108,7 @@ void FindProcTxtLeave(object sender, System.EventArgs e)
11071108
if (findProcTxt.Text == "")
11081109
{
11091110
findProcTxt.Text = searchInvitation;
1110-
findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;
1111+
findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
11111112
clearButton.Enabled = false;
11121113
}
11131114
}
@@ -1126,7 +1127,7 @@ private void clearButton_Click(object sender, EventArgs e)
11261127
// Update colors on start after theme engine
11271128
public void UpdateAfterTheme()
11281129
{
1129-
findProcTxt.ForeColor = System.Drawing.SystemColors.GrayText;
1130+
findProcTxt.ForeColor = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
11301131
}
11311132

11321133
protected override Boolean ProcessDialogKey(Keys keyData)
@@ -1176,7 +1177,7 @@ private TreeNode FindMatch(TreeNodeCollection nodes)
11761177
{
11771178
foreach (TreeNode node in nodes)
11781179
{
1179-
if (node.BackColor == SystemColors.Highlight) return node;
1180+
if (node.BackColor == PluginBase.MainForm.GetThemeColor("Global.Highlight", SystemColors.Highlight)) return node;
11801181
if (node.Nodes.Count > 0)
11811182
{
11821183
TreeNode subnode = FindMatch(node.Nodes);

‎External/Plugins/FlashDebugger/Controls/StackframeUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ private void FilterResults()
406406
string filterText = toolStripTextBoxFilter.Text.Trim();
407407
lv.Items.Clear();
408408
Regex regex = null;
409-
Color color = System.Drawing.SystemColors.GrayText;
409+
Color color = PluginBase.MainForm.GetThemeColor("Global.GrayText", SystemColors.GrayText);
410410
if (toolStripItemRegEx.Checked)
411411
{
412412
try

‎External/Plugins/FlashLogViewer/PluginUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ private void FilterTextBoxTextChanged(Object sender, EventArgs e)
544544
try
545545
{
546546
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);
548548
}
549549
catch { this.filterComboBox.ForeColor = Color.Red; }
550550
}

‎External/Plugins/HaXeContext/Completion/HaxeComplete.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void EscapeMacros(List<string> hxmlArgs)
145145
{
146146
Match m = reMacro.Match(arg);
147147
if (m.Success)
148-
hxmlArgs[i] = m.Groups[1].Value + " \"" + EscapeQuotes(m.Groups[2].Value.Trim()) + "\"";
148+
hxmlArgs[i] = m.Groups[1].Value + " \"" + m.Groups[2].Value.Trim() + "\"";
149149
}
150150
}
151151
}

‎External/Plugins/OutputPanel/PluginUI.cs

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -398,28 +398,62 @@ public void AddTraces()
398398
switch (state)
399399
{
400400
case 0: // Info
401-
newColor = Color.Gray;
401+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.InfoColor") != Color.Empty)
402+
{
403+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.InfoColor");
404+
}
405+
else newColor = Color.Gray;
402406
break;
403407
case 1: // Debug
404-
newColor = this.ForeColor;
408+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.DebugColor") != Color.Empty)
409+
{
410+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.DebugColor");
411+
}
412+
else newColor = this.ForeColor;
405413
break;
406414
case 2: // Warning
407-
newColor = Color.Orange;
415+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.WarningColor") != Color.Empty)
416+
{
417+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.WarningColor");
418+
}
419+
else newColor = Color.Orange;
408420
break;
409421
case 3: // Error
410-
newColor = Color.Red;
422+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.ErrorColor") != Color.Empty)
423+
{
424+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.ErrorColor");
425+
}
426+
else newColor = Color.Red;
411427
break;
412428
case 4: // Fatal
413-
newColor = Color.Magenta;
429+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.FatalColor") != Color.Empty)
430+
{
431+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.FatalColor");
432+
}
433+
else newColor = Color.Magenta;
414434
break;
415435
case -1: // ProcessStart
416-
newColor = Color.Blue;
436+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.ProcessStartColor") != Color.Empty)
437+
{
438+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.ProcessStartColor");
439+
}
440+
else newColor = Color.Blue;
417441
break;
418442
case -2: // ProcessEnd
419-
newColor = Color.Blue;
443+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.ProcessEndColor") != Color.Empty)
444+
{
445+
newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.ProcessEndColor");
446+
}
447+
else newColor = Color.Blue;
420448
break;
421449
case -3: // ProcessError
422-
newColor = (message.IndexOf("Warning") >= 0) ? Color.Orange : Color.Red;
450+
if (PluginBase.MainForm.GetThemeColor("OutputPanel.WarningColor") != Color.Empty
451+
&& PluginBase.MainForm.GetThemeColor("OutputPanel.ErrorColor") != Color.Empty)
452+
{
453+
if (message.IndexOf("Warning") >= 0) newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.WarningColor");
454+
else newColor = PluginBase.MainForm.GetThemeColor("OutputPanel.ErrorColor");
455+
}
456+
else newColor = (message.IndexOf("Warning") >= 0) ? Color.Orange : Color.Red;
423457
break;
424458
}
425459
if (newColor != currentColor)

0 commit comments

Comments
 (0)