Feature: Improve command exec & use hotkeys

BornToBeRoot · BornToBeRoot · commit 1c31db8f12b3 · 2025-07-23T00:07:45.000+02:00
diff --git a/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs b/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs
@@ -41,6 +41,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditAWSProfile().ConfigureAwait(false);
+        if (_viewModel.EditAWSProfileCommand.CanExecute(null))
+            _viewModel.EditAWSProfileCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
@@ -13,7 +13,6 @@ public CredentialsPasswordProfileFileChildWindow()
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             PasswordBoxPassword.Focus();
diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs
@@ -1,8 +1,8 @@
-﻿using System.Windows;
+﻿using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.ViewModels;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
-using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
 
@@ -24,6 +24,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditDNSServer().ConfigureAwait(false);
+        if (_viewModel.EditDNSServerCommand.CanExecute(null))
+            _viewModel.EditDNSServerCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/GroupChildWindow.xaml.cs b/Source/NETworkManager/Views/GroupChildWindow.xaml.cs
@@ -27,7 +27,6 @@ public GroupChildWindow(Window parentWindow)
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxName.Focus();
diff --git a/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs b/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs
@@ -13,7 +13,6 @@ public HostsFileEditorEntryChildWindow()
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxIPAddress.Focus();
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml b/Source/NETworkManager/Views/HostsFileEditorView.xaml
@@ -169,6 +169,7 @@
                     </controls:MultiSelectDataGrid.Resources>
                     <controls:MultiSelectDataGrid.RowStyle>
                         <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MahApps.Styles.DataGridRow}">
+                            <EventSetter Event="MouseDoubleClick" Handler="DataGridRow_MouseDoubleClick" />
                             <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}" />
                             <Style.Triggers>
                                 <DataTrigger
@@ -197,6 +198,10 @@
                                             SortMemberPath="Hostname"
                                             MinWidth="200" />
                     </controls:MultiSelectDataGrid.Columns>
+                    <controls:MultiSelectDataGrid.InputBindings>
+                        <KeyBinding Command="{Binding EditEntryCommand}" Key="F2" />
+                        <KeyBinding Command="{Binding DeleteEntryCommand}" Key="Delete" />
+                    </controls:MultiSelectDataGrid.InputBindings>
                 </controls:MultiSelectDataGrid>
                 <Grid Grid.Column="0" Grid.Row="4">
                     <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs b/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs
@@ -1,7 +1,7 @@
-﻿using System.Windows;
-using System.Windows.Controls;
-using MahApps.Metro.Controls.Dialogs;
+﻿using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace NETworkManager.Views;
 
@@ -30,4 +30,10 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
         if (sender is ContextMenu menu)
             menu.DataContext = _viewModel;
     }
+
+    private void DataGridRow_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        if (_viewModel.EditEntryCommand.CanExecute(null))
+            _viewModel.EditEntryCommand.Execute(null);
+    }
 }
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
@@ -17,7 +17,8 @@
              AllowMove="True"
              TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
              CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"                               
+             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"         
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKCancelInfoMessageViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -40,13 +41,15 @@
                 <TextBlock Grid.Column="2" Grid.Row="0"
                            VerticalAlignment="Center"
                            Text="{Binding Message}"
-                           Style="{StaticResource ResourceKey=WrapTextBlock}"/>                
+                           Style="{StaticResource ResourceKey=WrapTextBlock}"/>
             </Grid>
         </ScrollViewer>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
+            <Button x:Name="ButtonOK"
+                    Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
                     Style="{StaticResource ResourceKey=HighlightedButton}" Margin="0,0,10,0" />
-            <Button Content="{Binding CancelButtonText}" Command="{Binding Path=CancelCommand}" IsCancel="True"
+            <Button x:Name="ButtonCancel"
+                    Content="{Binding CancelButtonText}" Command="{Binding Path=CancelCommand}" IsCancel="True"
                     Style="{StaticResource ResourceKey=DefaultButton}" />
         </StackPanel>
     </Grid>
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs
@@ -1,9 +1,20 @@
-﻿namespace NETworkManager.Views;
+﻿using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class OKCancelInfoMessageChildWindow
 {
     public OKCancelInfoMessageChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonOK.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/OKMessageChildWindow.xaml b/Source/NETworkManager/Views/OKMessageChildWindow.xaml
@@ -16,7 +16,8 @@
              AllowMove="True"
              TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
              CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"                               
+             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"      
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKMessageViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
@@ -47,7 +48,8 @@
             </Grid>
         </ScrollViewer>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
+            <Button x:Name="ButtonOK"
+                    Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
                     Style="{StaticResource ResourceKey=HighlightedButton}" />            
         </StackPanel>
     </Grid>
diff --git a/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs b/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs
@@ -1,9 +1,20 @@
-﻿namespace NETworkManager.Views;
+﻿using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class OKMessageChildWindow
 {
     public OKMessageChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonOK.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs b/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void RowContextMenu_OnOpened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditPortProfile().ConfigureAwait(false);
+        if (_viewModel.EditPortProfileCommand.CanExecute(null))
+            _viewModel.EditPortProfileCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs b/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs
@@ -31,7 +31,6 @@ public ProfileChildWindow(Window parentWindow)
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxName.Focus();
diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs b/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void RowContextMenu_OnOpened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditOIDProfile().ConfigureAwait(false);
+        if(_viewModel.EditOIDProfileCommand.CanExecute(null))
+            _viewModel.EditOIDProfileCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs b/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditServer().ConfigureAwait(false);
+        if(_viewModel.EditServerCommand.CanExecute(null))
+            _viewModel.EditServerCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs b/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs
@@ -35,6 +35,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditProfileFileCommand.Execute(null);
+        if (_viewModel.EditProfileFileCommand.CanExecute(null))
+            _viewModel.EditProfileFileCommand.Execute(null);
     }
 }
