Skip to content

Commit 714aad5

Browse files
BornToBeRootBornToBeRoot
authored
Chore: Rename string & variable (BornToBeRoot#2234)
1 parent 9108df8 commit 714aad5

16 files changed

Lines changed: 88 additions & 79 deletions

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

Lines changed: 12 additions & 12 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,8 @@
588588
<data name="StaticIPv4DNSServer" xml:space="preserve">
589589
<value>Static IPv4 DNS server</value>
590590
</data>
591-
<data name="Subnetmask" xml:space="preserve">
592-
<value>Subnetmask</value>
593-
</data>
594-
<data name="SubnetmaskOrCIDR" xml:space="preserve">
595-
<value>Subnetmask or CIDR</value>
591+
<data name="SubnetMask" xml:space="preserve">
592+
<value>Subnet mask</value>
596593
</data>
597594
<data name="Threads" xml:space="preserve">
598595
<value>Threads</value>
@@ -3541,4 +3538,7 @@ Changes to this value will take effect after the application is restarted. Wheth
35413538
<data name="FromProfile" xml:space="preserve">
35423539
<value>(from profile)</value>
35433540
</data>
3541+
<data name="NewSubnetMask" xml:space="preserve">
3542+
<value>New subnet mask</value>
3543+
</data>
35443544
</root>

‎Source/NETworkManager.Profiles/ProfileInfo.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using NETworkManager.Models.PuTTY;
44
using NETworkManager.Models.RemoteDesktop;
55
using NETworkManager.Settings;
6+
using System;
67
using System.Security;
78
using System.Xml.Serialization;
89

@@ -42,7 +43,10 @@ public class ProfileInfo
4243
public bool NetworkInterface_Enabled { get; set; }
4344
public bool NetworkInterface_EnableStaticIPAddress { get; set; }
4445
public string NetworkInterface_IPAddress { get; set; }
46+
47+
//[Obsolete("Replaced by NetworkInterface_Subnetmask")]
4548
public string NetworkInterface_SubnetmaskOrCidr { get; set; }
49+
public string NetworkInterface_Subnetmask { get; set; }
4650
public string NetworkInterface_Gateway { get; set; }
4751
public bool NetworkInterface_EnableStaticDNS { get; set; }
4852
public string NetworkInterface_PrimaryDNSServer { get; set; }
@@ -247,6 +251,7 @@ public ProfileInfo(ProfileInfo profile)
247251
NetworkInterface_Enabled = profile.NetworkInterface_Enabled;
248252
NetworkInterface_EnableStaticIPAddress = profile.NetworkInterface_EnableStaticIPAddress;
249253
NetworkInterface_IPAddress = profile.NetworkInterface_IPAddress;
254+
NetworkInterface_Subnetmask = profile.NetworkInterface_Subnetmask;
250255
NetworkInterface_SubnetmaskOrCidr = profile.NetworkInterface_SubnetmaskOrCidr;
251256
NetworkInterface_Gateway = profile.NetworkInterface_Gateway;
252257
NetworkInterface_EnableStaticDNS = profile.NetworkInterface_EnableStaticDNS;

‎Source/NETworkManager.Profiles/ProfileManager.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,9 +604,13 @@ private static List<GroupInfo> DeserializeGroup(Stream stream)
604604
List<ProfileInfo> profiles = new();
605605

606606
foreach (ProfileInfoSerializable profileSerializable in groupSerializable.Profiles)
607-
{
607+
{
608608
ProfileInfo profile = new(profileSerializable)
609609
{
610+
// Migrate old data
611+
NetworkInterface_Subnetmask = string.IsNullOrEmpty(profileSerializable.NetworkInterface_Subnetmask) && !string.IsNullOrEmpty(profileSerializable.NetworkInterface_SubnetmaskOrCidr) ? profileSerializable.NetworkInterface_SubnetmaskOrCidr : profileSerializable.NetworkInterface_Subnetmask,
612+
613+
// Convert passwords to secure strings
610614
RemoteDesktop_Password = !string.IsNullOrEmpty(profileSerializable.RemoteDesktop_Password) ? SecureStringHelper.ConvertToSecureString(profileSerializable.RemoteDesktop_Password) : null,
611615
RemoteDesktop_GatewayServerPassword = !string.IsNullOrEmpty(profileSerializable.RemoteDesktop_GatewayServerPassword) ? SecureStringHelper.ConvertToSecureString(profileSerializable.RemoteDesktop_GatewayServerPassword) : null,
612616
SNMP_Community = !string.IsNullOrEmpty(profileSerializable.SNMP_Community) ? SecureStringHelper.ConvertToSecureString(profileSerializable.SNMP_Community) : null,
@@ -621,7 +625,7 @@ private static List<GroupInfo> DeserializeGroup(Stream stream)
621625
{
622626
Profiles = profiles,
623627

624-
// Convert passwort to secure string
628+
// Convert passwords to secure strings
625629
RemoteDesktop_Password = !string.IsNullOrEmpty(groupSerializable.RemoteDesktop_Password) ? SecureStringHelper.ConvertToSecureString(groupSerializable.RemoteDesktop_Password) : null,
626630
RemoteDesktop_GatewayServerPassword = !string.IsNullOrEmpty(groupSerializable.RemoteDesktop_GatewayServerPassword) ? SecureStringHelper.ConvertToSecureString(groupSerializable.RemoteDesktop_GatewayServerPassword) : null,
627631
SNMP_Community = !string.IsNullOrEmpty(groupSerializable.SNMP_Community) ? SecureStringHelper.ConvertToSecureString(groupSerializable.SNMP_Community) : null,

‎Source/NETworkManager.Settings/SettingsInfo.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,16 +3641,16 @@ public ObservableCollection<string> SubnetCalculator_Subnetting_SubnetHistory
36413641
}
36423642
}
36433643

3644-
private ObservableCollection<string> _subnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory = new();
3645-
public ObservableCollection<string> SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory
3644+
private ObservableCollection<string> _subnetCalculator_Subnetting_NewSubnetmaskHistory = new();
3645+
public ObservableCollection<string> SubnetCalculator_Subnetting_NewSubnetmaskHistory
36463646
{
3647-
get => _subnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory;
3647+
get => _subnetCalculator_Subnetting_NewSubnetmaskHistory;
36483648
set
36493649
{
3650-
if (value == _subnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory)
3650+
if (value == _subnetCalculator_Subnetting_NewSubnetmaskHistory)
36513651
return;
36523652

3653-
_subnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory = value;
3653+
_subnetCalculator_Subnetting_NewSubnetmaskHistory = value;
36543654
OnPropertyChanged();
36553655
SettingsChanged = true;
36563656
}
@@ -4194,7 +4194,7 @@ public SettingsInfo()
41944194

41954195
// Subnet Calculator / Subnetting
41964196
SubnetCalculator_Subnetting_SubnetHistory.CollectionChanged += CollectionChanged;
4197-
SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory.CollectionChanged += CollectionChanged;
4197+
SubnetCalculator_Subnetting_NewSubnetmaskHistory.CollectionChanged += CollectionChanged;
41984198

41994199
// Subnet Calculator / Supernetting
42004200
SubnetCalculator_WideSubnet_Subnet1.CollectionChanged += CollectionChanged;

‎Source/NETworkManager/ProfileDialogManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
239239
NetworkInterface_EnableStaticIPAddress = instance.NetworkInterface_EnableStaticIPAddress,
240240
NetworkInterface_IPAddress = instance.NetworkInterface_IPAddress?.Trim(),
241241
NetworkInterface_Gateway = instance.NetworkInterface_Gateway?.Trim(),
242-
NetworkInterface_SubnetmaskOrCidr = instance.NetworkInterface_SubnetmaskOrCidr?.Trim(),
242+
NetworkInterface_Subnetmask = instance.NetworkInterface_Subnetmask?.Trim(),
243243
NetworkInterface_EnableStaticDNS = instance.NetworkInterface_EnableStaticDNS,
244244
NetworkInterface_PrimaryDNSServer = instance.NetworkInterface_PrimaryDNSServer?.Trim(),
245245
NetworkInterface_SecondaryDNSServer = instance.NetworkInterface_SecondaryDNSServer?.Trim(),

‎Source/NETworkManager/ViewModels/IPAddressAndSubnetmaskViewModel.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public string IPAddress
2424
}
2525
}
2626

27-
private string _subnetmaskOrCidr;
28-
public string SubnetmaskOrCidr
27+
private string _subnetmask;
28+
public string Subnetmask
2929
{
30-
get => _subnetmaskOrCidr;
30+
get => _subnetmask;
3131
set
3232
{
33-
if (value == _subnetmaskOrCidr)
33+
if (value == _subnetmask)
3434
return;
3535

36-
_subnetmaskOrCidr = value;
36+
_subnetmask = value;
3737
OnPropertyChanged();
3838
}
3939
}

‎Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,16 @@ public string ConfigIPAddress
311311
}
312312
}
313313

