WakeOnLAN/PortScanner/NetworkInterface - Search implementet

BornToBeRoot · BornToBeRoot · commit 8d7a212c38e6 · 2017-11-01T14:43:11.000+01:00
diff --git a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
@@ -339,7 +339,6 @@ public IPScannerViewModel(IDialogCoordinator instance)
                 return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0;
             };
 
-
             LoadSettings();
 
             // Detect if settings have changed...
diff --git a/Source/NETworkManager/ViewModels/Applications/NetworkInterfaceViewModel.cs b/Source/NETworkManager/ViewModels/Applications/NetworkInterfaceViewModel.cs
@@ -618,6 +618,23 @@ public bool ExpandProfileView
                 OnPropertyChanged();
             }
         }
+
+        private string _search;
+        public string Search
+        {
+            get { return _search; }
+            set
+            {
+                if (value == _search)
+                    return;
+
+                _search = value;
+
+                NetworkInterfaceProfiles.Refresh();
+
+                OnPropertyChanged();
+            }
+        }
         #endregion               
         #endregion
 
@@ -635,6 +652,18 @@ public NetworkInterfaceViewModel(IDialogCoordinator instance)
 
             _networkInterfaceProfiles = CollectionViewSource.GetDefaultView(NetworkInterfaceProfileManager.Profiles);
             _networkInterfaceProfiles.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
+            _networkInterfaceProfiles.Filter = o =>
+            {
+                if (string.IsNullOrEmpty(Search))
+                    return true;
+
+                NetworkInterfaceProfileInfo info = o as NetworkInterfaceProfileInfo;
+
+                string search = Search.Trim();
+
+                // Search by: Name
+                return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0;
+            };
 
             LoadSettings();
 
diff --git a/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs
@@ -319,6 +319,23 @@ public bool ExpandProfileView
                 OnPropertyChanged();
             }
         }
+
+        private string _search;
+        public string Search
+        {
+            get { return _search; }
+            set
+            {
+                if (value == _search)
+                    return;
+
+                _search = value;
+
+                PortScannerProfiles.Refresh();
+
+                OnPropertyChanged();
+            }
+        }
         #endregion
         #endregion
 
@@ -334,6 +351,18 @@ public PortScannerViewModel(IDialogCoordinator instance)
             _portScannerProfiles = CollectionViewSource.GetDefaultView(PortScannerProfileManager.Profiles);
             _portScannerProfiles.GroupDescriptions.Add(new PropertyGroupDescription("Group"));
             _portScannerProfiles.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
+            _portScannerProfiles.Filter = o =>
+            {
+                if (string.IsNullOrEmpty(Search))
+                    return true;
+
+                PortScannerProfileInfo info = o as PortScannerProfileInfo;
+
+                string search = Search.Trim();
+
+                // Search by: Name
+                return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0;
+            };
 
             LoadSettings();
 
diff --git a/Source/NETworkManager/ViewModels/Applications/WakeOnLanViewModel.cs b/Source/NETworkManager/ViewModels/Applications/WakeOnLanViewModel.cs
@@ -178,6 +178,23 @@ public bool ExpandClientView
                 OnPropertyChanged();
             }
         }
+
+        private string _search;
+        public string Search
+        {
+            get { return _search; }
+            set
+            {
+                if (value == _search)
+                    return;
+
+                _search = value;
+
+                WakeOnLANClients.Refresh();
+
+                OnPropertyChanged();
+            }
+        }
         #endregion
         #endregion
 
@@ -192,6 +209,18 @@ public WakeOnLANViewModel(IDialogCoordinator instance)
             _wakeOnLANClients = CollectionViewSource.GetDefaultView(WakeOnLANClientManager.Clients);
             _wakeOnLANClients.GroupDescriptions.Add(new PropertyGroupDescription("Group"));
             _wakeOnLANClients.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
+            _wakeOnLANClients.Filter = o =>
+            {
+                if (string.IsNullOrEmpty(Search))
+                    return true;
+
+                WakeOnLANClientInfo info = o as WakeOnLANClientInfo;
+
+                string search = Search.Trim();
+
+                // Search by: Name
+                return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0;
+            };
 
             LoadSettings();
 
diff --git a/Source/NETworkManager/Views/Applications/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/Applications/NetworkInterfaceView.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:Network="clr-namespace:NETworkManager.Models.Network"
         xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+        xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         xmlns:Converter="clr-namespace:NETworkManager.Converters"
         xmlns:Validator="clr-namespace:NETworkManager.Validators"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
@@ -17,6 +18,7 @@
         <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <Converter:IPAddressArrayToStringConverter x:Key="IPAddressArrayToStringConverter" />
+        <Converter:NullOrEmptyToBoolConverter x:Key="NullOrEmptyToBoolConverter" />
         <Converter:NullToFalseConverter x:Key="NullToFalseConverter" />
         <Converter:PhysicalAddressToStringConverter x:Key="PhysicalAddressToStringConverter" />
         <Converter:ValidateNetworkInterfaceProfileConverter x:Key="ValidateNetworkInterfaceProfileConverter" />
@@ -486,11 +488,24 @@
                     <Expander x:Name="expanderProfiles" Header="{DynamicResource String_Header_Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
                         <Grid Width="250">
                             <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="10" />
                                 <RowDefinition Height="*" />
                                 <RowDefinition Height="10" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <ListBox Grid.Column="0" Grid.Row="0" x:Name="listBoxProfiles"  FontSize="14" ItemsSource="{Binding NetworkInterfaceProfiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}">                                <ListBox.Resources>
