Skip to content

Commit c4fc7dd

Browse files
BornToBeRootBornToBeRoot
committed
License added, code improved, view/design improved
1 parent 900dd85 commit c4fc7dd

11 files changed

Lines changed: 235 additions & 94 deletions

File tree

‎Source/NETworkManager/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ public ICommand OpenGithubProjectCommand
603603

604604
private void OpenGithubProjectAction()
605605
{
606-
Process.Start(Properties.Resources.Project_GitHub_Url);
606+
Process.Start(Properties.Resources.NETworkManager_ProjectUrl);
607607
}
608608

609609
public ICommand OpenApplicationListCommand

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@
182182
<Compile Include="ViewModels\Help\HelpCommandLineViewModel.cs" />
183183
<Compile Include="ViewModels\Settings\SettingsApplicationDNSLookupViewModel.cs" />
184184
<Compile Include="ViewModels\Settings\SettingsApplicationWakeOnLANViewModel.cs" />
185+
<Compile Include="Views\Settings\UpdateView.xaml.cs">
186+
<DependentUpon>UpdateView.xaml</DependentUpon>
187+
</Compile>
185188
<Compile Include="Views\Settings\SettingsApplicationDNSLookupView.xaml.cs">
186189
<DependentUpon>SettingsApplicationDNSLookupView.xaml</DependentUpon>
187190
</Compile>
@@ -256,6 +259,10 @@
256259
<SubType>Designer</SubType>
257260
<Generator>MSBuild:Compile</Generator>
258261
</Page>
262+
<Page Include="Views\Settings\UpdateView.xaml">
263+
<Generator>MSBuild:Compile</Generator>
264+
<SubType>Designer</SubType>
265+
</Page>
259266
<Page Include="Views\Settings\SettingsApplicationDNSLookupView.xaml">
260267
<Generator>MSBuild:Compile</Generator>
261268
<SubType>Designer</SubType>

‎Source/NETworkManager/Properties/Resources.Designer.cs‎

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

‎Source/NETworkManager/Properties/Resources.resx‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,55 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Libary_ControlzEx_Url" xml:space="preserve">
120+
<data name="Libary_ControlzEx_LicenseUrl" xml:space="preserve">
121+
<value>https://github.com/ControlzEx/ControlzEx/blob/master/LICENSE</value>
122+
</data>
123+
<data name="Libary_ControlzEx_Name" xml:space="preserve">
124+
<value>ControlzEx</value>
125+
</data>
126+
<data name="Libary_ControlzEx_ProjectUrl" xml:space="preserve">
121127
<value>https://github.com/ControlzEx/ControlzEx</value>
122128
</data>
123-
<data name="Libary_HeijdenDNS_Url" xml:space="preserve">
129+
<data name="Libary_HeijdenDNS_LicenseUrl" xml:space="preserve">
130+
<value>https://www.codeproject.com/info/cpol10.aspx</value>
131+
</data>
132+
<data name="Libary_HeijdenDNS_Name" xml:space="preserve">
133+
<value>Heijden.DNS</value>
134+
</data>
135+
<data name="Libary_HeijdenDNS_ProjectUrl" xml:space="preserve">
124136
<value>https://www.codeproject.com/Articles/23673/DNS-NET-Resolver-C</value>
125137
</data>
126-
<data name="Libary_MahAppsMetroIconPacks_Url" xml:space="preserve">
138+
<data name="Libary_MahAppsMetroIconPacks_LicenseUrl" xml:space="preserve">
139+
<value>https://github.com/MahApps/MahApps.Metro.IconPacks/blob/master/LICENSE</value>
140+
</data>
141+
<data name="Libary_MahAppsMetroIconPacks_Name" xml:space="preserve">
142+
<value>MahApps.Metro.IconPacks</value>
143+
</data>
144+
<data name="Libary_MahAppsMetroIconPacks_ProjectUrl" xml:space="preserve">
127145
<value>https://github.com/MahApps/MahApps.Metro.IconPacks</value>
128146
</data>
129-
<data name="Libary_MahAppsMetro_Url" xml:space="preserve">
147+
<data name="Libary_MahAppsMetro_LicenseUrl" xml:space="preserve">
148+
<value>https://github.com/MahApps/MahApps.Metro/blob/master/LICENSE</value>
149+
</data>
150+
<data name="Libary_MahAppsMetro_Name" xml:space="preserve">
151+
<value>MahApps.Metro</value>
152+
</data>
153+
<data name="Libary_MahAppsMetro_ProjectUrl" xml:space="preserve">
130154
<value>http://mahapps.com/</value>
131155
</data>
132-
<data name="Project_GitHub_Url" xml:space="preserve">
156+
<data name="License_CPOL" xml:space="preserve">
157+
<value>Code Project Open License</value>
158+
</data>
159+
<data name="License_GNUGPLv3" xml:space="preserve">
160+
<value>GNU General Public License v3.0</value>
161+
</data>
162+
<data name="License_MIT" xml:space="preserve">
163+
<value>MIT License</value>
164+
</data>
165+
<data name="NETworkManager_LicenseUrl" xml:space="preserve">
166+
<value>https://github.com/BornToBeRoot/NETworkManager/blob/master/LICENSE</value>
167+
</data>
168+
<data name="NETworkManager_ProjectUrl" xml:space="preserve">
133169
<value>https://github.com/BornToBeRoot/NETworkManager</value>
134170
</data>
135171
</root>

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
<system:String x:Key="String_SettingsSuccessfullyImported">Einstellungen erfolgreich importiert!</system:String>
224224
<system:String x:Key="String_WakeOnLANClientsReloaded">Wake on LAN Clients neu geladen</system:String>
225225
<system:String x:Key="String_NetworkInterfaceProfilesReloaded">Netzwerkinterface Profile neu geladen</system:String>
226+
<system:String x:Key="String_ComingSoon">Kommt demnächst!</system:String>
226227

