Skip to content

Commit 8fba5b8

Browse files
HirogenHirogen
authored
Merge pull request #371 from LogExperts/decouple_ui_businesslogic
new project structure - new project for resources - new project for UI elements
2 parents a945130 + 6959b30 commit 8fba5b8

Some content is hidden

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

72 files changed

+1401
-1459
lines changed

‎src/Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
2929
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
3030
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
31+
<PackageVersion Include="System.Drawing.Common" Version="9.0.3" />
32+
<PackageVersion Include="System.Resources.Extensions" Version="9.0.3" />
3133
<PackageVersion Include="System.Text.Encoding" Version="4.3.0" />
3234
</ItemGroup>
3335
</Project>

‎src/LogExpert.sln

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegexColumnizer.UnitTests",
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogexpertgRPCService", "LogexpertgRPCService\LogexpertgRPCService.csproj", "{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}"
5959
EndProject
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Core", "Logexpert.Core\LogExpert.Core.csproj", "{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}"
61+
EndProject
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Resources", "Logexpert.Resources\LogExpert.Resources.csproj", "{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.UI", "Logexpert.UI\LogExpert.UI.csproj", "{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}"
65+
EndProject
6066
Global
6167
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6268
Debug|Any CPU = Debug|Any CPU
@@ -133,6 +139,18 @@ Global
133139
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
134140
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
135141
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Release|Any CPU.Build.0 = Release|Any CPU
146+
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147+
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
148+
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
149+
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Release|Any CPU.Build.0 = Release|Any CPU
150+
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151+
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
152+
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
153+
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Release|Any CPU.Build.0 = Release|Any CPU
136154
EndGlobalSection
137155
GlobalSection(SolutionProperties) = preSolution
138156
HideSolutionNode = FALSE

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using LogExpert.Config;
22
using LogExpert.Dialogs;
33
using LogExpert.Entities;
4-
using LogExpert.Entities.EventArgs;
54
using LogExpert.Extensions.Forms;
65
using LogExpert.Interface;
76

@@ -150,7 +149,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum
150149
// get a list of resource names from the manifest
151150
string[] resNames = a.GetManifestResourceNames();
152151

153-
Bitmap bmp = Properties.Resources.Deceased;
152+
Bitmap bmp = Resources.Resources.Deceased;
154153
_deadIcon = Icon.FromHandle(bmp.GetHicon());
155154
bmp.Dispose();
156155
Closing += OnLogTabWindowClosing;
@@ -239,19 +238,19 @@ public void ChangeTheme(Control.ControlCollection container)
239238
// Tabs line
240239
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
241240
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
242-
241+
243242
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
244243
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;
245244

246245
// Tabs
247246
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
248247
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
249248
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
250-
249+
251250
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
252251
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
253252
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;
254-
253+
255254
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = ColorMode.InactiveTabColor;
256255
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = ColorMode.InactiveTabColor;
257256
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = ColorMode.ForeColor;

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

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,10 @@ private void OnTabRenameToolStripMenuItemClick(object sender, EventArgs e)
10041004
{
10051005
if (CurrentLogWindow != null)
10061006
{
1007-
TabRenameDlg dlg = new();
1008-
dlg.TabName = CurrentLogWindow.Text;
1007+
TabRenameDialog dlg = new()
1008+
{
1009+
TabName = CurrentLogWindow.Text
1010+
};
10091011
if (DialogResult.OK == dlg.ShowDialog())
10101012
{
10111013
CurrentLogWindow.Text = dlg.TabName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
228228
dataGridView.EditModeMenuStrip = editModeContextMenuStrip;
229229
markEditModeToolStripMenuItem.Enabled = true;
230230

231-
_panelOpenButtonImage = Properties.Resources.Arrow_menu_open;
232-
_panelCloseButtonImage = Properties.Resources.Arrow_menu_close;
231+
_panelOpenButtonImage = Resources.Resources.Arrow_menu_open;
232+
_panelCloseButtonImage = Resources.Resources.Arrow_menu_close;
233233

234234
Settings settings = ConfigManager.Settings;
235235

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

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

0 commit comments

Comments
 (0)