From ff54ac4c8b57f21f4cdeed87e6a543e2ce01086d Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 7 Jul 2020 09:05:16 +0300 Subject: [PATCH] Show error window on error label click --- ShareX/Controls/TaskThumbnailPanel.Designer.cs | 2 ++ ShareX/Controls/TaskThumbnailPanel.cs | 8 ++++++++ ShareX/UploadInfoManager.cs | 13 ++----------- ShareX/WorkerTask.cs | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ShareX/Controls/TaskThumbnailPanel.Designer.cs b/ShareX/Controls/TaskThumbnailPanel.Designer.cs index 0ebfe0b99..df84b95ae 100644 --- a/ShareX/Controls/TaskThumbnailPanel.Designer.cs +++ b/ShareX/Controls/TaskThumbnailPanel.Designer.cs @@ -83,6 +83,7 @@ private void InitializeComponent() // lblError // this.lblError.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.lblError.Cursor = System.Windows.Forms.Cursors.Hand; this.lblError.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblError.ForeColor = System.Drawing.Color.White; this.lblError.Location = new System.Drawing.Point(96, 8); @@ -92,6 +93,7 @@ private void InitializeComponent() this.lblError.Text = "Error"; this.lblError.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblError.Visible = false; + this.lblError.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblError_MouseClick); // // pbProgress // diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index 7126f142b..abffeb35a 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -435,6 +435,14 @@ private void LblTitle_MouseClick(object sender, MouseEventArgs e) } } + private void lblError_MouseClick(object sender, MouseEventArgs e) + { + if (ModifierKeys == Keys.None && e.Button == MouseButtons.Left) + { + Task.ShowErrorWindow(); + } + } + private void PbThumbnail_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs index e526632fa..412790ba5 100644 --- a/ShareX/UploadInfoManager.cs +++ b/ShareX/UploadInfoManager.cs @@ -25,7 +25,6 @@ You should have received a copy of the GNU General Public License using Microsoft.VisualBasic.FileIO; using ShareX.HelpersLib; -using ShareX.Properties; using ShareX.UploadersLib; using System.Collections.Generic; using System.Drawing; @@ -309,17 +308,9 @@ public void ShowImagePreview() public void ShowErrors() { - if (IsItemSelected && SelectedItem.Info.Result != null && SelectedItem.Info.Result.IsError) + if (IsItemSelected) { - string errors = SelectedItem.Info.Result.ErrorsToString(); - - if (!string.IsNullOrEmpty(errors)) - { - using (ErrorForm form = new ErrorForm(Resources.UploadInfoManager_ShowErrors_Upload_errors, errors, Program.LogsFilePath, Links.URL_ISSUES, false)) - { - form.ShowDialog(); - } - } + SelectedItem.Task.ShowErrorWindow(); } } diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index a3da4abbf..d21339fa1 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -283,6 +283,22 @@ public void Stop() } } + public void ShowErrorWindow() + { + if (Info != null && Info.Result != null && Info.Result.IsError) + { + string errors = Info.Result.ErrorsToString(); + + if (!string.IsNullOrEmpty(errors)) + { + using (ErrorForm form = new ErrorForm(Resources.UploadInfoManager_ShowErrors_Upload_errors, errors, Program.LogsFilePath, Links.URL_ISSUES, false)) + { + form.ShowDialog(); + } + } + } + } + private void ThreadDoWork() { CreateTaskReferenceHelper();