Skip to content

Decouple UI businesslogic - Part 1 #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hirogen merged 4 commits into from
Mar 26, 2025
Merged

Decouple UI businesslogic - Part 1 #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ec920e
new projects for refactoring
Mar 26, 2025
884073f
resources are now their respective own project
Mar 26, 2025
469bd03
delete old about box
Mar 26, 2025
6959b30
rename dialog moved to LogExpert.UI
Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.3" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.3" />
<PackageVersion Include="System.Text.Encoding" Version="4.3.0" />
</ItemGroup>
</Project>
18 changes: 18 additions & 0 deletions src/LogExpert.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegexColumnizer.UnitTests",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogexpertgRPCService", "LogexpertgRPCService\LogexpertgRPCService.csproj", "{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Core", "Logexpert.Core\LogExpert.Core.csproj", "{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Resources", "Logexpert.Resources\LogExpert.Resources.csproj", "{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.UI", "Logexpert.UI\LogExpert.UI.csproj", "{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -133,6 +139,18 @@ Global
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.Build.0 = Release|Any CPU
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Release|Any CPU.Build.0 = Release|Any CPU
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}.Release|Any CPU.Build.0 = Release|Any CPU
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DB0B0F8-3C3E-4805-93A3-7E69AC45CD40}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 4 additions & 5 deletions src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using LogExpert.Config;
using LogExpert.Dialogs;
using LogExpert.Entities;
using LogExpert.Entities.EventArgs;
using LogExpert.Extensions.Forms;
using LogExpert.Interface;

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

Bitmap bmp = Properties.Resources.Deceased;
Bitmap bmp = Resources.Resources.Deceased;
_deadIcon = Icon.FromHandle(bmp.GetHicon());
bmp.Dispose();
Closing += OnLogTabWindowClosing;
Expand Down Expand Up @@ -239,19 +238,19 @@ public void ChangeTheme(Control.ControlCollection container)
// Tabs line
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;

dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = ColorMode.TabsBackgroundStripColor;
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = ColorMode.TabsBackgroundStripColor;

// Tabs
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;

dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = ColorMode.ActiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = ColorMode.ActiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = ColorMode.ForeColor;

dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = ColorMode.InactiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = ColorMode.InactiveTabColor;
dockPanel.Theme.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = ColorMode.ForeColor;
Expand Down
33 changes: 16 additions & 17 deletions src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,10 @@ private void OnTabRenameToolStripMenuItemClick(object sender, EventArgs e)
{
if (CurrentLogWindow != null)
{
TabRenameDlg dlg = new();
dlg.TabName = CurrentLogWindow.Text;
TabRenameDialog dlg = new()
{
TabName = CurrentLogWindow.Text
};
if (DialogResult.OK == dlg.ShowDialog())
{
CurrentLogWindow.Text = dlg.TabName;
Expand Down
4 changes: 2 additions & 2 deletions src/LogExpert/Controls/LogWindow/LogWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
dataGridView.EditModeMenuStrip = editModeContextMenuStrip;
markEditModeToolStripMenuItem.Enabled = true;

_panelOpenButtonImage = Properties.Resources.Arrow_menu_open;
_panelCloseButtonImage = Properties.Resources.Arrow_menu_close;
_panelOpenButtonImage = Resources.Resources.Arrow_menu_open;
_panelCloseButtonImage = Resources.Resources.Arrow_menu_close;

Settings settings = ConfigManager.Settings;

Expand Down
9 changes: 4 additions & 5 deletions src/LogExpert/Controls/LogWindow/LogWindow.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading