Skip to content

Commit ec9569f

Browse files
BornToBeRootBornToBeRoot
committed
Feature: Adjust clear filter button
1 parent d81c6b0 commit ec9569f

16 files changed

+164
-161
lines changed

‎Source/NETworkManager/Views/AWSSessionManagerHostView.xaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -743,9 +743,10 @@
743743
<Setter Property="Command" Value="{Binding AddProfileCommand}" />
744744
<Style.Triggers>
745745
<DataTrigger
746-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
747-
Value="False">
748-
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />
746+
Binding="{Binding Path=IsProfileFilterSet}"
747+
Value="True">
748+
<Setter Property="Command"
749+
Value="{Binding Path=ClearProfileFilterCommand}" />
749750
<Setter Property="ToolTip"
750751
Value="{x:Static localization:Strings.ClearFilter}" />
751752
</DataTrigger>
@@ -776,8 +777,8 @@
776777
Value="{DynamicResource MahApps.Brushes.Gray5}" />
777778
</DataTrigger>
778779
<DataTrigger
779-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
780-
Value="False">
780+
Binding="{Binding Path=IsProfileFilterSet}"
781+
Value="True">
781782
<Setter Property="OpacityMask"
782783
Value="{StaticResource VisualClear}" />
783784
</DataTrigger>
@@ -799,8 +800,8 @@
799800
Value="{DynamicResource MahApps.Brushes.Gray5}" />
800801
</DataTrigger>
801802
<DataTrigger
802-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
803-
Value="False">
803+
Binding="{Binding Path=IsProfileFilterSet}"
804+
Value="True">
804805
<Setter Property="Text"
805806
Value="{x:Static localization:Strings.NothingFound}" />
806807
</DataTrigger>

‎Source/NETworkManager/Views/DNSLookupHostView.xaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,11 @@
514514
<Button.Style>
515515
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
516516
<Setter Property="Command" Value="{Binding AddProfileCommand}" />
517-
518517
<Style.Triggers>
519518
<DataTrigger
520-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
521-
Value="False">
522-
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />
519+
Binding="{Binding Path=IsProfileFilterSet}"
520+
Value="True">
521+
<Setter Property="Command" Value="{Binding Path=ClearProfileFilterCommand}" />
523522
<Setter Property="ToolTip"
524523
Value="{x:Static localization:Strings.ClearFilter}" />
525524
</DataTrigger>
@@ -550,8 +549,8 @@
550549
Value="{DynamicResource MahApps.Brushes.Gray5}" />
551550
</DataTrigger>
552551
<DataTrigger
553-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
554-
Value="False">
552+
Binding="{Binding Path=IsProfileFilterSet}"
553+
Value="True">
555554
<Setter Property="OpacityMask" Value="{StaticResource VisualClear}" />
556555
</DataTrigger>
557556
</Style.Triggers>
@@ -572,8 +571,8 @@
572571
Value="{DynamicResource MahApps.Brushes.Gray5}" />
573572
</DataTrigger>
574573
<DataTrigger
575-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
576-
Value="False">
574+
Binding="{Binding Path=IsProfileFilterSet}"
575+
Value="True">
577576
<Setter Property="Text"
578577
Value="{x:Static localization:Strings.NothingFound}" />
579578
</DataTrigger>

‎Source/NETworkManager/Views/IPGeolocationHostView.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@
511511
<Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
512512
<Style.Triggers>
513513
<DataTrigger
514-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
515-
Value="False">
516-
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />
514+
Binding="{Binding Path=IsProfileFilterSet}"
515+
Value="True">
516+
<Setter Property="Command" Value="{Binding Path=ClearProfileFilterCommand}" />
517517
<Setter Property="ToolTip"
518518
Value="{x:Static localization:Strings.ClearFilter}" />
519519
</DataTrigger>
@@ -544,8 +544,8 @@
544544
Value="{DynamicResource MahApps.Brushes.Gray5}" />
545545
</DataTrigger>
546546
<DataTrigger
547-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
548-
Value="False">
547+
Binding="{Binding Path=IsProfileFilterSet}"
548+
Value="True">
549549
<Setter Property="OpacityMask" Value="{StaticResource VisualClear}" />
550550
</DataTrigger>
551551
</Style.Triggers>
@@ -566,8 +566,8 @@
566566
Value="{DynamicResource MahApps.Brushes.Gray5}" />
567567
</DataTrigger>
568568
<DataTrigger
569-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
570-
Value="False">
569+
Binding="{Binding Path=IsProfileFilterSet}"
570+
Value="True">
571571
<Setter Property="Text"
572572
Value="{x:Static localization:Strings.NothingFound}" />
573573
</DataTrigger>

