Skip to content

Commit 499b0c0

Browse files
BornToBeRootBornToBeRoot
authored
New dashboard and status window (BornToBeRoot#703)
* New dashboard and new status window * First check added, network connection added to status window * Update style * Fix detect ipv6 * Update * New dashboard * Hide status window on focus lost * Settings added, string translated * Fix design issue for admin label * Cancel added, IPv6 dns resolve added Co-authored-by: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
1 parent b8471fa commit 499b0c0

25 files changed

Lines changed: 1564 additions & 1753 deletions

‎Source/NETworkManager.Converters/ConnectionStateToRectangleStyleConverter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1616
{
1717
case ConnectionState.None:
1818
break;
19-
//return Application.Current.Resources["HelpRectangle"] as Style;
2019
case ConnectionState.OK:
2120
return Application.Current.Resources["CheckRectangle"] as Style;
2221
case ConnectionState.Warning:
2322
return Application.Current.Resources["AlertRectangle"] as Style;
2423
case ConnectionState.Critical:
2524
return Application.Current.Resources["ErrorRectangle"] as Style;
25+
case ConnectionState.Info:
26+
return Application.Current.Resources["InfoRectangle"] as Style;
2627
default:
2728
throw new ArgumentOutOfRangeException();
2829
}

‎Source/NETworkManager.Localization/Resources/StaticStrings.Designer.cs‎

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/StaticStrings.resx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<data name="XML" xml:space="preserve">
274274
<value>XML</value>
275275
</data>
276-
<data name="ExamplePublicIPAddressAPI" xml:space="preserve">
276+
<data name="ExamplePublicIPv4AddressAPI" xml:space="preserve">
277277
<value>https://api.ipify.org</value>
278278
</data>
279279
<data name="IExploreExe" xml:space="preserve">
@@ -291,4 +291,10 @@
291291
<data name="ExamplePorts" xml:space="preserve">
292292
<value>22; 80; 443</value>
293293
</data>
294+
<data name="ExampleIPv6Address" xml:space="preserve">
295+
<value>2606:4700:4700::1111</value>
296+
</data>
297+
<data name="ExamplePublicIPv6AddressAPI" xml:space="preserve">
298+
<value>https://api6.ipify.org</value>
299+
</data>
294300
</root>

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

Lines changed: 71 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/Strings.resx‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@ URL: https://api.github.com/</value>
19981998
<data name="HelpMessage_CheckPublicIPAddress" xml:space="preserve">
19991999
<value>The public IP address is determined via ipify.org.
20002000

2001-
URL: https://api.ipify.org/</value>
2001+
URL: https://api.ipify.org and https://api6.ipify.org</value>
20022002
</data>
20032003
<data name="Privacy" xml:space="preserve">
20042004
<value>Privacy</value>
@@ -2094,8 +2094,8 @@ is disabled!</value>
20942094
<data name="XXXIsReachableViaICMPMessage" xml:space="preserve">
20952095
<value>"{0}" is reachable via ICMP!</value>
20962096
</data>
2097-
<data name="UseCustomAPI" xml:space="preserve">
2098-
<value>Use custom API</value>
2097+
<data name="UseCustomIPv4AddressAPI" xml:space="preserve">
2098+
<value>Use custom IPv4 address API</value>
20992099
</data>
21002100
<data name="HelpMessage_CustomPublicIPAddressAPI" xml:space="preserve">
21012101
<value>URL to a web service that can be reached via http or https and returns an IP address as response.</value>
@@ -2106,15 +2106,6 @@ is disabled!</value>
21062106
<data name="CouldNotConnectToXXXMessage" xml:space="preserve">
21072107
<value>Could not connect to "{0}"!</value>
21082108
</data>
2109-
<data name="PublicDNSTestDomain" xml:space="preserve">
2110-
<value>Public DNS test domain</value>
2111-
</data>
2112-
<data name="PublicDNSTestIPAddress" xml:space="preserve">
2113-
<value>Public DNS test IP address</value>
2114-
</data>
2115-
<data name="PublicICMPTestIPAddress" xml:space="preserve">
2116-
<value>Public ICMP test IP address</value>
2117-
</data>
21182109
<data name="IPv4ProtocolAvailable" xml:space="preserve">
21192110
<value>IPv4 protocol available</value>
21202111
</data>
@@ -2205,15 +2196,6 @@ is disabled!</value>
22052196
<data name="RemoteDesktopAudioRedirectionMode_PlayOnThisComputer" xml:space="preserve">
22062197
<value>Play on this computer</value>
22072198
</data>
2208-
<data name="HelpMessage_PublicDNSTestDomain" xml:space="preserve">
2209-
<value>Domain to test dns server settings (Domain must resolve A or AAAA record).</value>
2210-
</data>
2211-
<data name="HelpMessage_PublicDNSTestIPAddress" xml:space="preserve">
2212-
<value>IP address to test dns server settings (IP address must resolve PTR record).</value>
2213-
</data>
2214-
<data name="HelpMessage_PublicICMPTestIPAddress" xml:space="preserve">
2215-
<value>IP address to test connection via ping (ICMP).</value>
2216-
</data>
22172199
<data name="Gateway" xml:space="preserve">
22182200
<value>Gateway</value>
22192201
</data>
@@ -3065,11 +3047,35 @@ The application will be restarted afterwards!</value>
30653047

30663048
Enable profile file encryption in Settings&gt;Profile to store credentials securely.</value>
30673049
</data>
3068-
<data name="String1" xml:space="preserve">
3069-
<value />
3050+
<data name="ICMPv4" xml:space="preserve">
3051+
<value>ICMPv4</value>
3052+
</data>
3053+
<data name="ICMPv6" xml:space="preserve">
3054+
<value>ICMPv6</value>
3055+
</data>
3056+
<data name="CheckIsDisabled" xml:space="preserve">
3057+
<value>Check is disabled!</value>
3058+
</data>
3059+
<data name="EnterValidIPv6Address" xml:space="preserve">
3060+
<value>Enter a valid IPv6 address!</value>
3061+
</data>
3062+
<data name="HelpMessage_PublicIPv4Address" xml:space="preserve">
3063+
<value>Public accessible IPv4 address.</value>
3064+
</data>
3065+
<data name="HelpMessage_PublicIPv6Address" xml:space="preserve">
3066+
<value>Public accessible IPv6 address.</value>
3067+
</data>
3068+
<data name="PublicIPv4Address" xml:space="preserve">
3069+
<value>Public IPv4 address</value>
3070+
</data>
3071+
<data name="PublicIPv6Address" xml:space="preserve">
3072+
<value>Public IPv6 address</value>
3073+
</data>
3074+
<data name="UseCustomIPv6AddressAPI" xml:space="preserve">
3075+
<value>Use custom IPv6 address API</value>
30703076
</data>
30713077
<data name="TimeToLive" xml:space="preserve">
3072-
<value>Time to live</value>
3078+
<value>Time to live</value>
30733079
</data>
30743080
<data name="ChassisId" xml:space="preserve">
30753081
<value>Chassis Id</value>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ public enum ConnectionState
2323
/// <summary>
2424
/// Connection is critical.
2525
/// </summary>
26-
Critical
26+
Critical,
27+
28+
/// <summary>
29+
/// Informations.
30+
/// </summary>
31+
Info
2732
}
2833
}

0 commit comments

Comments
 (0)