Skip to content

Commit dbf4c82

Browse files
BornToBeRootBornToBeRoot
committed
Some more changes, fixes, code cleanup
1 parent 2b7805e commit dbf4c82

10 files changed

Lines changed: 248 additions & 172 deletions

‎Source/NETworkManager/Models/Settings/SettingsInfo.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,16 +1005,16 @@ public bool DNSLookup_ExpandStatistics
10051005
#endregion
10061006

10071007
#region Calculator
1008-
private List<string> _subnetCalculator_SubnetHistory = new List<string>();
1009-
public List<string> SubnetCalculator_SubnetHistory
1008+
private List<string> _subnetCalculator_IPv4Calculator_SubnetHistory = new List<string>();
1009+
public List<string> SubnetCalculator_IPv4Calculator_SubnetHistory
10101010
{
1011-
get { return _subnetCalculator_SubnetHistory; }
1011+
get { return _subnetCalculator_IPv4Calculator_SubnetHistory; }
10121012
set
10131013
{
1014-
if (value == _subnetCalculator_SubnetHistory)
1014+
if (value == _subnetCalculator_IPv4Calculator_SubnetHistory)
10151015
return;
10161016

1017-
_subnetCalculator_SubnetHistory = value;
1017+
_subnetCalculator_IPv4Calculator_SubnetHistory = value;
10181018
SettingsChanged = true;
10191019
}
10201020
}

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@
184184
<Compile Include="ViewModels\Help\HelpCommandLineViewModel.cs" />
185185
<Compile Include="ViewModels\Settings\SettingsApplicationDNSLookupViewModel.cs" />
186186
<Compile Include="ViewModels\Settings\SettingsApplicationWakeOnLANViewModel.cs" />
187+
<Compile Include="Views\Applications\SubnetCalculatorView.xaml.cs">
188+
<DependentUpon>SubnetCalculatorView.xaml</DependentUpon>
189+
</Compile>
187190
<Compile Include="Views\Applications\WikiOUILookupView.xaml.cs">
188191
<DependentUpon>WikiOUILookupView.xaml</DependentUpon>
189192
</Compile>
@@ -243,6 +246,10 @@
243246
<Generator>MSBuild:Compile</Generator>
244247
<SubType>Designer</SubType>
245248
</Page>
249+
<Page Include="Views\Applications\SubnetCalculatorView.xaml">
250+
<Generator>MSBuild:Compile</Generator>
251+
<SubType>Designer</SubType>
252+
</Page>
246253
<Page Include="Views\Applications\WikiOUILookupView.xaml">
247254
<Generator>MSBuild:Compile</Generator>
248255
<SubType>Designer</SubType>
@@ -355,7 +362,7 @@
355362
<SubType>Designer</SubType>
356363
<Generator>MSBuild:Compile</Generator>
357364
</Page>
358-
<Page Include="Views\Applications\SubnetCalculatorView.xaml">
365+
<Page Include="Views\Applications\SubnetCalculatorIPv4CalculatorView.xaml">
359366
<SubType>Designer</SubType>
360367
<Generator>MSBuild:Compile</Generator>
361368
</Page>
@@ -466,7 +473,7 @@
466473
<Compile Include="ViewModels\Applications\IPScannerViewModel.cs" />
467474
<Compile Include="ViewModels\Applications\NetworkInterfaceViewModel.cs" />
468475
<Compile Include="ViewModels\Applications\PingViewModel.cs" />
469-
<Compile Include="ViewModels\Applications\SubnetCalculatorViewModel.cs" />
476+
<Compile Include="ViewModels\Applications\SubnetCalculatorIPv4CalculatorViewModel.cs" />
470477
<Compile Include="ViewModels\Applications\TracerouteViewModel.cs" />
471478
<Compile Include="ViewModels\Applications\WakeOnLANViewModel.cs" />
472479
<Compile Include="ViewModels\RelayCommand.cs" />
@@ -574,8 +581,8 @@
574581
<Compile Include="Views\Applications\WakeOnLANView.xaml.cs">
575582
<DependentUpon>WakeOnLANView.xaml</DependentUpon>
576583
</Compile>
577-
<Compile Include="Views\Applications\SubnetCalculatorView.xaml.cs">
578-
<DependentUpon>SubnetCalculatorView.xaml</DependentUpon>
584+
<Compile Include="Views\Applications\SubnetCalculatorIPv4CalculatorView.xaml.cs">
585+
<DependentUpon>SubnetCalculatorIPv4CalculatorView.xaml</DependentUpon>
579586
</Compile>
580587
<Compile Include="MainWindow.xaml.cs">
581588
<DependentUpon>MainWindow.xaml</DependentUpon>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
<system:String x:Key="String_Header_Scan">Scannen</system:String>
6363
<system:String x:Key="String_Header_Lookup">Lookup</system:String>
6464
<system:String x:Key="String_Header_Subnet">Subnetz</system:String>
65-
65+
<system:String x:Key="String_Header_IPv4Calculator">IPv4-Rechner</system:String>
66+
<system:String x:Key="String_Header_IPv4Splitter">IPv4-Splitter</system:String>
67+
6668
<!-- Normal strings -->
6769
<system:String x:Key="String_ProductName">NETworkManager</system:String>
6870
<system:String x:Key="String_Slogan">Ein leistungsstarkes Tool zum Verwalten von Netzwerken und zur Behebung von Netzwerkproblemen!</system:String>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
<system:String x:Key="String_Header_Scan">Scan</system:String>
6363
<system:String x:Key="String_Header_Lookup">Lookup</system:String>
6464
<system:String x:Key="String_Header_Subnet">Subnet</system:String>
65-
65+
<system:String x:Key="String_Header_IPv4Calculator">IPv4-Calculator</system:String>
66+
<system:String x:Key="String_Header_IPv4Splitter">IPv4-Splitter</system:String>
67+
6668
<!-- Normal strings -->
6769
<system:String x:Key="String_ProductName">NETworkManager</system:String>
6870
<system:String x:Key="String_Slogan">A powerful tool for managing networks and troubleshoot network problems!</system:String>