314-
private string _configSubnetmaskOrCidr;
315-
public string ConfigSubnetmaskOrCidr
314+
private string _configSubnetmask;
315+
public string ConfigSubnetmask
316316
{
317-
get => _configSubnetmaskOrCidr;
317+
get => _configSubnetmask;
318318
set
319319
{
320-
if (value == _configSubnetmaskOrCidr)
320+
if (value == _configSubnetmask)
321321
return;
322322

323-
_configSubnetmaskOrCidr = value;
323+
_configSubnetmask = value;
324324
OnPropertyChanged();
325325
}
326326
}
@@ -426,7 +426,7 @@ public ProfileInfo SelectedProfile
426426
ConfigEnableStaticIPAddress = value.NetworkInterface_EnableStaticIPAddress;
427427
ConfigIPAddress = value.NetworkInterface_IPAddress;
428428
ConfigGateway = value.NetworkInterface_Gateway;
429-
ConfigSubnetmaskOrCidr = value.NetworkInterface_SubnetmaskOrCidr;
429+
ConfigSubnetmask = value.NetworkInterface_Subnetmask;
430430
ConfigEnableDynamicDNS = !value.NetworkInterface_EnableStaticDNS;
431431
ConfigEnableStaticDNS = value.NetworkInterface_EnableStaticDNS;
432432
ConfigPrimaryDNSServer = value.NetworkInterface_PrimaryDNSServer;
@@ -758,7 +758,7 @@ private async Task AddIPv4AddressAction()
758758
{
759759
await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
760760

761-
AddIPv4Address(instance.IPAddress, instance.SubnetmaskOrCidr);
761+
AddIPv4Address(instance.IPAddress, instance.Subnetmask);
762762
}, instance =>
763763
{
764764
_dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -832,7 +832,7 @@ private void SetConfigurationDefaults(NetworkInterfaceInfo info)
832832
{
833833
ConfigEnableStaticIPAddress = true;
834834
ConfigIPAddress = info.IPv4Address.FirstOrDefault()?.Item1.ToString();
835-
ConfigSubnetmaskOrCidr = info.IPv4Address.FirstOrDefault()?.Item2.ToString();
835+
ConfigSubnetmask = info.IPv4Address.FirstOrDefault()?.Item2.ToString();
836836
ConfigGateway = info.IPv4Gateway?.Any() == true ? info.IPv4Gateway.FirstOrDefault()?.ToString() : string.Empty;
837837
}
838838

@@ -855,7 +855,7 @@ public async Task ApplyConfiguration()
855855
IsConfigurationRunning = true;
856856
IsStatusMessageDisplayed = false;
857857

858-
var subnetmask = ConfigSubnetmaskOrCidr;
858+
var subnetmask = ConfigSubnetmask;
859859

860860
// CIDR to subnetmask
861861
if (ConfigEnableStaticIPAddress && subnetmask.StartsWith("/"))
@@ -910,7 +910,7 @@ public async Task ApplyConfigurationFromProfile()
910910
IsConfigurationRunning = true;
911911
IsStatusMessageDisplayed = false;
912912

913-
var subnetmask = SelectedProfile.NetworkInterface_SubnetmaskOrCidr;
913+
var subnetmask = SelectedProfile.NetworkInterface_Subnetmask;
914914

915915
// CIDR to subnetmask
916916
if (SelectedProfile.NetworkInterface_EnableStaticIPAddress && subnetmask.StartsWith("/"))

‎Source/NETworkManager/ViewModels/ProfileViewModel.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,16 @@ public string NetworkInterface_IPAddress
178178
}
179179
}
180180

