Skip to content

Commit b4d8ab5

Browse files
BornToBeRootBornToBeRoot
authored
Feature: Remove checkboxes in group dialog (BornToBeRoot#1530)
* Feature: Remove checkboxes in group dialog * Docs: Add BornToBeRoot#1530
1 parent ff24ff4 commit b4d8ab5

6 files changed

Lines changed: 1218 additions & 1310 deletions

File tree

‎Source/NETworkManager.Profiles/GroupInfo.cs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public class GroupInfo
2020

2121
[XmlIgnore]
2222
public new List<ProfileInfo> Profiles { get; set; }
23-
24-
public bool RemoteDesktop_Enabled { get; set; }
23+
2524
public bool RemoteDesktop_UseCredentials { get; set; }
2625
public string RemoteDesktop_Username { get; set; }
2726

@@ -80,14 +79,12 @@ public class GroupInfo
8079
public bool RemoteDesktop_MenuAndWindowAnimation { get; set; }
8180
public bool RemoteDesktop_OverrideVisualStyles { get; set; }
8281
public bool RemoteDesktop_VisualStyles { get; set; }
83-
84-
public bool PowerShell_Enabled { get; set; }
82+
8583
public bool PowerShell_OverrideAdditionalCommandLine { get; set; }
8684
public string PowerShell_AdditionalCommandLine { get; set; }
8785
public bool PowerShell_OverrideExecutionPolicy { get; set; }
8886
public PowerShell.ExecutionPolicy PowerShell_ExecutionPolicy { get; set; }
89-
90-
public bool PuTTY_Enabled { get; set; }
87+
9188
public bool PuTTY_OverrideUsername { get; set; }
9289
public string PuTTY_Username { get; set; }
9390
public bool PuTTY_OverridePrivateKeyFile { get; set; }
@@ -104,8 +101,7 @@ public class GroupInfo
104101
public string PuTTY_LogFileName { get; set; } = GlobalStaticConfiguration.PuTTY_LogFileName;
105102
public bool PuTTY_OverrideAdditionalCommandLine { get; set; }
106103
public string PuTTY_AdditionalCommandLine { get; set; }
107-
108-
public bool TigerVNC_Enabled { get; set; }
104+
109105
public bool TigerVNC_OverridePort { get; set; }
110106
public int TigerVNC_Port { get; set; }
111107

@@ -133,7 +129,6 @@ public GroupInfo(GroupInfo group) : this(group.Name)
133129
{
134130
Profiles = group.Profiles;
135131

136-
RemoteDesktop_Enabled = group.RemoteDesktop_Enabled;
137132
RemoteDesktop_UseCredentials = group.RemoteDesktop_UseCredentials;
138133
RemoteDesktop_Username = group.RemoteDesktop_Username;
139134
RemoteDesktop_Password = group.RemoteDesktop_Password;
@@ -191,13 +186,11 @@ public GroupInfo(GroupInfo group) : this(group.Name)
191186
RemoteDesktop_OverrideVisualStyles = group.RemoteDesktop_OverrideVisualStyles;
192187
RemoteDesktop_VisualStyles = group.RemoteDesktop_VisualStyles;
193188

194-
PowerShell_Enabled = group.PowerShell_Enabled;
195189
PowerShell_OverrideAdditionalCommandLine = group.PowerShell_OverrideAdditionalCommandLine;
196190
PowerShell_AdditionalCommandLine = group.PowerShell_AdditionalCommandLine;
197191
PowerShell_OverrideExecutionPolicy = group.PowerShell_OverrideExecutionPolicy;
198192
PowerShell_ExecutionPolicy = group.PowerShell_ExecutionPolicy;
199193

200-
PuTTY_Enabled = group.PuTTY_Enabled;
201194
PuTTY_OverrideUsername = group.PuTTY_OverrideUsername;
202195
PuTTY_Username = group.PuTTY_Username;
203196
PuTTY_OverridePrivateKeyFile = group.PuTTY_OverridePrivateKeyFile;
@@ -215,7 +208,6 @@ public GroupInfo(GroupInfo group) : this(group.Name)
215208
PuTTY_OverrideAdditionalCommandLine = group.PuTTY_OverrideAdditionalCommandLine;
216209
PuTTY_AdditionalCommandLine = group.PuTTY_AdditionalCommandLine;
217210

218-
TigerVNC_Enabled = group.TigerVNC_Enabled;
219211
TigerVNC_OverridePort = group.TigerVNC_OverridePort;
220212
TigerVNC_Port = group.TigerVNC_Port;
221213
}

‎Source/NETworkManager/ProfileDialogManager.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ public static GroupInfo ParseGroupInfo(GroupViewModel instance)
399399

400400
Profiles = profiles,
401401

402-
RemoteDesktop_Enabled = instance.RemoteDesktop_Enabled,
403402
RemoteDesktop_UseCredentials = instance.RemoteDesktop_UseCredentials,
404403
RemoteDesktop_Username = instance.RemoteDesktop_UseCredentials ? instance.RemoteDesktop_Username : string.Empty, // Remove sensitive info on disable
405404
RemoteDesktop_Password = instance.RemoteDesktop_UseCredentials ? instance.RemoteDesktop_Password : new SecureString(), // Remove sensitive info on disable
@@ -451,13 +450,11 @@ public static GroupInfo ParseGroupInfo(GroupViewModel instance)
451450
RemoteDesktop_MenuAndWindowAnimation = instance.RemoteDesktop_MenuAndWindowAnimation,
452451
RemoteDesktop_VisualStyles = instance.RemoteDesktop_VisualStyles,
453452

454-
PowerShell_Enabled = instance.PowerShell_Enabled,
455453
PowerShell_OverrideAdditionalCommandLine = instance.PowerShell_OverrideAdditionalCommandLine,
456454
PowerShell_AdditionalCommandLine = instance.PowerShell_AdditionalCommandLine,
457455
PowerShell_OverrideExecutionPolicy = instance.PowerShell_OverrideExecutionPolicy,
458456
PowerShell_ExecutionPolicy = instance.PowerShell_ExecutionPolicy,
459457

460-
PuTTY_Enabled = instance.PuTTY_Enabled,
461458
PuTTY_OverrideUsername = instance.PuTTY_OverrideUsername,
462459
PuTTY_Username = instance.PuTTY_Username?.Trim(),
463460
PuTTY_OverridePrivateKeyFile = instance.PuTTY_OverridePrivateKeyFile,
@@ -475,7 +472,6 @@ public static GroupInfo ParseGroupInfo(GroupViewModel instance)
475472
PuTTY_OverrideAdditionalCommandLine = instance.PuTTY_OverrideAdditionalCommandLine,
476473
PuTTY_AdditionalCommandLine = instance.PuTTY_AdditionalCommandLine?.Trim(),
477474

478-
TigerVNC_Enabled = instance.TigerVNC_Enabled,
479475
TigerVNC_OverridePort = instance.TigerVNC_OverridePort,
480476
TigerVNC_Port = instance.TigerVNC_Port
481477
};

