Skip to content

Commit 9b0fea3

Browse files
BornToBeRootBornToBeRoot
committed
Feature: Redesign Status Window
1 parent fcb00a4 commit 9b0fea3

File tree

5 files changed

+157
-44
lines changed

5 files changed

+157
-44
lines changed

‎Source/NETworkManager.Converters/TimeToStrokeDashOffsetConverter.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
5+
namespace NETworkManager.Converters;
6+
7+
/// <summary>
8+
/// Converts <c>Time</c> (values[0]) and <c>TimeMax</c> (values[1]) into a <see cref="double" />
9+
/// stroke dash offset for a circular countdown ring. <c>ConverterParameter</c> must be the full
10+
/// circumference of the ring in <c>StrokeDashArray</c> units (circumference / StrokeThickness).
11+
/// </summary>
12+
public sealed class TimeToStrokeDashOffsetConverter : IMultiValueConverter
13+
{
14+
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
15+
{
16+
if (parameter is not string circumferenceStr ||
17+
!double.TryParse(circumferenceStr, NumberStyles.Float, CultureInfo.InvariantCulture,
18+
out var circumference))
19+
return 0.0;
20+
21+
if (values.Length < 2 ||
22+
values[0] is not double time ||
23+
values[1] is not double timeMax ||
24+
timeMax == 0 ||
25+
time <= 0)
26+
return circumference + 1.0;
27+
28+
var progress = (double)time / timeMax;
29+
30+
return (1.0 - progress) * circumference;
31+
}
32+
33+
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
34+
{
35+
throw new NotImplementedException();
36+
}
37+
}

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

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

‎Source/NETworkManager.Localization/Resources/Strings.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3998,4 +3998,10 @@ You can copy your profile files from “{0}” to “{1}” to migrate your exis
39983998

39993999
You can copy your profile files from “{0}” to “{1}” to migrate your existing profiles, if necessary. The application must be closed for this to prevent the profiles from being overwritten.</value>
40004000
</data>
4001+
<data name="NetworkConnection" xml:space="preserve">
4002+
<value>Network connection</value>
4003+
</data>
4004+
<data name="NetworkStatus" xml:space="preserve">
4005+
<value>Network Status</value>
4006+
</data>
40014007
</root>

‎Source/NETworkManager/StatusWindow.xaml‎