181-
private string _networkInterface_SubnetmaskOrCidr;
182-
public string NetworkInterface_SubnetmaskOrCidr
181+
private string _networkInterface_Subnetmask;
182+
public string NetworkInterface_Subnetmask
183183
{
184-
get => _networkInterface_SubnetmaskOrCidr;
184+
get => _networkInterface_Subnetmask;
185185
set
186186
{
187-
if (value == _networkInterface_SubnetmaskOrCidr)
187+
if (value == _networkInterface_Subnetmask)
188188
return;
189189

190-
_networkInterface_SubnetmaskOrCidr = value;
190+
_networkInterface_Subnetmask = value;
191191
OnPropertyChanged();
192192
}
193193
}
@@ -2653,7 +2653,7 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
26532653
NetworkInterface_EnableStaticIPAddress = profileInfo.NetworkInterface_EnableStaticIPAddress;
26542654
NetworkInterface_IPAddress = profileInfo.NetworkInterface_IPAddress;
26552655
NetworkInterface_Gateway = profileInfo.NetworkInterface_Gateway;
2656-
NetworkInterface_SubnetmaskOrCidr = profileInfo.NetworkInterface_SubnetmaskOrCidr;
2656+
NetworkInterface_Subnetmask = profileInfo.NetworkInterface_Subnetmask;
26572657
NetworkInterface_EnableDynamicDNS = !profileInfo.NetworkInterface_EnableStaticDNS;
26582658
NetworkInterface_EnableStaticDNS = profileInfo.NetworkInterface_EnableStaticDNS;
26592659
NetworkInterface_PrimaryDNSServer = profileInfo.NetworkInterface_PrimaryDNSServer;

