UI improved

Author: BornToBeRoot

Icon/NETworkManager.ico

@@ -7,7 +7,6 @@
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-        xmlns:Documentation="clr-namespace:NETworkManager.Models.Documentation"
         xmlns:Resources="clr-namespace:NETworkManager.Properties"
         xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
         mc:Ignorable="d"
@@ -29,7 +28,7 @@
     </Controls:MetroWindow.IconTemplate>
     <Controls:MetroWindow.RightWindowCommands>
         <Controls:WindowCommands>
-            <Button Command="{Binding OpenDocumentationCommand}" Cursor="Hand">
+            <Button Focusable="False" Command="{Binding OpenDocumentationCommand}" Cursor="Hand">
                 <StackPanel Orientation="Horizontal">
                     <Rectangle Width="20" Height="20" Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
                         <Rectangle.OpacityMask>
@@ -39,7 +38,7 @@
                     <TextBlock Text="{DynamicResource String_Documentation}" VerticalAlignment="Center" Margin="5,0,0,0" />
                 </StackPanel>
             </Button>
-            <Button Command="{Binding OpenWebsiteCommand}" CommandParameter="{x:Static Resources:Resources.NETworkManager_ProjectUrl}" Cursor="Hand">
+            <Button Focusable="False" Command="{Binding OpenWebsiteCommand}" CommandParameter="{x:Static Resources:Resources.NETworkManager_ProjectUrl}" Cursor="Hand">
                 <StackPanel Orientation="Horizontal">
                     <Rectangle Width="20" Height="20" Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
                         <Rectangle.OpacityMask>

Icon/NETworkManager.svg

@@ -351,6 +351,16 @@ private async void EditGroupAction(object group)
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
 
+        public ICommand ClearSearchCommand
+        {
+            get { return new RelayCommand(p => ClearSearchAction()); }
+        }
+
+        private void ClearSearchAction()
+        {
+            Search = string.Empty;
+        }
+
         public ItemActionCallback CloseItemCommand
         {
             get { return CloseItemAction; }

NETworkManager.svg

@@ -341,6 +341,16 @@ private async void EditGroupAction(object group)
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
 
+        public ICommand ClearSearchCommand
+        {
+            get { return new RelayCommand(p => ClearSearchAction()); }
+        }
+
+        private void ClearSearchAction()
+        {
+            Search = string.Empty;
+        }
+
         public ItemActionCallback CloseItemCommand
         {
             get { return CloseItemAction; }

Source/NETworkManager/MainWindow.xaml

@@ -433,6 +433,16 @@ private async void EditGroupAction(object group)
             ConfigurationManager.Current.FixAirspace = true;
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
+
+        public ICommand ClearSearchCommand
+        {
+            get { return new RelayCommand(p => ClearSearchAction()); }
+        }
+
+        private void ClearSearchAction()
+        {
+            Search = string.Empty;
+        }
         #endregion
 
         #region Methods

Source/NETworkManager/NETworkManager.ico

@@ -168,17 +168,7 @@ private void LoadSettings()
         }
         #endregion
 
-        #region ICommand & Actions
-        public ItemActionCallback CloseItemCommand
-        {
-            get { return CloseItemAction; }
-        }
-
-        private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
-        {
-            ((args.DragablzItem.Content as DragablzTabItem).View as RemoteDesktopControl).OnClose();
-        }
-
+        #region ICommand & Actions        
         public ICommand ConnectNewSessionCommand
         {
             get { return new RelayCommand(p => ConnectNewSessionAction(), ConnectNewSession_CanExecute); }
@@ -594,6 +584,26 @@ private async void EditGroupAction(object group)
             ConfigurationManager.Current.FixAirspace = true;
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
+
+        public ICommand ClearSearchCommand
+        {
+            get { return new RelayCommand(p => ClearSearchAction()); }
+        }
+
+        private void ClearSearchAction()
+        {
+            Search = string.Empty;
+        }
+
+        public ItemActionCallback CloseItemCommand
+        {
+            get { return CloseItemAction; }
+        }
+
+        private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
+        {
+            ((args.DragablzItem.Content as DragablzTabItem).View as RemoteDesktopControl).OnClose();
+        }
         #endregion
 
         #region Methods