+                            <TextBox x:Name="txtSearch" Grid.Column="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="1" FontSize="14" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_Search}" Controls:TextBoxHelper.ClearTextButton="True">
+                                <TextBox.Style>
+                                    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource SearchMetroTextBox}">
+                                        <Style.Triggers>
+                                            <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                                                <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate" Value="{x:Null}" />
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Style>
+                            </TextBox>
+                            <ListBox Grid.Column="0" Grid.Row="2" x:Name="listBoxProfiles"  FontSize="14" ItemsSource="{Binding NetworkInterfaceProfiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}">                                <ListBox.Resources>
                                     <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaulScrollViewer}" />
                                     <ContextMenu x:Key="ListBoxItemContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                                         <MenuItem Header="{DynamicResource String_Delete}" Command="{Binding DeleteProfileCommand}">
@@ -511,19 +526,25 @@
                                     <KeyBinding Command="{Binding DeleteProfileCommand}" Key="Delete" />
                                 </ListBox.InputBindings>
                             </ListBox>
-                            <TextBlock Grid.Column="0" Grid.Row="0" FontSize="18" Foreground="{DynamicResource GrayBrush3}" Text="{DynamicResource String_NoProfilesFoundCreateOne}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" >
+                            <TextBlock Grid.Row="2" FontSize="18" Foreground="{DynamicResource GrayBrush3}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" >
                                 <TextBlock.Style>
                                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
                                         <Setter Property="Visibility" Value="Collapsed" />
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding NetworkInterfaceProfiles.Count}" Value="0">
-                                                <Setter Property="Visibility" Value="Visible" />
+                                            <DataTrigger Binding="{Binding NetworkInterfaceProfiles.Count}" Value="0" >
+                                                <DataTrigger.Setters>
+                                                    <Setter Property="Visibility" Value="Visible" />
+                                                    <Setter Property="Text" Value="{DynamicResource String_NoProfilesFoundCreateOne}" />
+                                                </DataTrigger.Setters>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{DynamicResource String_NothingFound}" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <Button x:Name="btnAddProfile" Grid.Column="0" Grid.Row="2" Command="{Binding AddProfileCommand}">
+                            <Button x:Name="btnAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}">
                                 <Button.Content>
                                     <Grid>
                                         <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/Applications/PortScannerView.xaml b/Source/NETworkManager/Views/Applications/PortScannerView.xaml
@@ -16,7 +16,8 @@
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
         <Converter:IPAddressToStringConverter x:Key="IPAddressToStringConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
-        <Converter:NullOrEmptyToStringConverter x:Key="NullOrEmptyToStringConverter" />
+        <Converter:NullOrEmptyToBoolConverter x:Key="NullOrEmptyToBoolConverter" />
+        <Converter:NullOrEmptyToStringConverter x:Key="NullOrEmptyToStringConverter" />        
         <Converter:PortStatusToStringConverter x:Key="PortStatusToStringConverter" />
     </UserControl.Resources>
     <Grid>
@@ -251,11 +252,24 @@
             <Expander x:Name="expanderProfiles" Header="{DynamicResource String_Header_Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
                 <Grid Width="250">
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="10" />
                         <RowDefinition Height="*" />
                         <RowDefinition Height="10" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <ListBox Grid.Column="0" Grid.Row="0" x:Name="listBoxProfiles" FontSize="14" ItemsSource="{Binding PortScannerProfiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}">
+                    <TextBox x:Name="txtSearch" Grid.Column="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="1" FontSize="14" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_Search}" Controls:TextBoxHelper.ClearTextButton="True">
+                        <TextBox.Style>
+                            <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource SearchMetroTextBox}">
+                                <Style.Triggers>
+                                    <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                                        <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate" Value="{x:Null}" />
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBox.Style>
+                    </TextBox>
+                    <ListBox Grid.Column="0" Grid.Row="2" x:Name="listBoxProfiles" FontSize="14" ItemsSource="{Binding PortScannerProfiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}">
                         <ListBox.Resources>
                             <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaulScrollViewer}" />
                             <ContextMenu x:Key="ListBoxItemContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -316,19 +330,25 @@
                             </GroupStyle>
                         </ListBox.GroupStyle>
                     </ListBox>
-                    <TextBlock Grid.Column="0" Grid.Row="0" FontSize="18" Foreground="{DynamicResource GrayBrush3}" Text="{DynamicResource String_NoProfilesFoundCreateOne}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" >
+                    <TextBlock Grid.Row="2" FontSize="18" Foreground="{DynamicResource GrayBrush3}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" >
                         <TextBlock.Style>
                             <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
                                 <Setter Property="Visibility" Value="Collapsed" />
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding PortScannerProfiles.Count}" Value="0">
-                                        <Setter Property="Visibility" Value="Visible" />
+                                    <DataTrigger Binding="{Binding PortScannerProfiles.Count}" Value="0" >
+                                        <DataTrigger.Setters>
+                                            <Setter Property="Visibility" Value="Visible" />
+                                            <Setter Property="Text" Value="{DynamicResource String_NoProfilesFoundCreateOne}" />
+                                        </DataTrigger.Setters>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Text" Value="{DynamicResource String_NothingFound}" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </TextBlock.Style>
                     </TextBlock>
-                    <Button x:Name="btnAddProfile" Grid.Column="0" Grid.Row="2" Command="{Binding AddProfileCommand}">
+                    <Button x:Name="btnAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}">
                         <Button.Content>
                             <Grid>
                                 <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml b/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
