diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index 5326d5e1..15db67a9 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", "16.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -3094,7 +3094,7 @@ namespace mRemoteNG.Properties { this["ConDefaultDisableCursorBlinking"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -3106,5 +3106,41 @@ namespace mRemoteNG.Properties { this["ConDefaultStartProgram"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("EncrBasic")] + public string ConDefaultICAEncryptionStrength { + get { + return ((string)(this["ConDefaultICAEncryptionStrength"])); + } + set { + this["ConDefaultICAEncryptionStrength"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public string InhDefaultICAEncryptionStrength { + get { + return ((string)(this["InhDefaultICAEncryptionStrength"])); + } + set { + this["InhDefaultICAEncryptionStrength"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool StartFullScreen { + get { + return ((bool)(this["StartFullScreen"])); + } + set { + this["StartFullScreen"] = value; + } + } } } diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings index 2a90ba08..6fb5fd1e 100644 --- a/mRemoteNG/Properties/Settings.settings +++ b/mRemoteNG/Properties/Settings.settings @@ -773,5 +773,14 @@ + + EncrBasic + + + False + + + False + \ No newline at end of file diff --git a/mRemoteNG/Resources/Language/Language.Designer.cs b/mRemoteNG/Resources/Language/Language.Designer.cs index 383cbba4..e96f1fe6 100644 --- a/mRemoteNG/Resources/Language/Language.Designer.cs +++ b/mRemoteNG/Resources/Language/Language.Designer.cs @@ -5849,7 +5849,18 @@ namespace mRemoteNG.Resources.Language { return ResourceManager.GetString("StartMinimized", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Start minimized. + /// + internal static string StartFullScreen + { + get + { + return ResourceManager.GetString("StartFullScreen", resourceCulture); + } + } + /// /// Looks up a localized string similar to Startup/Exit. /// diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs index 42a8c8fb..75124a5d 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs @@ -1,4 +1,4 @@ - + using mRemoteNG.UI.Controls; @@ -33,16 +33,17 @@ namespace mRemoteNG.UI.Forms.OptionsPages [System.Diagnostics.DebuggerStepThrough()] private void InitializeComponent() { - this.chkReconnectOnStart = new MrngCheckBox(); - this.chkSaveConsOnExit = new MrngCheckBox(); - this.chkSingleInstance = new MrngCheckBox(); - this.chkProperInstallationOfComponentsAtStartup = new MrngCheckBox(); - this.chkStartMinimized = new MrngCheckBox(); + this.chkReconnectOnStart = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkSaveConsOnExit = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkSingleInstance = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkProperInstallationOfComponentsAtStartup = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkStartMinimized = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkStartFullScreen = new mRemoteNG.UI.Controls.MrngCheckBox(); this.SuspendLayout(); // // chkReconnectOnStart // - this.chkReconnectOnStart._mice = MrngCheckBox.MouseState.OUT; + this.chkReconnectOnStart._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkReconnectOnStart.AutoSize = true; this.chkReconnectOnStart.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkReconnectOnStart.Location = new System.Drawing.Point(3, 26); @@ -54,7 +55,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSaveConsOnExit // - this.chkSaveConsOnExit._mice = MrngCheckBox.MouseState.OUT; + this.chkSaveConsOnExit._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkSaveConsOnExit.AutoSize = true; this.chkSaveConsOnExit.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSaveConsOnExit.Location = new System.Drawing.Point(3, 2); @@ -66,7 +67,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSingleInstance // - this.chkSingleInstance._mice = MrngCheckBox.MouseState.OUT; + this.chkSingleInstance._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkSingleInstance.AutoSize = true; this.chkSingleInstance.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSingleInstance.Location = new System.Drawing.Point(3, 50); @@ -78,7 +79,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkProperInstallationOfComponentsAtStartup // - this.chkProperInstallationOfComponentsAtStartup._mice = MrngCheckBox.MouseState.OUT; + this.chkProperInstallationOfComponentsAtStartup._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkProperInstallationOfComponentsAtStartup.AutoSize = true; this.chkProperInstallationOfComponentsAtStartup.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkProperInstallationOfComponentsAtStartup.Location = new System.Drawing.Point(3, 74); @@ -90,7 +91,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkStartMinimized // - this.chkStartMinimized._mice = MrngCheckBox.MouseState.OUT; + this.chkStartMinimized._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkStartMinimized.AutoSize = true; this.chkStartMinimized.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkStartMinimized.Location = new System.Drawing.Point(3, 97); @@ -100,10 +101,23 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkStartMinimized.Text = "Start minimized"; this.chkStartMinimized.UseVisualStyleBackColor = true; // + // chkStartFullScreen + // + this.chkStartFullScreen._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; + this.chkStartFullScreen.AutoSize = true; + this.chkStartFullScreen.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.chkStartFullScreen.Location = new System.Drawing.Point(3, 120); + this.chkStartFullScreen.Name = "chkStartFullScreen"; + this.chkStartFullScreen.Size = new System.Drawing.Size(109, 17); + this.chkStartFullScreen.TabIndex = 4; + this.chkStartFullScreen.Text = "Start Full Screen"; + this.chkStartFullScreen.UseVisualStyleBackColor = true; + // // StartupExitPage // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.chkStartFullScreen); this.Controls.Add(this.chkReconnectOnStart); this.Controls.Add(this.chkSaveConsOnExit); this.Controls.Add(this.chkSingleInstance); @@ -121,5 +135,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages internal MrngCheckBox chkSingleInstance; internal MrngCheckBox chkProperInstallationOfComponentsAtStartup; internal MrngCheckBox chkStartMinimized; + internal MrngCheckBox chkStartFullScreen; } } diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs index bbce35bc..8f01d044 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs @@ -38,6 +38,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages Settings.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked; Settings.Default.SingleInstance = chkSingleInstance.Checked; Settings.Default.StartMinimized = chkStartMinimized.Checked; + Settings.Default.StartFullScreen = chkStartFullScreen.Checked; } private void StartupExitPage_Load(object sender, EventArgs e) @@ -46,6 +47,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages chkReconnectOnStart.Checked = Settings.Default.OpenConsFromLastSession; chkSingleInstance.Checked = Settings.Default.SingleInstance; chkStartMinimized.Checked = Settings.Default.StartMinimized; + chkStartFullScreen.Checked = Settings.Default.StartFullScreen; + ; } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/frmMain.Designer.cs b/mRemoteNG/UI/Forms/frmMain.Designer.cs index 899582f6..88e32b32 100644 --- a/mRemoteNG/UI/Forms/frmMain.Designer.cs +++ b/mRemoteNG/UI/Forms/frmMain.Designer.cs @@ -60,7 +60,7 @@ this.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingSdi; this.pnlDock.Location = new System.Drawing.Point(0, 0); this.pnlDock.Name = "pnlDock"; - this.pnlDock.Size = new System.Drawing.Size(1129, 471); + this.pnlDock.Size = new System.Drawing.Size(1129, 496); this.pnlDock.TabIndex = 13; this.pnlDock.ActiveDocumentChanged += new System.EventHandler(this.pnlDock_ActiveDocumentChanged); // @@ -78,7 +78,7 @@ this.msMain.Location = new System.Drawing.Point(3, 50); this.msMain.Name = "msMain"; this.msMain.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.msMain.Size = new System.Drawing.Size(184, 25); + this.msMain.Size = new System.Drawing.Size(303, 25); this.msMain.Stretch = false; this.msMain.TabIndex = 0; this.msMain.Text = "Main Toolbar"; @@ -112,7 +112,7 @@ this.toolsMenu.MainForm = null; this.toolsMenu.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.toolsMenu.Name = "mMenTools"; - this.toolsMenu.Size = new System.Drawing.Size(47, 19); + this.toolsMenu.Size = new System.Drawing.Size(46, 19); this.toolsMenu.Text = "&Tools"; // // helpMenu @@ -134,7 +134,7 @@ // tsContainer.ContentPanel // this.tsContainer.ContentPanel.Controls.Add(this.pnlDock); - this.tsContainer.ContentPanel.Size = new System.Drawing.Size(1129, 471); + this.tsContainer.ContentPanel.Size = new System.Drawing.Size(1129, 496); this.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill; this.tsContainer.Location = new System.Drawing.Point(0, 0); this.tsContainer.Name = "tsContainer"; @@ -144,9 +144,9 @@ // // tsContainer.TopToolStripPanel // + this.tsContainer.TopToolStripPanel.Controls.Add(this.msMain); this.tsContainer.TopToolStripPanel.Controls.Add(this._quickConnectToolStrip); this.tsContainer.TopToolStripPanel.Controls.Add(this._multiSshToolStrip); - this.tsContainer.TopToolStripPanel.Controls.Add(this.msMain); this.tsContainer.TopToolStripPanel.Controls.Add(this._externalToolsToolStrip); this.tsContainer.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; // @@ -156,15 +156,15 @@ this._quickConnectToolStrip.ConnectionInitiator = connectionInitiator1; this._quickConnectToolStrip.Dock = System.Windows.Forms.DockStyle.None; this._quickConnectToolStrip.ForeColor = System.Drawing.SystemColors.ControlText; - this._quickConnectToolStrip.Location = new System.Drawing.Point(3, 0); + this._quickConnectToolStrip.Location = new System.Drawing.Point(114, 25); this._quickConnectToolStrip.Name = "_quickConnectToolStrip"; - this._quickConnectToolStrip.Size = new System.Drawing.Size(364, 25); + this._quickConnectToolStrip.Size = new System.Drawing.Size(395, 25); this._quickConnectToolStrip.TabIndex = 18; // // _multiSshToolStrip // this._multiSshToolStrip.Dock = System.Windows.Forms.DockStyle.None; - this._multiSshToolStrip.Location = new System.Drawing.Point(3, 25); + this._multiSshToolStrip.Location = new System.Drawing.Point(3, 0); this._multiSshToolStrip.MinimumSize = new System.Drawing.Size(300, 0); this._multiSshToolStrip.Name = "_multiSshToolStrip"; this._multiSshToolStrip.Size = new System.Drawing.Size(376, 25); @@ -175,7 +175,7 @@ this._externalToolsToolStrip.BackColor = System.Drawing.SystemColors.Control; this._externalToolsToolStrip.Dock = System.Windows.Forms.DockStyle.None; this._externalToolsToolStrip.ForeColor = System.Drawing.SystemColors.ControlText; - this._externalToolsToolStrip.Location = new System.Drawing.Point(3, 75); + this._externalToolsToolStrip.Location = new System.Drawing.Point(3, 25); this._externalToolsToolStrip.Name = "_externalToolsToolStrip"; this._externalToolsToolStrip.Size = new System.Drawing.Size(111, 25); this._externalToolsToolStrip.TabIndex = 17; @@ -201,6 +201,7 @@ this.MinimumSize = new System.Drawing.Size(400, 400); this.Name = "FrmMain"; this.Opacity = 0D; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = " "; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing); this.Load += new System.EventHandler(this.FrmMain_Load); diff --git a/mRemoteNG/app.config b/mRemoteNG/app.config index db061d82..cc4f174b 100644 --- a/mRemoteNG/app.config +++ b/mRemoteNG/app.config @@ -792,12 +792,18 @@ False + + + EncrBasic False + + False + diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 1fb45ffa..75c5d98f 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -42,7 +42,7 @@ false true 1 - 1.64.0.1 + 1.64.0.%2a false true true