‎Source/NETworkManager/ViewModels/GroupViewModel.cs‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,6 @@ public string Name
6262
#endregion
6363

6464
#region Remote Desktop
65-
private bool _remoteDesktop_Enabled;
66-
public bool RemoteDesktop_Enabled
67-
{
68-
get => _remoteDesktop_Enabled;
69-
set
70-
{
71-
if (value == _remoteDesktop_Enabled)
72-
return;
73-
74-
_remoteDesktop_Enabled = value;
75-
76-
OnPropertyChanged();
77-
}
78-
}
79-
8065
private bool _remoteDesktop_UseCredentials;
8166
public bool RemoteDesktop_UseCredentials
8267
{
@@ -825,21 +810,6 @@ public bool RemoteDesktop_VisualStyles
825810
#endregion
826811

827812
#region PowerShell
828-
private bool _powerShell_Enabled;
829-
public bool PowerShell_Enabled
830-
{
831-
get => _powerShell_Enabled;
832-
set
833-
{
834-
if (value == _powerShell_Enabled)
835-
return;
836-
837-
_powerShell_Enabled = value;
838-
839-
OnPropertyChanged();
840-
}
841-
}
842-
843813
private bool _powerShell_OverrideAdditionalCommandLine;
844814
public bool PowerShell_OverrideAdditionalCommandLine
845815
{
@@ -912,21 +882,6 @@ public PowerShell.ExecutionPolicy PowerShell_ExecutionPolicy
912882
#endregion
913883

914884
#region PuTTY
915-
private bool _puTTY_Enabled;
916-
public bool PuTTY_Enabled
917-
{
918-
get => _puTTY_Enabled;
919-
set
920-
{
921-
if (value == _puTTY_Enabled)
922-
return;
923-
924-
_puTTY_Enabled = value;
925-
926-
OnPropertyChanged();
927-
}
928-
}
929-
930885
private bool _puTTY_OverrideUsername;
931886
public bool PuTTY_OverrideUsername
932887
{
@@ -1168,21 +1123,6 @@ public ConnectionMode PuTTY_ConnectionMode
11681123
#endregion
11691124

11701125
#region TigerVNC
1171-
private bool _tigerVNC_Enabled;
1172-
public bool TigerVNC_Enabled
1173-
{
1174-
get => _tigerVNC_Enabled;
1175-
set
1176-
{
1177-
if (value == _tigerVNC_Enabled)
1178-
return;
1179-
1180-
_tigerVNC_Enabled = value;
1181-
1182-
OnPropertyChanged();
1183-
}
1184-
}
1185-
11861126
private bool _tigerVNC_OverridePort;
11871127
public bool TigerVNC_OverridePort
11881128
{
@@ -1230,7 +1170,6 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
12301170
Name = groupInfo.Name;
12311171

12321172
// Remote Desktop
1233-
RemoteDesktop_Enabled = groupInfo.RemoteDesktop_Enabled;
12341173
RemoteDesktop_UseCredentials = groupInfo.RemoteDesktop_UseCredentials;
12351174
RemoteDesktop_Username = groupInfo.RemoteDesktop_Username;
12361175
RemoteDesktop_Password = groupInfo.RemoteDesktop_Password;
@@ -1281,15 +1220,13 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
12811220
RemoteDesktop_VisualStyles = groupInfo.RemoteDesktop_VisualStyles;
12821221

12831222
// PowerShell
1284-
PowerShell_Enabled = groupInfo.PowerShell_Enabled;
12851223
PowerShell_OverrideAdditionalCommandLine = groupInfo.PowerShell_OverrideAdditionalCommandLine;
12861224
PowerShell_AdditionalCommandLine = groupInfo.PowerShell_AdditionalCommandLine;
12871225
PowerShell_ExecutionPolicies = Enum.GetValues(typeof(PowerShell.ExecutionPolicy)).Cast<PowerShell.ExecutionPolicy>().ToList();
12881226
PowerShell_OverrideExecutionPolicy = groupInfo.PowerShell_OverrideExecutionPolicy;
12891227
PowerShell_ExecutionPolicy = editMode != GroupEditMode.Add ? groupInfo.PowerShell_ExecutionPolicy : PowerShell_ExecutionPolicies.FirstOrDefault(x => x == SettingsManager.Current.PowerShell_ExecutionPolicy); ;
12901228

12911229
// PuTTY
1292-
PuTTY_Enabled = groupInfo.PuTTY_Enabled;
12931230
PuTTY_OverrideUsername = groupInfo.PuTTY_OverrideUsername;
12941231
PuTTY_Username = groupInfo.PuTTY_Username;
12951232
PuTTY_OverridePrivateKeyFile = groupInfo.PuTTY_OverridePrivateKeyFile;
@@ -1308,7 +1245,6 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
13081245
PuTTY_AdditionalCommandLine = groupInfo.PuTTY_AdditionalCommandLine;
13091246

13101247
// TigerVNC
1311-
TigerVNC_Enabled = groupInfo.TigerVNC_Enabled;
13121248
TigerVNC_OverridePort = groupInfo.TigerVNC_OverridePort;
13131249
TigerVNC_Port = groupInfo.TigerVNC_OverridePort ? groupInfo.TigerVNC_Port : SettingsManager.Current.TigerVNC_Port;
13141250

0 commit comments

Comments
 (0)