Improvements

- Update to .NET 10
- Set actual window title to window name
- Add new way to identify other windows
This commit is contained in:
2026-02-24 17:11:21 -05:00
parent 72ddd0ad88
commit e2236ddc16
11 changed files with 91 additions and 117 deletions

View File

@@ -1,6 +1,5 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
using System.Windows;

View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
@@ -14,7 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ChrisKaczor.Wpf.Application.StartWithWindows" Version="1.0.5" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
</Project>

View File

@@ -41,36 +41,24 @@ internal class WindowSource1 : IWindowSource, IDisposable
public Guid Id => Guid.Parse("0329D04D-B89B-4FEC-AFD0-4CB972E47FC8");
public string Name
{
get { return "Test Window 1"; }
}
public string Name => "Test Window 1";
public System.Drawing.Icon Icon
{
get { return Properties.Resources.ApplicationIcon; }
}
public System.Drawing.Icon Icon => Properties.Resources.ApplicationIcon;
public bool HasSettingsMenu
{
get { return true; }
}
public bool HasSettingsMenu => true;
public bool HasAboutMenu => true;
public void ShowAbout()
{
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly().GetName().Version.ToString());
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly()?.GetName().Version?.ToString());
}
public void ShowSettings()
{
}
public bool HasRefreshMenu
{
get { return true; }
}
public bool HasRefreshMenu => true;
public void Refresh()
{
@@ -78,7 +66,7 @@ internal class WindowSource1 : IWindowSource, IDisposable
public string WindowSettings
{
get { return Properties.Settings.Default.WindowSettings1; }
get => Properties.Settings.Default.WindowSettings1;
set
{
Properties.Settings.Default.WindowSettings1 = value;

View File

@@ -41,36 +41,24 @@ internal class WindowSource2 : IWindowSource, IDisposable
public Guid Id => Guid.Parse("F42F92BC-D397-497A-8E01-E71D084BEDB6");
public string Name
{
get { return "Test Window 2"; }
}
public string Name => "Test Window 2";
public System.Drawing.Icon Icon
{
get { return Properties.Resources.ApplicationIcon; }
}
public System.Drawing.Icon Icon => Properties.Resources.ApplicationIcon;
public bool HasSettingsMenu
{
get { return true; }
}
public bool HasSettingsMenu => true;
public bool HasAboutMenu => true;
public void ShowAbout()
{
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly().GetName().Version.ToString());
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly()?.GetName().Version?.ToString());
}
public void ShowSettings()
{
}
public bool HasRefreshMenu
{
get { return true; }
}
public bool HasRefreshMenu => true;
public void Refresh()
{
@@ -78,7 +66,7 @@ internal class WindowSource2 : IWindowSource, IDisposable
public string WindowSettings
{
get { return Properties.Settings.Default.WindowSettings2; }
get => Properties.Settings.Default.WindowSettings2;
set
{
Properties.Settings.Default.WindowSettings2 = value;

View File

@@ -41,36 +41,24 @@ internal class WindowSource3 : IWindowSource, IDisposable
public Guid Id => Guid.Parse("CF7466DF-8980-452B-B2FA-290B26204BF2");
public string Name
{
get { return "Test Window 3"; }
}
public string Name => "Test Window 3";
public System.Drawing.Icon Icon
{
get { return Properties.Resources.ApplicationIcon; }
}
public System.Drawing.Icon Icon => Properties.Resources.ApplicationIcon;
public bool HasSettingsMenu
{
get { return true; }
}
public bool HasSettingsMenu => true;
public bool HasAboutMenu => true;
public void ShowAbout()
{
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly().GetName().Version.ToString());
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly()?.GetName().Version?.ToString());
}
public void ShowSettings()
{
}
public bool HasRefreshMenu
{
get { return true; }
}
public bool HasRefreshMenu => true;
public void Refresh()
{
@@ -78,7 +66,7 @@ internal class WindowSource3 : IWindowSource, IDisposable
public string WindowSettings
{
get { return Properties.Settings.Default.WindowSettings3; }
get => Properties.Settings.Default.WindowSettings3;
set
{
Properties.Settings.Default.WindowSettings3 = value;

View File

@@ -41,36 +41,24 @@ internal class WindowSource4 : IWindowSource, IDisposable
public Guid Id => Guid.Parse("0DD89F7E-3AD4-4226-8CBD-B75C8EBEEF32");
public string Name
{
get { return "Test Window 4"; }
}
public string Name => "Test Window 4";
public System.Drawing.Icon Icon
{
get { return Properties.Resources.ApplicationIcon; }
}
public System.Drawing.Icon Icon => Properties.Resources.ApplicationIcon;
public bool HasSettingsMenu
{
get { return true; }
}
public bool HasSettingsMenu => true;
public bool HasAboutMenu => true;
public void ShowAbout()
{
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly().GetName().Version.ToString());
_floatingStatusWindow.SetText(Assembly.GetEntryAssembly()?.GetName().Version?.ToString());
}
public void ShowSettings()
{
}
public bool HasRefreshMenu
{
get { return true; }
}
public bool HasRefreshMenu => true;
public void Refresh()
{
@@ -78,7 +66,7 @@ internal class WindowSource4 : IWindowSource, IDisposable
public string WindowSettings
{
get { return Properties.Settings.Default.WindowSettings4; }
get => Properties.Settings.Default.WindowSettings4;
set
{
Properties.Settings.Default.WindowSettings4 = value;