diff --git a/Source/NETworkManager/Views/UpgradeChildWindow.xaml b/Source/NETworkManager/Views/UpgradeChildWindow.xaml
@@ -14,6 +14,7 @@
                                CloseByEscape="False"               
                                Padding="20"
                                OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}"
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:UpgradeViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -76,7 +77,8 @@
                 </Button>
             </StackPanel>
         </ScrollViewer>
-        <Button Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
+        <Button x:Name="ButtonContinue"
+                Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
                 Command="{Binding Path=ContinueCommand}" IsDefault="True"
                 Style="{StaticResource ResourceKey=HighlightedButton}" />   
           </Grid>
diff --git a/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs b/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs
@@ -1,9 +1,20 @@
-﻿namespace NETworkManager.Views;
+﻿using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class UpgradeChildWindow
 {
     public UpgradeChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonContinue.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
@@ -15,6 +15,7 @@
                                CloseByEscape="False"               
                                Padding="20"
                                OverlayBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                               Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WelcomeViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -125,7 +126,8 @@
                 </StackPanel>
             </StackPanel>
         </ScrollViewer>
-        <Button Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
+        <Button x:Name="ButtonContinue"
+                Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
                 Command="{Binding ContinueCommand}" IsDefault="True"
                 Style="{StaticResource ResourceKey=HighlightedButton}" />   
           </Grid>
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs b/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs
@@ -1,9 +1,20 @@
-﻿namespace NETworkManager.Views;
+﻿using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class WelcomeChildWindow
 {
     public WelcomeChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonContinue.Focus();
+        }));
+    }
 }
diff --git a/Website/docs/application/hosts-file-editor.md b/Website/docs/application/hosts-file-editor.md
@@ -36,6 +36,8 @@ In addition, further actions can be performed using the buttons below:
 
 With `F5` you can refresh the hosts file.
 
-Right-click on the result to enable, disable, edit or delete an entry, or to copy or export the information.
+Right-click on the result to `enable`, `disable`, `edit` or `delete` an entry, or to `copy` or `export` the information.
+
+You can also use the Hotkeys `F2` (`edit`) or `Del` (`delete`) on a selected entry.
 
 :::

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)`
`41`	`41`
`42`	`42`	`private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)`
`43`	`43`	`{`
`44`		`- _viewModel.EditAWSProfile().ConfigureAwait(false);`
	`44`	`+ if (_viewModel.EditAWSProfileCommand.CanExecute(null))`
	`45`	`+ _viewModel.EditAWSProfileCommand.Execute(null);`
`45`	`46`	`}`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public CredentialsPasswordProfileFileChildWindow()`
`13`	`13`
`14`	`14`	`private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)`
`15`	`15`	`{`
`16`		`- // Focus the PasswordBox when the child window is loaded`
`17`	`16`	`Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate`
`18`	`17`	`{`
`19`	`18`	`PasswordBoxPassword.Focus();`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-using System.Windows;`
	`1`	`+using MahApps.Metro.Controls.Dialogs;`
	`2`	`+using NETworkManager.ViewModels;`
	`3`	`+using System.Windows;`
`2`	`4`	`using System.Windows.Controls;`
`3`	`5`	`using System.Windows.Input;`
`4`		`-using MahApps.Metro.Controls.Dialogs;`
`5`		`-using NETworkManager.ViewModels;`
`6`	`6`
`7`	`7`	`namespace NETworkManager.Views;`
`8`	`8`
`@@ -24,6 +24,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)`
`24`	`24`
`25`	`25`	`private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)`
`26`	`26`	`{`
`27`		`- _viewModel.EditDNSServer().ConfigureAwait(false);`
	`27`	`+ if (_viewModel.EditDNSServerCommand.CanExecute(null))`
	`28`	`+ _viewModel.EditDNSServerCommand.Execute(null);`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public GroupChildWindow(Window parentWindow)`
`27`	`27`
`28`	`28`	`private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)`
`29`	`29`	`{`
`30`		`- // Focus the PasswordBox when the child window is loaded`
`31`	`30`	`Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate`
`32`	`31`	`{`
`33`	`32`	`TextBoxName.Focus();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public HostsFileEditorEntryChildWindow()`
`13`	`13`
`14`	`14`	`private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)`
`15`	`15`	`{`
`16`		`- // Focus the PasswordBox when the child window is loaded`
`17`	`16`	`Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate`
`18`	`17`	`{`
`19`	`18`	`TextBoxIPAddress.Focus();`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,20 @@`
`1`		`-namespace NETworkManager.Views;`
	`1`	`+using System;`
	`2`	`+using System.Windows.Threading;`
	`3`	`+`
	`4`	`+namespace NETworkManager.Views;`
`2`	`5`
`3`	`6`	`public partial class OKCancelInfoMessageChildWindow`
`4`	`7`	`{`
`5`	`8`	`public OKCancelInfoMessageChildWindow()`
`6`	`9`	`{`
`7`	`10`	`InitializeComponent();`
`8`	`11`	`}`
	`12`	`+`
	`13`	`+ private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)`
	`14`	`+ {`
	`15`	`+ Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate`
	`16`	`+ {`
	`17`	`+ ButtonOK.Focus();`
	`18`	`+ }));`
	`19`	`+ }`
`9`	`20`	`}`