‎Source/NETworkManager/Views/IPScannerHostView.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
</Rectangle.OpacityMask>
296296
</Rectangle>
297297
</Button>
298-
<Button Command="{Binding ClearProfileFilterCommand}"
298+
<Button Command="{Binding Path=ClearProfileFilterCommand}"
299299
Style="{StaticResource ImageButton}"
300300
ToolTip="{x:Static localization:Strings.ClearFilter}"
301301
Margin="10,0,0,0">
@@ -517,9 +517,9 @@
517517
<Setter Property="Command" Value="{Binding AddProfileCommand}" />
518518
<Style.Triggers>
519519
<DataTrigger
520-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
521-
Value="False">
522-
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />
520+
Binding="{Binding Path=IsProfileFilterSet}"
521+
Value="True">
522+
<Setter Property="Command" Value="{Binding Path=ClearProfileFilterCommand}" />
523523
<Setter Property="ToolTip"
524524
Value="{x:Static localization:Strings.ClearFilter}" />
525525
</DataTrigger>
@@ -550,8 +550,8 @@
550550
Value="{DynamicResource MahApps.Brushes.Gray5}" />
551551
</DataTrigger>
552552
<DataTrigger
553-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
554-
Value="False">
553+
Binding="{Binding Path=IsProfileFilterSet}"
554+
Value="True">
555555
<Setter Property="OpacityMask" Value="{StaticResource VisualClear}" />
556556
</DataTrigger>
557557
</Style.Triggers>
@@ -572,8 +572,8 @@
572572
Value="{DynamicResource MahApps.Brushes.Gray5}" />
573573
</DataTrigger>
574574
<DataTrigger
575-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
576-
Value="False">
575+
Binding="{Binding Path=IsProfileFilterSet}"
576+
Value="True">
577577
<Setter Property="Text"
578578
Value="{x:Static localization:Strings.NothingFound}" />
579579
</DataTrigger>

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,9 +1763,9 @@
17631763
<Setter Property="Command" Value="{Binding AddProfileCommand}" />
17641764
<Style.Triggers>
17651765
<DataTrigger
1766-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
1767-
Value="False">
1768-
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />
1766+
Binding="{Binding Path=IsProfileFilterSet}"
1767+
Value="True">
1768+
<Setter Property="Command" Value="{Binding Path=ClearProfileFilterCommand}" />
17691769
<Setter Property="ToolTip"
17701770
Value="{x:Static localization:Strings.ClearFilter}" />
17711771
</DataTrigger>
@@ -1796,8 +1796,8 @@
17961796
Value="{DynamicResource MahApps.Brushes.Gray5}" />
17971797
</DataTrigger>
17981798
<DataTrigger
1799-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
1800-
Value="False">
1799+
Binding="{Binding Path=IsProfileFilterSet}"
1800+
Value="True">
18011801
<Setter Property="OpacityMask"
18021802
Value="{StaticResource VisualClear}" />
18031803
</DataTrigger>
@@ -1819,8 +1819,8 @@
18191819
Value="{DynamicResource MahApps.Brushes.Gray5}" />
18201820
</DataTrigger>
18211821
<DataTrigger
1822-
Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}"
1823-
Value="False">
1822+
Binding="{Binding Path=IsProfileFilterSet}"
1823+
Value="True">
18241824
<Setter Property="Text"
18251825
Value="{x:Static localization:Strings.NothingFound}" />
18261826
</DataTrigger>

0 commit comments

Comments
 (0)