Merge branch 'v1.77.3-dev' of https://github.com/mRemoteNG/mRemoteNG into v1.77.3-dev

6 files changed, 33 insertions, 15 deletions

diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs
index f0e01ed2..83ca03fa 100644
--- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs
+++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs
@@ -151,6 +151,9 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
                 ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain)
                 : new XAttribute("RDGatewayDomain", ""));
 
+            element.Add(new XAttribute("UseRCG", connectionInfo.UseRCG));
+            element.Add(new XAttribute("UseRestrictedAdmin", connectionInfo.UseRestrictedAdmin));
+
             element.Add(new XAttribute("UserViaAPI", connectionInfo.UserViaAPI));
             element.Add(new XAttribute("EC2InstanceId", connectionInfo.EC2InstanceId));
             element.Add(new XAttribute("EC2Region", connectionInfo.EC2Region));
@@ -298,6 +301,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
                     element.Add(new XAttribute("InheritUseEnhancedMode", inheritance.UseEnhancedMode.ToString().ToLowerInvariant()));
                 if (inheritance.UserViaAPI)
                     element.Add(new XAttribute("InheritUserViaAPI", inheritance.UserViaAPI.ToString().ToLowerInvariant()));
+                if (inheritance.UseRCG)
+                    element.Add(new XAttribute("InheritUseRCG", inheritance.UseRCG.ToString().ToLowerInvariant()));
+                if (inheritance.UseRestrictedAdmin)
+                    element.Add(new XAttribute("InheritUseRestrictedAdmin", inheritance.UseRestrictedAdmin.ToString().ToLowerInvariant()));
             }
         }
     }
diff --git a/mRemoteNG/Config/Settings/SettingsSaver.cs b/mRemoteNG/Config/Settings/SettingsSaver.cs
index 26937498..ff31d23f 100644
--- a/mRemoteNG/Config/Settings/SettingsSaver.cs
+++ b/mRemoteNG/Config/Settings/SettingsSaver.cs
@@ -47,6 +47,21 @@ namespace mRemoteNG.Config.Settings
                 SaveQuickConnectToolbarLocation(quickConnectToolStrip);
                 SaveMultiSshToolbarLocation(multiSshToolStrip);
 
+                Properties.App.Default.Save();
+                Properties.AppUI.Default.Save();
+                Properties.OptionsAdvancedPage.Default.Save();
+                Properties.OptionsAppearancePage.Default.Save();
+                Properties.OptionsBackupPage.Default.Save();
+                Properties.OptionsConnectionsPage.Default.Save();
+                Properties.OptionsCredentialsPage.Default.Save();
+                Properties.OptionsDBsPage.Default.Save();
+                Properties.OptionsNotificationsPage.Default.Save();
+                Properties.OptionsSecurityPage.Default.Save();
+                Properties.OptionsStartupExitPage.Default.Save();
+                Properties.OptionsTabsPanelsPage.Default.Save();
+                Properties.OptionsThemePage.Default.Save();
+                Properties.OptionsUpdatesPage.Default.Save();
+                
                 Properties.Settings.Default.Save();
 
                 SaveDockPanelLayout();
diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs
index 75f6bcae..7a76e94d 100644
--- a/mRemoteNG/Properties/Settings.Designer.cs
+++ b/mRemoteNG/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace mRemoteNG.Properties {
     

     

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]

     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {

         

         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

@@ -1405,7 +1405,7 @@ namespace mRemoteNG.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("True")]

