Skip to content

Commit ea4b3b1

Browse files
BornToBeRootBornToBeRoot
committed
Some cleanup
1 parent 085e2a2 commit ea4b3b1

10 files changed

Lines changed: 16 additions & 29 deletions

File tree

‎Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@
292292
<system:String x:Key="String_ValidateError_EnterValidIPScanRange">Geben Sie einen gültigen IP-Bereich ein!</system:String>
293293
<system:String x:Key="String_ValidateError_FileDoesNotExist">Datei existiert nicht!</system:String>
294294
<system:String x:Key="String_ValidateError_EnterValidMACAddressOrFirst3Bytes">Geben Sie eine gültige MAC-Adresse oder die ersten 6-Zeichen einer MAC-Adresse ein!</system:String>
295-
<system:String x:Key="String_ValidationError_EnterValidPortOrPortRange">Geben Sie einen gültigen Port und/oder Port-Bereich ein (1 - 65535)!</system:String>
295+
<system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Geben Sie einen gültigen Port und/oder Port-Bereich ein (1 - 65535)!</system:String>
296+
<system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Es dürfen nur Zahlen eingegeben werden!</system:String>
297+
<system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Geben Sie einen gültigen Wert ein zwischen 10 und 100!</system:String>
296298

297299
<!-- ApplicationInfo.Name && ApplicationInfo.Description-->
298300
<system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>

‎Source/NETworkManager/Resources/Localization/Resources.en-US.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,9 @@
293293
<system:String x:Key="String_ValidateError_EnterValidIPScanRange">Enter a valid ip range!</system:String>
294294
<system:String x:Key="String_ValidateError_FileDoesNotExist">File does not exists!</system:String>
295295
<system:String x:Key="String_ValidateError_EnterValidMACAddressOrFirst3Bytes">Enter a valid MAC address or the first 6 characters of a MAC address!</system:String>
296-
<system:String x:Key="String_ValidationError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
296+
<system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
297+
<system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Only numbers can be entered!</system:String>
298+
<system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
297299

298300
<!-- ApplicationView.Name -->
299301
<system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>

‎Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,4 @@
5757
</DataTrigger>
5858
</Style.Triggers>
5959
</Style>
60-
61-
<!--
62-
<Style x:Key="DataGridScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MetroScrollBar}">
63-
<Setter Property="Width" Value="8" />
64-
<Style.Triggers>
65-
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}, Path=IsMouseOver}" Value="False">
66-
<Setter Property="Opacity" Value="0.5" />
67-
</DataTrigger>
68-
</Style.Triggers>
69-
</Style>
70-
71-
<Style x:Key="DataGridMultiSelectScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MetroScrollBar}">
72-
<Style.Triggers>
73-
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Control:MultiSelectDataGrid}}, Path=IsMouseOver}" Value="False">
74-
<Setter Property="Opacity" Value="0.5" />
75-
</DataTrigger>
76-
</Style.Triggers>
77-
</Style>-->
7860
</ResourceDictionary>

‎Source/NETworkManager/Resources/Styles/WindowStyles.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
</ResourceDictionary.MergedDictionaries>
77
<Style x:Key="DefaultWindow" TargetType="{x:Type Controls:MetroWindow}" BasedOn="{StaticResource CleanWindowStyleKey}" >
88
<Setter Property="TitleCaps" Value="False" />
9-
<Setter Property="BorderThickness" Value="1" />
109
<Setter Property="EnableDWMDropShadow" Value="True" />
1110
<Setter Property="TitleForeground" Value="{DynamicResource GrayBrush3}" />
1211
<Setter Property="TitlebarHeight" Value="35" />

‎Source/NETworkManager/Validators/PortRangeValidator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
4343
if (isValid)
4444
return ValidationResult.ValidResult;
4545
else
46-
return new ValidationResult(false, Application.Current.Resources["String_ValidationError_EnterValidPortOrPortRange"] as string);
46+
return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidPortOrPortRange"] as string);
4747
}
4848
}
4949
}