‎Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ public string Subnet
4141

4242
public ICollectionView SubnetHistoryView { get; }
4343

44-
private string _newSubnetmaskOrCIDR;
45-
public string NewSubnetmaskOrCIDR
44+
private string _newSubnetmask;
45+
public string NewSubnetmask
4646
{
47-
get => _newSubnetmaskOrCIDR;
47+
get => _newSubnetmask;
4848
set
4949
{
50-
if (value == _newSubnetmaskOrCIDR)
50+
if (value == _newSubnetmask)
5151
return;
5252

53-
_newSubnetmaskOrCIDR = value;
53+
_newSubnetmask = value;
5454
OnPropertyChanged();
5555
}
5656
}
5757

58-
public ICollectionView NewSubnetmaskOrCIDRHistoryView { get; }
58+
public ICollectionView NewSubnetmaskHistoryView { get; }
5959

6060
private bool _isCalculationRunning;
6161
public bool IsCalculationRunning
@@ -139,7 +139,7 @@ public SubnetCalculatorSubnettingViewModel(IDialogCoordinator instance)
139139

140140
// Set collection view
141141
SubnetHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Subnetting_SubnetHistory);
142-
NewSubnetmaskOrCIDRHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory);
142+
NewSubnetmaskHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskHistory);
143143

144144
// Result view
145145
SubnetsResultsView = CollectionViewSource.GetDefaultView(SubnetsResult);
@@ -258,7 +258,7 @@ private async Task Calculate()
258258
SubnetsResult.Clear();
259259

260260
var subnet = Subnet.Trim();
261-
var newSubnetmaskOrCidr = NewSubnetmaskOrCIDR.Trim();
261+
var newSubnetmaskOrCidr = NewSubnetmask.Trim();
262262

263263
var ipNetwork = IPNetwork.Parse(Subnet.Trim());
264264

@@ -326,14 +326,14 @@ private void AddSubnetToHistory(string subnet)
326326
private void AddNewSubnetmaskOrCIDRToHistory(string newSubnetmaskOrCIDR)
327327
{
328328
// Create the new list
329-
var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory.ToList(), newSubnetmaskOrCIDR, SettingsManager.Current.General_HistoryListEntries);
329+
var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskHistory.ToList(), newSubnetmaskOrCIDR, SettingsManager.Current.General_HistoryListEntries);
330330

331331
// Clear the old items
332-
SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory.Clear();
333-
OnPropertyChanged(nameof(NewSubnetmaskOrCIDR)); // Raise property changed again, after the collection has been cleared
332+
SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskHistory.Clear();
333+
OnPropertyChanged(nameof(NewSubnetmask)); // Raise property changed again, after the collection has been cleared
334334

335335
// Fill with the new items
336-
list.ForEach(x => SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory.Add(x));
336+
list.ForEach(x => SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskHistory.Add(x));
337337
}
338338

339339
public void OnShutdown()

0 commit comments

Comments
 (0)