227228
<!-- Buttons -->
228229
<system:String x:Key="String_Button_Change">Wechseln</system:String>
@@ -377,12 +378,8 @@
377378
<system:String x:Key="String_PortStatus_Open">Offen</system:String>
378379

379380
<!-- Libaries -->
380-
<system:String x:Key="String_Libary_ControlzExName">ControlzEx</system:String>
381-
<system:String x:Key="String_Libary_ControlzExDescription">Shared Controlz for WPF and ... more.</system:String>
382-
<system:String x:Key="String_Libary_MahAppsMetroName">MahApps.Metro</system:String>
381+
<system:String x:Key="String_Libary_ControlzExDescription">Shared Controlz für WPF und ... mehr.</system:String>
383382
<system:String x:Key="String_Libary_MahAppsMetroDescription">Ein Toolkit für die Erstellung von WPF-Anwendungen im Metro - / Modern UI Stil.</system:String>
384-
<system:String x:Key="String_Libary_MahAppsMetroIconPacksName">MahApps.Metro.IconPacks</system:String>
385383
<system:String x:Key="String_Libary_MahAppsMetroIconPacksDescription">Eine Sammlung von Icons für WPF und UWP...</system:String>
386-
<system:String x:Key="String_Libary_HeijdenDNSName">Heijden.DNS</system:String>
387384
<system:String x:Key="String_Libary_HeijdenDNSDescription">Wiederverwendbare DNS-Resolver-Komponente</system:String>
388385
</ResourceDictionary>

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@
223223
<system:String x:Key="String_SettingsSuccessfullyImported">Settings successfully imported!</system:String>
224224
<system:String x:Key="String_WakeOnLANClientsReloaded">Wake on LAN clients reloaded</system:String>
225225
<system:String x:Key="String_NetworkInterfaceProfilesReloaded">Network interface profiles reloaded</system:String>
226-
226+
<system:String x:Key="String_ComingSoon">Coming Soon!</system:String>
227+
227228
<!-- Buttons -->
228229
<system:String x:Key="String_Button_Change">Change</system:String>
229230
<system:String x:Key="String_Button_Default">Default</system:String>
@@ -377,12 +378,8 @@
377378
<system:String x:Key="String_PortStatus_Open">Open</system:String>
378379

379380
<!-- Libaries -->
380-
<system:String x:Key="String_Libary_ControlzExName">ControlzEx</system:String>
381381
<system:String x:Key="String_Libary_ControlzExDescription">Shared Controlz for WPF and ... more.</system:String>
382-
<system:String x:Key="String_Libary_MahAppsMetroName">MahApps.Metro</system:String>
383382
<system:String x:Key="String_Libary_MahAppsMetroDescription">A toolkit for creating Metro / Modern UI styled WPF apps.</system:String>
384-
<system:String x:Key="String_Libary_MahAppsMetroIconPacksName">MahApps.Metro.IconPacks</system:String>
385383
<system:String x:Key="String_Libary_MahAppsMetroIconPacksDescription">Some awesome icons for WPF and UWP all together...</system:String>
386-
<system:String x:Key="String_Libary_HeijdenDNSName">Heijden.DNS</system:String>
387384
<system:String x:Key="String_Libary_HeijdenDNSDescription">Reusable DNS resolver component</system:String>
388385
</ResourceDictionary>

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

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -60,44 +60,14 @@ public AboutViewModel()
6060
#endregion
6161

6262
#region Commands & Actions
63-
public ICommand OpenWebsiteLibaryControlzExCommand
63+
public ICommand OpenWebsiteCommand
6464
{
65-
get { return new RelayCommand(p => OpenWebsiteLibaryControlzExAction()); }
65+
get { return new RelayCommand(p => OpenWebsiteAction(p)); }
6666
}
6767

68-
private void OpenWebsiteLibaryControlzExAction()
68+
private void OpenWebsiteAction(object url)
6969
{
70-
Process.Start(Properties.Resources.Libary_ControlzEx_Url);
71-
}
72-
73-
public ICommand OpenWebsiteLibaryMahAppsMetroCommand
74-
{
75-
get { return new RelayCommand(p => OpenWebsiteLibaryMahAppsMetroAction()); }
76-
}
77-
78-
private void OpenWebsiteLibaryMahAppsMetroAction()
79-
{
80-
Process.Start(Properties.Resources.Libary_MahAppsMetro_Url);
81-
}
82-
83-
public ICommand OpenWebsiteLibaryMahAppsMetroIconPacksCommand
84-
{
85-
get { return new RelayCommand(p => OpenWebsiteLibaryMahAppsMetroIconPacksAction()); }
86-
}
87-
88-
private void OpenWebsiteLibaryMahAppsMetroIconPacksAction()
89-
{
90-
Process.Start(Properties.Resources.Libary_MahAppsMetroIconPacks_Url);
91-
}
92-
93-
public ICommand OpenWebsiteLibaryHeijdenDNSCommand
94-
{
95-
get { return new RelayCommand(p => OpenWebsiteLibaryHeijdenDNSAction()); }
96-
}
97-
98-
private void OpenWebsiteLibaryHeijdenDNSAction()
99-
{
100-
Process.Start(Properties.Resources.Libary_HeijdenDNS_Url);
70+
Process.Start((string)url);
10171
}
10272
#endregion
10373
}

0 commit comments

Comments
 (0)