From 7316e2d9d5313bcb7d9a6ba8615e6a5d7f3c179d Mon Sep 17 00:00:00 2001 From: DevAtHome Date: Wed, 16 Jul 2014 21:43:20 +0100 Subject: [PATCH] Add 'Edit Image' to context file list right click menu when an image is selected. --- ShareX/Forms/MainForm.Designer.cs | 10 ++++++++++ ShareX/Forms/MainForm.cs | 10 +++++++++- ShareX/TaskHelpers.cs | 8 ++++++++ ShareX/UploadInfoManager.cs | 5 +++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 6b821799f..b7a98c264 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -142,6 +142,7 @@ private void InitializeComponent() this.tsmiCopyFolder = new System.Windows.Forms.ToolStripMenuItem(); this.tssCopy5 = new System.Windows.Forms.ToolStripSeparator(); this.tsmiUploadSelectedFile = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiEditSelectedFile = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiShortenSelectedURL = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiShareSelectedURL = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiShowQRCode = new System.Windows.Forms.ToolStripMenuItem(); @@ -947,6 +948,7 @@ private void InitializeComponent() this.tsmiOpen, this.tsmiCopy, this.tsmiUploadSelectedFile, + this.tsmiEditSelectedFile, this.tsmiShortenSelectedURL, this.tsmiShareSelectedURL, this.tsmiShowQRCode, @@ -1239,6 +1241,13 @@ private void InitializeComponent() this.tsmiUploadSelectedFile.Text = "Upload"; this.tsmiUploadSelectedFile.Click += new System.EventHandler(this.tsmiUploadSelectedFile_Click); // + // tsmiEditSelectedFile + // + this.tsmiEditSelectedFile.Name = "tsmiEditSelectedFile"; + this.tsmiEditSelectedFile.Size = new System.Drawing.Size(128, 22); + this.tsmiEditSelectedFile.Text = "Edit Image"; + this.tsmiEditSelectedFile.Click += new System.EventHandler(this.tsmiEditSelectedFile_Click); + // // tsmiShortenSelectedURL // this.tsmiShortenSelectedURL.Name = "tsmiShortenSelectedURL"; @@ -2057,5 +2066,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiShortenSelectedURL; private System.Windows.Forms.ToolStripMenuItem tsmiRectangleAnnotate; private System.Windows.Forms.ToolStripMenuItem tsmiTrayRectangleAnnotate; + private System.Windows.Forms.ToolStripMenuItem tsmiEditSelectedFile; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 7fc69f9a5..4c34e6ad0 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -295,7 +295,7 @@ private void UpdateControls() { cmsUploadInfo.SuspendLayout(); - tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiShowQRCode.Visible = + tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiShowQRCode.Visible = tsmiEditSelectedFile.Visible = tsmiUploadSelectedFile.Visible = tsmiShortenSelectedURL.Visible = tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = false; pbPreview.Reset(); uim.RefreshSelectedItems(); @@ -362,6 +362,9 @@ private void UpdateControls() tsmiCopyFileNameWithExtension.Enabled = uim.SelectedItems.Any(x => x.IsFilePathValid); tsmiCopyFolder.Enabled = uim.SelectedItems.Any(x => x.IsFilePathValid); + // Edit + tsmiEditSelectedFile.Visible = uim.SelectedItem.IsImageFile; + CleanCustomClipboardFormats(); if (Program.Settings.ClipboardContentFormats != null && Program.Settings.ClipboardContentFormats.Count > 0) @@ -1185,6 +1188,11 @@ private void tsmiUploadSelectedFile_Click(object sender, EventArgs e) uim.Upload(); } + private void tsmiEditSelectedFile_Click(object sender, EventArgs e) + { + uim.EditImage(); + } + private void tsmiClearList_Click(object sender, EventArgs e) { RemoveAllItems(); diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 533a87f02..bec7c9bf7 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -513,6 +513,14 @@ public static void OpenImageEditor() } } + public static void OpenImageEditor(string filePath) + { + if (!string.IsNullOrEmpty(filePath)) + { + TaskHelpers.AnnotateImage(filePath); + } + } + public static void OpenImageEffects() { string filePath = ImageHelpers.OpenImageFileDialog(); diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs index e4b6e6196..10a3b0399 100644 --- a/ShareX/UploadInfoManager.cs +++ b/ShareX/UploadInfoManager.cs @@ -309,6 +309,11 @@ public void ShowResponse() } } + public void EditImage() + { + if (IsItemSelected && SelectedItem.IsImageFile) TaskHelpers.OpenImageEditor(SelectedItem.Info.FilePath); + } + #endregion Other } } \ No newline at end of file