diff --git a/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs b/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs index 6b264bf0..7852e03e 100644 --- a/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs @@ -94,5 +94,17 @@ namespace mRemoteNG.Properties { this["RdpLoadBalanceInfoUseUtf8"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbAdvancedPageInOptionMenu { + get { + return ((bool)(this["cbAdvancedPageInOptionMenu"])); + } + set { + this["cbAdvancedPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsAdvancedPage.settings b/mRemoteNG/Properties/OptionsAdvancedPage.settings index 3bcb8b84..be0c1629 100644 --- a/mRemoteNG/Properties/OptionsAdvancedPage.settings +++ b/mRemoteNG/Properties/OptionsAdvancedPage.settings @@ -20,5 +20,8 @@ False + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs b/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs index 9c318157..43606fd9 100644 --- a/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs +++ b/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs @@ -82,5 +82,17 @@ namespace mRemoteNG.Properties { this["ShowCompleteConsPathInTitle"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbAppearancePageInOptionMenu { + get { + return ((bool)(this["cbAppearancePageInOptionMenu"])); + } + set { + this["cbAppearancePageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsAppearancePage.settings b/mRemoteNG/Properties/OptionsAppearancePage.settings index 3987a1f2..7517e719 100644 --- a/mRemoteNG/Properties/OptionsAppearancePage.settings +++ b/mRemoteNG/Properties/OptionsAppearancePage.settings @@ -17,5 +17,8 @@ False + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsBackupPage.Designer.cs b/mRemoteNG/Properties/OptionsBackupPage.Designer.cs index 9e121e38..b35aeb57 100644 --- a/mRemoteNG/Properties/OptionsBackupPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsBackupPage.Designer.cs @@ -205,7 +205,7 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool cbBacupPageInOptionMenu { get { return ((bool)(this["cbBacupPageInOptionMenu"])); diff --git a/mRemoteNG/Properties/OptionsBackupPage.settings b/mRemoteNG/Properties/OptionsBackupPage.settings index 00d139ee..f72f00e6 100644 --- a/mRemoteNG/Properties/OptionsBackupPage.settings +++ b/mRemoteNG/Properties/OptionsBackupPage.settings @@ -48,7 +48,7 @@ 0 - False + True \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs b/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs index 506da452..10e434cd 100644 --- a/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs @@ -46,5 +46,17 @@ namespace mRemoteNG.Properties { this["ConnectrionFilePath"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbConnectionsPageInOptionMenu { + get { + return ((bool)(this["cbConnectionsPageInOptionMenu"])); + } + set { + this["cbConnectionsPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsConnectionsPage.settings b/mRemoteNG/Properties/OptionsConnectionsPage.settings index f60fc228..65c95d4e 100644 --- a/mRemoteNG/Properties/OptionsConnectionsPage.settings +++ b/mRemoteNG/Properties/OptionsConnectionsPage.settings @@ -8,5 +8,8 @@ + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs index 945e9c3c..5d3736f4 100644 --- a/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs @@ -82,5 +82,17 @@ namespace mRemoteNG.Properties { this["EmptyCredentials"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbCredentialsPageInOptionMenu { + get { + return ((bool)(this["cbCredentialsPageInOptionMenu"])); + } + set { + this["cbCredentialsPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsCredentialsPage.settings b/mRemoteNG/Properties/OptionsCredentialsPage.settings index 557bd792..c634f512 100644 --- a/mRemoteNG/Properties/OptionsCredentialsPage.settings +++ b/mRemoteNG/Properties/OptionsCredentialsPage.settings @@ -17,5 +17,8 @@ noinfo + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsDBsPage.Designer.cs b/mRemoteNG/Properties/OptionsDBsPage.Designer.cs index b64361a0..23dadcc1 100644 --- a/mRemoteNG/Properties/OptionsDBsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsDBsPage.Designer.cs @@ -106,5 +106,17 @@ namespace mRemoteNG.Properties { this["SQLPass"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbDBsPageInOptionMenu { + get { + return ((bool)(this["cbDBsPageInOptionMenu"])); + } + set { + this["cbDBsPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsDBsPage.settings b/mRemoteNG/Properties/OptionsDBsPage.settings index aed15235..4283ae8c 100644 --- a/mRemoteNG/Properties/OptionsDBsPage.settings +++ b/mRemoteNG/Properties/OptionsDBsPage.settings @@ -23,5 +23,8 @@ + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs b/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs index 1c6a98c0..5c12ecdc 100644 --- a/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs @@ -226,5 +226,17 @@ namespace mRemoteNG.Properties { this["TextLogMessageWriterWriteWarningMsgs"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbNotificationsPageInOptionMenu { + get { + return ((bool)(this["cbNotificationsPageInOptionMenu"])); + } + set { + this["cbNotificationsPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsNotificationsPage.settings b/mRemoteNG/Properties/OptionsNotificationsPage.settings index 681c19ba..c8581c2c 100644 --- a/mRemoteNG/Properties/OptionsNotificationsPage.settings +++ b/mRemoteNG/Properties/OptionsNotificationsPage.settings @@ -53,5 +53,8 @@ True + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs b/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs index 4ed36d85..0fe666e4 100644 --- a/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs @@ -70,5 +70,17 @@ namespace mRemoteNG.Properties { this["EncryptionKeyDerivationIterations"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbSecurityPageInOptionMenu { + get { + return ((bool)(this["cbSecurityPageInOptionMenu"])); + } + set { + this["cbSecurityPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsSecurityPage.settings b/mRemoteNG/Properties/OptionsSecurityPage.settings index fb5cc3e3..a54e8c7b 100644 --- a/mRemoteNG/Properties/OptionsSecurityPage.settings +++ b/mRemoteNG/Properties/OptionsSecurityPage.settings @@ -14,5 +14,8 @@ 10000 + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs b/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs index 25ed8f63..ef8fca45 100644 --- a/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs @@ -82,5 +82,17 @@ namespace mRemoteNG.Properties { this["OpenConsFromLastSession"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbStartupExitPageInOptionMenu { + get { + return ((bool)(this["cbStartupExitPageInOptionMenu"])); + } + set { + this["cbStartupExitPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsStartupExitPage.settings b/mRemoteNG/Properties/OptionsStartupExitPage.settings index 4b93d330..035712f3 100644 --- a/mRemoteNG/Properties/OptionsStartupExitPage.settings +++ b/mRemoteNG/Properties/OptionsStartupExitPage.settings @@ -17,5 +17,8 @@ False + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs b/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs index 9f5e99b6..81084083 100644 --- a/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs @@ -142,5 +142,17 @@ namespace mRemoteNG.Properties { this["AlwaysShowPanelSelectionDlg"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbTabsPanelsPageInOptionMenu { + get { + return ((bool)(this["cbTabsPanelsPageInOptionMenu"])); + } + set { + this["cbTabsPanelsPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsTabsPanelsPage.settings b/mRemoteNG/Properties/OptionsTabsPanelsPage.settings index 186f6c1c..f8f77498 100644 --- a/mRemoteNG/Properties/OptionsTabsPanelsPage.settings +++ b/mRemoteNG/Properties/OptionsTabsPanelsPage.settings @@ -32,5 +32,8 @@ False + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsThemePage.Designer.cs b/mRemoteNG/Properties/OptionsThemePage.Designer.cs index 9c26dfd5..888caea8 100644 --- a/mRemoteNG/Properties/OptionsThemePage.Designer.cs +++ b/mRemoteNG/Properties/OptionsThemePage.Designer.cs @@ -46,5 +46,17 @@ namespace mRemoteNG.Properties { this["ThemeName"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbThemePageInOptionMenu { + get { + return ((bool)(this["cbThemePageInOptionMenu"])); + } + set { + this["cbThemePageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsThemePage.settings b/mRemoteNG/Properties/OptionsThemePage.settings index b8862c4f..5d442d24 100644 --- a/mRemoteNG/Properties/OptionsThemePage.settings +++ b/mRemoteNG/Properties/OptionsThemePage.settings @@ -8,5 +8,8 @@ + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs b/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs index 90344d54..8fc1851e 100644 --- a/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs @@ -184,5 +184,17 @@ namespace mRemoteNG.Properties { this["CheckForUpdatesAsked"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool cbUpdatesPageInOptionMenu { + get { + return ((bool)(this["cbUpdatesPageInOptionMenu"])); + } + set { + this["cbUpdatesPageInOptionMenu"] = value; + } + } } } diff --git a/mRemoteNG/Properties/OptionsUpdatesPage.settings b/mRemoteNG/Properties/OptionsUpdatesPage.settings index 10b7658e..f7a4cecd 100644 --- a/mRemoteNG/Properties/OptionsUpdatesPage.settings +++ b/mRemoteNG/Properties/OptionsUpdatesPage.settings @@ -1,5 +1,5 @@  - + @@ -44,5 +44,8 @@ False + + True + \ No newline at end of file diff --git a/mRemoteNG/Properties/rbac.Designer.cs b/mRemoteNG/Properties/rbac.Designer.cs index 3f4892b0..00cfec9c 100644 --- a/mRemoteNG/Properties/rbac.Designer.cs +++ b/mRemoteNG/Properties/rbac.Designer.cs @@ -25,7 +25,7 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("UserRole")] + [global::System.Configuration.DefaultSettingValueAttribute("AdminRole")] public string ActiveRole { get { return ((string)(this["ActiveRole"])); diff --git a/mRemoteNG/Properties/rbac.settings b/mRemoteNG/Properties/rbac.settings index 4e11b6d5..05b3569e 100644 --- a/mRemoteNG/Properties/rbac.settings +++ b/mRemoteNG/Properties/rbac.settings @@ -3,7 +3,7 @@ - UserRole + AdminRole mR3m0t3NG! diff --git a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs index 6a211f04..0ccb578f 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs @@ -37,18 +37,12 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.cbConnectionBackupFrequency = new System.Windows.Forms.ComboBox(); this.lblConnectionsBackupMaxCount = new System.Windows.Forms.Label(); this.numMaxBackups = new System.Windows.Forms.NumericUpDown(); - this.cbBackupEnableACL = new System.Windows.Forms.ComboBox(); this.pnlBackupEnable = new System.Windows.Forms.Panel(); this.rbBackupEnableEnable = new System.Windows.Forms.RadioButton(); this.rbBackupEnableDisable = new System.Windows.Forms.RadioButton(); this.pnlBackupType = new System.Windows.Forms.Panel(); this.radioButton2 = new System.Windows.Forms.RadioButton(); this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.cbBackupFrequencyACL = new System.Windows.Forms.ComboBox(); - this.cbBackupTypeACL = new System.Windows.Forms.ComboBox(); - this.cbBackupNumberACL = new System.Windows.Forms.ComboBox(); - this.cbBackupNameFormatACL = new System.Windows.Forms.ComboBox(); - this.cbBackupLocationACL = new System.Windows.Forms.ComboBox(); this.lblConnectionsBackupPath = new System.Windows.Forms.Label(); this.txtConnectionsBackupPath = new System.Windows.Forms.TextBox(); this.btnBrowsePath = new System.Windows.Forms.Button(); @@ -58,11 +52,29 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.pnlShowForUser = new System.Windows.Forms.Panel(); this.cbBacupPageInOptionMenu = new System.Windows.Forms.CheckBox(); this.lblACL = new System.Windows.Forms.Label(); + this.plBackupEnableACL = new System.Windows.Forms.Panel(); + this.cbBackupEnableACL = new System.Windows.Forms.ComboBox(); + this.plBackupType = new System.Windows.Forms.Panel(); + this.cbBackupTypeACL = new System.Windows.Forms.ComboBox(); + this.plBackupFrequency = new System.Windows.Forms.Panel(); + this.cbBackupFrequencyACL = new System.Windows.Forms.ComboBox(); + this.plBackupNumber = new System.Windows.Forms.Panel(); + this.cbBackupNumberACL = new System.Windows.Forms.ComboBox(); + this.plBackupNameFormat = new System.Windows.Forms.Panel(); + this.cbBackupNameFormatACL = new System.Windows.Forms.ComboBox(); + this.plBackupLocation = new System.Windows.Forms.Panel(); + this.cbBackupLocationACL = new System.Windows.Forms.ComboBox(); this.tableLayoutPanelBackupFile.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numMaxBackups)).BeginInit(); this.pnlBackupEnable.SuspendLayout(); this.pnlBackupType.SuspendLayout(); this.pnlShowForUser.SuspendLayout(); + this.plBackupEnableACL.SuspendLayout(); + this.plBackupType.SuspendLayout(); + this.plBackupFrequency.SuspendLayout(); + this.plBackupNumber.SuspendLayout(); + this.plBackupNameFormat.SuspendLayout(); + this.plBackupLocation.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanelBackupFile @@ -79,14 +91,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.tableLayoutPanelBackupFile.Controls.Add(this.cbConnectionBackupFrequency, 2, 3); this.tableLayoutPanelBackupFile.Controls.Add(this.lblConnectionsBackupMaxCount, 1, 4); this.tableLayoutPanelBackupFile.Controls.Add(this.numMaxBackups, 2, 4); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupEnableACL, 0, 1); this.tableLayoutPanelBackupFile.Controls.Add(this.pnlBackupEnable, 2, 1); this.tableLayoutPanelBackupFile.Controls.Add(this.pnlBackupType, 2, 2); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupFrequencyACL, 0, 3); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupTypeACL, 0, 2); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupNumberACL, 0, 4); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupNameFormatACL, 0, 5); - this.tableLayoutPanelBackupFile.Controls.Add(this.cbBackupLocationACL, 0, 6); this.tableLayoutPanelBackupFile.Controls.Add(this.lblConnectionsBackupPath, 1, 6); this.tableLayoutPanelBackupFile.Controls.Add(this.txtConnectionsBackupPath, 2, 6); this.tableLayoutPanelBackupFile.Controls.Add(this.btnBrowsePath, 3, 6); @@ -95,6 +101,12 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.tableLayoutPanelBackupFile.Controls.Add(this.lblBacupPageShowInOptionsMenu, 1, 0); this.tableLayoutPanelBackupFile.Controls.Add(this.pnlShowForUser, 2, 0); this.tableLayoutPanelBackupFile.Controls.Add(this.lblACL, 0, 0); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupEnableACL, 0, 1); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupType, 0, 2); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupFrequency, 0, 3); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupNumber, 0, 4); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupNameFormat, 0, 5); + this.tableLayoutPanelBackupFile.Controls.Add(this.plBackupLocation, 0, 6); this.tableLayoutPanelBackupFile.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelBackupFile.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; this.tableLayoutPanelBackupFile.Location = new System.Drawing.Point(0, 0); @@ -115,9 +127,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.lblBackupType.AutoSize = true; this.lblBackupType.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblBackupType.Location = new System.Drawing.Point(92, 60); + this.lblBackupType.Location = new System.Drawing.Point(103, 57); this.lblBackupType.Name = "lblBackupType"; - this.lblBackupType.Size = new System.Drawing.Size(171, 27); + this.lblBackupType.Size = new System.Drawing.Size(165, 30); this.lblBackupType.TabIndex = 20; this.lblBackupType.Text = "Backup type"; this.lblBackupType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -126,9 +138,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.lblBackupEnable.AutoSize = true; this.lblBackupEnable.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblBackupEnable.Location = new System.Drawing.Point(92, 33); + this.lblBackupEnable.Location = new System.Drawing.Point(103, 27); this.lblBackupEnable.Name = "lblBackupEnable"; - this.lblBackupEnable.Size = new System.Drawing.Size(171, 27); + this.lblBackupEnable.Size = new System.Drawing.Size(165, 30); this.lblBackupEnable.TabIndex = 18; this.lblBackupEnable.Text = "Backups for connection data"; this.lblBackupEnable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -137,9 +149,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.lblConnectionsBackupFrequency.AutoSize = true; this.lblConnectionsBackupFrequency.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblConnectionsBackupFrequency.Location = new System.Drawing.Point(92, 87); + this.lblConnectionsBackupFrequency.Location = new System.Drawing.Point(103, 87); this.lblConnectionsBackupFrequency.Name = "lblConnectionsBackupFrequency"; - this.lblConnectionsBackupFrequency.Size = new System.Drawing.Size(171, 29); + this.lblConnectionsBackupFrequency.Size = new System.Drawing.Size(165, 30); this.lblConnectionsBackupFrequency.TabIndex = 14; this.lblConnectionsBackupFrequency.Text = "Connection Backup Frequency"; this.lblConnectionsBackupFrequency.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -149,7 +161,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.cbConnectionBackupFrequency.Dock = System.Windows.Forms.DockStyle.Fill; this.cbConnectionBackupFrequency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbConnectionBackupFrequency.FormattingEnabled = true; - this.cbConnectionBackupFrequency.Location = new System.Drawing.Point(269, 92); + this.cbConnectionBackupFrequency.Location = new System.Drawing.Point(274, 92); this.cbConnectionBackupFrequency.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3); this.cbConnectionBackupFrequency.Name = "cbConnectionBackupFrequency"; this.cbConnectionBackupFrequency.Size = new System.Drawing.Size(208, 21); @@ -159,42 +171,29 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.lblConnectionsBackupMaxCount.AutoSize = true; this.lblConnectionsBackupMaxCount.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblConnectionsBackupMaxCount.Location = new System.Drawing.Point(92, 116); + this.lblConnectionsBackupMaxCount.Location = new System.Drawing.Point(103, 117); this.lblConnectionsBackupMaxCount.Name = "lblConnectionsBackupMaxCount"; - this.lblConnectionsBackupMaxCount.Size = new System.Drawing.Size(171, 28); + this.lblConnectionsBackupMaxCount.Size = new System.Drawing.Size(165, 30); this.lblConnectionsBackupMaxCount.TabIndex = 13; this.lblConnectionsBackupMaxCount.Text = "Maximum number of backups"; this.lblConnectionsBackupMaxCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // numMaxBackups // - this.numMaxBackups.Location = new System.Drawing.Point(269, 119); + this.numMaxBackups.Location = new System.Drawing.Point(274, 120); this.numMaxBackups.Name = "numMaxBackups"; this.numMaxBackups.Size = new System.Drawing.Size(34, 22); this.numMaxBackups.TabIndex = 16; this.numMaxBackups.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // cbBackupEnableACL - // - this.cbBackupEnableACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupEnableACL.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbBackupEnableACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupEnableACL.FormattingEnabled = true; - this.cbBackupEnableACL.Location = new System.Drawing.Point(3, 36); - this.cbBackupEnableACL.MaxDropDownItems = 3; - this.cbBackupEnableACL.Name = "cbBackupEnableACL"; - this.cbBackupEnableACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupEnableACL.TabIndex = 25; - this.cbBackupEnableACL.Visible = false; - // // pnlBackupEnable // this.pnlBackupEnable.Controls.Add(this.rbBackupEnableEnable); this.pnlBackupEnable.Controls.Add(this.rbBackupEnableDisable); this.pnlBackupEnable.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlBackupEnable.Location = new System.Drawing.Point(269, 36); + this.pnlBackupEnable.Location = new System.Drawing.Point(274, 30); this.pnlBackupEnable.Name = "pnlBackupEnable"; - this.pnlBackupEnable.Size = new System.Drawing.Size(208, 21); + this.pnlBackupEnable.Size = new System.Drawing.Size(208, 24); this.pnlBackupEnable.TabIndex = 26; // // rbBackupEnableEnable @@ -225,9 +224,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.pnlBackupType.Controls.Add(this.radioButton1); this.pnlBackupType.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlBackupType.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.pnlBackupType.Location = new System.Drawing.Point(269, 63); + this.pnlBackupType.Location = new System.Drawing.Point(274, 60); this.pnlBackupType.Name = "pnlBackupType"; - this.pnlBackupType.Size = new System.Drawing.Size(208, 21); + this.pnlBackupType.Size = new System.Drawing.Size(208, 24); this.pnlBackupType.TabIndex = 27; // // radioButton2 @@ -253,85 +252,21 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.radioButton1.Text = "to File"; this.radioButton1.UseVisualStyleBackColor = true; // - // cbBackupFrequencyACL - // - this.cbBackupFrequencyACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupFrequencyACL.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbBackupFrequencyACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupFrequencyACL.FormattingEnabled = true; - this.cbBackupFrequencyACL.Location = new System.Drawing.Point(3, 90); - this.cbBackupFrequencyACL.MaxDropDownItems = 3; - this.cbBackupFrequencyACL.Name = "cbBackupFrequencyACL"; - this.cbBackupFrequencyACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupFrequencyACL.TabIndex = 29; - this.cbBackupFrequencyACL.Visible = false; - // - // cbBackupTypeACL - // - this.cbBackupTypeACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupTypeACL.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbBackupTypeACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupTypeACL.FormattingEnabled = true; - this.cbBackupTypeACL.Location = new System.Drawing.Point(3, 63); - this.cbBackupTypeACL.MaxDropDownItems = 3; - this.cbBackupTypeACL.Name = "cbBackupTypeACL"; - this.cbBackupTypeACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupTypeACL.TabIndex = 28; - this.cbBackupTypeACL.Visible = false; - // - // cbBackupNumberACL - // - this.cbBackupNumberACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupNumberACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupNumberACL.FormattingEnabled = true; - this.cbBackupNumberACL.Location = new System.Drawing.Point(3, 119); - this.cbBackupNumberACL.MaxDropDownItems = 3; - this.cbBackupNumberACL.Name = "cbBackupNumberACL"; - this.cbBackupNumberACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupNumberACL.TabIndex = 30; - this.cbBackupNumberACL.Visible = false; - // - // cbBackupNameFormatACL - // - this.cbBackupNameFormatACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupNameFormatACL.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbBackupNameFormatACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupNameFormatACL.FormattingEnabled = true; - this.cbBackupNameFormatACL.Location = new System.Drawing.Point(3, 147); - this.cbBackupNameFormatACL.MaxDropDownItems = 3; - this.cbBackupNameFormatACL.Name = "cbBackupNameFormatACL"; - this.cbBackupNameFormatACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupNameFormatACL.TabIndex = 31; - this.cbBackupNameFormatACL.Visible = false; - // - // cbBackupLocationACL - // - this.cbBackupLocationACL.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbBackupLocationACL.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbBackupLocationACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbBackupLocationACL.FormattingEnabled = true; - this.cbBackupLocationACL.Location = new System.Drawing.Point(3, 177); - this.cbBackupLocationACL.MaxDropDownItems = 3; - this.cbBackupLocationACL.Name = "cbBackupLocationACL"; - this.cbBackupLocationACL.Size = new System.Drawing.Size(83, 21); - this.cbBackupLocationACL.TabIndex = 32; - this.cbBackupLocationACL.Visible = false; - // // lblConnectionsBackupPath // this.lblConnectionsBackupPath.AutoSize = true; this.lblConnectionsBackupPath.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblConnectionsBackupPath.Location = new System.Drawing.Point(92, 174); + this.lblConnectionsBackupPath.Location = new System.Drawing.Point(103, 177); this.lblConnectionsBackupPath.Name = "lblConnectionsBackupPath"; - this.lblConnectionsBackupPath.Size = new System.Drawing.Size(171, 31); + this.lblConnectionsBackupPath.Size = new System.Drawing.Size(165, 31); this.lblConnectionsBackupPath.TabIndex = 13; - this.lblConnectionsBackupPath.Text = "backup folder"; + this.lblConnectionsBackupPath.Text = "Backup folder"; this.lblConnectionsBackupPath.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // txtConnectionsBackupPath // this.txtConnectionsBackupPath.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtConnectionsBackupPath.Location = new System.Drawing.Point(269, 179); + this.txtConnectionsBackupPath.Location = new System.Drawing.Point(274, 182); this.txtConnectionsBackupPath.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3); this.txtConnectionsBackupPath.Name = "txtConnectionsBackupPath"; this.txtConnectionsBackupPath.Size = new System.Drawing.Size(208, 22); @@ -340,7 +275,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // btnBrowsePath // this.btnBrowsePath.AutoSize = true; - this.btnBrowsePath.Location = new System.Drawing.Point(483, 177); + this.btnBrowsePath.Location = new System.Drawing.Point(488, 180); this.btnBrowsePath.Name = "btnBrowsePath"; this.btnBrowsePath.Size = new System.Drawing.Size(94, 25); this.btnBrowsePath.TabIndex = 15; @@ -352,9 +287,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.lblBackupNameFormat.AutoSize = true; this.lblBackupNameFormat.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblBackupNameFormat.Location = new System.Drawing.Point(92, 144); + this.lblBackupNameFormat.Location = new System.Drawing.Point(103, 147); this.lblBackupNameFormat.Name = "lblBackupNameFormat"; - this.lblBackupNameFormat.Size = new System.Drawing.Size(171, 30); + this.lblBackupNameFormat.Size = new System.Drawing.Size(165, 30); this.lblBackupNameFormat.TabIndex = 33; this.lblBackupNameFormat.Text = "Backup file name format"; this.lblBackupNameFormat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -362,7 +297,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // txtBackupNameFormat // this.txtBackupNameFormat.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtBackupNameFormat.Location = new System.Drawing.Point(269, 149); + this.txtBackupNameFormat.Location = new System.Drawing.Point(274, 152); this.txtBackupNameFormat.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3); this.txtBackupNameFormat.Name = "txtBackupNameFormat"; this.txtBackupNameFormat.Size = new System.Drawing.Size(208, 22); @@ -371,29 +306,35 @@ namespace mRemoteNG.UI.Forms.OptionsPages // lblBacupPageShowInOptionsMenu // this.lblBacupPageShowInOptionsMenu.AutoSize = true; + this.lblBacupPageShowInOptionsMenu.BackColor = System.Drawing.Color.Salmon; this.lblBacupPageShowInOptionsMenu.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBacupPageShowInOptionsMenu.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.lblBacupPageShowInOptionsMenu.Location = new System.Drawing.Point(92, 0); + this.lblBacupPageShowInOptionsMenu.Location = new System.Drawing.Point(100, 0); + this.lblBacupPageShowInOptionsMenu.Margin = new System.Windows.Forms.Padding(0); this.lblBacupPageShowInOptionsMenu.Name = "lblBacupPageShowInOptionsMenu"; - this.lblBacupPageShowInOptionsMenu.Size = new System.Drawing.Size(171, 33); + this.lblBacupPageShowInOptionsMenu.Size = new System.Drawing.Size(171, 27); this.lblBacupPageShowInOptionsMenu.TabIndex = 35; this.lblBacupPageShowInOptionsMenu.Text = "Page control in Options menu"; this.lblBacupPageShowInOptionsMenu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lblBacupPageShowInOptionsMenu.Visible = false; // // pnlShowForUser // + this.pnlShowForUser.BackColor = System.Drawing.Color.Salmon; this.pnlShowForUser.Controls.Add(this.cbBacupPageInOptionMenu); this.pnlShowForUser.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlShowForUser.Location = new System.Drawing.Point(269, 3); + this.pnlShowForUser.Location = new System.Drawing.Point(271, 0); + this.pnlShowForUser.Margin = new System.Windows.Forms.Padding(0); this.pnlShowForUser.Name = "pnlShowForUser"; - this.pnlShowForUser.Size = new System.Drawing.Size(208, 27); + this.pnlShowForUser.Size = new System.Drawing.Size(214, 27); this.pnlShowForUser.TabIndex = 37; + this.pnlShowForUser.Visible = false; // // cbBacupPageInOptionMenu // this.cbBacupPageInOptionMenu.AutoSize = true; this.cbBacupPageInOptionMenu.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.cbBacupPageInOptionMenu.Location = new System.Drawing.Point(4, 6); + this.cbBacupPageInOptionMenu.Location = new System.Drawing.Point(7, 5); this.cbBacupPageInOptionMenu.Name = "cbBacupPageInOptionMenu"; this.cbBacupPageInOptionMenu.Size = new System.Drawing.Size(104, 19); this.cbBacupPageInOptionMenu.TabIndex = 36; @@ -403,16 +344,151 @@ namespace mRemoteNG.UI.Forms.OptionsPages // lblACL // this.lblACL.AutoSize = true; + this.lblACL.BackColor = System.Drawing.Color.Salmon; this.lblACL.Dock = System.Windows.Forms.DockStyle.Fill; this.lblACL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.lblACL.Location = new System.Drawing.Point(3, 0); + this.lblACL.Location = new System.Drawing.Point(0, 0); + this.lblACL.Margin = new System.Windows.Forms.Padding(0); this.lblACL.Name = "lblACL"; - this.lblACL.Size = new System.Drawing.Size(83, 33); + this.lblACL.Size = new System.Drawing.Size(100, 27); this.lblACL.TabIndex = 17; this.lblACL.Text = "ACL for user"; - this.lblACL.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lblACL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblACL.Visible = false; // + // plBackupEnableACL + // + this.plBackupEnableACL.BackColor = System.Drawing.Color.Salmon; + this.plBackupEnableACL.Controls.Add(this.cbBackupEnableACL); + this.plBackupEnableACL.Location = new System.Drawing.Point(0, 27); + this.plBackupEnableACL.Margin = new System.Windows.Forms.Padding(0); + this.plBackupEnableACL.Name = "plBackupEnableACL"; + this.plBackupEnableACL.Size = new System.Drawing.Size(100, 30); + this.plBackupEnableACL.TabIndex = 38; + // + // cbBackupEnableACL + // + this.cbBackupEnableACL.BackColor = System.Drawing.Color.Salmon; + this.cbBackupEnableACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupEnableACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupEnableACL.FormattingEnabled = true; + this.cbBackupEnableACL.Location = new System.Drawing.Point(3, 5); + this.cbBackupEnableACL.MaxDropDownItems = 3; + this.cbBackupEnableACL.Name = "cbBackupEnableACL"; + this.cbBackupEnableACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupEnableACL.TabIndex = 25; + this.cbBackupEnableACL.Visible = false; + // + // plBackupType + // + this.plBackupType.BackColor = System.Drawing.Color.Salmon; + this.plBackupType.Controls.Add(this.cbBackupTypeACL); + this.plBackupType.Location = new System.Drawing.Point(0, 57); + this.plBackupType.Margin = new System.Windows.Forms.Padding(0); + this.plBackupType.Name = "plBackupType"; + this.plBackupType.Size = new System.Drawing.Size(100, 30); + this.plBackupType.TabIndex = 39; + // + // cbBackupTypeACL + // + this.cbBackupTypeACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupTypeACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupTypeACL.FormattingEnabled = true; + this.cbBackupTypeACL.Location = new System.Drawing.Point(3, 6); + this.cbBackupTypeACL.MaxDropDownItems = 3; + this.cbBackupTypeACL.Name = "cbBackupTypeACL"; + this.cbBackupTypeACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupTypeACL.TabIndex = 28; + this.cbBackupTypeACL.Visible = false; + // + // plBackupFrequency + // + this.plBackupFrequency.BackColor = System.Drawing.Color.Salmon; + this.plBackupFrequency.Controls.Add(this.cbBackupFrequencyACL); + this.plBackupFrequency.Location = new System.Drawing.Point(0, 87); + this.plBackupFrequency.Margin = new System.Windows.Forms.Padding(0); + this.plBackupFrequency.Name = "plBackupFrequency"; + this.plBackupFrequency.Size = new System.Drawing.Size(100, 30); + this.plBackupFrequency.TabIndex = 40; + // + // cbBackupFrequencyACL + // + this.cbBackupFrequencyACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupFrequencyACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupFrequencyACL.FormattingEnabled = true; + this.cbBackupFrequencyACL.Location = new System.Drawing.Point(3, 5); + this.cbBackupFrequencyACL.MaxDropDownItems = 3; + this.cbBackupFrequencyACL.Name = "cbBackupFrequencyACL"; + this.cbBackupFrequencyACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupFrequencyACL.TabIndex = 29; + this.cbBackupFrequencyACL.Visible = false; + // + // plBackupNumber + // + this.plBackupNumber.BackColor = System.Drawing.Color.Salmon; + this.plBackupNumber.Controls.Add(this.cbBackupNumberACL); + this.plBackupNumber.Location = new System.Drawing.Point(0, 117); + this.plBackupNumber.Margin = new System.Windows.Forms.Padding(0); + this.plBackupNumber.Name = "plBackupNumber"; + this.plBackupNumber.Size = new System.Drawing.Size(100, 30); + this.plBackupNumber.TabIndex = 41; + // + // cbBackupNumberACL + // + this.cbBackupNumberACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupNumberACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupNumberACL.FormattingEnabled = true; + this.cbBackupNumberACL.Location = new System.Drawing.Point(3, 6); + this.cbBackupNumberACL.MaxDropDownItems = 3; + this.cbBackupNumberACL.Name = "cbBackupNumberACL"; + this.cbBackupNumberACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupNumberACL.TabIndex = 30; + this.cbBackupNumberACL.Visible = false; + // + // plBackupNameFormat + // + this.plBackupNameFormat.BackColor = System.Drawing.Color.Salmon; + this.plBackupNameFormat.Controls.Add(this.cbBackupNameFormatACL); + this.plBackupNameFormat.Location = new System.Drawing.Point(0, 147); + this.plBackupNameFormat.Margin = new System.Windows.Forms.Padding(0); + this.plBackupNameFormat.Name = "plBackupNameFormat"; + this.plBackupNameFormat.Size = new System.Drawing.Size(100, 30); + this.plBackupNameFormat.TabIndex = 42; + // + // cbBackupNameFormatACL + // + this.cbBackupNameFormatACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupNameFormatACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupNameFormatACL.FormattingEnabled = true; + this.cbBackupNameFormatACL.Location = new System.Drawing.Point(3, 5); + this.cbBackupNameFormatACL.MaxDropDownItems = 3; + this.cbBackupNameFormatACL.Name = "cbBackupNameFormatACL"; + this.cbBackupNameFormatACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupNameFormatACL.TabIndex = 31; + this.cbBackupNameFormatACL.Visible = false; + // + // plBackupLocation + // + this.plBackupLocation.BackColor = System.Drawing.Color.Salmon; + this.plBackupLocation.Controls.Add(this.cbBackupLocationACL); + this.plBackupLocation.Location = new System.Drawing.Point(0, 177); + this.plBackupLocation.Margin = new System.Windows.Forms.Padding(0); + this.plBackupLocation.Name = "plBackupLocation"; + this.plBackupLocation.Size = new System.Drawing.Size(100, 30); + this.plBackupLocation.TabIndex = 43; + // + // cbBackupLocationACL + // + this.cbBackupLocationACL.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbBackupLocationACL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbBackupLocationACL.FormattingEnabled = true; + this.cbBackupLocationACL.Location = new System.Drawing.Point(3, 5); + this.cbBackupLocationACL.MaxDropDownItems = 3; + this.cbBackupLocationACL.Name = "cbBackupLocationACL"; + this.cbBackupLocationACL.Size = new System.Drawing.Size(94, 21); + this.cbBackupLocationACL.TabIndex = 32; + this.cbBackupLocationACL.Visible = false; + // // BackupPage // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -429,6 +505,12 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.pnlBackupType.PerformLayout(); this.pnlShowForUser.ResumeLayout(false); this.pnlShowForUser.PerformLayout(); + this.plBackupEnableACL.ResumeLayout(false); + this.plBackupType.ResumeLayout(false); + this.plBackupFrequency.ResumeLayout(false); + this.plBackupNumber.ResumeLayout(false); + this.plBackupNameFormat.ResumeLayout(false); + this.plBackupLocation.ResumeLayout(false); this.ResumeLayout(false); } @@ -461,5 +543,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages private System.Windows.Forms.Label lblBacupPageShowInOptionsMenu; private System.Windows.Forms.CheckBox cbBacupPageInOptionMenu; private System.Windows.Forms.Panel pnlShowForUser; + private System.Windows.Forms.Panel plBackupEnableACL; + private System.Windows.Forms.Panel plBackupType; + private System.Windows.Forms.Panel plBackupFrequency; + private System.Windows.Forms.Panel plBackupNumber; + private System.Windows.Forms.Panel plBackupNameFormat; + private System.Windows.Forms.Panel plBackupLocation; } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/frmOptions.cs b/mRemoteNG/UI/Forms/frmOptions.cs index 9509d9cb..84e8e1ff 100644 --- a/mRemoteNG/UI/Forms/frmOptions.cs +++ b/mRemoteNG/UI/Forms/frmOptions.cs @@ -69,29 +69,32 @@ namespace mRemoteNG.UI.Forms #endif private void CompileListOfOptionsPages() { - _pages = new Dictionary - { - {typeof(StartupExitPage).Name, new StartupExitPage {Dock = DockStyle.Fill}}, - {typeof(AppearancePage).Name, new AppearancePage {Dock = DockStyle.Fill}}, - {typeof(TabsPanelsPage).Name, new TabsPanelsPage {Dock = DockStyle.Fill}}, - {typeof(NotificationsPage).Name, new NotificationsPage {Dock = DockStyle.Fill}}, - {typeof(ConnectionsPage).Name, new ConnectionsPage {Dock = DockStyle.Fill}}, - {typeof(CredentialsPage).Name, new CredentialsPage {Dock = DockStyle.Fill}}, - {typeof(SqlServerPage).Name, new SqlServerPage {Dock = DockStyle.Fill}}, - {typeof(UpdatesPage).Name, new UpdatesPage {Dock = DockStyle.Fill}}, - {typeof(ThemePage).Name, new ThemePage {Dock = DockStyle.Fill}}, - {typeof(SecurityPage).Name, new SecurityPage {Dock = DockStyle.Fill}}, - {typeof(AdvancedPage).Name, new AdvancedPage {Dock = DockStyle.Fill}}, - }; - + _pages = new Dictionary{}; + + if (Properties.OptionsStartupExitPage.Default.cbStartupExitPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(StartupExitPage).Name, new StartupExitPage { Dock = DockStyle.Fill }); + if (Properties.OptionsAppearancePage.Default.cbAppearancePageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(AppearancePage).Name, new AppearancePage { Dock = DockStyle.Fill }); + if (Properties.OptionsConnectionsPage.Default.cbConnectionsPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(ConnectionsPage).Name, new ConnectionsPage { Dock = DockStyle.Fill }); + if (Properties.OptionsTabsPanelsPage.Default.cbTabsPanelsPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(TabsPanelsPage).Name, new TabsPanelsPage { Dock = DockStyle.Fill }); + if (Properties.OptionsNotificationsPage.Default.cbNotificationsPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(NotificationsPage).Name, new NotificationsPage { Dock = DockStyle.Fill }); + if (Properties.OptionsCredentialsPage.Default.cbCredentialsPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(CredentialsPage).Name, new CredentialsPage { Dock = DockStyle.Fill }); + if (Properties.OptionsDBsPage.Default.cbDBsPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(SqlServerPage).Name, new SqlServerPage { Dock = DockStyle.Fill }); + if (Properties.OptionsUpdatesPage.Default.cbUpdatesPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(UpdatesPage).Name, new UpdatesPage { Dock = DockStyle.Fill }); + if (Properties.OptionsThemePage.Default.cbThemePageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(ThemePage).Name, new ThemePage { Dock = DockStyle.Fill }); + if (Properties.OptionsSecurityPage.Default.cbSecurityPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(SecurityPage).Name, new SecurityPage { Dock = DockStyle.Fill }); + if (Properties.OptionsAdvancedPage.Default.cbAdvancedPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") + _pages.Add(typeof(AdvancedPage).Name, new AdvancedPage { Dock = DockStyle.Fill }); if (Properties.OptionsBackupPage.Default.cbBacupPageInOptionMenu == true || Properties.rbac.Default.ActiveRole == "AdminRole") - { _pages.Add(typeof(BackupPage).Name, new BackupPage { Dock = DockStyle.Fill }); - } - - - //{typeof(ComponentsPage).Name, new ComponentsPage {Dock = DockStyle.Fill}}, - } private void AddOptionsPagesToListView()