Skip to content

Commit feff9cc

Browse files
trzecieutrzecieu
committed
Load Library styles from theme
1 parent 598eb33 commit feff9cc

7 files changed

Lines changed: 198 additions & 18 deletions

File tree

‎External/Plugins/ProjectManager/Controls/TreeView/DirectoryNode.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public override void Refresh(bool recursive)
6363
insideLibrarypath = (Parent as DirectoryNode).insideLibrarypath;
6464
}
6565

66+
string colorId = "ProjectTreeView.ForeColor";
6667
if (project != null)
6768
{
6869
if (project.IsPathHidden(BackingPath))
@@ -76,6 +77,14 @@ public override void Refresh(bool recursive)
7677
ImageIndex = Icons.FolderCompile.Index;
7778
else if (insideLibrarypath == null && project.IsLibraryAsset(BackingPath))
7879
{
80+
LibraryAsset asset = project.GetAsset(BackingPath);
81+
if (asset.SwfMode == SwfAssetMode.ExternalLibrary)
82+
colorId = "ProjectTreeView.ForeColor.ExternalLibrary";
83+
else if (asset.SwfMode == SwfAssetMode.Library)
84+
colorId = "ProjectTreeView.ForeColor.Library";
85+
else if (asset.SwfMode == SwfAssetMode.IncludedLibrary)
86+
colorId = "ProjectTreeView.ForeColor.IncludedLibrary";
87+
7988
insideLibrarypath = this;
8089
ImageIndex = Icons.LibrarypathFolder.Index;
8190
}
@@ -86,8 +95,9 @@ public override void Refresh(bool recursive)
8695

8796
SelectedImageIndex = ImageIndex;
8897

89-
Color color = PluginCore.PluginBase.MainForm.GetThemeColor("ProjectTreeView.ForeColor");
90-
if (color != Color.Empty) ForeColorRequest = color;
98+
Color textColor = PluginCore.PluginBase.MainForm.GetThemeColor(colorId);
99+
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = Color.Blue;
100+
if (textColor != Color.Empty) ForeColorRequest = textColor;
91101
else ForeColorRequest = SystemColors.ControlText;
92102

93103
// make the plus/minus sign correct

‎External/Plugins/ProjectManager/Controls/TreeView/FileNode.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,29 +75,29 @@ public override void Refresh(bool recursive)
7575

7676
Text = Path.GetFileName(path);
7777

78+
string colorId = "ProjectTreeView.ForeColor";
7879
if (project.IsLibraryAsset(path))
7980
{
8081
LibraryAsset asset = project.GetAsset(path);
81-
if (asset.IsSwc)
82-
{
83-
if (asset.SwfMode == SwfAssetMode.ExternalLibrary)
84-
ForeColorRequest = Color.DarkBlue;
85-
else if (asset.SwfMode == SwfAssetMode.Library)
86-
ForeColorRequest = Color.Blue;
87-
else if (asset.SwfMode == SwfAssetMode.IncludedLibrary)
88-
ForeColorRequest = Color.DarkCyan;
89-
}
90-
else ForeColorRequest = Color.Blue;
82+
if (asset.IsSwc)
83+
{
84+
if (asset.SwfMode == SwfAssetMode.ExternalLibrary)
85+
colorId = "ProjectTreeView.ForeColor.ExternalLibrary";
86+
else if (asset.SwfMode == SwfAssetMode.Library)
87+
colorId = "ProjectTreeView.ForeColor.Library";
88+
else if (asset.SwfMode == SwfAssetMode.IncludedLibrary)
89+
colorId = "ProjectTreeView.ForeColor.IncludedLibrary";
90+
}
9191

9292
if (asset != null && asset.HasManualID)
9393
Text += " (" + asset.ManualID + ")";
9494
}
95-
else
96-
{
97-
Color color = PluginCore.PluginBase.MainForm.GetThemeColor("ProjectTreeView.ForeColor");
98-
if (color != Color.Empty) ForeColorRequest = color;
99-
else ForeColorRequest = SystemColors.ControlText;
100-
}
95+
96+
Color textColor = PluginCore.PluginBase.MainForm.GetThemeColor(colorId);
97+
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = Color.Blue;
98+
99+
if (textColor != Color.Empty) ForeColorRequest = textColor;
100+
else ForeColorRequest = SystemColors.ControlText;
101101

102102
// hook for plugins
103103
if (OnFileNodeRefresh != null) OnFileNodeRefresh(this);

‎FlashDevelop/Bin/Debug/Settings/Themes/CURRENT‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,157 @@
11
# FD UI THEME (5.0+)
22

3+
# Bright, Default, Dim, Dark, Darker, Black
4+
ImageManager.ImageSet=Default
5+
6+
# Default, Large
7+
VS2005DockPaneStrip.TabSize=Default
8+
9+
# Default, Block, Rect
10+
VS2005DockPaneStrip.TabStyle=Default
11+
12+
# Default, Underlined
13+
VS2005AutoHideStrip.TabStyle=Default
14+
VS2005AutoHideStrip.TabUnderlineColor=#ff0000
15+
16+
# Default (Hover), Click
17+
DockPanel.ShowAutoHideContentOn=Hover
18+
19+
#ToolStrip.BorderColor=#ff0000
20+
#DockWindow.BorderColor=#ff0000
21+
#DockPanelControl.BorderColor=#ff0000
22+
#ToolStripSeparator.ForeColor=#00ff00
23+
24+
#ToolStripItem.ArrowColor=#ff0000
25+
#ToolStripItem.TextColor=#0000ff
26+
27+
#VS2005DockPaneCaption.BorderColor=#ff0000
28+
#VS2005DockPaneStrip.DocTabActiveBorder=#ff0000
29+
#VS2005DockPaneStrip.DocTabInactiveBorder=#0000ff
30+
#VS2005DockPaneStrip.ToolBorderColor=#ff0000
31+
32+
#ToolStripMenu.TitleBackColor=#ff00ff
33+
#ToolStripMenu.TitleBorderColor=#0000ff
34+
#ToolStripMenu.SeparatorColor=#00ff00
35+
#ToolStripMenu.DropDownBackColor=#0000ff
36+
#ToolStripMenu.DropDownBorderColor=#0000ff
37+
#ToolStripMenu.MarginBorderColor=#ff0000
38+
#ToolStripMenu.MarginBackColor=#ff0000
39+
#ToolStripMenu.BorderColor=#ff00ff
40+
#ToolStripMenu.BackColor=#0000ff
41+
42+
ProjectTreeView.ForeColor.Library=#0000FF
43+
ProjectTreeView.ForeColor.ExternalLibrary=#00008B
44+
ProjectTreeView.ForeColor.IncludedLibrary=#008B8B
45+
346
# FD UI THEME (4.3+)
47+
48+
### EDIT CONTROLS
49+
50+
ListBox.ForeColor=#000000
51+
ListBox.BackColor=#FFFFFF
52+
53+
TextBox.ForeColor=#000000
54+
TextBox.BackColor=#FFFFFF
55+
56+
ListView.ForeColor=#000000
57+
ListView.BackColor=#FFFFFF
58+
59+
RichTextBox.ForeColor=#000000
60+
RichTextBox.BackColor=#FFFFFF
61+
62+
FixedTreeView.ForeColor=#000000
63+
FixedTreeView.BackColor=#FFFFFF
64+
65+
TreeView.ForeColor=#000000
66+
TreeView.BackColor=#FFFFFF
67+
68+
TreeNode.ForeColor=#000000
69+
TreeNode.BackColor=#FFFFFF
70+
71+
ProjectTreeView.ForeColor=#000000
72+
ProjectTreeView.BackColor=#FFFFFF
73+
74+
DataTreeControl.ForeColor=#000000
75+
DataTreeControl.BackColor=#FFFFFF
76+
77+
DataGridView.ForeColor=#000000
78+
DataGridView.BackColor=#FFFFFF
79+
DataGridView.BackgroundColor=#FFFFFF
80+
81+
TreeViewAdv.ForeColor=#000000
82+
TreeViewAdv.BackColor=#FFFFFF
83+
84+
RichToolTip.ForeColor=#000000
85+
RichToolTip.BackColor=#FFFFE1
86+
87+
CompletionList.ForeColor=#000000
88+
CompletionList.BackColor=#FFFFFF
89+
90+
MessageBar.ForeColor=#000000
91+
MessageBar.BackColor=#FFFFE1
92+
93+
Panel.ForeColor=#000000
94+
Panel.BackColor=#FFFFFF
95+
96+
### MAIN INTERFACE
97+
98+
QuickFind.ForeColor=#000000
99+
QuickFind.BackColor=#F0F0F0
100+
101+
SplitterControl.BackColor=#F0F0F0
102+
SplitContainer.BackColor=#F0F0F0
103+
SplitterPanel.BackColor=#F0F0F0
104+
105+
LinkLabel.ForeColor=#000000
106+
LinkLabel.BackColor=#F0F0F0
107+
108+
### MENUS AND TOOLBARS
109+
110+
TreeBar.ForeColor=#000000
111+
TreeBar.BackColor=#F0F0F0
112+
113+
StatusStrip.ForeColor=#000000
114+
StatusStrip.BackColor=#F0F0F0
115+
116+
MenuStrip.ForeColor=#000000
117+
MenuStrip.BackColor=#F2F2F2
118+
119+
ToolStrip.ForeColor=#000000
120+
ToolStrip.BackColor=#FBFBFB
121+
ToolStrip.3dLightColor=#FFFFFF
122+
ToolStrip.3dDarkColor=#BDBDBD
123+
124+
#ToolStripItem.BackColor=#E4EFFA
125+
#ToolStripItem.BorderColor=#83AAD1
126+
127+
ToolStripComboBoxControl.ForeColor=#000000
128+
ToolStripComboBoxControl.BackColor=#FFFFFF
129+
130+
ToolStripTextBoxControl.ForeColor=#000000
131+
ToolStripTextBoxControl.BackColor=#FFFFFF
132+
133+
### DOCK SYSTEM
134+
135+
DockPanel.BackColor=#A0A0A0
136+
137+
AutoHideWindowControl.ForeColor=#FF0000
138+
AutoHideWindowControl.BackColor=#F0F0F0
139+
140+
VS2005DockPaneCaption.ForeColor=#000000
141+
VS2005DockPaneCaption.BackColor=#CCC7BA
142+
VS2005DockPaneCaption.TabGradientStart=#A8C2DD
143+
VS2005DockPaneCaption.TabGradientEnd=#9BB6D3
144+
145+
VS2005DockPaneStrip.ForeColor=#333333
146+
VS2005DockPaneStrip.TabForeColor=#000000
147+
VS2005DockPaneStrip.DocBackColor=#E4E2D5
148+
VS2005DockPaneStrip.ToolBackColor=#F0F0F0
149+
VS2005DockPaneStrip.ToolActiveBackColor=#FFFFFF
150+
VS2005DockPaneStrip.DocActiveBackColor=#FFFFFF
151+
VS2005DockPaneStrip.DocInactiveBackColor=#F0F0F0
152+
VS2005DockPaneStrip.TabSeparatorColor=#F0EFF3
153+
VS2005DockPaneStrip.TabStripColor=#FFBE3C
154+
155+
VS2005AutoHideStrip.ForeColor=#333333
156+
VS2005AutoHideStrip.BackColor=#F0F0F0
157+
VS2005AutoHideStrip.BorderColor=#A0A0A0

‎FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ DockPanel.ShowAutoHideContentOn=Hover
3939
#ToolStripMenu.BorderColor=#ff00ff
4040
#ToolStripMenu.BackColor=#0000ff
4141

42+
ProjectTreeView.ForeColor.Library=#0000FF
43+
ProjectTreeView.ForeColor.ExternalLibrary=#00008B
44+
ProjectTreeView.ForeColor.IncludedLibrary=#008B8B
45+
4246
# FD UI THEME (4.3+)
4347

4448
### EDIT CONTROLS

‎FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ DockPanel.ShowAutoHideContentOn=Hover
3939
#ToolStripMenu.BorderColor=#ff00ff
4040
#ToolStripMenu.BackColor=#0000ff
4141

42+
ProjectTreeView.ForeColor.Library=#0000FF
43+
ProjectTreeView.ForeColor.ExternalLibrary=#00008B
44+
ProjectTreeView.ForeColor.IncludedLibrary=#008B8B
45+
4246
# FD UI THEME (4.3+)
4347

4448
### EDIT CONTROLS

‎FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ ToolStripMenu.MarginBackColor=#B2B2B2
3939
ToolStripMenu.BorderColor=#5C676D
4040
ToolStripMenu.BackColor=#E4E9E8
4141

42+
ProjectTreeView.ForeColor.Library=#0000FF
43+
ProjectTreeView.ForeColor.ExternalLibrary=#00008B
44+
ProjectTreeView.ForeColor.IncludedLibrary=#008B8B
45+
4246
# FD UI THEME (4.3+)
4347

4448
### EDIT CONTROLS

‎FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ ToolStripMenu.MarginBackColor=#CBC8C5
3939
ToolStripMenu.BorderColor=#696463
4040
ToolStripMenu.BackColor=#DFDEDB
4141

42+
ProjectTreeView.ForeColor.Library=#0000FF
43+
ProjectTreeView.ForeColor.ExternalLibrary=#00008B
44+
ProjectTreeView.ForeColor.IncludedLibrary=#008B8B
45+
4246
# FD UI THEME (4.3+)
4347

4448
### EDIT CONTROLS

0 commit comments

Comments
 (0)