Lines changed: 71 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,88 @@
88
xmlns:resources="clr-namespace:NETworkManager.Properties"
99
xmlns:networkManager="clr-namespace:NETworkManager"
1010
xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
11+
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1112
mc:Ignorable="d" d:DataContext="{d:DesignInstance networkManager:StatusWindow}"
12-
Title="{x:Static resources:Resources.NETworkManager_ProjectName}"
13+
TitleAlignment="Left"
1314
Style="{DynamicResource DefaultWindow}"
14-
Deactivated="MetroWindow_Deactivated"
15-
Height="280" Width="950"
15+
Deactivated="MetroWindow_Deactivated"
1616
Topmost="True"
1717
ShowInTaskbar="False"
18+
Width="950"
19+
Height="241"
1820
ResizeMode="NoResize"
1921
IsWindowDraggable="False"
2022
ShowMinButton="False"
2123
ShowMaxRestoreButton="False"
22-
ShowCloseButton="False"
23-
ShowTitleBar="False"
24+
ShowCloseButton="True"
25+
ShowTitleBar="True"
2426
Closing="MetroWindow_Closing">
2527
<mah:MetroWindow.Resources>
2628
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
29+
<converters:TimeToStrokeDashOffsetConverter x:Key="TimeToStrokeDashOffsetConverter" />
2730
</mah:MetroWindow.Resources>
28-
<Grid Margin="10">
29-
<Grid>
30-
<Grid.RowDefinitions>
31-
<RowDefinition Height="*" />
32-
<RowDefinition Height="10" />
33-
<RowDefinition Height="Auto" />
34-
</Grid.RowDefinitions>
35-
<ContentControl x:Name="ContentControlNetworkConnection" Grid.Row="0" />
36-
<Grid Grid.Row="2">
37-
<Grid.ColumnDefinitions>
38-
<ColumnDefinition Width="*" />
39-
<ColumnDefinition Width="10" />
40-
<ColumnDefinition Width="Auto" />
41-
</Grid.ColumnDefinitions>
42-
<mah:MetroProgressBar Grid.Column="0" Minimum="0" Maximum="{Binding TimeMax}" Value="{Binding Time}"
43-
Visibility="{Binding ShowTime, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
44-
VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="150" />
45-
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
46-
<Button Content="{x:Static localization:Strings.Reload}" Command="{Binding ReloadCommand}"
47-
Style="{StaticResource DefaultButton}" Margin="0,0,10,0" />
48-
<Button Content="{x:Static localization:Strings.Show}" Command="{Binding ShowMainWindowCommand}"
49-
Style="{StaticResource DefaultButton}" Margin="0,0,10,0" />
50-
<Button Content="{x:Static localization:Strings.Close}" Command="{Binding CloseCommand}"
51-
Style="{StaticResource DefaultButton}" />
52-
</StackPanel>
31+
<mah:MetroWindow.LeftWindowCommands>
32+
<mah:WindowCommands ShowSeparators="False">
33+
<!-- Countdown progress ring -->
34+
<Grid Width="20" Height="20"
35+
Visibility="{Binding ShowTime, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
36+
VerticalAlignment="Center"
37+
Margin="10,0,0,0">
38+
<!-- Track (background ring) -->
39+
<Ellipse StrokeThickness="2.5"
40+
Stroke="{DynamicResource MahApps.Brushes.Accent}"
41+
Opacity="0.2" />
42+
<!-- Foreground arc that shrinks as time counts down -->
43+
<Ellipse StrokeThickness="2.5"
44+
Stroke="{DynamicResource MahApps.Brushes.Accent}"
45+
StrokeDashCap="Round"
46+
StrokeDashArray="22 100"
47+
RenderTransformOrigin="0.5,0.5">
48+
<Ellipse.RenderTransform>
49+
<RotateTransform Angle="-90" />
50+
</Ellipse.RenderTransform>
51+
<Ellipse.StrokeDashOffset>
52+
<MultiBinding Converter="{StaticResource TimeToStrokeDashOffsetConverter}"
53+
ConverterParameter="22.0">
54+
<Binding Path="Time" />
55+
<Binding Path="TimeMax" />
56+
</MultiBinding>
57+
</Ellipse.StrokeDashOffset>
58+
</Ellipse>
5359
</Grid>
54-
</Grid>
55-
</Grid>
60+
</mah:WindowCommands>
61+
</mah:MetroWindow.LeftWindowCommands>
62+
<mah:MetroWindow.RightWindowCommands>
63+
<mah:WindowCommands ShowSeparators="False">
64+
<Button Command="{Binding Path=ReloadCommand}"
65+
ToolTip="{x:Static Member=localization:Strings.ToolTip_RunCommandWithHotKey}"
66+
Cursor="Hand"
67+
Focusable="False"
68+
Margin="0,0,5,0">
69+
<StackPanel Orientation="Horizontal">
70+
<Rectangle Width="16" Height="16"
71+
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
72+
<Rectangle.OpacityMask>
73+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
74+
</Rectangle.OpacityMask>
75+
</Rectangle>
76+
</StackPanel>
77+
</Button>
78+
<Button Command="{Binding Path=ShowMainWindowCommand}"
79+
ToolTip="{x:Static Member=localization:Strings.ToolTip_RunCommandWithHotKey}"
80+
Cursor="Hand"
81+
Focusable="False"
82+
Margin="0,0,5,0">
83+
<StackPanel Orientation="Horizontal">
84+
<Rectangle Width="16" Height="16"
85+
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
86+
<Rectangle.OpacityMask>
87+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=OpenInNew}" />
88+
</Rectangle.OpacityMask>
89+
</Rectangle>
90+
</StackPanel>
91+
</Button>
92+
</mah:WindowCommands>
93+
</mah:MetroWindow.RightWindowCommands>
94+
<ContentControl Margin="10,5,10,10" x:Name="ContentControlNetworkConnection" />
5695
</mah:MetroWindow>

