Server Monitor window now stores it's location.

This commit is contained in:
Brett Hewitson 2021-12-09 20:33:14 +10:00
parent 77cac3329a
commit 72a0c342c3
14 changed files with 110 additions and 12 deletions

View file

@ -843,6 +843,12 @@
<setting name="AllowDiscordStop" serializeAs="String">
<value>True</value>
</setting>
<setting name="ServerMonitorWindow_Left" serializeAs="String">
<value>50</value>
</setting>
<setting name="ServerMonitorWindow_Top" serializeAs="String">
<value>50</value>
</setting>
</ServerManagerTool.Config>
</userSettings>
</configuration>

View file

@ -2962,5 +2962,29 @@ namespace ServerManagerTool {
this["AllowDiscordStop"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("50")]
public double ServerMonitorWindow_Left {
get {
return ((double)(this["ServerMonitorWindow_Left"]));
}
set {
this["ServerMonitorWindow_Left"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("50")]
public double ServerMonitorWindow_Top {
get {
return ((double)(this["ServerMonitorWindow_Top"]));
}
set {
this["ServerMonitorWindow_Top"] = value;
}
}
}
}

View file

@ -818,5 +818,11 @@
<Setting Name="AllowDiscordStop" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ServerMonitorWindow_Left" Type="System.Double" Scope="User">
<Value Profile="(Default)">50</Value>
</Setting>
<Setting Name="ServerMonitorWindow_Top" Type="System.Double" Scope="User">
<Value Profile="(Default)">50</Value>
</Setting>
</Settings>
</SettingsFile>

View file

@ -33,6 +33,7 @@
<br/>
<ul>
<li>Global Settings - Added reset button to the Data Directory Location.</li>
<li>Server Monitor window now stores it's location.</li>
<li>pt-BR Translation file updated.</li>
<li>ru-RU Translation file updated.</li>
<li>zh-CN Translation file updated.</li>

View file

@ -19,6 +19,7 @@
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Server Monitor window now stores it's location.</li>
<li>Reference library updates.</li>
<li>pt-BR Translation file updated.</li>
<li>ru-RU Translation file updated.</li>

View file

@ -10,7 +10,7 @@
xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
mc:Ignorable="d"
MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
<Window.Resources>
<ResourceDictionary>

View file

@ -53,6 +53,8 @@ namespace ServerManagerTool.Windows
SetWindowTitle();
this.Left = Config.Default.ServerMonitorWindow_Left;
this.Top = Config.Default.ServerMonitorWindow_Top;
this.Height = Config.Default.ServerMonitorWindow_Height;
this.Width = Config.Default.ServerMonitorWindow_Width;
@ -86,7 +88,7 @@ namespace ServerManagerTool.Windows
set { SetValue(IsStandAloneWindowProperty, value); }
}
private void Window_Loaded(object sender, RoutedEventArgs e)
private void ServerMonitorWindow_Loaded(object sender, RoutedEventArgs e)
{
if (ServerManager == null)
{
@ -120,12 +122,16 @@ namespace ServerManagerTool.Windows
}
}
private void Window_Closed(object sender, EventArgs e)
private void ServerMonitorWindow_LocationChanged(object sender, EventArgs e)
{
this.Activate();
if (this.WindowState == WindowState.Normal)
{
Config.Default.ServerMonitorWindow_Left = Math.Max(0D, this.Left);
Config.Default.ServerMonitorWindow_Top = Math.Max(0D, this.Top);
}
}
private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
private void ServerMonitorWindow_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (this.WindowState != WindowState.Minimized)
{
@ -134,7 +140,7 @@ namespace ServerManagerTool.Windows
}
}
private void Window_StateChanged(object sender, EventArgs e)
private void ServerMonitorWindow_StateChanged(object sender, EventArgs e)
{
if (IsStandAloneWindow && Config.Default.MainWindow_MinimizeToTray && this.WindowState == WindowState.Minimized)
{
@ -142,6 +148,11 @@ namespace ServerManagerTool.Windows
}
}
private void Window_Closed(object sender, EventArgs e)
{
this.Activate();
}
protected override void OnClosing(CancelEventArgs e)
{
if (this.OwnedWindows.OfType<ProgressWindow>().Any())

View file

@ -609,6 +609,12 @@
<setting name="AllowDiscordStop" serializeAs="String">
<value>True</value>
</setting>
<setting name="ServerMonitorWindow_Left" serializeAs="String">
<value>50</value>
</setting>
<setting name="ServerMonitorWindow_Top" serializeAs="String">
<value>50</value>
</setting>
</ServerManagerTool.Config>
</userSettings>
</configuration>

View file

@ -2115,5 +2115,29 @@ namespace ServerManagerTool {
this["AllowDiscordStop"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("50")]
public double ServerMonitorWindow_Left {
get {
return ((double)(this["ServerMonitorWindow_Left"]));
}
set {
this["ServerMonitorWindow_Left"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("50")]
public double ServerMonitorWindow_Top {
get {
return ((double)(this["ServerMonitorWindow_Top"]));
}
set {
this["ServerMonitorWindow_Top"] = value;
}
}
}
}

View file

@ -584,5 +584,11 @@
<Setting Name="AllowDiscordStop" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ServerMonitorWindow_Left" Type="System.Double" Scope="User">
<Value Profile="(Default)">50</Value>
</Setting>
<Setting Name="ServerMonitorWindow_Top" Type="System.Double" Scope="User">
<Value Profile="(Default)">50</Value>
</Setting>
</Settings>
</SettingsFile>

View file

@ -32,6 +32,7 @@
<br/>
<ul>
<li>Global Settings - Added reset button to the Data Directory Location.</li>
<li>Server Monitor window now stores it's location.</li>
</ul>
</p>
</div>

View file

@ -19,6 +19,7 @@
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Server Monitor window now stores it's location.</li>
<li>Reference library updates.</li>
</ul>
</p>

View file

@ -10,7 +10,7 @@
xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
mc:Ignorable="d"
MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
<Window.Resources>
<ResourceDictionary>

View file

@ -53,6 +53,8 @@ namespace ServerManagerTool.Windows
SetWindowTitle();
this.Left = Config.Default.ServerMonitorWindow_Left;
this.Top = Config.Default.ServerMonitorWindow_Top;
this.Height = Config.Default.ServerMonitorWindow_Height;
this.Width = Config.Default.ServerMonitorWindow_Width;
@ -86,7 +88,7 @@ namespace ServerManagerTool.Windows
set { SetValue(IsStandAloneWindowProperty, value); }
}
private void Window_Loaded(object sender, RoutedEventArgs e)
private void ServerMonitorWindow_Loaded(object sender, RoutedEventArgs e)
{
if (ServerManager == null)
{
@ -120,12 +122,16 @@ namespace ServerManagerTool.Windows
}
}
private void Window_Closed(object sender, EventArgs e)
private void ServerMonitorWindow_LocationChanged(object sender, EventArgs e)
{
this.Activate();
if (this.WindowState == WindowState.Normal)
{
Config.Default.ServerMonitorWindow_Left = Math.Max(0D, this.Left);
Config.Default.ServerMonitorWindow_Top = Math.Max(0D, this.Top);
}
}
private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
private void ServerMonitorWindow_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (this.WindowState != WindowState.Minimized)
{
@ -134,7 +140,7 @@ namespace ServerManagerTool.Windows
}
}
private void Window_StateChanged(object sender, EventArgs e)
private void ServerMonitorWindow_StateChanged(object sender, EventArgs e)
{
if (IsStandAloneWindow && Config.Default.MainWindow_MinimizeToTray && this.WindowState == WindowState.Minimized)
{
@ -142,6 +148,11 @@ namespace ServerManagerTool.Windows
}
}
private void Window_Closed(object sender, EventArgs e)
{
this.Activate();
}
protected override void OnClosing(CancelEventArgs e)
{
if (this.OwnedWindows.OfType<ProgressWindow>().Any())