diff --git a/HelpersLib/Forms/DebugForm.Designer.cs b/HelpersLib/Forms/DebugForm.Designer.cs index 69c5c2e27..256c23471 100644 --- a/HelpersLib/Forms/DebugForm.Designer.cs +++ b/HelpersLib/Forms/DebugForm.Designer.cs @@ -28,30 +28,15 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.txtDebugLog = new System.Windows.Forms.TextBox(); this.btnLoadedAssemblies = new System.Windows.Forms.Button(); this.btnCopyAll = new System.Windows.Forms.Button(); + this.rtbDebug = new System.Windows.Forms.RichTextBox(); this.SuspendLayout(); // - // txtDebugLog - // - this.txtDebugLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtDebugLog.BackColor = System.Drawing.Color.White; - this.txtDebugLog.Location = new System.Drawing.Point(8, 8); - this.txtDebugLog.Multiline = true; - this.txtDebugLog.Name = "txtDebugLog"; - this.txtDebugLog.ReadOnly = true; - this.txtDebugLog.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtDebugLog.Size = new System.Drawing.Size(744, 472); - this.txtDebugLog.TabIndex = 2; - this.txtDebugLog.WordWrap = false; - // // btnLoadedAssemblies // this.btnLoadedAssemblies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnLoadedAssemblies.Location = new System.Drawing.Point(96, 488); + this.btnLoadedAssemblies.Location = new System.Drawing.Point(96, 511); this.btnLoadedAssemblies.Name = "btnLoadedAssemblies"; this.btnLoadedAssemblies.Size = new System.Drawing.Size(136, 23); this.btnLoadedAssemblies.TabIndex = 1; @@ -62,7 +47,7 @@ private void InitializeComponent() // btnCopyAll // this.btnCopyAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnCopyAll.Location = new System.Drawing.Point(8, 488); + this.btnCopyAll.Location = new System.Drawing.Point(8, 511); this.btnCopyAll.Name = "btnCopyAll"; this.btnCopyAll.Size = new System.Drawing.Size(80, 23); this.btnCopyAll.TabIndex = 0; @@ -70,28 +55,37 @@ private void InitializeComponent() this.btnCopyAll.UseVisualStyleBackColor = true; this.btnCopyAll.Click += new System.EventHandler(this.btnCopyAll_Click); // + // rtbDebug + // + this.rtbDebug.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.rtbDebug.Location = new System.Drawing.Point(8, 8); + this.rtbDebug.Name = "rtbDebug"; + this.rtbDebug.Size = new System.Drawing.Size(744, 496); + this.rtbDebug.TabIndex = 3; + this.rtbDebug.Text = ""; + this.rtbDebug.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtbDebug_LinkClicked); + // // DebugForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(760, 518); + this.ClientSize = new System.Drawing.Size(760, 541); + this.Controls.Add(this.rtbDebug); this.Controls.Add(this.btnCopyAll); this.Controls.Add(this.btnLoadedAssemblies); - this.Controls.Add(this.txtDebugLog); this.MinimumSize = new System.Drawing.Size(400, 400); this.Name = "DebugForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ShareX - Debug log"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DebugForm_FormClosing); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.TextBox txtDebugLog; private System.Windows.Forms.Button btnLoadedAssemblies; private System.Windows.Forms.Button btnCopyAll; + private System.Windows.Forms.RichTextBox rtbDebug; } } \ No newline at end of file diff --git a/HelpersLib/Forms/DebugForm.cs b/HelpersLib/Forms/DebugForm.cs index 591a68611..e4054f1a7 100644 --- a/HelpersLib/Forms/DebugForm.cs +++ b/HelpersLib/Forms/DebugForm.cs @@ -42,9 +42,9 @@ public DebugForm(Logger logger) Icon = ShareXResources.Icon; this.logger = logger; - txtDebugLog.Text = logger.ToString(); - txtDebugLog.SelectionStart = txtDebugLog.TextLength; - txtDebugLog.ScrollToCaret(); + rtbDebug.Text = logger.ToString(); + rtbDebug.SelectionStart = rtbDebug.TextLength; + rtbDebug.ScrollToCaret(); logger.MessageAdded += logger_MessageAdded; } @@ -63,19 +63,19 @@ private void AppendMessage(string message) { if (!string.IsNullOrEmpty(message)) { - int start = txtDebugLog.SelectionStart; - int len = txtDebugLog.SelectionLength; - txtDebugLog.AppendText(message + Environment.NewLine); + int start = rtbDebug.SelectionStart; + int len = rtbDebug.SelectionLength; + rtbDebug.AppendText(message + Environment.NewLine); if (len > 0) { - txtDebugLog.Select(start, len); + rtbDebug.Select(start, len); } } } private void btnCopyAll_Click(object sender, EventArgs e) { - string text = txtDebugLog.Text.Trim(); + string text = rtbDebug.Text.Trim(); ClipboardHelpers.CopyText(text); } @@ -94,5 +94,10 @@ private void btnLoadedAssemblies_Click(object sender, EventArgs e) MessageBox.Show(assemblies, "ShareX - Loaded assemblies", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + private void rtbDebug_LinkClicked(object sender, LinkClickedEventArgs e) + { + Helpers.LoadBrowserAsync(e.LinkText); + } } } \ No newline at end of file diff --git a/HelpersLib/Helpers/Helpers.cs b/HelpersLib/Helpers/Helpers.cs index a3970156b..215ff61e8 100644 --- a/HelpersLib/Helpers/Helpers.cs +++ b/HelpersLib/Helpers/Helpers.cs @@ -465,7 +465,7 @@ public static void LoadBrowserAsync(string url) } catch (Exception e) { - DebugHelper.WriteException(e, "LoadBrowserAsync failed"); + DebugHelper.WriteException(e, "LoadBrowserAsync(" + url + ") failed"); } }); }