Skip to content

Commit 739ebd0

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 7981f19 commit 739ebd0

7 files changed

Lines changed: 51 additions & 18 deletions

File tree

‎Source/NETworkManager.Models/Network/ConnectionState.cs‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
namespace NETworkManager.Models.Network
22
{
3+
/// <summary>
4+
/// Enum indicates the state of a connection.
5+
/// </summary>
36
public enum ConnectionState
47
{
8+
/// <summary>
9+
/// Connection has no state.
10+
/// </summary>
511
None,
12+
13+
/// <summary>
14+
/// Connection is OK.
15+
/// </summary>
616
OK,
17+
18+
/// <summary>
19+
/// Connection is warning.
20+
/// </summary>
721
Warning,
8-
Error
22+
23+
/// <summary>
24+
/// Connection is critical.
25+
/// </summary>
26+
Critical
927
}
1028
}

‎Source/NETworkManager.Models/Network/DiscoveryProtocol.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
namespace NETworkManager.Models.Network
22
{
3+
/// <summary>
4+
/// Enum indicates all discovery protocols.
5+
/// </summary>
36
public enum DiscoveryProtocol
47
{
8+
/// <summary>
9+
/// Link layer and Cisco discovery protocol.
10+
/// </summary>
511
LLDP_CDP,
12+
13+
/// <summary>
14+
/// Link layer discovery protocol.
15+
/// </summary>
616
LLDP,
17+
18+
/// <summary>
19+
/// Cisco discovery protocol.
20+
/// </summary>
721
CDP
822
}
923
}

‎Source/NETworkManager/Converters/ConnectionStateToRectangleStyleConverter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
2121
return Application.Current.Resources["CheckRectangle"] as Style;
2222
case ConnectionState.Warning:
2323
return Application.Current.Resources["AlertRectangle"] as Style;
24-
case ConnectionState.Error:
24+
case ConnectionState.Critical:
2525
return Application.Current.Resources["ErrorRectangle"] as Style;
2626
default:
2727
throw new ArgumentOutOfRangeException();

‎Source/NETworkManager/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
5050
// übernehmen, indem Sie "*" eingeben:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("2020.1.0.0")]
53-
[assembly: AssemblyFileVersion("2020.1.0.0")]
52+
[assembly: AssemblyVersion("2020.3.0.0")]
53+
[assembly: AssemblyFileVersion("2020.3.0.0")]
5454

‎Source/NETworkManager/ViewModels/DashboardViewModel.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,8 @@ public void CheckConnection()
519519

520520
if (!IsHostReachable)
521521
{
522-
HostConnectionState = ConnectionState.Error;
523-
AddToHostDetails(ConnectionState.Error,
522+
HostConnectionState = ConnectionState.Critical;
523+
AddToHostDetails(ConnectionState.Critical,
524524
string.Format(Localization.LanguageFiles.Strings.TCPIPStackIsNotAvailableMessage, hostIPAddress));
525525

526526
IsHostCheckRunning = false;
@@ -548,8 +548,8 @@ public void CheckConnection()
548548

549549
if (HostIPAddress == null)
550550
{
551-
HostConnectionState = ConnectionState.Error;
552-
AddToHostDetails(ConnectionState.Error,
551+
HostConnectionState = ConnectionState.Critical;
552+
AddToHostDetails(ConnectionState.Critical,
553553
Localization.LanguageFiles.Strings.CouldNotDetectLocalIPAddressMessage + " " + Localization.LanguageFiles.Strings.CheckNetworkAdapterConfigurationAndNetworkConnectionMessage);
554554

555555
IsHostCheckRunning = false;
@@ -598,7 +598,7 @@ public void CheckConnection()
598598

599599
if (GatewayIPAddress == null)
600600
{
601-
AddToGatewayDetails(ConnectionState.Error,
601+
AddToGatewayDetails(ConnectionState.Critical,
602602
Localization.LanguageFiles.Strings.CouldNotDetectGatewayIPAddressMessage + " " + Localization.LanguageFiles.Strings.CheckNetworkAdapterConfigurationAndNetworkConnectionMessage);
603603

604604
IsGatewayCheckRunning = false;
@@ -635,7 +635,7 @@ public void CheckConnection()
635635

636636
if (!IsGatewayReachable)
637637
{
638-
AddToGatewayDetails(ConnectionState.Error,
638+
AddToGatewayDetails(ConnectionState.Critical,
639639
string.Format(Localization.LanguageFiles.Strings.XXXIsNotReachableViaICMPMessage, GatewayIPAddress));
640640

641641
IsGatewayCheckRunning = false;
@@ -699,7 +699,7 @@ public void CheckConnection()
699699

700700
if (!IsInternetReachable)
701701
{
702-
AddToInternetDetails(ConnectionState.Error,
702+
AddToInternetDetails(ConnectionState.Critical,
703703
string.Format(Localization.LanguageFiles.Strings.XXXIsNotReachableViaICMPMessage,
704704
publicICMPTestIPAddress));
705705

‎Source/NETworkManager/Views/ProfileDialog.xaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:network="clr-namespace:NETworkManager.Models.Network"
7-
xmlns:converters="clr-namespace:NETworkManager.Converters"
7+
xmlns:convertersOld="clr-namespace:NETworkManager.Converters"
8+
xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
89
xmlns:validators="clr-namespace:NETworkManager.Validators"
910
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
1011
xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
@@ -13,14 +14,14 @@
1314
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1415
mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:ProfileViewModel}">
1516
<UserControl.Resources>
16-
<converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
17-
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
18-
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
17+
<convertersOld:BooleanReverseConverter x:Key="BooleanReverseConverter" />
18+
<convertersOld:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
19+
<convertersOld:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
1920
<converters:RemoteDesktopAudioCaptureRedirectionModeToStringConverter x:Key="RemoteDesktopAudioCaptureRedirectionModeToStringConverter" />
2021
<converters:RemoteDesktopAudioRedirectionModeToStringConverter x:Key="RemoteDesktopAudioRedirectionModeToStringConverter" />
2122
<converters:RemoteDesktopKeyboardHookModeToStringConverter x:Key="RemoteDesktopKeyboardHookModeToStringConverter" />
2223
<converters:RemoteDesktopNetworkConnectionTypeToStringConverter x:Key="RemoteDesktopNetworkConnectionTypeToStringConverter" />
23-
<converters:StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter x:Key="StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter" />
24+
<convertersOld:StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter x:Key="StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter" />
2425
</UserControl.Resources>
2526
<Grid Margin="0,20">
2627
<Grid.RowDefinitions>

‎Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
77
xmlns:validators="clr-namespace:NETworkManager.Validators"
88
xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
9-
xmlns:localization="clr-namespace:NETworkManager.Localization.LanguageFiles;assembly=NETworkManager.Localization"
10-
xmlns:converters="clr-namespace:NETworkManager.Converters"
9+
xmlns:localization="clr-namespace:NETworkManager.Localization.LanguageFiles;assembly=NETworkManager.Localization"
10+
xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
1111
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:RemoteDesktopSettingsViewModel}">
1212
<UserControl.Resources>
1313
<converters:RemoteDesktopAudioCaptureRedirectionModeToStringConverter x:Key="RemoteDesktopAudioCaptureRedirectionModeToStringConverter" />

0 commit comments

Comments
 (0)