Skip to content

Commit ae99cf5

Browse files
authored
Merge pull request #26 from atc-net/feature/maintenance
Feature/maintenance
2 parents a41973c + 838ecb1 commit ae99cf5

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/Atc.Installer.Wpf.App/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
[assembly: AssemblyCompany("atc-net")]
66
[assembly: AssemblyProduct("Atc.Installer")]
77
[assembly: AssemblyTitle("Atc.Installer")]
8-
[assembly: AssemblyVersion("1.0.23.0")]
9-
[assembly: AssemblyInformationalVersion("1.0.23.0")]
10-
[assembly: AssemblyFileVersion("1.0.23.0")]
8+
[assembly: AssemblyVersion("1.0.24.0")]
9+
[assembly: AssemblyInformationalVersion("1.0.24.0")]
10+
[assembly: AssemblyFileVersion("1.0.24.0")]
1111
[assembly: System.Resources.NeutralResourcesLanguage("en")]
1212
[assembly: System.Runtime.Versioning.TargetPlatform("Windows8.0")]
1313
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows8.0")]

src/Atc.Installer.Wpf.App/Dialogs/ApplicationSettingsDialogViewModel.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ private void OkCommandHandler(
4848
if (file.Exists)
4949
{
5050
var dynamicJson = new DynamicJson(file);
51-
dynamicJson.SetValue("Application.Title", ApplicationOptions.Title);
52-
dynamicJson.SetValue("Application.Theme", ApplicationOptions.Theme);
53-
dynamicJson.SetValue("Application.OpenRecentConfigurationFileOnStartup", ApplicationOptions.OpenRecentFileOnStartup);
54-
dynamicJson.SetValue("Application.EnableEditingMode", ApplicationOptions.EnableEditingMode);
55-
dynamicJson.SetValue("Application.ShowOnlyBaseSettings", ApplicationOptions.ShowOnlyBaseSettings);
51+
dynamicJson.SetValue($"Application.{nameof(ApplicationOptions.Title)}", ApplicationOptions.Title);
52+
dynamicJson.SetValue($"Application.{nameof(ApplicationOptions.Theme)}", ApplicationOptions.Theme);
53+
dynamicJson.SetValue($"Application.{nameof(ApplicationOptions.OpenRecentFileOnStartup)}", ApplicationOptions.OpenRecentFileOnStartup);
54+
dynamicJson.SetValue($"Application.{nameof(ApplicationOptions.EnableEditingMode)}", ApplicationOptions.EnableEditingMode);
55+
dynamicJson.SetValue($"Application.{nameof(ApplicationOptions.ShowOnlyBaseSettings)}", ApplicationOptions.ShowOnlyBaseSettings);
5656
File.WriteAllText(file.FullName, dynamicJson.ToJson());
5757

5858
File.Copy(

src/Atc.Installer.Wpf.App/MainWindow.xaml.cs

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ private void OnLoaded(
2323
{
2424
var vm = DataContext as IMainWindowViewModel;
2525
vm!.OnLoaded(this, e);
26+
27+
if (MainWindowControl.Width >= SystemParameters.PrimaryScreenWidth ||
28+
MainWindowControl.Height >= SystemParameters.PrimaryScreenHeight)
29+
{
30+
vm.WindowState = WindowState.Maximized;
31+
}
2632
}
2733

2834
private void OnClosing(

0 commit comments

Comments
 (0)