Skip to content

Commit c111ef9

Browse files
committed
Resources added to about view / code cleanup
1 parent b276205 commit c111ef9

8 files changed

Lines changed: 254 additions & 163 deletions

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
namespace NETworkManager.Models.Documentation
2+
{
3+
public class ResourceInfo
4+
{
5+
public string Resource { get; set; }
6+
public string ResourceUrl { get; set; }
7+
public string Description { get; set; }
8+
9+
public ResourceInfo()
10+
{
11+
12+
}
13+
14+
public ResourceInfo(string resource, string resourceUrl, string description)
15+
{
16+
Resource = resource;
17+
ResourceUrl = resourceUrl;
18+
Description = description;
19+
}
20+
}
21+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Collections.Generic;
2+
3+
namespace NETworkManager.Models.Documentation
4+
{
5+
public static class ResourceManager
6+
{
7+
public static List<ResourceInfo> List
8+
{
9+
get
10+
{
11+
return new List<ResourceInfo>
12+
{
13+
new ResourceInfo("Organizationally unique identifier", "https://linuxnet.ca/ieee/oui/", "Sanitized IEEE OUI Data from linuxnet.ca"),
14+
new ResourceInfo("Service names and port numbers", "https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml", "Service Name and Transport Protocol Port Number Registry from iana.org")
15+
};
16+
}
17+
}
18+
}
19+
}

Source/NETworkManager/NETworkManager.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@
257257
<Compile Include="Converters\ValidateNetworkInterfaceProfileConverter.cs" />
258258
<Compile Include="Converters\ValidateSubnetCalculatorIPv4SplitterConverter.cs" />
259259
<Compile Include="Models\Documentation\CommunityManager.cs" />
260+
<Compile Include="Models\Documentation\ResourceInfo.cs" />
261+
<Compile Include="Models\Documentation\ResourceManager.cs" />
260262
<Compile Include="Models\PuTTY\PuTTYSessionInfo.cs" />
261263
<Compile Include="Models\PuTTY\PuTTY.cs" />
262264
<Compile Include="Models\Settings\TracerouteProfileManager.cs" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<system:String x:Key="String_Header_EditGroup">Gruppe bearbeiten</system:String>
107107
<system:String x:Key="String_Header_Overwrite">Überschreiben?</system:String>
108108
<system:String x:Key="String_Header_NewTab">Neuer Tab</system:String>
109+
<system:String x:Key="String_Header_Resources">Ressourcen</system:String>
109110

110111
<!-- Normal strings -->
111112
<system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -414,7 +415,8 @@
414415
<system:String x:Key="String_RemoteDesktop">Remote Desktop</system:String>
415416
<system:String x:Key="String_PuTTY">PuTTY</system:String>
416417
<system:String x:Key="String_SNMP">SNMP</system:String>
417-
418+
<system:String x:Key="String_OpenWebsite">Webseite öffnen</system:String>
419+
418420
<!-- Documentation title -->
419421
<system:String x:Key="String_DocumentationTitle_00001">Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?</system:String>
420422
<system:String x:Key="String_DocumentationTitle_00002">Wie erstelle ich ein benutzerdefiniertes Thema und Akzent?</system:String>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
<system:String x:Key="String_Header_EditGroup">Edit group</system:String>
107107
<system:String x:Key="String_Header_Overwrite">Overwrite?</system:String>
108108
<system:String x:Key="String_Header_NewTab">New tab</system:String>
109-
109+
<system:String x:Key="String_Header_Resources">Resources</system:String>
110+
110111
<!-- Normal strings -->
111112
<system:String x:Key="String_ProductName">NETworkManager</system:String>
112113
<system:String x:Key="String_Slogan">A powerful tool for managing networks and troubleshoot network problems!</system:String>
@@ -414,6 +415,7 @@
414415
<system:String x:Key="String_RemoteDesktop">Remote Desktop</system:String>
415416
<system:String x:Key="String_PuTTY">PuTTY</system:String>
416417
<system:String x:Key="String_SNMP">SNMP</system:String>
418+
<system:String x:Key="String_OpenWebsite">Open website</system:String>
417419

418420
<!-- Documentation title -->
419421
<system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2</system:String>

Source/NETworkManager/ViewModels/AboutViewModel.cs

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,26 @@ public LibraryInfo SelectedLibraryInfo
131131
OnPropertyChanged();
132132
}
133133
}
134+
135+
private ICollectionView _resourcesView;
136+
public ICollectionView ResourcesView
137+
{
138+
get { return _resourcesView; }
139+
}
140+
141+
private ResourceInfo _selectedResourceInfo;
142+
public ResourceInfo SelectedResourceInfo
143+
{
144+
get { return _selectedResourceInfo; }
145+
set
146+
{
147+
if (value == _selectedResourceInfo)
148+
return;
149+
150+
_selectedResourceInfo = value;
151+
OnPropertyChanged();
152+
}
153+
}
134154
#endregion
135155

136156
#region Constructor
@@ -140,6 +160,9 @@ public AboutViewModel()
140160

141161
_librariesView = CollectionViewSource.GetDefaultView(LibraryManager.List);
142162
_librariesView.SortDescriptions.Add(new SortDescription(nameof(LibraryInfo.Library), ListSortDirection.Ascending));
163+
164+
_resourcesView = CollectionViewSource.GetDefaultView(ResourceManager.List);
165+
_resourcesView.SortDescriptions.Add(new SortDescription(nameof(ResourceInfo.Resource), ListSortDirection.Ascending));
143166
}
144167
#endregion
145168

@@ -163,26 +186,6 @@ private void OpenWebsiteAction(object url)
163186
{
164187
Process.Start((string)url);
165188
}
166-
167-
public ICommand OpenLibaryWebsiteCommand
168-
{
169-
get { return new RelayCommand(p => OpenLibaryWebsiteAction()); }
170-
}
171-
172-
private void OpenLibaryWebsiteAction()
173-
{
174-
Process.Start(SelectedLibraryInfo.LibraryUrl);
175-
}
176-
177-
public ICommand OpenLibaryLicenseCommand
178-
{
179-
get { return new RelayCommand(p => OpenLibaryLicenseAction()); }
180-
}
181-
182-
private void OpenLibaryLicenseAction()
183-
{
184-
Process.Start(SelectedLibraryInfo.LicenseUrl);
185-
}
186189
#endregion
187190

188191
#region Methods

0 commit comments

Comments
 (0)