‎Source/NETworkManager/StatusWindow.xaml.cs‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using NETworkManager.Views;
44
using System;
55
using System.ComponentModel;
6+
using System.Diagnostics;
67
using System.Runtime.CompilerServices;
8+
using System.Threading.Tasks;
79
using System.Windows.Forms;
810
using System.Windows.Input;
911
using System.Windows.Threading;
@@ -19,9 +21,11 @@ public StatusWindow(MainWindow mainWindow)
1921
InitializeComponent();
2022
DataContext = this;
2123

24+
Title = $"NETworkManager {AssemblyManager.Current.Version} - {Localization.Resources.Strings.NetworkStatus}";
25+
2226
_mainWindow = mainWindow;
2327

24-
_dispatcherTimerClose.Interval = new TimeSpan(0, 0, 0, 0, 250);
28+
_dispatcherTimerClose.Interval = TimeSpan.FromMilliseconds(16);
2529
_dispatcherTimerClose.Tick += DispatcherTimerTime_Tick;
2630

2731
_networkConnectionView = new NetworkConnectionWidgetView();
@@ -43,8 +47,8 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
4347

4448
#region Variables
4549

46-
// Set priority to make the ui smoother
47-
private readonly DispatcherTimer _dispatcherTimerClose = new(DispatcherPriority.Normal);
50+
private readonly DispatcherTimer _dispatcherTimerClose = new(DispatcherPriority.Render);
51+
private readonly Stopwatch _stopwatch = new();
4852

4953
private readonly MainWindow _mainWindow;
5054
private readonly NetworkConnectionWidgetView _networkConnectionView;
@@ -64,9 +68,9 @@ public bool ShowTime
6468
}
6569
}
6670

67-
private int _timeMax;
71+
private double _timeMax;
6872

69-
public int TimeMax
73+
public double TimeMax
7074
{
7175
get => _timeMax;
7276
private set
@@ -79,9 +83,9 @@ private set
7983
}
8084
}
8185

82-
private int _time;
86+
private double _time;
8387

84-
public int Time
88+
public double Time
8589
{
8690
get => _time;
8791
set
@@ -153,6 +157,8 @@ public void ShowWindow(bool enableCloseTimer = false)
153157
// Check the network connection
154158
Check();
155159

160+
enableCloseTimer = true;
161+
156162
// Close the window after a certain time
157163
if (enableCloseTimer)
158164
{
@@ -162,13 +168,16 @@ public void ShowWindow(bool enableCloseTimer = false)
162168

163169
// Focus the window
164170
Activate();
171+
172+
Debug.WriteLine(Height);
165173
}
166174

167175
private void SetupCloseTimer()
168176
{
169-
Time = SettingsManager.Current.Status_WindowCloseTime * 4;
170-
TimeMax = Time;
177+
TimeMax = SettingsManager.Current.Status_WindowCloseTime;
178+
Time = TimeMax;
171179

180+
_stopwatch.Restart();
172181
ShowTime = true;
173182
_dispatcherTimerClose.Start();
174183
}
@@ -189,18 +198,22 @@ private void MetroWindow_Closing(object sender, CancelEventArgs e)
189198
Hide();
190199
}
191200

192-
private void DispatcherTimerTime_Tick(object sender, EventArgs e)
201+
private async void DispatcherTimerTime_Tick(object sender, EventArgs e)
193202
{
194-
Time--;
203+
Time = Math.Max(0.0, TimeMax - _stopwatch.Elapsed.TotalSeconds);
195204

196205
if (Time > 0)
197206
return;
198207

199208
_dispatcherTimerClose.Stop();
209+
_stopwatch.Stop();
210+
211+
await Task.Delay(250);
212+
200213
ShowTime = false;
201214

202215
Hide();
203216
}
204217

205218
#endregion
206-
}
219+
}

0 commit comments

Comments
 (0)