Skip to content

Commit a945130

Browse files
HirogenHirogen
authored
Merge pull request #364 from RandallFlagg/dockpanelsuite
Replaced the WinFormsUI source code with the NuGet version
2 parents 4f05327 + ec8c61a commit a945130

File tree

84 files changed

+23
-19072
lines changed

Some content is hidden

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

84 files changed

+23
-19072
lines changed

‎src/Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<ItemGroup>
88
<PackageVersion Include="chocolatey" Version="2.4.1" />
99
<PackageVersion Include="CsvHelper" Version="33.0.1" />
10+
<PackageVersion Include="DockPanelSuite" Version="3.1.1" />
11+
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
1012
<PackageVersion Include="GitVersion.CommandLine" Version="5.12.0" />
1113
<PackageVersion Include="GitVersion.Core" Version="6.1.0" />
1214
<PackageVersion Include="Google.Protobuf" Version="3.30.1" />

‎src/LogExpert.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlassfishColumnizer", "Glas
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlashIconHighlighter", "FlashIconHighlighter\FlashIconHighlighter.csproj", "{F5E81EBE-3E6F-409F-B510-918E97F59072}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormsUI", "WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
25-
EndProject
2624
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE6375A4-B4C4-4620-8FFB-B9D5A4E21144}"
2725
ProjectSection(SolutionItems) = preProject
2826
Solution Items\AssemblyVersion.cs = Solution Items\AssemblyVersion.cs
@@ -93,10 +91,6 @@ Global
9391
{F5E81EBE-3E6F-409F-B510-918E97F59072}.Debug|Any CPU.Build.0 = Debug|Any CPU
9492
{F5E81EBE-3E6F-409F-B510-918E97F59072}.Release|Any CPU.ActiveCfg = Release|Any CPU
9593
{F5E81EBE-3E6F-409F-B510-918E97F59072}.Release|Any CPU.Build.0 = Release|Any CPU
96-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
98-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
99-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
10094
{4C899885-E361-410A-B6AC-C2F236C436FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10195
{4C899885-E361-410A-B6AC-C2F236C436FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
10296
{4C899885-E361-410A-B6AC-C2F236C436FA}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,24 +237,24 @@ public void ChangeTheme(Control.ControlCollection container)
237237
}
238238

239239
// Tabs line
240-
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
241-
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
242-
243-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
244-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
240+
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
241+
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
242+
243+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
244+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
245245

246246
// Tabs
247-
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
248-
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
249-
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
250-
251-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
252-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
253-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
254-
255-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = ColorMode.InactiveTabColor;
256-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = ColorMode.InactiveTabColor;
257-
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = ColorMode.ForeColor;
247+
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
248+
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
249+
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
250+
251+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
252+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
253+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
254+
255+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = ColorMode.InactiveTabColor;
256+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = ColorMode.InactiveTabColor;
257+
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = ColorMode.ForeColor;
258258
#endregion Tabs
259259
}
260260
#endregion

‎src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
using LogExpert.Config;
99
using LogExpert.Entities;
1010
using LogExpert.Entities.EventArgs;
11-
1211
using System;
1312
using System.Collections.Generic;
1413
using System.Drawing;
1514
using System.IO;
1615
using System.Text;
1716
using System.Threading.Tasks;
1817
using System.Windows.Forms;
19-
//using System.Linq;
2018

2119
namespace LogExpert.Controls.LogWindow
2220
{

‎src/LogExpert/LogExpert.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
</Content>
7777
</ItemGroup>
7878
<ItemGroup>
79+
<PackageReference Include="DockPanelSuite" />
80+
<PackageReference Include="DockPanelSuite.ThemeVS2015" />
7981
<PackageReference Include="Grpc.AspNetCore" />
8082
<PackageReference Include="Google.Protobuf" />
8183
<PackageReference Include="Grpc.Core" />
@@ -87,7 +89,6 @@
8789
<ItemGroup>
8890
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
8991
<ProjectReference Include="..\LogexpertgRPCService\LogexpertgRPCService.csproj" />
90-
<ProjectReference Include="..\WinFormsUI\WinFormsUI.csproj" />
9192
</ItemGroup>
9293
<ItemGroup>
9394
<Compile Remove="DebugWindow.Designer.cs" />

0 commit comments

Comments
 (0)