Source/NETworkManager/ViewModels/Applications/SubnetCalculatorViewModel.cs renamed to Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4CalculatorViewModel.cs

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
using System.Collections.Generic;
44
using System.Net;
55
using System.Windows.Input;
6+
using NETworkManager.Helpers;
67

78
namespace NETworkManager.ViewModels.Applications
89
{
9-
public class SubnetCalculatorViewModel : ViewModelBase
10+
public class SubnetCalculatorIPv4CalculatorViewModel : ViewModelBase
1011
{
1112
#region Variables
1213
private bool _isLoading = true;
13-
14+
1415
private string _subnet;
1516
public string Subnet
1617
{
@@ -35,7 +36,7 @@ public List<string> SubnetHistory
3536
return;
3637

3738
if (!_isLoading)
38-
SettingsManager.Current.SubnetCalculator_SubnetHistory = value;
39+
SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory = value;
3940

4041
_subnetHistory = value;
4142
OnPropertyChanged();
@@ -156,6 +157,21 @@ public int DetailsHostIPs
156157
}
157158
#endregion
158159

160+
#region Constructor, load settings
161+
public SubnetCalculatorIPv4CalculatorViewModel()
162+
{
163+
LoadSettings();
164+
165+
_isLoading = false;
166+
}
167+
168+
private void LoadSettings()
169+
{
170+
if (SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory != null)
171+
SubnetHistory = new List<string>(SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory);
172+
}
173+
#endregion
174+
159175
#region ICommands
160176
public ICommand CalculateIPv4SubnetCommand
161177
{
@@ -171,11 +187,11 @@ private void CalculateIPv4SubnetAction()
171187
string[] subnet = Subnet.Trim().Split('/');
172188

173189
string subnetmask = subnet[1];
174-
190+
175191
// Convert CIDR to subnetmask
176192
if (subnetmask.Length < 3)
177193
subnetmask = Subnetmask.GetFromCidr(int.Parse(subnet[1])).Subnetmask;
178-
194+
179195
SubnetInfo subnetInfo = Models.Network.Subnet.CalculateIPv4Subnet(IPAddress.Parse(subnet[0]), IPAddress.Parse(subnetmask));
180196

181197
DetailsNetworkAddress = subnetInfo.NetworkAddress;
@@ -187,6 +203,8 @@ private void CalculateIPv4SubnetAction()
187203
DetailsHostIPs = subnetInfo.HostIPs;
188204

189205
IsDetailsVisible = true;
206+
207+
SubnetHistory = new List<string>(HistoryListHelper.Modify(SubnetHistory, Subnet, SettingsManager.Current.Application_HistoryListEntries));
190208
}
191209
#endregion
192210
}

0 commit comments

Comments
 (0)