+        [global::System.Configuration.DefaultSettingValueAttribute("False")]

         public bool ConDefaultUseRestrictedAdmin {

             get {

                 return ((bool)(this["ConDefaultUseRestrictedAdmin"]));

@@ -1429,7 +1429,7 @@ namespace mRemoteNG.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("True")]

+        [global::System.Configuration.DefaultSettingValueAttribute("False")]

         public bool ConDefaultUseRCG {

             get {

                 return ((bool)(this["ConDefaultUseRCG"]));

diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings
index f75b9d31..93ba8b49 100644
--- a/mRemoteNG/Properties/Settings.settings
+++ b/mRemoteNG/Properties/Settings.settings
@@ -348,13 +348,13 @@
       <Value Profile="(Default)">False</Value>

     </Setting>

     <Setting Name="ConDefaultUseRestrictedAdmin" Type="System.Boolean" Scope="User">

-      <Value Profile="(Default)">True</Value>

+      <Value Profile="(Default)">False</Value>

     </Setting>

     <Setting Name="InhDefaultUseRCG" Type="System.Boolean" Scope="User">

       <Value Profile="(Default)">False</Value>

     </Setting>

     <Setting Name="ConDefaultUseRCG" Type="System.Boolean" Scope="User">

-      <Value Profile="(Default)">True</Value>

+      <Value Profile="(Default)">False</Value>

     </Setting>

     <Setting Name="ConDefaultUseVmId" Type="System.Boolean" Scope="User">

       <Value Profile="(Default)">False</Value>

diff --git a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd
index 7305756b..aef6fcb6 100644
--- a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd
+++ b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd
@@ -175,5 +175,10 @@
     <xs:attribute name="UserViaAPI" type="xs:string" use="optional" />
     <xs:attribute name="EC2InstanceId" type="xs:string" use="optional" />
     <xs:attribute name="EC2Region" type="xs:string" use="optional" />
+    <xs:attribute name="UseRCG" type="xs:boolean" use="optional" />
+    <xs:attribute name="UseRestrictedAdmin" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseRCG" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseRestrictedAdmin" type="xs:boolean" use="optional" />
+
   </xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/mRemoteNG/UI/Forms/frmMain.Designer.cs b/mRemoteNG/UI/Forms/frmMain.Designer.cs
index 3b6580ed..0ff629f4 100644
--- a/mRemoteNG/UI/Forms/frmMain.Designer.cs
+++ b/mRemoteNG/UI/Forms/frmMain.Designer.cs
@@ -39,7 +39,6 @@
             this.viewMenu = new mRemoteNG.UI.Menu.ViewMenu();
             this.toolsMenu = new mRemoteNG.UI.Menu.ToolsMenu();
             this.helpMenu = new mRemoteNG.UI.Menu.HelpMenu();
-            this.modeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mMenSep3 = new System.Windows.Forms.ToolStripSeparator();
             this.tsContainer = new System.Windows.Forms.ToolStripContainer();
             this._quickConnectToolStrip = new mRemoteNG.UI.Controls.QuickConnectToolStrip();
@@ -47,7 +46,6 @@
             this._externalToolsToolStrip = new mRemoteNG.UI.Controls.ExternalToolsToolStrip();
             this.tmrAutoSave = new System.Windows.Forms.Timer(this.components);
             this.vsToolStripExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components);
-            this.modeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tsModeAdmin = new System.Windows.Forms.ToolStripMenuItem();
             this.tsModeUser = new System.Windows.Forms.ToolStripMenuItem();
             this.msMain.SuspendLayout();
@@ -77,8 +75,7 @@
             this.fileMenu,
             this.viewMenu,
             this.toolsMenu,
-            this.helpMenu,
-            this.modeToolStripMenuItem});
+            this.helpMenu});
             this.msMain.Location = new System.Drawing.Point(3, 0);
             this.msMain.Name = "msMain";
             this.msMain.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
@@ -125,11 +122,6 @@
             this.helpMenu.Text = "&Help";
             this.helpMenu.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
             // 
-            // modeToolStripMenuItem
-            // 
-            this.modeToolStripMenuItem.Name = "modeToolStripMenuItem";
-            this.modeToolStripMenuItem.Size = new System.Drawing.Size(12, 25);
-            // 
             // mMenSep3
             // 
             this.mMenSep3.Name = "mMenSep3";
@@ -254,7 +246,6 @@
 		internal mRemoteNG.UI.Controls.MultiSshToolStrip _multiSshToolStrip;
         //theming support
         private WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender vsToolStripExtender;
-        private System.Windows.Forms.ToolStripMenuItem modeToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem tsModeAdmin;
         private System.Windows.Forms.ToolStripMenuItem tsModeUser;
     }