Skip to content

Commit 9e74521

Browse files
BornToBeRootBornToBeRoot
authored
Fix: #2614 due to #2586 (#2615)
* Fix: #2614 due to #2586 * Chore: Apply JetBrains Rider style & code cleanup
1 parent fb531f5 commit 9e74521

File tree

4 files changed

+109
-69
lines changed

4 files changed

+109
-69
lines changed

‎Source/GlobalAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
[assembly: AssemblyCulture("")]
88

99
[assembly: AssemblyVersion("2024.1.6.0")]
10-
[assembly: AssemblyFileVersion("2024.1.6.0")]
10+
[assembly: AssemblyFileVersion("2024.1.6.0")]

‎Source/NETworkManager.Documentation/DocumentationManager.cs‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -22,63 +22,63 @@ public static class DocumentationManager
2222
/// </summary>
2323
private static IEnumerable<DocumentationInfo> List =>
2424
[
25-
new DocumentationInfo(DocumentationIdentifier.ApplicationDashboard,
25+
new DocumentationInfo(DocumentationIdentifier.ApplicationDashboard,
2626
@"docs/application/dashboard"),
27-
27+
2828
new DocumentationInfo(DocumentationIdentifier.ApplicationNetworkInterface,
2929
@"docs/application/network-interface"),
3030

31-
new DocumentationInfo(DocumentationIdentifier.ApplicationWiFi,
31+
new DocumentationInfo(DocumentationIdentifier.ApplicationWiFi,
3232
@"docs/application/wifi"),
33-
34-
new DocumentationInfo(DocumentationIdentifier.ApplicationIPScanner,
33+
34+
new DocumentationInfo(DocumentationIdentifier.ApplicationIPScanner,
3535
@"docs/application/ip-scanner"),
36-
37-
new DocumentationInfo(DocumentationIdentifier.ApplicationPortScanner,
36+
37+
new DocumentationInfo(DocumentationIdentifier.ApplicationPortScanner,
3838
@"docs/application/port-scanner"),
39-
40-
new DocumentationInfo(DocumentationIdentifier.ApplicationPingMonitor,
39+
40+
new DocumentationInfo(DocumentationIdentifier.ApplicationPingMonitor,
4141
@"docs/application/ping-monitor"),
42-
43-
new DocumentationInfo(DocumentationIdentifier.ApplicationTraceroute,
42+
43+
new DocumentationInfo(DocumentationIdentifier.ApplicationTraceroute,
4444
@"docs/application/traceroute"),
45-
46-
new DocumentationInfo(DocumentationIdentifier.ApplicationDnsLookup,
45+
46+
new DocumentationInfo(DocumentationIdentifier.ApplicationDnsLookup,
4747
@"docs/application/dns-lookup"),
48-
48+
4949
new DocumentationInfo(DocumentationIdentifier.ApplicationRemoteDesktop,
5050
@"docs/application/remote-desktop"),
5151

52-
new DocumentationInfo(DocumentationIdentifier.ApplicationPowerShell,
52+
new DocumentationInfo(DocumentationIdentifier.ApplicationPowerShell,
5353
@"docs/application/powershell"),
54-
55-
new DocumentationInfo(DocumentationIdentifier.ApplicationPutty,
54+
55+
new DocumentationInfo(DocumentationIdentifier.ApplicationPutty,
5656
@"docs/application/putty"),
57-
57+
5858
new DocumentationInfo(DocumentationIdentifier.ApplicationAWSSessionManager,
5959
@"docs/application/aws-session-manager"),
6060

61-
new DocumentationInfo(DocumentationIdentifier.ApplicationTigerVNC,
61+
new DocumentationInfo(DocumentationIdentifier.ApplicationTigerVNC,
6262
@"docs/application/tigervnc"),
63-
64-
new DocumentationInfo(DocumentationIdentifier.ApplicationWebConsole,
63+
64+
new DocumentationInfo(DocumentationIdentifier.ApplicationWebConsole,
6565
@"docs/application/web-console"),
66-
67-
new DocumentationInfo(DocumentationIdentifier.ApplicationSnmp,
66+
67+
new DocumentationInfo(DocumentationIdentifier.ApplicationSnmp,
6868
@"docs/application/snmp"),
69-
69+
7070
new DocumentationInfo(DocumentationIdentifier.ApplicationSntpLookup,
7171
@"docs/application/sntp-lookup"),
72-
72+
7373
new DocumentationInfo(DocumentationIdentifier.ApplicationDiscoveryProtocol,
7474
@"docs/application/discovery-protocol"),
7575

76-
new DocumentationInfo(DocumentationIdentifier.ApplicationWakeOnLan,
76+
new DocumentationInfo(DocumentationIdentifier.ApplicationWakeOnLan,
7777
@"docs/application/wake-on-lan"),
78-
79-
new DocumentationInfo(DocumentationIdentifier.ApplicationWhois,
78+
79+
new DocumentationInfo(DocumentationIdentifier.ApplicationWhois,
8080
@"docs/application/whois"),
81-
81+
8282
new DocumentationInfo(DocumentationIdentifier.ApplicationIPGeolocation,
8383
@"docs/application/ip-geolocation"),
8484

@@ -88,55 +88,55 @@ public static class DocumentationManager
8888
new DocumentationInfo(DocumentationIdentifier.ApplicationBitCalculator,
8989
@"docs/application/bit-calculator"),
9090

91-
new DocumentationInfo(DocumentationIdentifier.ApplicationLookup,
91+
new DocumentationInfo(DocumentationIdentifier.ApplicationLookup,
9292
@"docs/application/lookup"),
93-
94-
new DocumentationInfo(DocumentationIdentifier.ApplicationConnections,
93+
94+
new DocumentationInfo(DocumentationIdentifier.ApplicationConnections,
9595
@"docs/application/connection"),
96-
97-
new DocumentationInfo(DocumentationIdentifier.ApplicationListeners,
96+
97+
new DocumentationInfo(DocumentationIdentifier.ApplicationListeners,
9898
@"docs/application/listeners"),
99-
100-
new DocumentationInfo(DocumentationIdentifier.ApplicationArpTable,
99+
100+
new DocumentationInfo(DocumentationIdentifier.ApplicationArpTable,
101101
@"docs/application/arp-table"),
102-
103-
new DocumentationInfo(DocumentationIdentifier.SettingsGeneral,
102+
103+
new DocumentationInfo(DocumentationIdentifier.SettingsGeneral,
104104
@"docs/settings/general"),
105-
106-
new DocumentationInfo(DocumentationIdentifier.SettingsWindow,
105+
106+
new DocumentationInfo(DocumentationIdentifier.SettingsWindow,
107107
@"docs/settings/window"),
108-
109-
new DocumentationInfo(DocumentationIdentifier.SettingsAppearance,
108+
109+
new DocumentationInfo(DocumentationIdentifier.SettingsAppearance,
110110
@"docs/settings/appearance"),
111-
112-
new DocumentationInfo(DocumentationIdentifier.SettingsLanguage,
111+
112+
new DocumentationInfo(DocumentationIdentifier.SettingsLanguage,
113113
@"docs/settings/language"),
114-
115-
new DocumentationInfo(DocumentationIdentifier.SettingsNetwork,
114+
115+
new DocumentationInfo(DocumentationIdentifier.SettingsNetwork,
116116
@"docs/settings/network"),
117-
118-
new DocumentationInfo(DocumentationIdentifier.SettingsStatus,
117+
118+
new DocumentationInfo(DocumentationIdentifier.SettingsStatus,
119119
@"docs/settings/status"),
120-
121-
new DocumentationInfo(DocumentationIdentifier.SettingsHotKeys,
120+
121+
new DocumentationInfo(DocumentationIdentifier.SettingsHotKeys,
122122
@"docs/settings/hotkeys"),
123-
124-
new DocumentationInfo(DocumentationIdentifier.SettingsAutostart,
123+
124+
new DocumentationInfo(DocumentationIdentifier.SettingsAutostart,
125125
@"docs/settings/autostart"),
126-
127-
new DocumentationInfo(DocumentationIdentifier.SettingsUpdate,
126+
127+
new DocumentationInfo(DocumentationIdentifier.SettingsUpdate,
128128
@"docs/settings/update"),
129-
130-
new DocumentationInfo(DocumentationIdentifier.SettingsProfiles,
129+
130+
new DocumentationInfo(DocumentationIdentifier.SettingsProfiles,
131131
@"docs/settings/profiles"),
132-
133-
new DocumentationInfo(DocumentationIdentifier.SettingsSettings,
132+
133+
new DocumentationInfo(DocumentationIdentifier.SettingsSettings,
134134
@"docs/settings/settings"),
135-
136-
new DocumentationInfo(DocumentationIdentifier.Profiles,
135+
136+
new DocumentationInfo(DocumentationIdentifier.Profiles,
137137
@"Documentation/profiles"),
138-
139-
new DocumentationInfo(DocumentationIdentifier.CommandLineArguments,
138+
139+
new DocumentationInfo(DocumentationIdentifier.CommandLineArguments,
140140
@"docs/commandline-arguments")
141141
];
142142

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
135135
};
136136

137137
LookupClient lookupClient = new(lookupClientOptions);
138-
138+
139139
// Get the dns server hostname for some additional information
140140
var dnsServerHostName = string.Empty;
141141

@@ -146,12 +146,13 @@ public void ResolveAsync(IEnumerable<string> hosts)
146146
if (!result.HasError)
147147
{
148148
var record = result.Answers.PtrRecords().FirstOrDefault();
149-
149+
150150
if (record != null)
151151
dnsServerHostName = record.PtrDomainName;
152152
}
153153
}
154-
catch {
154+
catch
155+
{
155156
// ignored
156157
}
157158

@@ -170,18 +171,18 @@ public void ResolveAsync(IEnumerable<string> hosts)
170171
{
171172
OnLookupError(new DNSLookupErrorArgs(query, $"{dnsServer.Address}",
172173
$"{dnsServer.Address}:{dnsServer.Port}", dnsResponse.ErrorMessage));
173-
174+
174175
return; // continue
175176
}
176177

177178
if (dnsResponse.Answers.Count == 0)
178179
{
179180
var digAdditionalCommand = _settings.QueryType == QueryType.PTR ? " -x " : " ";
180-
181+
181182
OnLookupError(new DNSLookupErrorArgs(query, $"{dnsServer.Address}",
182183
$"{dnsServer.Address}:{dnsServer.Port}",
183184
$"No DNS resource records received for query \"{query}\" (Query type: \"{_settings.QueryType}\") and the DNS server did not return an error. Try to check your DNS server with: dig @{dnsServer.Address}{digAdditionalCommand}{query}"));
184-
185+
185186
return; // continue
186187
}
187188

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,45 @@
2626
<converters:ApplicationNameToTranslatedStringConverter x:Key="ApplicationNameToTranslatedStringConverter" />
2727
<converters:ApplicationNameToIconConverter x:Key="ApplicationNameToIconConverter" />
2828
<converters:IntZeroToVisibilityCollapsedConverter x:Key="IntZeroToVisibilityCollapsedConverter" />
29+
<!-- ReSharper disable once Xaml.RedundantResource - Used in TrayIcon -->
30+
<ContextMenu x:Key="ContextMenuNotifyIcon" MinWidth="200" Opened="ContextMenu_Opened" x:Shared="False">
31+
<MenuItem Header="{x:Static localization:Strings.Show}" Command="{Binding ShowWindowCommand}">
32+
<MenuItem.Icon>
33+
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
34+
<Rectangle.OpacityMask>
35+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=OpenInNew}" />
36+
</Rectangle.OpacityMask>
37+
</Rectangle>
38+
</MenuItem.Icon>
39+
</MenuItem>
40+
<MenuItem Header="{x:Static localization:Strings.Status}" Command="{Binding OpenStatusWindowCommand}">
41+
<MenuItem.Icon>
42+
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
43+
<Rectangle.OpacityMask>
44+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Pulse}" />
45+
</Rectangle.OpacityMask>
46+
</Rectangle>
47+
</MenuItem.Icon>
48+
</MenuItem>
49+
<MenuItem Header="{x:Static localization:Strings.Settings}" Command="{Binding OpenSettingsFromTrayCommand}">
50+
<MenuItem.Icon>
51+
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
52+
<Rectangle.OpacityMask>
53+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
54+
</Rectangle.OpacityMask>
55+
</Rectangle>
56+
</MenuItem.Icon>
57+
</MenuItem>
58+
<MenuItem Header="{x:Static localization:Strings.Close}" Command="{Binding CloseApplicationCommand}">
59+
<MenuItem.Icon>
60+
<Rectangle Width="16" Height="16" Fill="Red">
61+
<Rectangle.OpacityMask>
62+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=WindowClose}" />
63+
</Rectangle.OpacityMask>
64+
</Rectangle>
65+
</MenuItem.Icon>
66+
</MenuItem>
67+
</ContextMenu>
2968
</mah:MetroWindow.Resources>
3069
<mah:MetroWindow.TitleTemplate>
3170
<DataTemplate>

0 commit comments

Comments
 (0)