‎Source/NETworkManager/ViewModels/Settings/SettingsGeneralAppearanceViewModel.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using MahApps.Metro;
22
using NETworkManager.Models.Settings;
3+
using System.Windows;
34

45
namespace NETworkManager.ViewModels.Settings
56
{
@@ -58,7 +59,7 @@ public SettingsGeneralAppearanceViewModel()
5859
}
5960

6061
private void LoadSettings()
61-
{
62+
{
6263
AppThemeSelectedItem = ThemeManager.DetectAppStyle().Item1;
6364
AccentSelectedItem = ThemeManager.DetectAppStyle().Item2;
6465
}

‎Source/NETworkManager/Views/Applications/IPScannerView.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
99
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
1010
xmlns:Validator="clr-namespace:NETworkManager.Validators"
11-
xmlns:Control="clr-namespace:NETworkManager.Controls"
1211
xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1312
xmlns:Dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
1413
Dialog:DialogParticipation.Register="{Binding}"

‎Source/NETworkManager/Views/Applications/WikiView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
5959
<Setter Property="IsEnabled" Value="True" />
6060
<Style.Triggers>
61-
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=txttxtMACAddressOrVendor}" Value="True" >
61+
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=txtMACAddressOrVendor}" Value="True" >
6262
<Setter Property="IsEnabled" Value="False" />
6363
</DataTrigger>
6464
</Style.Triggers>

‎Source/NETworkManager/Views/Settings/SettingsGeneralAppearanceView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:Converter="clr-namespace:NETworkManager.Converters"
7-
xmlns:metro="clr-namespace:MahApps.Metro;assembly=MahApps.Metro"
7+
xmlns:metro="clr-namespace:MahApps.Metro;assembly=MahApps.Metro"
88
mc:Ignorable="d">
99
<UserControl.Resources>
1010
<!-- Converters -->
1111
<Converter:AppThemeToBrushConverter x:Key="AppThemeToBrushConverter" />
1212
<Converter:AppThemeToStringConverter x:Key="AppThemeToStringConverter" />
1313
<Converter:AccentToBrushConverter x:Key="AccentToBrushConverter" />
1414
<Converter:AccentToStringConverter x:Key="AccentToStringConverter" />
15-
</UserControl.Resources>
15+
</UserControl.Resources>
1616
<StackPanel>
1717
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Theme}" />
1818
<ListView ItemsSource="{x:Static metro:ThemeManager.AppThemes}" VerticalAlignment="Top" BorderThickness="0" Margin="0,0,0,20" SelectionMode="Single" >
@@ -31,7 +31,7 @@
3131
</ListView.SelectedItem>
3232
</ListView>
3333
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Accent}" />
34-
<ListView ItemsSource="{x:Static metro:ThemeManager.Accents}" BorderThickness="0" SelectionMode="Single">
34+
<ListView ItemsSource="{x:Static metro:ThemeManager.Accents}" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
3535
<ListView.ItemTemplate>
3636
<DataTemplate >
3737
<Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Converter={StaticResource AccentToBrushConverter}, ConverterParameter='Name'}" ToolTip="{Binding Converter={StaticResource AccentToStringConverter}, ConverterParameter='Name'}" />

‎Source/NETworkManager/Views/Settings/SettingsWindow.xaml.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using MahApps.Metro.Controls;
2+
using NETworkManager.Models.Settings;
23
using NETworkManager.ViewModels.Settings;
34
using System.Windows.Input;
45

@@ -19,9 +20,10 @@ public SettingsWindow() : this(ApplicationViewManager.Name.None)
1920
public SettingsWindow(ApplicationViewManager.Name selectedApplicationName)
2021
{
2122
InitializeComponent();
23+
2224
viewModel = new SettingsViewModel(selectedApplicationName);
2325
DataContext = viewModel;
24-
}
26+
}
2527

2628
private void MetroWindowSettings_PreviewKeyDown(object sender, KeyEventArgs e)
2729
{

0 commit comments

Comments
 (0)