CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

fixed #2366: Added search image button to task right click menu

Browse source
This commit is contained in:
Jaex 2017-03-16 03:20:59 +03:00
parent 7b0d208ef8
commit 8d68abd9d4
10 changed files with 410 additions and 330 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
View file

@ -198,16 +198,17 @@ private void ChangeStatus(string status)
private void HandleDownloadException(Exception ex)
{
if(ex is WebException)
if (ex is WebException)
{
var webEx = (WebException)ex;
WebException webEx = (WebException)ex;
if (webEx.Status == WebExceptionStatus.ProtocolError)
{
var response = webEx.Response as HttpWebResponse;
HttpWebResponse response = webEx.Response as HttpWebResponse;
if (response != null)
{
var responseCode = (int)response.StatusCode;
int responseCode = (int)response.StatusCode;
if (responseCode == 401)
{

10
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -165,6 +165,7 @@ private void InitializeComponent()
this.tsmiImagePreviewShow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImagePreviewHide = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImagePreviewAutomatic = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSearchImage = new System.Windows.Forms.ToolStripMenuItem();
this.niTray = new System.Windows.Forms.NotifyIcon(this.components);
this.cmsTray = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiTrayCapture = new System.Windows.Forms.ToolStripMenuItem();
@ -894,6 +895,7 @@ private void InitializeComponent()
this.tsmiDeleteSelectedFile,
this.tsmiShortenSelectedURL,
this.tsmiShareSelectedURL,
this.tsmiSearchImage,
this.tsmiShowQRCode,
this.tsmiOCRImage,
this.tsmiCombineImages,
@ -1285,6 +1287,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiImagePreviewAutomatic, "tsmiImagePreviewAutomatic");
this.tsmiImagePreviewAutomatic.Click += new System.EventHandler(this.tsmiImagePreviewAutomatic_Click);
//
// tsmiSearchImage
//
this.tsmiSearchImage.Image = global::ShareX.Properties.Resources.Google;
this.tsmiSearchImage.Name = "tsmiSearchImage";
resources.ApplyResources(this.tsmiSearchImage, "tsmiSearchImage");
this.tsmiSearchImage.Click += new System.EventHandler(this.tsmiSearchImage_Click);
//
// niTray
//
this.niTray.ContextMenuStrip = this.cmsTray;
@ -2094,5 +2103,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiCombineImages;
private System.Windows.Forms.ToolStripMenuItem tsmiOpenActionsToolbar;
private System.Windows.Forms.ToolStripMenuItem tsmiDeleteSelectedItem;
private System.Windows.Forms.ToolStripMenuItem tsmiSearchImage;
}
}

13
ShareX/Forms/MainForm.cs
View file

@ -524,9 +524,10 @@ private void UpdateContextMenu()
{
cmsTaskInfo.SuspendLayout();
tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiShowQRCode.Visible = tsmiOCRImage.Visible =
tsmiCombineImages.Visible = tsmiUploadSelectedFile.Visible = tsmiDownloadSelectedURL.Visible = tsmiEditSelectedFile.Visible = tsmiDeleteSelectedItem.Visible =
tsmiDeleteSelectedFile.Visible = tsmiShortenSelectedURL.Visible = tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = false;
tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiSearchImage.Visible =
tsmiShowQRCode.Visible = tsmiOCRImage.Visible = tsmiCombineImages.Visible = tsmiUploadSelectedFile.Visible = tsmiDownloadSelectedURL.Visible =
tsmiEditSelectedFile.Visible = tsmiDeleteSelectedItem.Visible = tsmiDeleteSelectedFile.Visible = tsmiShortenSelectedURL.Visible =
tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = false;
pbPreview.Reset();
uim.RefreshSelectedItems();
@ -614,6 +615,7 @@ private void UpdateContextMenu()
tsmiDeleteSelectedFile.Visible = uim.SelectedItem.IsFileExist;
tsmiShortenSelectedURL.Visible = uim.SelectedItem.IsURLExist;
tsmiShareSelectedURL.Visible = uim.SelectedItem.IsURLExist;
tsmiSearchImage.Visible = uim.SelectedItem.IsURLExist;
tsmiShowQRCode.Visible = uim.SelectedItem.IsURLExist;
tsmiOCRImage.Visible = uim.SelectedItem.IsImageFile;
tsmiCombineImages.Visible = uim.SelectedItems.Where(x => x.IsImageFile).Count() > 1;
@ -1891,6 +1893,11 @@ private void tsmiEditSelectedFile_Click(object sender, EventArgs e)
uim.EditImage();
}
private void tsmiSearchImage_Click(object sender, EventArgs e)
{
uim.SearchImage();
}
private void tsmiShowQRCode_Click(object sender, EventArgs e)
{
uim.ShowQRCode();

679
ShareX/Forms/MainForm.resx
View file

@ -183,45 +183,6 @@
<data name="&gt;&gt;lblSplitter.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
<value>Filename</value>
</data>
<data name="chFilename.Width" type="System.Int32, mscorlib">
<value>150</value>
</data>
<data name="chStatus.Text" xml:space="preserve">
<value>Status</value>
</data>
<data name="chProgress.Text" xml:space="preserve">
<value>Progress</value>
</data>
<data name="chProgress.Width" type="System.Int32, mscorlib">
<value>125</value>
</data>
<data name="chSpeed.Text" xml:space="preserve">
<value>Speed</value>
</data>
<data name="chSpeed.Width" type="System.Int32, mscorlib">
<value>75</value>
</data>
<data name="chElapsed.Text" xml:space="preserve">
<value>Elapsed</value>
</data>
<data name="chElapsed.Width" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="chRemaining.Text" xml:space="preserve">
<value>Remaining</value>
</data>
<data name="chRemaining.Width" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="chURL.Text" xml:space="preserve">
<value>URL</value>
</data>
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>145</value>
</data>
<data name="lvUploads.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -318,12 +279,105 @@
<data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
<value>Filename</value>
</data>
<data name="chFilename.Width" type="System.Int32, mscorlib">
<value>150</value>
</data>
<data name="chStatus.Text" xml:space="preserve">
<value>Status</value>
</data>
<data name="chProgress.Text" xml:space="preserve">
<value>Progress</value>
</data>
<data name="chProgress.Width" type="System.Int32, mscorlib">
<value>125</value>
</data>
<data name="chSpeed.Text" xml:space="preserve">
<value>Speed</value>
</data>
<data name="chSpeed.Width" type="System.Int32, mscorlib">
<value>75</value>
</data>
<data name="chElapsed.Text" xml:space="preserve">
<value>Elapsed</value>
</data>
<data name="chElapsed.Width" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="chRemaining.Text" xml:space="preserve">
<value>Remaining</value>
</data>
<data name="chRemaining.Width" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="chURL.Text" xml:space="preserve">
<value>URL</value>
</data>
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>145</value>
</data>
<data name="flpPatreon.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="flpPatreon.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;pbPatreonOpen.Name" xml:space="preserve">
<value>pbPatreonOpen</value>
</data>
<data name="&gt;&gt;pbPatreonOpen.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbPatreonOpen.Parent" xml:space="preserve">
<value>flpPatreon</value>
</data>
<data name="&gt;&gt;pbPatreonOpen.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;pbPatreonHide.Name" xml:space="preserve">
<value>pbPatreonHide</value>
</data>
<data name="&gt;&gt;pbPatreonHide.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbPatreonHide.Parent" xml:space="preserve">
<value>flpPatreon</value>
</data>
<data name="&gt;&gt;pbPatreonHide.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="flpPatreon.Location" type="System.Drawing.Point, System.Drawing">
<value>613, 356</value>
</data>
<data name="flpPatreon.Size" type="System.Drawing.Size, System.Drawing">
<value>215, 45</value>
</data>
<data name="flpPatreon.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="flpPatreon.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="flpPatreon.WrapContents" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;flpPatreon.Name" xml:space="preserve">
<value>flpPatreon</value>
</data>
<data name="&gt;&gt;flpPatreon.Type" xml:space="preserve">
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flpPatreon.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;flpPatreon.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>567, 17</value>
</metadata>
<data name="pbPatreonOpen.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@ -339,9 +393,6 @@
<data name="pbPatreonOpen.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>567, 17</value>
</metadata>
<data name="pbPatreonOpen.ToolTip" xml:space="preserve">
<value>Open ShareX Patreon campaign web page</value>
</data>
@ -387,33 +438,6 @@
<data name="&gt;&gt;pbPatreonHide.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="flpPatreon.Location" type="System.Drawing.Point, System.Drawing">
<value>613, 356</value>
</data>
<data name="flpPatreon.Size" type="System.Drawing.Size, System.Drawing">
<value>215, 45</value>
</data>
<data name="flpPatreon.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="flpPatreon.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="flpPatreon.WrapContents" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;flpPatreon.Name" xml:space="preserve">
<value>flpPatreon</value>
</data>
<data name="&gt;&gt;flpPatreon.Type" xml:space="preserve">
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flpPatreon.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;flpPatreon.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@ -423,6 +447,42 @@
<data name="tsMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tsMain.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 407</value>
</data>
<data name="tsMain.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;tsMain.Name" xml:space="preserve">
<value>tsMain</value>
</data>
<data name="&gt;&gt;tsMain.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="tsddbCapture.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbCapture.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbCapture.Text" xml:space="preserve">
<value>Capture</value>
</data>
<data name="tsmiFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -501,17 +561,17 @@
<data name="tsmiAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
</data>
<data name="tsddbCapture.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<data name="tsddbUpload.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbCapture.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<data name="tsddbUpload.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbCapture.Size" type="System.Drawing.Size, System.Drawing">
<data name="tsddbUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbCapture.Text" xml:space="preserve">
<value>Capture</value>
<data name="tsddbUpload.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiUploadFile.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
@ -543,18 +603,6 @@
<data name="tsmiUploadDragDrop.Text" xml:space="preserve">
<value>Drag and drop upload...</value>
</data>
<data name="tsddbUpload.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbUpload.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbUpload.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsddbWorkflows.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>BottomLeft</value>
</data>
@ -567,6 +615,18 @@
<data name="tsddbWorkflows.Text" xml:space="preserve">
<value>Workflows</value>
</data>
<data name="tsddbTools.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbTools.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbTools.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbTools.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="tsmiColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
@ -651,18 +711,6 @@
<data name="tsmiMonitorTest.Text" xml:space="preserve">
<value>Monitor test...</value>
</data>
<data name="tsddbTools.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbTools.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbTools.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbTools.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="tssMain1.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 6</value>
</data>
@ -690,6 +738,18 @@
<data name="tsddbAfterUploadTasks.Text" xml:space="preserve">
<value>After upload tasks</value>
</data>
<data name="tsddbDestinations.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbDestinations.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbDestinations.Text" xml:space="preserve">
<value>Destinations</value>
</data>
<data name="tsmiImageUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
@ -729,18 +789,6 @@
<data name="tsmiDestinationSettings.Text" xml:space="preserve">
<value>Destination settings...</value>
</data>
<data name="tsddbDestinations.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbDestinations.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbDestinations.Text" xml:space="preserve">
<value>Destinations</value>
</data>
<data name="tsbTaskSettings.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -816,6 +864,18 @@
<data name="tsbImageHistory.Text" xml:space="preserve">
<value>Image history...</value>
</data>
<data name="tsddbDebug.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbDebug.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbDebug.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbDebug.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="tsmiShowDebugLog.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
@ -852,18 +912,6 @@
<data name="tsmiTestURLSharing.Text" xml:space="preserve">
<value>Test URL sharing</value>
</data>
<data name="tsddbDebug.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsddbDebug.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsddbDebug.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 20</value>
</data>
<data name="tsddbDebug.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="tsmiDonate.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -888,30 +936,6 @@
<data name="tsmiAbout.Text" xml:space="preserve">
<value>About...</value>
</data>
<data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tsMain.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 407</value>
</data>
<data name="tsMain.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;tsMain.Name" xml:space="preserve">
<value>tsMain</value>
</data>
<data name="&gt;&gt;tsMain.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<metadata name="cmsTaskInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>286, 17</value>
</metadata>
@ -927,6 +951,147 @@
<data name="tsmiStopUpload.Text" xml:space="preserve">
<value>Stop upload</value>
</data>
<data name="tsmiOpen.ShortcutKeyDisplayString" xml:space="preserve">
<value />
</data>
<data name="tsmiOpen.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiOpen.Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="tsmiCopy.ShortcutKeyDisplayString" xml:space="preserve">
<value />
</data>
<data name="tsmiCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiCopy.Text" xml:space="preserve">
<value>Copy</value>
</data>
<data name="tsmiUploadSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+U</value>
</data>
<data name="tsmiUploadSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiUploadSelectedFile.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiDownloadSelectedURL.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+D</value>
</data>
<data name="tsmiDownloadSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDownloadSelectedURL.Text" xml:space="preserve">
<value>Download</value>
</data>
<data name="tsmiEditSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+E</value>
</data>
<data name="tsmiEditSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiEditSelectedFile.Text" xml:space="preserve">
<value>Edit image...</value>
</data>
<data name="tsmiDeleteSelectedItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Del</value>
</data>
<data name="tsmiDeleteSelectedItem.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDeleteSelectedItem.Text" xml:space="preserve">
<value>Remove task from list</value>
</data>
<data name="tsmiDeleteSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Shift+Del</value>
</data>
<data name="tsmiDeleteSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDeleteSelectedFile.Text" xml:space="preserve">
<value>Delete file locally...</value>
</data>
<data name="tsmiShortenSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShortenSelectedURL.Text" xml:space="preserve">
<value>Shorten URL</value>
</data>
<data name="tsmiShareSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShareSelectedURL.Text" xml:space="preserve">
<value>Share URL</value>
</data>
<data name="tsmiSearchImage.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiSearchImage.Text" xml:space="preserve">
<value>Search image...</value>
</data>
<data name="tsmiShowQRCode.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShowQRCode.Text" xml:space="preserve">
<value>Show QR code...</value>
</data>
<data name="tsmiOCRImage.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiOCRImage.Text" xml:space="preserve">
<value>OCR image...</value>
</data>
<data name="tsmiCombineImages.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiCombineImages.Text" xml:space="preserve">
<value>Combine images...</value>
</data>
<data name="tsmiShowResponse.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShowResponse.Text" xml:space="preserve">
<value>Show response...</value>
</data>
<data name="tsmiClearList.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiClearList.Text" xml:space="preserve">
<value>Clear list</value>
</data>
<data name="tssUploadInfo1.Size" type="System.Drawing.Size, System.Drawing">
<value>225, 6</value>
</data>
<data name="tsmiHideMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiHideMenu.Text" xml:space="preserve">
<value>Hide menu</value>
</data>
<data name="tsmiHideColumns.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiHideColumns.Text" xml:space="preserve">
<value>Hide columns</value>
</data>
<data name="tsmiImagePreview.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiImagePreview.Text" xml:space="preserve">
<value>Image preview</value>
</data>
<data name="cmsTaskInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>229, 472</value>
</data>
<data name="&gt;&gt;cmsTaskInfo.Name" xml:space="preserve">
<value>cmsTaskInfo</value>
</data>
<data name="&gt;&gt;cmsTaskInfo.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="tsmiOpenURL.ShortcutKeyDisplayString" xml:space="preserve">
<value>Enter</value>
</data>
@ -981,15 +1146,6 @@
<data name="tsmiOpenThumbnailFile.Text" xml:space="preserve">
<value>Thumbnail file</value>
</data>
<data name="tsmiOpen.ShortcutKeyDisplayString" xml:space="preserve">
<value />
</data>
<data name="tsmiOpen.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiOpen.Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="tsmiCopyURL.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+C</value>
</data>
@ -1134,117 +1290,6 @@
<data name="tssCopy5.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="tsmiCopy.ShortcutKeyDisplayString" xml:space="preserve">
<value />
</data>
<data name="tsmiCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiCopy.Text" xml:space="preserve">
<value>Copy</value>
</data>
<data name="tsmiUploadSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+U</value>
</data>
<data name="tsmiUploadSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiUploadSelectedFile.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiDownloadSelectedURL.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+D</value>
</data>
<data name="tsmiDownloadSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDownloadSelectedURL.Text" xml:space="preserve">
<value>Download</value>
</data>
<data name="tsmiEditSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+E</value>
</data>
<data name="tsmiEditSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiEditSelectedFile.Text" xml:space="preserve">
<value>Edit image...</value>
</data>
<data name="tsmiDeleteSelectedItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Del</value>
</data>
<data name="tsmiDeleteSelectedItem.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDeleteSelectedItem.Text" xml:space="preserve">
<value>Remove task from list</value>
</data>
<data name="tsmiDeleteSelectedFile.ShortcutKeyDisplayString" xml:space="preserve">
<value>Shift+Del</value>
</data>
<data name="tsmiDeleteSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiDeleteSelectedFile.Text" xml:space="preserve">
<value>Delete file locally...</value>
</data>
<data name="tsmiShortenSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShortenSelectedURL.Text" xml:space="preserve">
<value>Shorten URL</value>
</data>
<data name="tsmiShareSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShareSelectedURL.Text" xml:space="preserve">
<value>Share URL</value>
</data>
<data name="tsmiShowQRCode.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShowQRCode.Text" xml:space="preserve">
<value>Show QR code...</value>
</data>
<data name="tsmiOCRImage.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiOCRImage.Text" xml:space="preserve">
<value>OCR image...</value>
</data>
<data name="tsmiCombineImages.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiCombineImages.Text" xml:space="preserve">
<value>Combine images...</value>
</data>
<data name="tsmiShowResponse.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiShowResponse.Text" xml:space="preserve">
<value>Show response...</value>
</data>
<data name="tsmiClearList.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiClearList.Text" xml:space="preserve">
<value>Clear list</value>
</data>
<data name="tssUploadInfo1.Size" type="System.Drawing.Size, System.Drawing">
<value>225, 6</value>
</data>
<data name="tsmiHideMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiHideMenu.Text" xml:space="preserve">
<value>Hide menu</value>
</data>
<data name="tsmiHideColumns.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiHideColumns.Text" xml:space="preserve">
<value>Hide columns</value>
</data>
<data name="tsmiImagePreviewShow.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
</data>
@ -1263,27 +1308,30 @@
<data name="tsmiImagePreviewAutomatic.Text" xml:space="preserve">
<value>Automatic</value>
</data>
<data name="tsmiImagePreview.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
<data name="tsmiImagePreview.Text" xml:space="preserve">
<value>Image preview</value>
</data>
<data name="cmsTaskInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>229, 428</value>
</data>
<data name="&gt;&gt;cmsTaskInfo.Name" xml:space="preserve">
<value>cmsTaskInfo</value>
</data>
<data name="&gt;&gt;cmsTaskInfo.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<metadata name="niTray.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>105, 17</value>
</metadata>
<metadata name="cmsTray.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>190, 17</value>
</metadata>
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
<value>193, 484</value>
</data>
<data name="&gt;&gt;cmsTray.Name" xml:space="preserve">
<value>cmsTray</value>
</data>
<data name="&gt;&gt;cmsTray.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="niTray.Text" xml:space="preserve">
<value>ShareX</value>
</data>
<data name="tsmiTrayCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayCapture.Text" xml:space="preserve">
<value>Capture</value>
</data>
<data name="tsmiTrayFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -1362,11 +1410,11 @@
<data name="tsmiTrayAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
</data>
<data name="tsmiTrayCapture.Size" type="System.Drawing.Size, System.Drawing">
<data name="tsmiTrayUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayCapture.Text" xml:space="preserve">
<value>Capture</value>
<data name="tsmiTrayUpload.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiTrayUploadFile.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
@ -1398,18 +1446,18 @@
<data name="tsmiTrayUploadDragDrop.Text" xml:space="preserve">
<value>Drag and drop upload...</value>
</data>
<data name="tsmiTrayUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayUpload.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiTrayWorkflows.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayWorkflows.Text" xml:space="preserve">
<value>Workflows</value>
</data>
<data name="tsmiTrayTools.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayTools.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="tsmiTrayColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
@ -1494,12 +1542,6 @@
<data name="tsmiTrayMonitorTest.Text" xml:space="preserve">
<value>Monitor test...</value>
</data>
<data name="tsmiTrayTools.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayTools.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="tssTray1.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 6</value>
</data>
@ -1515,6 +1557,12 @@
<data name="tsmiTrayAfterUploadTasks.Text" xml:space="preserve">
<value>After upload tasks</value>
</data>
<data name="tsmiTrayDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayDestinations.Text" xml:space="preserve">
<value>Destinations</value>
</data>
<data name="tsmiTrayImageUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
@ -1554,12 +1602,6 @@
<data name="tsmiTrayDestinationSettings.Text" xml:space="preserve">
<value>Destination settings...</value>
</data>
<data name="tsmiTrayDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayDestinations.Text" xml:space="preserve">
<value>Destinations</value>
</data>
<data name="tsmiTrayTaskSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
@ -1605,6 +1647,12 @@
<data name="tsmiTrayImageHistory.Text" xml:space="preserve">
<value>Image history...</value>
</data>
<data name="tsmiTrayDebug.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayDebug.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="tsmiTrayShowDebugLog.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
@ -1641,12 +1689,6 @@
<data name="tsmiTrayTestURLSharing.Text" xml:space="preserve">
<value>Test URL sharing</value>
</data>
<data name="tsmiTrayDebug.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="tsmiTrayDebug.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="tsmiTrayDonate.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
@ -1689,21 +1731,12 @@
<data name="tsmiTrayExit.Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
<value>193, 484</value>
</data>
<data name="&gt;&gt;cmsTray.Name" xml:space="preserve">
<value>cmsTray</value>
</data>
<data name="&gt;&gt;cmsTray.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="niTray.Text" xml:space="preserve">
<value>ShareX</value>
</data>
<metadata name="timerTraySingleClick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>405, 17</value>
</metadata>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>567, 17</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -2472,6 +2505,12 @@
<data name="&gt;&gt;tsmiImagePreviewAutomatic.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiSearchImage.Name" xml:space="preserve">
<value>tsmiSearchImage</value>
</data>
<data name="&gt;&gt;tsmiSearchImage.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;niTray.Name" xml:space="preserve">
<value>niTray</value>
</data>

10
ShareX/Properties/Resources.Designer.cs generated
View file

@ -1068,6 +1068,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap Google {
get {
object obj = ResourceManager.GetObject("Google", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
ShareX/Properties/Resources.resx
View file

@ -877,4 +877,7 @@ Would you like to restart ShareX?</value>
<data name="script__minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\script--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Google" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Google.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/Google.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 631 B

1
ShareX/ShareX.csproj
View file

@ -1316,6 +1316,7 @@
<None Include="Resources\application-home.png" />
<None Include="Resources\clipboard-task.png" />
<None Include="Resources\script--minus.png" />
<None Include="Resources\Google.png" />
<Content Include="ShareX_Icon.ico" />
<None Include="Resources\globe--pencil.png" />
<None Include="Resources\camcorder--pencil.png" />

10
ShareX/TaskHelpers.cs
View file

@ -977,6 +977,11 @@ public static void OCRImage(Image img)
}
}
public static void SearchImage(string url)
{
URLHelpers.OpenURL("https://www.google.com/searchbyimage?image_url=" + URLHelpers.URLEncode(url));
}
public static void OCRImage(string filePath)
{
if (File.Exists(filePath))
@ -1102,8 +1107,7 @@ public static bool CheckFFmpeg(TaskSettings taskSettings)
if (MessageBox.Show(string.Format(Resources.ScreenRecordForm_StartRecording_does_not_exist, ffmpegPath),
"ShareX - " + Resources.ScreenRecordForm_StartRecording_Missing + " ffmpeg.exe", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
var downloadDialogResult = FFmpegDownloader.DownloadFFmpeg(false, DownloaderForm_InstallRequested);
DialogResult downloadDialogResult = FFmpegDownloader.DownloadFFmpeg(false, DownloaderForm_InstallRequested);
if (downloadDialogResult == DialogResult.OK)
{
@ -1115,7 +1119,7 @@ public static bool CheckFFmpeg(TaskSettings taskSettings)
taskSettings.CaptureSettings.FFmpegOptions.OverrideCLIPath = true;
#endif
}
else if(downloadDialogResult == DialogResult.Cancel)
else if (downloadDialogResult == DialogResult.Cancel)
{
return false;
}

5
ShareX/UploadInfoManager.cs
View file

@ -337,6 +337,11 @@ public void ShareURL(URLSharingServices urlSharingService)
if (IsItemSelected && SelectedItem.IsURLExist) UploadManager.ShareURL(SelectedItem.Info.Result.ToString(), urlSharingService);
}
public void SearchImage()
{
if (IsItemSelected && SelectedItem.IsURLExist) TaskHelpers.SearchImage(SelectedItem.Info.Result.URL);
}
public void ShowQRCode()
{
if (IsItemSelected && SelectedItem.IsURLExist) new QRCodeForm(SelectedItem.Info.Result.URL).Show();