From 6e8200a380a3f12a79ab2e87fc0fc2a6518af9ee Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 2 Feb 2017 20:22:22 -0700 Subject: [PATCH] started building new options page for messages --- mRemoteV1/App/Logger.cs | 5 +- mRemoteV1/Properties/Settings.Designer.cs | 50 +-- mRemoteV1/Properties/Settings.settings | 5 +- .../Resources/Icons_FamFamFam/comments.ico | Bin 0 -> 1150 bytes .../Resources/Language/Language.Designer.cs | 9 - mRemoteV1/Resources/Language/Language.resx | 3 - .../OptionsPages/MessagesPage.Designer.cs | 325 ++++++++++++++++++ .../UI/Forms/OptionsPages/MessagesPage.cs | 51 +++ .../UI/Forms/OptionsPages/MessagesPage.resx | 148 ++++++++ .../OptionsPages/TabsPanelsPage.Designer.cs | 262 ++++++-------- .../UI/Forms/OptionsPages/TabsPanelsPage.cs | 25 -- .../UI/Forms/OptionsPages/TabsPanelsPage.resx | 6 +- mRemoteV1/UI/Forms/frmOptions.cs | 1 + mRemoteV1/app.config | 21 +- mRemoteV1/mRemoteV1.csproj | 9 + 15 files changed, 660 insertions(+), 260 deletions(-) create mode 100644 mRemoteV1/Resources/Icons_FamFamFam/comments.ico create mode 100644 mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs create mode 100644 mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs create mode 100644 mRemoteV1/UI/Forms/OptionsPages/MessagesPage.resx diff --git a/mRemoteV1/App/Logger.cs b/mRemoteV1/App/Logger.cs index 3f2f0acec..a2939df5e 100644 --- a/mRemoteV1/App/Logger.cs +++ b/mRemoteV1/App/Logger.cs @@ -28,7 +28,8 @@ namespace mRemoteNG.App private void Initialize() { XmlConfigurator.Configure(); - var logFile = BuildLogFilePath(); + if (string.IsNullOrEmpty(Settings.Default.LogFilePath)) + Settings.Default.LogFilePath = BuildLogFilePath(); var repository = LogManager.GetRepository(); var appenders = repository.GetAppenders(); @@ -37,7 +38,7 @@ namespace mRemoteNG.App { var fileAppender = (RollingFileAppender)appender; if (fileAppender == null || fileAppender.Name != "LogFileAppender") continue; - fileAppender.File = logFile; + fileAppender.File = Settings.Default.LogFilePath; fileAppender.ActivateOptions(); } _log = LogManager.GetLogger("Logger"); diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs index 923ae6ae2..80a1620f6 100644 --- a/mRemoteV1/Properties/Settings.Designer.cs +++ b/mRemoteV1/Properties/Settings.Designer.cs @@ -443,42 +443,6 @@ namespace mRemoteNG { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ConDefaultUsername { - get { - return ((string)(this["ConDefaultUsername"])); - } - set { - this["ConDefaultUsername"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ConDefaultPassword { - get { - return ((string)(this["ConDefaultPassword"])); - } - set { - this["ConDefaultPassword"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ConDefaultDomain { - get { - return ((string)(this["ConDefaultDomain"])); - } - set { - this["ConDefaultDomain"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("RDP")] @@ -2386,7 +2350,7 @@ namespace mRemoteNG { this["InhDefaultRDPAlertIdleTimeout"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2410,5 +2374,17 @@ namespace mRemoteNG { this["ConDefaultCredentialRecord"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string LogFilePath { + get { + return ((string)(this["LogFilePath"])); + } + set { + this["LogFilePath"] = value; + } + } } } diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings index 4364b64a3..c31bd2919 100644 --- a/mRemoteV1/Properties/Settings.settings +++ b/mRemoteV1/Properties/Settings.settings @@ -590,5 +590,8 @@ 00000000-0000-0000-0000-000000000000 + + + - + \ No newline at end of file diff --git a/mRemoteV1/Resources/Icons_FamFamFam/comments.ico b/mRemoteV1/Resources/Icons_FamFamFam/comments.ico new file mode 100644 index 0000000000000000000000000000000000000000..bfa94ca156e4b080560bae86bdd6ab0f6729dfab GIT binary patch literal 1150 zcmcJNJ!=$E6o&7DjfI#dc4909EmDZJ;GYm|jD-mH!5@%n3ztZ0Z6uZGDzb$p;f55k z5;uf22J^+5WItxj?Ck8<%o>i*xtYN+5F`<2dG_8td*An*_wE{#<25p3c*e}*bH-d^ zcOA4e208a`%pJZv{)kBKfABGX?=rlD@w51&y8r?7;no>F)+^c@T*rr@g9So14yr^VY^mBXL$5yOFWyzdfJH|6W%ta@p#$>jWb z_9gfL*PuQKnsSI{(5gz`-e`b12=EmN2JmEElzZ z5lUpWWVK{<9{X!cpO>Fc`U{1L;X>g7Obj`v{{cT?k2McBpoG6At0imVQFC)}=k7DJ z>YdD{cb#32^z`rg&V#I$tay1&tM$L=XUJ;F3e2H&Q(9Jk6S8XmscheLPhB%SgZC%! Qiuyyil4`Q6F(UuMFPh3LYXATM literal 0 HcmV?d00001 diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index ea56087ce..b9fa47199 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -6875,15 +6875,6 @@ namespace mRemoteNG { } } - /// - /// Looks up a localized string similar to Use only Notifications panel (no messagebox popups). - /// - internal static string strUseOnlyErrorsAndInfosPanel { - get { - return ResourceManager.GetString("strUseOnlyErrorsAndInfosPanel", resourceCulture); - } - } - /// /// Looks up a localized string similar to User. /// diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index 3e7eea97f..f99b7dce3 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2301,9 +2301,6 @@ mRemoteNG will now quit and begin with the installation. Use a different username and password - - Use only Notifications panel (no messagebox popups) - User diff --git a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs new file mode 100644 index 000000000..43fb3bdec --- /dev/null +++ b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs @@ -0,0 +1,325 @@ + + +namespace mRemoteNG.UI.Forms.OptionsPages +{ + + public partial class MessagesPage : OptionsPage + { + + //UserControl overrides dispose to clean up the component list. + [System.Diagnostics.DebuggerNonUserCode()]protected override void Dispose(bool disposing) + { + try + { + if (disposing && components != null) + { + components.Dispose(); + } + } + finally + { + base.Dispose(disposing); + } + } + + //Required by the Windows Form Designer + private System.ComponentModel.Container components = null; + + //NOTE: The following procedure is required by the Windows Form Designer + //It can be modified using the Windows Form Designer. + //Do not modify it using the code editor. + [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessagesPage)); + this.lblSwitchToErrorsAndInfos = new System.Windows.Forms.Label(); + this.chkMCInformation = new System.Windows.Forms.CheckBox(); + this.chkMCErrors = new System.Windows.Forms.CheckBox(); + this.chkMCWarnings = new System.Windows.Forms.CheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.chkMCDebug = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); + this.chkShowErrorInMC = new System.Windows.Forms.CheckBox(); + this.chkShowWarningInMC = new System.Windows.Forms.CheckBox(); + this.chkShowInfoInMC = new System.Windows.Forms.CheckBox(); + this.chkShowDebugInMC = new System.Windows.Forms.CheckBox(); + this.groupBoxLogging = new System.Windows.Forms.GroupBox(); + this.labelLogFilePath = new System.Windows.Forms.Label(); + this.textBoxLogPath = new System.Windows.Forms.TextBox(); + this.saveFileDialogLogging = new System.Windows.Forms.SaveFileDialog(); + this.labelLogTheseMsgTypes = new System.Windows.Forms.Label(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.buttonSelectLogPath = new System.Windows.Forms.Button(); + this.buttonOpenLog = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + this.groupBoxLogging.SuspendLayout(); + this.SuspendLayout(); + // + // lblSwitchToErrorsAndInfos + // + this.lblSwitchToErrorsAndInfos.AutoSize = true; + this.lblSwitchToErrorsAndInfos.Location = new System.Drawing.Point(177, 26); + this.lblSwitchToErrorsAndInfos.Name = "lblSwitchToErrorsAndInfos"; + this.lblSwitchToErrorsAndInfos.Size = new System.Drawing.Size(159, 13); + this.lblSwitchToErrorsAndInfos.TabIndex = 24; + this.lblSwitchToErrorsAndInfos.Text = "Switch to Notifications panel on:"; + // + // chkMCInformation + // + this.chkMCInformation.AutoSize = true; + this.chkMCInformation.Enabled = false; + this.chkMCInformation.Location = new System.Drawing.Point(195, 68); + this.chkMCInformation.Name = "chkMCInformation"; + this.chkMCInformation.Size = new System.Drawing.Size(78, 17); + this.chkMCInformation.TabIndex = 25; + this.chkMCInformation.Text = "Information"; + this.chkMCInformation.UseVisualStyleBackColor = true; + // + // chkMCErrors + // + this.chkMCErrors.AutoSize = true; + this.chkMCErrors.Enabled = false; + this.chkMCErrors.Location = new System.Drawing.Point(195, 114); + this.chkMCErrors.Name = "chkMCErrors"; + this.chkMCErrors.Size = new System.Drawing.Size(48, 17); + this.chkMCErrors.TabIndex = 27; + this.chkMCErrors.Text = "Error"; + this.chkMCErrors.UseVisualStyleBackColor = true; + // + // chkMCWarnings + // + this.chkMCWarnings.AutoSize = true; + this.chkMCWarnings.Enabled = false; + this.chkMCWarnings.Location = new System.Drawing.Point(195, 91); + this.chkMCWarnings.Name = "chkMCWarnings"; + this.chkMCWarnings.Size = new System.Drawing.Size(66, 17); + this.chkMCWarnings.TabIndex = 26; + this.chkMCWarnings.Text = "Warning"; + this.chkMCWarnings.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.chkMCDebug); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.lblSwitchToErrorsAndInfos); + this.groupBox1.Controls.Add(this.chkMCErrors); + this.groupBox1.Controls.Add(this.chkShowErrorInMC); + this.groupBox1.Controls.Add(this.chkMCInformation); + this.groupBox1.Controls.Add(this.chkShowWarningInMC); + this.groupBox1.Controls.Add(this.chkMCWarnings); + this.groupBox1.Controls.Add(this.chkShowInfoInMC); + this.groupBox1.Controls.Add(this.chkShowDebugInMC); + this.groupBox1.Location = new System.Drawing.Point(6, 3); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(601, 141); + this.groupBox1.TabIndex = 28; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Notifications Panel"; + // + // chkMCDebug + // + this.chkMCDebug.AutoSize = true; + this.chkMCDebug.Enabled = false; + this.chkMCDebug.Location = new System.Drawing.Point(195, 45); + this.chkMCDebug.Name = "chkMCDebug"; + this.chkMCDebug.Size = new System.Drawing.Size(58, 17); + this.chkMCDebug.TabIndex = 33; + this.chkMCDebug.Text = "Debug"; + this.chkMCDebug.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 26); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(139, 13); + this.label1.TabIndex = 29; + this.label1.Text = "Show these message types:"; + // + // chkShowErrorInMC + // + this.chkShowErrorInMC.AutoSize = true; + this.chkShowErrorInMC.Location = new System.Drawing.Point(20, 114); + this.chkShowErrorInMC.Name = "chkShowErrorInMC"; + this.chkShowErrorInMC.Size = new System.Drawing.Size(48, 17); + this.chkShowErrorInMC.TabIndex = 32; + this.chkShowErrorInMC.Text = "Error"; + this.chkShowErrorInMC.UseVisualStyleBackColor = true; + // + // chkShowWarningInMC + // + this.chkShowWarningInMC.AutoSize = true; + this.chkShowWarningInMC.Location = new System.Drawing.Point(20, 91); + this.chkShowWarningInMC.Name = "chkShowWarningInMC"; + this.chkShowWarningInMC.Size = new System.Drawing.Size(66, 17); + this.chkShowWarningInMC.TabIndex = 31; + this.chkShowWarningInMC.Text = "Warning"; + this.chkShowWarningInMC.UseVisualStyleBackColor = true; + // + // chkShowInfoInMC + // + this.chkShowInfoInMC.AutoSize = true; + this.chkShowInfoInMC.Location = new System.Drawing.Point(20, 68); + this.chkShowInfoInMC.Name = "chkShowInfoInMC"; + this.chkShowInfoInMC.Size = new System.Drawing.Size(78, 17); + this.chkShowInfoInMC.TabIndex = 30; + this.chkShowInfoInMC.Text = "Information"; + this.chkShowInfoInMC.UseVisualStyleBackColor = true; + // + // chkShowDebugInMC + // + this.chkShowDebugInMC.AutoSize = true; + this.chkShowDebugInMC.Location = new System.Drawing.Point(20, 45); + this.chkShowDebugInMC.Name = "chkShowDebugInMC"; + this.chkShowDebugInMC.Size = new System.Drawing.Size(58, 17); + this.chkShowDebugInMC.TabIndex = 29; + this.chkShowDebugInMC.Text = "Debug"; + this.chkShowDebugInMC.UseVisualStyleBackColor = true; + // + // groupBoxLogging + // + this.groupBoxLogging.Controls.Add(this.buttonOpenLog); + this.groupBoxLogging.Controls.Add(this.buttonSelectLogPath); + this.groupBoxLogging.Controls.Add(this.labelLogTheseMsgTypes); + this.groupBoxLogging.Controls.Add(this.checkBox1); + this.groupBoxLogging.Controls.Add(this.labelLogFilePath); + this.groupBoxLogging.Controls.Add(this.checkBox2); + this.groupBoxLogging.Controls.Add(this.textBoxLogPath); + this.groupBoxLogging.Controls.Add(this.checkBox3); + this.groupBoxLogging.Controls.Add(this.checkBox4); + this.groupBoxLogging.Location = new System.Drawing.Point(6, 150); + this.groupBoxLogging.Name = "groupBoxLogging"; + this.groupBoxLogging.Size = new System.Drawing.Size(601, 140); + this.groupBoxLogging.TabIndex = 29; + this.groupBoxLogging.TabStop = false; + this.groupBoxLogging.Text = "Logging"; + // + // labelLogFilePath + // + this.labelLogFilePath.AutoSize = true; + this.labelLogFilePath.Location = new System.Drawing.Point(193, 26); + this.labelLogFilePath.Name = "labelLogFilePath"; + this.labelLogFilePath.Size = new System.Drawing.Size(68, 13); + this.labelLogFilePath.TabIndex = 30; + this.labelLogFilePath.Text = "Log file path:"; + // + // textBoxLogPath + // + this.textBoxLogPath.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxLogPath.Enabled = false; + this.textBoxLogPath.Location = new System.Drawing.Point(196, 43); + this.textBoxLogPath.Name = "textBoxLogPath"; + this.textBoxLogPath.ReadOnly = true; + this.textBoxLogPath.Size = new System.Drawing.Size(399, 20); + this.textBoxLogPath.TabIndex = 0; + // + // labelLogTheseMsgTypes + // + this.labelLogTheseMsgTypes.AutoSize = true; + this.labelLogTheseMsgTypes.Location = new System.Drawing.Point(6, 26); + this.labelLogTheseMsgTypes.Name = "labelLogTheseMsgTypes"; + this.labelLogTheseMsgTypes.Size = new System.Drawing.Size(130, 13); + this.labelLogTheseMsgTypes.TabIndex = 34; + this.labelLogTheseMsgTypes.Text = "Log these message types:"; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(20, 114); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(48, 17); + this.checkBox1.TabIndex = 38; + this.checkBox1.Text = "Error"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(20, 91); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(66, 17); + this.checkBox2.TabIndex = 37; + this.checkBox2.Text = "Warning"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Location = new System.Drawing.Point(20, 68); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(78, 17); + this.checkBox3.TabIndex = 36; + this.checkBox3.Text = "Information"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // checkBox4 + // + this.checkBox4.AutoSize = true; + this.checkBox4.Location = new System.Drawing.Point(20, 45); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(58, 17); + this.checkBox4.TabIndex = 35; + this.checkBox4.Text = "Debug"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // buttonSelectLogPath + // + this.buttonSelectLogPath.Location = new System.Drawing.Point(490, 68); + this.buttonSelectLogPath.Name = "buttonSelectLogPath"; + this.buttonSelectLogPath.Size = new System.Drawing.Size(105, 23); + this.buttonSelectLogPath.TabIndex = 30; + this.buttonSelectLogPath.Text = "Choose Path"; + this.buttonSelectLogPath.UseVisualStyleBackColor = true; + // + // buttonOpenLog + // + this.buttonOpenLog.Location = new System.Drawing.Point(379, 69); + this.buttonOpenLog.Name = "buttonOpenLog"; + this.buttonOpenLog.Size = new System.Drawing.Size(105, 23); + this.buttonOpenLog.TabIndex = 30; + this.buttonOpenLog.Text = "Open File"; + this.buttonOpenLog.UseVisualStyleBackColor = true; + // + // MessagesPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.groupBoxLogging); + this.Controls.Add(this.groupBox1); + this.Name = "MessagesPage"; + this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); + this.Size = new System.Drawing.Size(610, 489); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBoxLogging.ResumeLayout(false); + this.groupBoxLogging.PerformLayout(); + this.ResumeLayout(false); + + } + + internal System.Windows.Forms.Label lblSwitchToErrorsAndInfos; + internal System.Windows.Forms.CheckBox chkMCInformation; + internal System.Windows.Forms.CheckBox chkMCErrors; + internal System.Windows.Forms.CheckBox chkMCWarnings; + private System.Windows.Forms.GroupBox groupBox1; + internal System.Windows.Forms.CheckBox chkMCDebug; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.CheckBox chkShowErrorInMC; + private System.Windows.Forms.CheckBox chkShowWarningInMC; + private System.Windows.Forms.CheckBox chkShowInfoInMC; + private System.Windows.Forms.CheckBox chkShowDebugInMC; + private System.Windows.Forms.GroupBox groupBoxLogging; + private System.Windows.Forms.SaveFileDialog saveFileDialogLogging; + private System.Windows.Forms.Label labelLogFilePath; + private System.Windows.Forms.TextBox textBoxLogPath; + private System.Windows.Forms.Button buttonSelectLogPath; + private System.Windows.Forms.Label labelLogTheseMsgTypes; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.Button buttonOpenLog; + } +} diff --git a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs new file mode 100644 index 000000000..9010ac899 --- /dev/null +++ b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs @@ -0,0 +1,51 @@ +using System.Windows.Forms; +using mRemoteNG.App; + +namespace mRemoteNG.UI.Forms.OptionsPages +{ + public partial class MessagesPage + { + public MessagesPage() + { + InitializeComponent(); + } + + public override string PageName + { + get { return "Messages"; } + set { } + } + + public override void ApplyLanguage() + { + base.ApplyLanguage(); + + // notifications panel + lblSwitchToErrorsAndInfos.Text = Language.strSwitchToErrorsAndInfos; + chkMCInformation.Text = Language.strInformations; + chkMCWarnings.Text = Language.strWarnings; + chkMCErrors.Text = Language.strErrors; + } + + public override void LoadSettings() + { + base.SaveSettings(); + // notifications panel + chkMCInformation.Checked = Settings.Default.SwitchToMCOnInformation; + chkMCWarnings.Checked = Settings.Default.SwitchToMCOnWarning; + chkMCErrors.Checked = Settings.Default.SwitchToMCOnError; + + // log file + textBoxLogPath.Text = Settings.Default.LogFilePath; + } + + public override void SaveSettings() + { + Settings.Default.SwitchToMCOnInformation = chkMCInformation.Checked; + Settings.Default.SwitchToMCOnWarning = chkMCWarnings.Checked; + Settings.Default.SwitchToMCOnError = chkMCErrors.Checked; + + Settings.Default.Save(); + } + } +} \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.resx b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.resx new file mode 100644 index 000000000..4568e263f --- /dev/null +++ b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.resx @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA + AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8BuIdYHbiHWK+4h1gt////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////AbiHWA24h1jxuIdY97iHWDP///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BuIdY2eLOuv+4h1j5uIdYMf// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BuIdYVbiHWPH59vH/4s25/7iH + WP+4h1jduIdY07iHWJG4h1gP////Af///wG4h1gVuIdYgbiHWCH///8BuIdYh8+ujv/r3tH//fz6//38 + +v/9+/j/9Ovj//Hn3f/YvqP/uIdY97iHWHP///8BuIdYCbiHWLO4h1i3uIdYJbiHWOn48ez//fv4//jw + 5//37+b/9+7k//jw6P/48er//fv5//Lp4P+4h1jZ////Af///wG4h1ih4s66vbiHWLm4h1jz+vfy//rz + 7P/48en/+PDn//fv5v/37uT/9uzi//fv5//07OX/uIdY3////wG4h1g9uIdYq/bw6b3izbm9uIdY+/r2 + 8f/69O7/+fLq//jx6f/48Oj/9+/m//fu5P/48en/8+ri/7iHWNu4h1hlzqyMverczr39/Pq9/fz6vbqL + Xfv69vL/+vXv//r07v/68+3/+fPr//ny6//48en/+vXv//Pq4v+4h1jbuIdYrfjx7L39+/m9+PDnvffv + 5r3FnHXx5NG+//r28v/69vH/+vbx//r18f/69fH/+vXw//bw6f/cxK3/uIdYrbiHWLP69/K9+vPsvfjx + 6b348Oe95tPAy8Sbc++7jF77u4xf+7uMXvu4h1j5uIdY77iHWO+4h1jluIdYh7iHWCm4h1iz+vbxvfr0 + 7r358uq9+PHpvfjw6L337+a99+7kvfjx6b3z6uK9uIdYo////wH///8B////Af///wH///8BuIdYs/r2 + 8r369e+9+vTuvfrz7b358+u9+fLrvfjx6b369e+98+rivbiHWKP///8B////Af///wH///8B////AbiH + WJHk0b69+vbyvfr28b369vG9+vXxvfr18b369fC99vDpvdzErb24h1iB////Af///wH///8B////Af// + /wG4h1gpuIdYj7iHWLG4h1ixuIdYsbiHWLG4h1ixuIdYsbiHWKm4h1hjuIdYH////wH///8B////Af// + /wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//w== + + + \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs index 6cbe49d99..d62aa698c 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs @@ -30,178 +30,110 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsPanelsPage)); - this.chkAlwaysShowPanelTabs = new System.Windows.Forms.CheckBox(); - this.chkIdentifyQuickConnectTabs = new System.Windows.Forms.CheckBox(); - this.chkUseOnlyErrorsAndInfosPanel = new System.Windows.Forms.CheckBox(); - this.chkUseOnlyErrorsAndInfosPanel.CheckedChanged += new System.EventHandler(this.chkUseOnlyErrorsAndInfosPanel_CheckedChanged); - this.chkOpenNewTabRightOfSelected = new System.Windows.Forms.CheckBox(); - this.lblSwitchToErrorsAndInfos = new System.Windows.Forms.Label(); - this.chkAlwaysShowPanelSelectionDlg = new System.Windows.Forms.CheckBox(); - this.chkMCInformation = new System.Windows.Forms.CheckBox(); - this.chkShowLogonInfoOnTabs = new System.Windows.Forms.CheckBox(); - this.chkMCErrors = new System.Windows.Forms.CheckBox(); - this.chkDoubleClickClosesTab = new System.Windows.Forms.CheckBox(); - this.chkMCWarnings = new System.Windows.Forms.CheckBox(); - this.chkShowProtocolOnTabs = new System.Windows.Forms.CheckBox(); - this.SuspendLayout(); - // - //chkAlwaysShowPanelTabs - // - this.chkAlwaysShowPanelTabs.AutoSize = true; - this.chkAlwaysShowPanelTabs.Location = new System.Drawing.Point(3, 0); - this.chkAlwaysShowPanelTabs.Name = "chkAlwaysShowPanelTabs"; - this.chkAlwaysShowPanelTabs.Size = new System.Drawing.Size(139, 17); - this.chkAlwaysShowPanelTabs.TabIndex = 12; - this.chkAlwaysShowPanelTabs.Text = "Always show panel tabs"; - this.chkAlwaysShowPanelTabs.UseVisualStyleBackColor = true; - // - //chkIdentifyQuickConnectTabs - // - this.chkIdentifyQuickConnectTabs.AutoSize = true; - this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 92); - this.chkIdentifyQuickConnectTabs.Name = "chkIdentifyQuickConnectTabs"; - this.chkIdentifyQuickConnectTabs.Size = new System.Drawing.Size(293, 17); - this.chkIdentifyQuickConnectTabs.TabIndex = 16; - this.chkIdentifyQuickConnectTabs.Text = Language.strIdentifyQuickConnectTabs; - this.chkIdentifyQuickConnectTabs.UseVisualStyleBackColor = true; - // - //chkUseOnlyErrorsAndInfosPanel - // - this.chkUseOnlyErrorsAndInfosPanel.AutoSize = true; - this.chkUseOnlyErrorsAndInfosPanel.Location = new System.Drawing.Point(3, 185); - this.chkUseOnlyErrorsAndInfosPanel.Name = "chkUseOnlyErrorsAndInfosPanel"; - this.chkUseOnlyErrorsAndInfosPanel.Size = new System.Drawing.Size(278, 17); - this.chkUseOnlyErrorsAndInfosPanel.TabIndex = 19; - this.chkUseOnlyErrorsAndInfosPanel.Text = "Use only Notifications panel (no messagebox popups)"; - this.chkUseOnlyErrorsAndInfosPanel.UseVisualStyleBackColor = true; - // - //chkOpenNewTabRightOfSelected - // - this.chkOpenNewTabRightOfSelected.AutoSize = true; - this.chkOpenNewTabRightOfSelected.Location = new System.Drawing.Point(3, 23); - this.chkOpenNewTabRightOfSelected.Name = "chkOpenNewTabRightOfSelected"; - this.chkOpenNewTabRightOfSelected.Size = new System.Drawing.Size(280, 17); - this.chkOpenNewTabRightOfSelected.TabIndex = 13; - this.chkOpenNewTabRightOfSelected.Text = "Open new tab to the right of the currently selected tab"; - this.chkOpenNewTabRightOfSelected.UseVisualStyleBackColor = true; - // - //lblSwitchToErrorsAndInfos - // - this.lblSwitchToErrorsAndInfos.AutoSize = true; - this.lblSwitchToErrorsAndInfos.Location = new System.Drawing.Point(3, 210); - this.lblSwitchToErrorsAndInfos.Name = "lblSwitchToErrorsAndInfos"; - this.lblSwitchToErrorsAndInfos.Size = new System.Drawing.Size(159, 13); - this.lblSwitchToErrorsAndInfos.TabIndex = 20; - this.lblSwitchToErrorsAndInfos.Text = "Switch to Notifications panel on:"; - // - //chkAlwaysShowPanelSelectionDlg - // - this.chkAlwaysShowPanelSelectionDlg.AutoSize = true; - this.chkAlwaysShowPanelSelectionDlg.Location = new System.Drawing.Point(3, 138); - this.chkAlwaysShowPanelSelectionDlg.Name = "chkAlwaysShowPanelSelectionDlg"; - this.chkAlwaysShowPanelSelectionDlg.Size = new System.Drawing.Size(317, 17); - this.chkAlwaysShowPanelSelectionDlg.TabIndex = 18; - this.chkAlwaysShowPanelSelectionDlg.Text = "Always show panel selection dialog when opening connectins"; - this.chkAlwaysShowPanelSelectionDlg.UseVisualStyleBackColor = true; - // - //chkMCInformation - // - this.chkMCInformation.AutoSize = true; - this.chkMCInformation.Enabled = false; - this.chkMCInformation.Location = new System.Drawing.Point(19, 230); - this.chkMCInformation.Name = "chkMCInformation"; - this.chkMCInformation.Size = new System.Drawing.Size(83, 17); - this.chkMCInformation.TabIndex = 21; - this.chkMCInformation.Text = "Informations"; - this.chkMCInformation.UseVisualStyleBackColor = true; - // - //chkShowLogonInfoOnTabs - // - this.chkShowLogonInfoOnTabs.AutoSize = true; - this.chkShowLogonInfoOnTabs.Location = new System.Drawing.Point(3, 46); - this.chkShowLogonInfoOnTabs.Name = "chkShowLogonInfoOnTabs"; - this.chkShowLogonInfoOnTabs.Size = new System.Drawing.Size(203, 17); - this.chkShowLogonInfoOnTabs.TabIndex = 14; - this.chkShowLogonInfoOnTabs.Text = "Show logon information on tab names"; - this.chkShowLogonInfoOnTabs.UseVisualStyleBackColor = true; - // - //chkMCErrors - // - this.chkMCErrors.AutoSize = true; - this.chkMCErrors.Enabled = false; - this.chkMCErrors.Location = new System.Drawing.Point(19, 276); - this.chkMCErrors.Name = "chkMCErrors"; - this.chkMCErrors.Size = new System.Drawing.Size(53, 17); - this.chkMCErrors.TabIndex = 23; - this.chkMCErrors.Text = "Errors"; - this.chkMCErrors.UseVisualStyleBackColor = true; - // - //chkDoubleClickClosesTab - // - this.chkDoubleClickClosesTab.AutoSize = true; - this.chkDoubleClickClosesTab.Location = new System.Drawing.Point(3, 115); - this.chkDoubleClickClosesTab.Name = "chkDoubleClickClosesTab"; - this.chkDoubleClickClosesTab.Size = new System.Drawing.Size(159, 17); - this.chkDoubleClickClosesTab.TabIndex = 17; - this.chkDoubleClickClosesTab.Text = "Double click on tab closes it"; - this.chkDoubleClickClosesTab.UseVisualStyleBackColor = true; - // - //chkMCWarnings - // - this.chkMCWarnings.AutoSize = true; - this.chkMCWarnings.Enabled = false; - this.chkMCWarnings.Location = new System.Drawing.Point(19, 253); - this.chkMCWarnings.Name = "chkMCWarnings"; - this.chkMCWarnings.Size = new System.Drawing.Size(71, 17); - this.chkMCWarnings.TabIndex = 22; - this.chkMCWarnings.Text = "Warnings"; - this.chkMCWarnings.UseVisualStyleBackColor = true; - // - //chkShowProtocolOnTabs - // - this.chkShowProtocolOnTabs.AutoSize = true; - this.chkShowProtocolOnTabs.Location = new System.Drawing.Point(3, 69); - this.chkShowProtocolOnTabs.Name = "chkShowProtocolOnTabs"; - this.chkShowProtocolOnTabs.Size = new System.Drawing.Size(166, 17); - this.chkShowProtocolOnTabs.TabIndex = 15; - this.chkShowProtocolOnTabs.Text = "Show protocols on tab names"; - this.chkShowProtocolOnTabs.UseVisualStyleBackColor = true; - // - //TabsPanelsPage - // - this.AutoScaleDimensions = new System.Drawing.SizeF((float) (6.0F), (float) (13.0F)); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.chkAlwaysShowPanelTabs); - this.Controls.Add(this.chkIdentifyQuickConnectTabs); - this.Controls.Add(this.chkUseOnlyErrorsAndInfosPanel); - this.Controls.Add(this.chkOpenNewTabRightOfSelected); - this.Controls.Add(this.lblSwitchToErrorsAndInfos); - this.Controls.Add(this.chkAlwaysShowPanelSelectionDlg); - this.Controls.Add(this.chkMCInformation); - this.Controls.Add(this.chkShowLogonInfoOnTabs); - this.Controls.Add(this.chkMCErrors); - this.Controls.Add(this.chkDoubleClickClosesTab); - this.Controls.Add(this.chkMCWarnings); - this.Controls.Add(this.chkShowProtocolOnTabs); - this.Name = "TabsPanelsPage"; - this.PageIcon = (System.Drawing.Icon) (resources.GetObject("$this.PageIcon")); - this.Size = new System.Drawing.Size(610, 489); - this.ResumeLayout(false); - this.PerformLayout(); - + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsPanelsPage)); + this.chkAlwaysShowPanelTabs = new System.Windows.Forms.CheckBox(); + this.chkIdentifyQuickConnectTabs = new System.Windows.Forms.CheckBox(); + this.chkOpenNewTabRightOfSelected = new System.Windows.Forms.CheckBox(); + this.chkAlwaysShowPanelSelectionDlg = new System.Windows.Forms.CheckBox(); + this.chkShowLogonInfoOnTabs = new System.Windows.Forms.CheckBox(); + this.chkDoubleClickClosesTab = new System.Windows.Forms.CheckBox(); + this.chkShowProtocolOnTabs = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // chkAlwaysShowPanelTabs + // + this.chkAlwaysShowPanelTabs.AutoSize = true; + this.chkAlwaysShowPanelTabs.Location = new System.Drawing.Point(3, 0); + this.chkAlwaysShowPanelTabs.Name = "chkAlwaysShowPanelTabs"; + this.chkAlwaysShowPanelTabs.Size = new System.Drawing.Size(139, 17); + this.chkAlwaysShowPanelTabs.TabIndex = 12; + this.chkAlwaysShowPanelTabs.Text = "Always show panel tabs"; + this.chkAlwaysShowPanelTabs.UseVisualStyleBackColor = true; + // + // chkIdentifyQuickConnectTabs + // + this.chkIdentifyQuickConnectTabs.AutoSize = true; + this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 92); + this.chkIdentifyQuickConnectTabs.Name = "chkIdentifyQuickConnectTabs"; + this.chkIdentifyQuickConnectTabs.Size = new System.Drawing.Size(293, 17); + this.chkIdentifyQuickConnectTabs.TabIndex = 16; + this.chkIdentifyQuickConnectTabs.Text = global::mRemoteNG.Language.strIdentifyQuickConnectTabs; + this.chkIdentifyQuickConnectTabs.UseVisualStyleBackColor = true; + // + // chkOpenNewTabRightOfSelected + // + this.chkOpenNewTabRightOfSelected.AutoSize = true; + this.chkOpenNewTabRightOfSelected.Location = new System.Drawing.Point(3, 23); + this.chkOpenNewTabRightOfSelected.Name = "chkOpenNewTabRightOfSelected"; + this.chkOpenNewTabRightOfSelected.Size = new System.Drawing.Size(280, 17); + this.chkOpenNewTabRightOfSelected.TabIndex = 13; + this.chkOpenNewTabRightOfSelected.Text = "Open new tab to the right of the currently selected tab"; + this.chkOpenNewTabRightOfSelected.UseVisualStyleBackColor = true; + // + // chkAlwaysShowPanelSelectionDlg + // + this.chkAlwaysShowPanelSelectionDlg.AutoSize = true; + this.chkAlwaysShowPanelSelectionDlg.Location = new System.Drawing.Point(3, 138); + this.chkAlwaysShowPanelSelectionDlg.Name = "chkAlwaysShowPanelSelectionDlg"; + this.chkAlwaysShowPanelSelectionDlg.Size = new System.Drawing.Size(317, 17); + this.chkAlwaysShowPanelSelectionDlg.TabIndex = 18; + this.chkAlwaysShowPanelSelectionDlg.Text = "Always show panel selection dialog when opening connectins"; + this.chkAlwaysShowPanelSelectionDlg.UseVisualStyleBackColor = true; + // + // chkShowLogonInfoOnTabs + // + this.chkShowLogonInfoOnTabs.AutoSize = true; + this.chkShowLogonInfoOnTabs.Location = new System.Drawing.Point(3, 46); + this.chkShowLogonInfoOnTabs.Name = "chkShowLogonInfoOnTabs"; + this.chkShowLogonInfoOnTabs.Size = new System.Drawing.Size(203, 17); + this.chkShowLogonInfoOnTabs.TabIndex = 14; + this.chkShowLogonInfoOnTabs.Text = "Show logon information on tab names"; + this.chkShowLogonInfoOnTabs.UseVisualStyleBackColor = true; + // + // chkDoubleClickClosesTab + // + this.chkDoubleClickClosesTab.AutoSize = true; + this.chkDoubleClickClosesTab.Location = new System.Drawing.Point(3, 115); + this.chkDoubleClickClosesTab.Name = "chkDoubleClickClosesTab"; + this.chkDoubleClickClosesTab.Size = new System.Drawing.Size(159, 17); + this.chkDoubleClickClosesTab.TabIndex = 17; + this.chkDoubleClickClosesTab.Text = "Double click on tab closes it"; + this.chkDoubleClickClosesTab.UseVisualStyleBackColor = true; + // + // chkShowProtocolOnTabs + // + this.chkShowProtocolOnTabs.AutoSize = true; + this.chkShowProtocolOnTabs.Location = new System.Drawing.Point(3, 69); + this.chkShowProtocolOnTabs.Name = "chkShowProtocolOnTabs"; + this.chkShowProtocolOnTabs.Size = new System.Drawing.Size(166, 17); + this.chkShowProtocolOnTabs.TabIndex = 15; + this.chkShowProtocolOnTabs.Text = "Show protocols on tab names"; + this.chkShowProtocolOnTabs.UseVisualStyleBackColor = true; + // + // TabsPanelsPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.chkAlwaysShowPanelTabs); + this.Controls.Add(this.chkIdentifyQuickConnectTabs); + this.Controls.Add(this.chkOpenNewTabRightOfSelected); + this.Controls.Add(this.chkAlwaysShowPanelSelectionDlg); + this.Controls.Add(this.chkShowLogonInfoOnTabs); + this.Controls.Add(this.chkDoubleClickClosesTab); + this.Controls.Add(this.chkShowProtocolOnTabs); + this.Name = "TabsPanelsPage"; + this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); + this.Size = new System.Drawing.Size(610, 489); + this.ResumeLayout(false); + this.PerformLayout(); + } internal System.Windows.Forms.CheckBox chkAlwaysShowPanelTabs; internal System.Windows.Forms.CheckBox chkIdentifyQuickConnectTabs; - internal System.Windows.Forms.CheckBox chkUseOnlyErrorsAndInfosPanel; internal System.Windows.Forms.CheckBox chkOpenNewTabRightOfSelected; - internal System.Windows.Forms.Label lblSwitchToErrorsAndInfos; internal System.Windows.Forms.CheckBox chkAlwaysShowPanelSelectionDlg; - internal System.Windows.Forms.CheckBox chkMCInformation; internal System.Windows.Forms.CheckBox chkShowLogonInfoOnTabs; - internal System.Windows.Forms.CheckBox chkMCErrors; internal System.Windows.Forms.CheckBox chkDoubleClickClosesTab; - internal System.Windows.Forms.CheckBox chkMCWarnings; internal System.Windows.Forms.CheckBox chkShowProtocolOnTabs; } diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs index 496244bdd..7e53abbef 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs @@ -1,5 +1,3 @@ -using System; - namespace mRemoteNG.UI.Forms.OptionsPages { public partial class TabsPanelsPage @@ -26,12 +24,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages chkIdentifyQuickConnectTabs.Text = Language.strIdentifyQuickConnectTabs; chkDoubleClickClosesTab.Text = Language.strDoubleClickTabClosesIt; chkAlwaysShowPanelSelectionDlg.Text = Language.strAlwaysShowPanelSelection; - - chkUseOnlyErrorsAndInfosPanel.Text = Language.strUseOnlyErrorsAndInfosPanel; - lblSwitchToErrorsAndInfos.Text = Language.strSwitchToErrorsAndInfos; - chkMCInformation.Text = Language.strInformations; - chkMCWarnings.Text = Language.strWarnings; - chkMCErrors.Text = Language.strErrors; } public override void LoadSettings() @@ -45,11 +37,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages chkIdentifyQuickConnectTabs.Checked = Settings.Default.IdentifyQuickConnectTabs; chkDoubleClickClosesTab.Checked = Settings.Default.DoubleClickOnTabClosesIt; chkAlwaysShowPanelSelectionDlg.Checked = Settings.Default.AlwaysShowPanelSelectionDlg; - - chkUseOnlyErrorsAndInfosPanel.Checked = Settings.Default.ShowNoMessageBoxes; - chkMCInformation.Checked = Settings.Default.SwitchToMCOnInformation; - chkMCWarnings.Checked = Settings.Default.SwitchToMCOnWarning; - chkMCErrors.Checked = Settings.Default.SwitchToMCOnError; } public override void SaveSettings() @@ -66,19 +53,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages Settings.Default.DoubleClickOnTabClosesIt = chkDoubleClickClosesTab.Checked; Settings.Default.AlwaysShowPanelSelectionDlg = chkAlwaysShowPanelSelectionDlg.Checked; - Settings.Default.ShowNoMessageBoxes = chkUseOnlyErrorsAndInfosPanel.Checked; - Settings.Default.SwitchToMCOnInformation = chkMCInformation.Checked; - Settings.Default.SwitchToMCOnWarning = chkMCWarnings.Checked; - Settings.Default.SwitchToMCOnError = chkMCErrors.Checked; - Settings.Default.Save(); } - - private void chkUseOnlyErrorsAndInfosPanel_CheckedChanged(object sender, EventArgs e) - { - chkMCInformation.Enabled = chkUseOnlyErrorsAndInfosPanel.Checked; - chkMCWarnings.Enabled = chkUseOnlyErrorsAndInfosPanel.Checked; - chkMCErrors.Enabled = chkUseOnlyErrorsAndInfosPanel.Checked; - } } } \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx index eb78287ce..6af5d5b1d 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/mRemoteV1/UI/Forms/frmOptions.cs b/mRemoteV1/UI/Forms/frmOptions.cs index 49e0c6700..482c79d87 100644 --- a/mRemoteV1/UI/Forms/frmOptions.cs +++ b/mRemoteV1/UI/Forms/frmOptions.cs @@ -51,6 +51,7 @@ namespace mRemoteNG.UI.Forms {typeof(StartupExitPage).Name, new StartupExitPage()}, {typeof(AppearancePage).Name, new AppearancePage()}, {typeof(TabsPanelsPage).Name, new TabsPanelsPage()}, + {typeof(MessagesPage).Name, new MessagesPage()}, {typeof(ConnectionsPage).Name, new ConnectionsPage()}, {typeof(SqlServerPage).Name, new SqlServerPage()}, {typeof(UpdatesPage).Name, new UpdatesPage()}, diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 97c592c97..b99e87974 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -403,18 +403,6 @@ False - - 0 - - - False - - - False - - - False - 5500 @@ -610,18 +598,21 @@ False - - False - False False + + False + 00000000-0000-0000-0000-000000000000 + + + diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 4433e1864..028ebf958 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -346,6 +346,12 @@ UserControl + + UserControl + + + MessagesPage.cs + ConnectionsPage.cs @@ -600,6 +606,9 @@ frmOptions.cs + + MessagesPage.cs + OptionsPage.cs