Skip to content

Commit 8d9b2c4

Browse files
committed
Some changes
1 parent 796f886 commit 8d9b2c4

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

Source/NETworkManager/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
</Rectangle.Style>
180180
</Rectangle>
181181
</Button>
182-
<TextBox x:Name="txtSearch" Grid.Column="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="1" FontSize="14" VerticalAlignment="Center" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_Search}" mah:TextBoxHelper.ButtonCommand="{Binding TextBoxSearchCommand}" Controls:TextBoxHelper.ClearTextButton="True">
182+
<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}" mah:TextBoxHelper.ButtonCommand="{Binding TextBoxSearchCommand}" Controls:TextBoxHelper.ClearTextButton="True">
183183
<TextBox.Style>
184184
<Style BasedOn="{StaticResource SearchMetroTextBox}" TargetType="{x:Type TextBox}">
185185
<Setter Property="Visibility" Value="Hidden" />

Source/NETworkManager/MainWindow.xaml.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using NETworkManager.Views;
2222
using NETworkManager.Helpers;
2323
using System.Runtime.CompilerServices;
24+
using System.Windows.Markup;
2425

2526
namespace NETworkManager
2627
{
@@ -143,16 +144,16 @@ public ApplicationViewInfo SelectedApplicationViewInfo
143144
ApplicationViewManager.Name filterLastViewName;
144145
int? filterLastCount;
145146

146-
private string _searchText;
147-
public string SearchText
147+
private string _search;
148+
public string Search
148149
{
149-
get { return _searchText; }
150+
get { return _search; }
150151
set
151152
{
152-
if (value == _searchText)
153+
if (value == _search)
153154
return;
154155

155-
_searchText = value;
156+
_search = value;
156157

157158
if (SelectedApplicationViewInfo != null)
158159
filterLastViewName = SelectedApplicationViewInfo.Name;
@@ -235,7 +236,7 @@ public MainWindow()
235236

236237
Version = AssemblyManager.Current.AssemblyVersion.ToString();
237238

238-
// LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(LocalizationManager.Culture.IetfLanguageTag)));
239+
LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(LocalizationManager.Culture.IetfLanguageTag)));
239240

240241
// Load appearance
241242
AppearanceManager.Load();
@@ -420,7 +421,7 @@ private void ChangeApplicationView(ApplicationViewManager.Name name)
420421
#region ListView Search/Filter
421422
private void ApplicationView_Search(object sender, FilterEventArgs e)
422423
{
423-
if (string.IsNullOrEmpty(SearchText))
424+
if (string.IsNullOrEmpty(Search))
424425
{
425426
e.Accepted = true;
426427
return;
@@ -432,7 +433,7 @@ private void ApplicationView_Search(object sender, FilterEventArgs e)
432433
Regex regex = new Regex(@" |-");
433434

434435
// Try to find the translated application view name first --> it's faster when the language ist different than english and equal when it's english
435-
if ((regex.Replace(info.TranslatedName, "").IndexOf(regex.Replace(SearchText, ""), StringComparison.OrdinalIgnoreCase) >= 0) || (regex.Replace(info.Name.ToString(), "").IndexOf(regex.Replace(SearchText, ""), StringComparison.OrdinalIgnoreCase) >= 0))
436+
if ((regex.Replace(info.TranslatedName, "").IndexOf(regex.Replace(Search, ""), StringComparison.OrdinalIgnoreCase) >= 0) || (regex.Replace(info.Name.ToString(), "").IndexOf(regex.Replace(Search, ""), StringComparison.OrdinalIgnoreCase) >= 0))
436437
e.Accepted = true;
437438
else
438439
e.Accepted = false;
@@ -449,7 +450,7 @@ private void ClearSearchFilterOnApplicationListMinimize()
449450
if (OpenApplicationList && IsMouseOverApplicationList)
450451
return;
451452

452-
SearchText = string.Empty;
453+
Search = string.Empty;
453454
}
454455
#endregion
455456

@@ -767,10 +768,10 @@ public ICommand TextBoxSearchCommand
767768

768769
private void TextBoxSearchAction()
769770
{
770-
if (string.IsNullOrEmpty(SearchText))
771+
if (string.IsNullOrEmpty(Search))
771772
txtSearch.Focus();
772773
else
773-
SearchText = string.Empty;
774+
Search = string.Empty;
774775
}
775776

776777
public ICommand ApplicationListMouseEnterCommand

0 commit comments

Comments
 (0)