diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index e3e65066b..f715ae971 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -877,6 +877,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Choose Path. + /// + internal static string strChoosePath { + get { + return ResourceManager.GetString("strChoosePath", resourceCulture); + } + } + /// /// Looks up a localized string similar to Closed Ports. /// @@ -1448,6 +1457,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Debug. + /// + internal static string strDebug { + get { + return ResourceManager.GetString("strDebug", resourceCulture); + } + } + /// /// Looks up a localized string similar to Default Theme. /// @@ -2775,6 +2793,24 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Log file path. + /// + internal static string strLogFilePath { + get { + return ResourceManager.GetString("strLogFilePath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Logging. + /// + internal static string strLogging { + get { + return ResourceManager.GetString("strLogging", resourceCulture); + } + } + /// /// Looks up a localized string similar to Logoff. /// @@ -2784,6 +2820,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Log these message types. + /// + internal static string strLogTheseMessageTypes { + get { + return ResourceManager.GetString("strLogTheseMessageTypes", resourceCulture); + } + } + /// /// Looks up a localized string similar to Writing to report file failed!. /// @@ -3676,6 +3721,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Open File. + /// + internal static string strOpenFile { + get { + return ResourceManager.GetString("strOpenFile", resourceCulture); + } + } + /// /// Looks up a localized string similar to Open new tab to the right of the currently selected tab. /// @@ -3910,6 +3964,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Popups. + /// + internal static string strPopups { + get { + return ResourceManager.GetString("strPopups", resourceCulture); + } + } + /// /// Looks up a localized string similar to Port scan complete.. /// @@ -5992,6 +6055,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Show these message types. + /// + internal static string strShowTheseMessageTypes { + get { + return ResourceManager.GetString("strShowTheseMessageTypes", resourceCulture); + } + } + /// /// Looks up a localized string similar to Single click on connection opens it. /// @@ -6875,6 +6947,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Use Default. + /// + internal static string strUseDefault { + get { + return ResourceManager.GetString("strUseDefault", resourceCulture); + } + } + /// /// Looks up a localized string similar to Use a different username and password. /// diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index 86508c43e..e59f4869d 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2478,4 +2478,31 @@ mRemoteNG will now quit and begin with the installation. Choose a path for the mRemoteNG log file + + Debug + + + Show these message types + + + Log file path + + + Log these message types + + + Choose Path + + + Open File + + + Use Default + + + Logging + + + Popups + \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs index 2ff43530b..a827ea319 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.Designer.cs @@ -31,17 +31,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessagesPage)); - this.lblSwitchToErrorsAndInfos = new System.Windows.Forms.Label(); + this.labelSwitchToErrorsAndInfos = new System.Windows.Forms.Label(); this.chkSwitchToMCInformation = new System.Windows.Forms.CheckBox(); this.chkSwitchToMCErrors = new System.Windows.Forms.CheckBox(); this.chkSwitchToMCWarnings = new System.Windows.Forms.CheckBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); + this.groupBoxNotifications = new System.Windows.Forms.GroupBox(); + this.labelNotificationsShowTypes = 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.buttonRestoreDefaultLogPath = new System.Windows.Forms.Button(); this.buttonOpenLogFile = new System.Windows.Forms.Button(); this.buttonSelectLogPath = new System.Windows.Forms.Button(); this.labelLogTheseMsgTypes = new System.Windows.Forms.Label(); @@ -52,19 +53,25 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkLogInfoMsgs = new System.Windows.Forms.CheckBox(); this.chkLogDebugMsgs = new System.Windows.Forms.CheckBox(); this.saveFileDialogLogging = new System.Windows.Forms.SaveFileDialog(); - this.buttonRestoreDefaultLogPath = new System.Windows.Forms.Button(); - this.groupBox1.SuspendLayout(); + this.groupBoxPopups = new System.Windows.Forms.GroupBox(); + this.labelPopupShowTypes = new System.Windows.Forms.Label(); + this.chkPopupError = new System.Windows.Forms.CheckBox(); + this.chkPopupWarning = new System.Windows.Forms.CheckBox(); + this.chkPopupInfo = new System.Windows.Forms.CheckBox(); + this.chkPopupDebug = new System.Windows.Forms.CheckBox(); + this.groupBoxNotifications.SuspendLayout(); this.groupBoxLogging.SuspendLayout(); + this.groupBoxPopups.SuspendLayout(); this.SuspendLayout(); // - // lblSwitchToErrorsAndInfos + // labelSwitchToErrorsAndInfos // - 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:"; + this.labelSwitchToErrorsAndInfos.AutoSize = true; + this.labelSwitchToErrorsAndInfos.Location = new System.Drawing.Point(177, 26); + this.labelSwitchToErrorsAndInfos.Name = "labelSwitchToErrorsAndInfos"; + this.labelSwitchToErrorsAndInfos.Size = new System.Drawing.Size(159, 13); + this.labelSwitchToErrorsAndInfos.TabIndex = 24; + this.labelSwitchToErrorsAndInfos.Text = "Switch to Notifications panel on:"; // // chkSwitchToMCInformation // @@ -96,32 +103,32 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkSwitchToMCWarnings.Text = "Warning"; this.chkSwitchToMCWarnings.UseVisualStyleBackColor = true; // - // groupBox1 + // groupBoxNotifications // - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.lblSwitchToErrorsAndInfos); - this.groupBox1.Controls.Add(this.chkSwitchToMCErrors); - this.groupBox1.Controls.Add(this.chkShowErrorInMC); - this.groupBox1.Controls.Add(this.chkSwitchToMCInformation); - this.groupBox1.Controls.Add(this.chkShowWarningInMC); - this.groupBox1.Controls.Add(this.chkSwitchToMCWarnings); - 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"; + this.groupBoxNotifications.Controls.Add(this.labelNotificationsShowTypes); + this.groupBoxNotifications.Controls.Add(this.labelSwitchToErrorsAndInfos); + this.groupBoxNotifications.Controls.Add(this.chkSwitchToMCErrors); + this.groupBoxNotifications.Controls.Add(this.chkShowErrorInMC); + this.groupBoxNotifications.Controls.Add(this.chkSwitchToMCInformation); + this.groupBoxNotifications.Controls.Add(this.chkShowWarningInMC); + this.groupBoxNotifications.Controls.Add(this.chkSwitchToMCWarnings); + this.groupBoxNotifications.Controls.Add(this.chkShowInfoInMC); + this.groupBoxNotifications.Controls.Add(this.chkShowDebugInMC); + this.groupBoxNotifications.Location = new System.Drawing.Point(6, 3); + this.groupBoxNotifications.Name = "groupBoxNotifications"; + this.groupBoxNotifications.Size = new System.Drawing.Size(601, 141); + this.groupBoxNotifications.TabIndex = 28; + this.groupBoxNotifications.TabStop = false; + this.groupBoxNotifications.Text = "Notifications Panel"; // - // label1 + // labelNotificationsShowTypes // - 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:"; + this.labelNotificationsShowTypes.AutoSize = true; + this.labelNotificationsShowTypes.Location = new System.Drawing.Point(6, 26); + this.labelNotificationsShowTypes.Name = "labelNotificationsShowTypes"; + this.labelNotificationsShowTypes.Size = new System.Drawing.Size(139, 13); + this.labelNotificationsShowTypes.TabIndex = 29; + this.labelNotificationsShowTypes.Text = "Show these message types:"; // // chkShowErrorInMC // @@ -182,6 +189,16 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.groupBoxLogging.TabStop = false; this.groupBoxLogging.Text = "Logging"; // + // buttonRestoreDefaultLogPath + // + this.buttonRestoreDefaultLogPath.Location = new System.Drawing.Point(496, 69); + this.buttonRestoreDefaultLogPath.Name = "buttonRestoreDefaultLogPath"; + this.buttonRestoreDefaultLogPath.Size = new System.Drawing.Size(99, 23); + this.buttonRestoreDefaultLogPath.TabIndex = 39; + this.buttonRestoreDefaultLogPath.Text = "Use Default"; + this.buttonRestoreDefaultLogPath.UseVisualStyleBackColor = true; + this.buttonRestoreDefaultLogPath.Click += new System.EventHandler(this.buttonRestoreDefaultLogPath_Click); + // // buttonOpenLogFile // this.buttonOpenLogFile.Location = new System.Drawing.Point(274, 68); @@ -269,39 +286,95 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkLogDebugMsgs.Text = "Debug"; this.chkLogDebugMsgs.UseVisualStyleBackColor = true; // - // buttonRestoreDefaultLogPath + // groupBoxPopups // - this.buttonRestoreDefaultLogPath.Location = new System.Drawing.Point(496, 69); - this.buttonRestoreDefaultLogPath.Name = "buttonRestoreDefaultLogPath"; - this.buttonRestoreDefaultLogPath.Size = new System.Drawing.Size(99, 23); - this.buttonRestoreDefaultLogPath.TabIndex = 39; - this.buttonRestoreDefaultLogPath.Text = "Use Default"; - this.buttonRestoreDefaultLogPath.UseVisualStyleBackColor = true; - this.buttonRestoreDefaultLogPath.Click += new System.EventHandler(this.buttonRestoreDefaultLogPath_Click); + this.groupBoxPopups.Controls.Add(this.chkPopupError); + this.groupBoxPopups.Controls.Add(this.labelPopupShowTypes); + this.groupBoxPopups.Controls.Add(this.chkPopupWarning); + this.groupBoxPopups.Controls.Add(this.chkPopupDebug); + this.groupBoxPopups.Controls.Add(this.chkPopupInfo); + this.groupBoxPopups.Location = new System.Drawing.Point(4, 297); + this.groupBoxPopups.Name = "groupBoxPopups"; + this.groupBoxPopups.Size = new System.Drawing.Size(603, 135); + this.groupBoxPopups.TabIndex = 30; + this.groupBoxPopups.TabStop = false; + this.groupBoxPopups.Text = "Pop-ups"; + // + // labelPopupShowTypes + // + this.labelPopupShowTypes.AutoSize = true; + this.labelPopupShowTypes.Location = new System.Drawing.Point(8, 25); + this.labelPopupShowTypes.Name = "labelPopupShowTypes"; + this.labelPopupShowTypes.Size = new System.Drawing.Size(139, 13); + this.labelPopupShowTypes.TabIndex = 33; + this.labelPopupShowTypes.Text = "Show these message types:"; + // + // chkPopupError + // + this.chkPopupError.AutoSize = true; + this.chkPopupError.Location = new System.Drawing.Point(22, 110); + this.chkPopupError.Name = "chkPopupError"; + this.chkPopupError.Size = new System.Drawing.Size(48, 17); + this.chkPopupError.TabIndex = 43; + this.chkPopupError.Text = "Error"; + this.chkPopupError.UseVisualStyleBackColor = true; + // + // chkPopupWarning + // + this.chkPopupWarning.AutoSize = true; + this.chkPopupWarning.Location = new System.Drawing.Point(22, 87); + this.chkPopupWarning.Name = "chkPopupWarning"; + this.chkPopupWarning.Size = new System.Drawing.Size(66, 17); + this.chkPopupWarning.TabIndex = 42; + this.chkPopupWarning.Text = "Warning"; + this.chkPopupWarning.UseVisualStyleBackColor = true; + // + // chkPopupInfo + // + this.chkPopupInfo.AutoSize = true; + this.chkPopupInfo.Location = new System.Drawing.Point(22, 64); + this.chkPopupInfo.Name = "chkPopupInfo"; + this.chkPopupInfo.Size = new System.Drawing.Size(78, 17); + this.chkPopupInfo.TabIndex = 41; + this.chkPopupInfo.Text = "Information"; + this.chkPopupInfo.UseVisualStyleBackColor = true; + // + // chkPopupDebug + // + this.chkPopupDebug.AutoSize = true; + this.chkPopupDebug.Location = new System.Drawing.Point(22, 41); + this.chkPopupDebug.Name = "chkPopupDebug"; + this.chkPopupDebug.Size = new System.Drawing.Size(58, 17); + this.chkPopupDebug.TabIndex = 40; + this.chkPopupDebug.Text = "Debug"; + this.chkPopupDebug.UseVisualStyleBackColor = true; // // MessagesPage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.groupBoxPopups); this.Controls.Add(this.groupBoxLogging); - this.Controls.Add(this.groupBox1); + this.Controls.Add(this.groupBoxNotifications); 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.groupBoxNotifications.ResumeLayout(false); + this.groupBoxNotifications.PerformLayout(); this.groupBoxLogging.ResumeLayout(false); this.groupBoxLogging.PerformLayout(); + this.groupBoxPopups.ResumeLayout(false); + this.groupBoxPopups.PerformLayout(); this.ResumeLayout(false); } - internal System.Windows.Forms.Label lblSwitchToErrorsAndInfos; + internal System.Windows.Forms.Label labelSwitchToErrorsAndInfos; internal System.Windows.Forms.CheckBox chkSwitchToMCInformation; internal System.Windows.Forms.CheckBox chkSwitchToMCErrors; internal System.Windows.Forms.CheckBox chkSwitchToMCWarnings; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.GroupBox groupBoxNotifications; + private System.Windows.Forms.Label labelNotificationsShowTypes; private System.Windows.Forms.CheckBox chkShowErrorInMC; private System.Windows.Forms.CheckBox chkShowWarningInMC; private System.Windows.Forms.CheckBox chkShowInfoInMC; @@ -318,5 +391,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages private System.Windows.Forms.CheckBox chkLogDebugMsgs; private System.Windows.Forms.Button buttonOpenLogFile; private System.Windows.Forms.Button buttonRestoreDefaultLogPath; + private System.Windows.Forms.GroupBox groupBoxPopups; + private System.Windows.Forms.CheckBox chkPopupError; + private System.Windows.Forms.Label labelPopupShowTypes; + private System.Windows.Forms.CheckBox chkPopupWarning; + private System.Windows.Forms.CheckBox chkPopupDebug; + private System.Windows.Forms.CheckBox chkPopupInfo; } } diff --git a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs index c628292e4..0e31d9c3a 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/MessagesPage.cs @@ -23,10 +23,36 @@ namespace mRemoteNG.UI.Forms.OptionsPages base.ApplyLanguage(); // notifications panel - lblSwitchToErrorsAndInfos.Text = Language.strSwitchToErrorsAndInfos; + groupBoxNotifications.Text = Language.strMenuNotifications; + labelNotificationsShowTypes.Text = Language.strShowTheseMessageTypes; + chkShowDebugInMC.Text = Language.strDebug; + chkShowInfoInMC.Text = Language.strInformations; + chkShowWarningInMC.Text = Language.strWarnings; + chkShowErrorInMC.Text = Language.strErrors; + labelSwitchToErrorsAndInfos.Text = Language.strSwitchToErrorsAndInfos; chkSwitchToMCInformation.Text = Language.strInformations; chkSwitchToMCWarnings.Text = Language.strWarnings; chkSwitchToMCErrors.Text = Language.strErrors; + + // logging + groupBoxLogging.Text = Language.strLogging; + chkLogDebugMsgs.Text = Language.strDebug; + chkLogInfoMsgs.Text = Language.strInformations; + chkLogWarningMsgs.Text = Language.strWarnings; + chkLogErrorMsgs.Text = Language.strErrors; + labelLogFilePath.Text = Language.strLogFilePath; + labelLogTheseMsgTypes.Text = Language.strLogTheseMessageTypes; + buttonOpenLogFile.Text = Language.strOpenFile; + buttonSelectLogPath.Text = Language.strChoosePath; + buttonRestoreDefaultLogPath.Text = Language.strUseDefault; + + // popups + groupBoxPopups.Text = Language.strPopups; + labelPopupShowTypes.Text = Language.strShowTheseMessageTypes; + chkPopupDebug.Text = Language.strDebug; + chkPopupInfo.Text = Language.strInformations; + chkPopupWarning.Text = Language.strWarnings; + chkPopupError.Text = Language.strErrors; } public override void LoadSettings() @@ -69,7 +95,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void LoadPopupSettings() { - + chkPopupDebug.Checked = Settings.Default.PopupMessageWriterWriteDebugMsgs; + chkPopupInfo.Checked = Settings.Default.PopupMessageWriterWriteInfoMsgs; + chkPopupWarning.Checked = Settings.Default.PopupMessageWriterWriteWarningMsgs; + chkPopupError.Checked = Settings.Default.PopupMessageWriterWriteErrorMsgs; } private void SaveNotificationPanelSettings() @@ -95,7 +124,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void SavePopupSettings() { - + Settings.Default.PopupMessageWriterWriteDebugMsgs = chkPopupDebug.Checked; + Settings.Default.PopupMessageWriterWriteInfoMsgs = chkPopupInfo.Checked; + Settings.Default.PopupMessageWriterWriteWarningMsgs = chkPopupWarning.Checked; + Settings.Default.PopupMessageWriterWriteErrorMsgs = chkPopupError.Checked; } private void buttonSelectLogPath_Click(object sender, System.EventArgs e)