StatusWindow update

BornToBeRoot · BornToBeRoot · commit f89e698f0822 · 2019-07-15T01:54:44.000+02:00
diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -1023,7 +1023,7 @@ private void InitNotifyIcon()
             }
 
             _notifyIcon.Text = Title;
-            // DISABLED IN RELEASE _notifyIcon.Click += NotifyIcon_Click;            
+            _notifyIcon.Click += NotifyIcon_Click;            
             _notifyIcon.MouseDown += NotifyIcon_MouseDown;
             _notifyIcon.Visible = SettingsManager.Current.TrayIcon_AlwaysShowIcon;
         }
@@ -1034,6 +1034,7 @@ private void NotifyIcon_MouseDown(object sender, System.Windows.Forms.MouseEvent
                 return;
 
             var trayMenu = (ContextMenu)FindResource("ContextMenuNotifyIcon");
+
             trayMenu.IsOpen = true;
         }
 
diff --git a/Source/NETworkManager/StatusWindow.xaml b/Source/NETworkManager/StatusWindow.xaml
@@ -59,6 +59,7 @@
             <TextBlock Text="{x:Static localization:Strings.DetectingNetworkDots}" Style="{StaticResource MessageTextBlock}" />
         </StackPanel>
         <StackPanel Grid.Row="2" Visibility="{Binding IsRefreshing, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Margin="0,0,0,10">
+            <TextBlock Text="Closing in x seconds..." Foreground="{DynamicResource GrayBrush5}" Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,10"/>
             <mahAppsControls:MetroProgressBar Value="{Binding CountdownValue}" Minimum="0" Maximum="10" Foreground="{DynamicResource AccentColorBrush}" />
         </StackPanel>
         <Button Grid.Row="3" Content="{x:Static localization:Strings.Open}" Command="{Binding OpenMainWindowCommand}" Style="{StaticResource DefaultButton}" />
diff --git a/Source/NETworkManager/StatusWindow.xaml.cs b/Source/NETworkManager/StatusWindow.xaml.cs
@@ -92,6 +92,9 @@ public StatusWindow(MainWindow mainWindow)
 
         private void OpenMainWindowAction()
         {
+            // Stop timer if running
+            _timer.Stop();
+
             HideWindow();
 
             if (_mainWindow.ShowWindowCommand.CanExecute(null))
@@ -170,7 +173,7 @@ private void StartCountdownToClose()
             _timer.Start();
         }
 
-        private void CountdownToCloseTimer_Tick(object sender, System.EventArgs e)
+        private void CountdownToCloseTimer_Tick(object sender, EventArgs e)
         {
             CountdownValue--;
 
@@ -192,10 +195,7 @@ public void ShowFromExternal()
         }
 
         private void ShowWindow()
-        {
-            // Stop timer if running
-            _timer.Stop();
-
+        {    
             // Show on primary screen in left/bottom corner
             // ToDo: User setting...
             Left = Screen.PrimaryScreen.WorkingArea.Right - Width - 10;

Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,7 @@ private void InitNotifyIcon()`
`1023`	`1023`	`}`
`1024`	`1024`
`1025`	`1025`	`_notifyIcon.Text = Title;`
`1026`		`- // DISABLED IN RELEASE _notifyIcon.Click += NotifyIcon_Click;`
	`1026`	`+ _notifyIcon.Click += NotifyIcon_Click;`
`1027`	`1027`	`_notifyIcon.MouseDown += NotifyIcon_MouseDown;`
`1028`	`1028`	`_notifyIcon.Visible = SettingsManager.Current.TrayIcon_AlwaysShowIcon;`
`1029`	`1029`	`}`
`@@ -1034,6 +1034,7 @@ private void NotifyIcon_MouseDown(object sender, System.Windows.Forms.MouseEvent`
`1034`	`1034`	`return;`
`1035`	`1035`
`1036`	`1036`	`var trayMenu = (ContextMenu)FindResource("ContextMenuNotifyIcon");`
	`1037`	`+`
`1037`	`1038`	`trayMenu.IsOpen = true;`
`1038`	`1039`	`}`
`1039`	`1040`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ public StatusWindow(MainWindow mainWindow)`
`92`	`92`
`93`	`93`	`private void OpenMainWindowAction()`
`94`	`94`	`{`
	`95`	`+ // Stop timer if running`
	`96`	`+ _timer.Stop();`
	`97`	`+`
`95`	`98`	`HideWindow();`
`96`	`99`
`97`	`100`	`if (_mainWindow.ShowWindowCommand.CanExecute(null))`
`@@ -170,7 +173,7 @@ private void StartCountdownToClose()`
`170`	`173`	`_timer.Start();`
`171`	`174`	`}`
`172`	`175`
`173`		`- private void CountdownToCloseTimer_Tick(object sender, System.EventArgs e)`
	`176`	`+ private void CountdownToCloseTimer_Tick(object sender, EventArgs e)`
`174`	`177`	`{`
`175`	`178`	`CountdownValue--;`
`176`	`179`
`@@ -192,10 +195,7 @@ public void ShowFromExternal()`
`192`	`195`	`}`
`193`	`196`
`194`	`197`	`private void ShowWindow()`
`195`		`- {`
`196`		`- // Stop timer if running`
`197`		`- _timer.Stop();`
`198`		`-`
	`198`	`+ {`
`199`	`199`	`// Show on primary screen in left/bottom corner`
`200`	`200`	`// ToDo: User setting...`
`201`	`201`	`Left = Screen.PrimaryScreen.WorkingArea.Right - Width - 10;`