fixed #6340: Added OCR help button, OCR window layout changes

This commit is contained in:
Jaex 2022-07-09 16:01:35 +03:00
parent 6cc4f116d6
commit aa04cae425
8 changed files with 197 additions and 163 deletions

View file

@ -44,5 +44,6 @@ public static class Links
private const string Docs = Website + "/docs";
public const string DocsCustomUploader = Docs + "/custom-uploader";
public const string DocsRegionCapture = Docs + "/region-capture";
public const string DocsOCR = Docs + "/ocr";
}
}

View file

@ -23,10 +23,10 @@ private void InitializeComponent()
this.lblScaleFactor = new System.Windows.Forms.Label();
this.nudScaleFactor = new System.Windows.Forms.NumericUpDown();
this.cbServices = new System.Windows.Forms.ComboBox();
this.btnOpen = new System.Windows.Forms.Button();
this.btnOpenServiceLink = new System.Windows.Forms.Button();
this.cbEditServices = new System.Windows.Forms.Button();
this.pbStatus = new System.Windows.Forms.ProgressBar();
this.lblStatus = new System.Windows.Forms.Label();
this.btnOpenOCRHelp = new System.Windows.Forms.Button();
this.lblService = new System.Windows.Forms.Label();
this.btnSelectRegion = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.nudScaleFactor)).BeginInit();
this.SuspendLayout();
@ -95,12 +95,12 @@ private void InitializeComponent()
this.cbServices.Name = "cbServices";
this.cbServices.SelectedIndexChanged += new System.EventHandler(this.cbServices_SelectedIndexChanged);
//
// btnOpen
// btnOpenServiceLink
//
resources.ApplyResources(this.btnOpen, "btnOpen");
this.btnOpen.Name = "btnOpen";
this.btnOpen.UseVisualStyleBackColor = true;
this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
resources.ApplyResources(this.btnOpenServiceLink, "btnOpenServiceLink");
this.btnOpenServiceLink.Name = "btnOpenServiceLink";
this.btnOpenServiceLink.UseVisualStyleBackColor = true;
this.btnOpenServiceLink.Click += new System.EventHandler(this.btnOpenServiceLink_Click);
//
// cbEditServices
//
@ -110,17 +110,18 @@ private void InitializeComponent()
this.cbEditServices.UseVisualStyleBackColor = true;
this.cbEditServices.Click += new System.EventHandler(this.cbEditServices_Click);
//
// pbStatus
// btnOpenOCRHelp
//
resources.ApplyResources(this.pbStatus, "pbStatus");
this.pbStatus.MarqueeAnimationSpeed = 50;
this.pbStatus.Name = "pbStatus";
this.pbStatus.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
resources.ApplyResources(this.btnOpenOCRHelp, "btnOpenOCRHelp");
this.btnOpenOCRHelp.Image = global::ShareX.Properties.Resources.question;
this.btnOpenOCRHelp.Name = "btnOpenOCRHelp";
this.btnOpenOCRHelp.UseVisualStyleBackColor = true;
this.btnOpenOCRHelp.Click += new System.EventHandler(this.btnOpenOCRHelp_Click);
//
// lblStatus
// lblService
//
resources.ApplyResources(this.lblStatus, "lblStatus");
this.lblStatus.Name = "lblStatus";
resources.ApplyResources(this.lblService, "lblService");
this.lblService.Name = "lblService";
//
// btnSelectRegion
//
@ -133,11 +134,11 @@ private void InitializeComponent()
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lblService);
this.Controls.Add(this.btnOpenOCRHelp);
this.Controls.Add(this.btnSelectRegion);
this.Controls.Add(this.lblStatus);
this.Controls.Add(this.pbStatus);
this.Controls.Add(this.cbEditServices);
this.Controls.Add(this.btnOpen);
this.Controls.Add(this.btnOpenServiceLink);
this.Controls.Add(this.cbServices);
this.Controls.Add(this.nudScaleFactor);
this.Controls.Add(this.lblScaleFactor);
@ -163,10 +164,10 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblScaleFactor;
private System.Windows.Forms.NumericUpDown nudScaleFactor;
private System.Windows.Forms.ComboBox cbServices;
private System.Windows.Forms.Button btnOpen;
private System.Windows.Forms.Button btnOpenServiceLink;
private System.Windows.Forms.Button cbEditServices;
private System.Windows.Forms.ProgressBar pbStatus;
private System.Windows.Forms.Label lblStatus;
private System.Windows.Forms.Button btnOpenOCRHelp;
private System.Windows.Forms.Label lblService;
private System.Windows.Forms.Button btnSelectRegion;
}
}

View file

@ -111,13 +111,18 @@ protected override void Dispose(bool disposing)
private void UpdateControls()
{
btnSelectRegion.Visible = !busy;
lblLanguage.Visible = !busy;
cbLanguages.Visible = !busy;
lblScaleFactor.Visible = !busy;
nudScaleFactor.Visible = !busy;
lblStatus.Visible = busy;
pbStatus.Visible = busy;
if (busy)
{
Cursor = Cursors.WaitCursor;
}
else
{
Cursor = Cursors.Default;
}
btnSelectRegion.Enabled = !busy;
cbLanguages.Enabled = !busy;
nudScaleFactor.Enabled = !busy;
}
private async Task OCR(Bitmap bmp)
@ -183,6 +188,11 @@ private async void cbLanguages_SelectedIndexChanged(object sender, EventArgs e)
}
}
private void btnOpenOCRHelp_Click(object sender, EventArgs e)
{
URLHelpers.OpenURL(Links.DocsOCR);
}
private async void nudScaleFactor_ValueChanged(object sender, EventArgs e)
{
if (loaded)
@ -198,7 +208,7 @@ private void cbServices_SelectedIndexChanged(object sender, EventArgs e)
Options.SelectedServiceLink = cbServices.SelectedIndex;
}
private void btnOpen_Click(object sender, EventArgs e)
private void btnOpenServiceLink_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(Result) && cbServices.SelectedItem is ServiceLink serviceLink)
{
@ -228,7 +238,7 @@ private void cbEditServices_Click(object sender, EventArgs e)
private void txtResult_TextChanged(object sender, EventArgs e)
{
Result = txtResult.Text.Trim();
btnOpen.Enabled = !string.IsNullOrEmpty(Result);
btnOpenServiceLink.Enabled = !string.IsNullOrEmpty(Result);
}
}
}

View file

@ -126,13 +126,13 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="lblLanguage.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 16</value>
<value>13, 56</value>
</data>
<data name="lblLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 16</value>
</data>
<data name="lblLanguage.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>1</value>
</data>
<data name="lblLanguage.Text" xml:space="preserve">
<value>Language:</value>
@ -153,13 +153,13 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="cbLanguages.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 40</value>
<value>16, 80</value>
</data>
<data name="cbLanguages.Size" type="System.Drawing.Size, System.Drawing">
<value>272, 24</value>
</data>
<data name="cbLanguages.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>2</value>
</data>
<data name="&gt;&gt;cbLanguages.Name" xml:space="preserve">
<value>cbLanguages</value>
@ -180,13 +180,13 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="lblResult.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 72</value>
<value>341, 16</value>
</data>
<data name="lblResult.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 16</value>
</data>
<data name="lblResult.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>10</value>
</data>
<data name="lblResult.Text" xml:space="preserve">
<value>Result:</value>
@ -211,7 +211,7 @@
<value>Microsoft Sans Serif, 12pt</value>
</data>
<data name="txtResult.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 96</value>
<value>344, 40</value>
</data>
<data name="txtResult.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
@ -220,10 +220,10 @@
<value>Both</value>
</data>
<data name="txtResult.Size" type="System.Drawing.Size, System.Drawing">
<value>592, 360</value>
<value>520, 344</value>
</data>
<data name="txtResult.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>11</value>
</data>
<data name="&gt;&gt;txtResult.Name" xml:space="preserve">
<value>txtResult</value>
@ -244,7 +244,7 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="lblScaleFactor.Location" type="System.Drawing.Point, System.Drawing">
<value>301, 16</value>
<value>13, 112</value>
</data>
<data name="lblScaleFactor.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 16</value>
@ -271,10 +271,10 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="nudScaleFactor.Location" type="System.Drawing.Point, System.Drawing">
<value>304, 40</value>
<value>16, 136</value>
</data>
<data name="nudScaleFactor.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 22</value>
<value>80, 22</value>
</data>
<data name="nudScaleFactor.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -298,13 +298,13 @@
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="cbServices.Location" type="System.Drawing.Point, System.Drawing">
<value>440, 20</value>
<value>16, 192</value>
</data>
<data name="cbServices.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 24</value>
<value>272, 24</value>
</data>
<data name="cbServices.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>7</value>
</data>
<data name="&gt;&gt;cbServices.Name" xml:space="preserve">
<value>cbServices</value>
@ -318,41 +318,41 @@
<data name="&gt;&gt;cbServices.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="btnOpen.Enabled" type="System.Boolean, mscorlib">
<data name="btnOpenServiceLink.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="btnOpen.Font" type="System.Drawing.Font, System.Drawing">
<data name="btnOpenServiceLink.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="btnOpen.Location" type="System.Drawing.Point, System.Drawing">
<value>440, 48</value>
<data name="btnOpenServiceLink.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 224</value>
</data>
<data name="btnOpen.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 32</value>
<data name="btnOpenServiceLink.Size" type="System.Drawing.Size, System.Drawing">
<value>272, 32</value>
</data>
<data name="btnOpen.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<data name="btnOpenServiceLink.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="btnOpen.Text" xml:space="preserve">
<value>Open...</value>
<data name="btnOpenServiceLink.Text" xml:space="preserve">
<value>Open service link...</value>
</data>
<data name="&gt;&gt;btnOpen.Name" xml:space="preserve">
<value>btnOpen</value>
<data name="&gt;&gt;btnOpenServiceLink.Name" xml:space="preserve">
<value>btnOpenServiceLink</value>
</data>
<data name="&gt;&gt;btnOpen.Type" xml:space="preserve">
<data name="&gt;&gt;btnOpenServiceLink.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnOpen.Parent" xml:space="preserve">
<data name="&gt;&gt;btnOpenServiceLink.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnOpen.ZOrder" xml:space="preserve">
<data name="&gt;&gt;btnOpenServiceLink.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="cbEditServices.Location" type="System.Drawing.Point, System.Drawing">
<value>568, 48</value>
<value>296, 190</value>
</data>
<data name="cbEditServices.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 32</value>
<value>28, 28</value>
</data>
<data name="cbEditServices.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -369,68 +369,74 @@
<data name="&gt;&gt;cbEditServices.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="pbStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 40</value>
</data>
<data name="pbStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>272, 24</value>
</data>
<data name="pbStatus.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;pbStatus.Name" xml:space="preserve">
<value>pbStatus</value>
</data>
<data name="&gt;&gt;pbStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbStatus.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pbStatus.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="lblStatus.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblStatus.Font" type="System.Drawing.Font, System.Drawing">
<data name="btnOpenOCRHelp.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="lblStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 16</value>
<data name="btnOpenOCRHelp.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 78</value>
</data>
<data name="lblStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 16</value>
<data name="btnOpenOCRHelp.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 28</value>
</data>
<data name="lblStatus.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
<data name="btnOpenOCRHelp.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="lblStatus.Text" xml:space="preserve">
<value>OCR is processing...</value>
<data name="&gt;&gt;btnOpenOCRHelp.Name" xml:space="preserve">
<value>btnOpenOCRHelp</value>
</data>
<data name="&gt;&gt;lblStatus.Name" xml:space="preserve">
<value>lblStatus</value>
<data name="&gt;&gt;btnOpenOCRHelp.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblStatus.Parent" xml:space="preserve">
<data name="&gt;&gt;btnOpenOCRHelp.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblStatus.ZOrder" xml:space="preserve">
<data name="&gt;&gt;btnOpenOCRHelp.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblService.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblService.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="lblService.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 168</value>
</data>
<data name="lblService.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 16</value>
</data>
<data name="lblService.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="lblService.Text" xml:space="preserve">
<value>Service:</value>
</data>
<data name="&gt;&gt;lblService.Name" xml:space="preserve">
<value>lblService</value>
</data>
<data name="&gt;&gt;lblService.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblService.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblService.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnSelectRegion.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="btnSelectRegion.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnSelectRegion.Location" type="System.Drawing.Point, System.Drawing">
<value>128, -2</value>
<value>16, 16</value>
</data>
<data name="btnSelectRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 32</value>
<value>272, 32</value>
</data>
<data name="btnSelectRegion.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
<value>0</value>
</data>
<data name="btnSelectRegion.Text" xml:space="preserve">
<value>Select region...</value>
@ -445,7 +451,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnSelectRegion.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -454,10 +460,10 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>624, 471</value>
<value>879, 399</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>640, 510</value>
<value>600, 400</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>

View file

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

View file

@ -193,9 +193,6 @@
<data name="UploadTask_Stop_Stopping" xml:space="preserve">
<value>Stopping</value>
</data>
<data name="keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_terminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-terminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -226,9 +223,6 @@
<data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Changelog" xml:space="preserve">
<value>Changelog</value>
</data>
@ -243,6 +237,9 @@
Would you like to restart ShareX?</value>
</data>
<data name="AboutForm_AboutForm_Language_zh_TW" xml:space="preserve">
<value>Traditional Chinese</value>
</data>
<data name="ActionsToolbar_Edit" xml:space="preserve">
<value>Edit...</value>
</data>
@ -285,6 +282,12 @@ Would you like to restart ShareX?</value>
<data name="MainForm_UpdateMainFormTip_Currently_configured_hotkeys_" xml:space="preserve">
<value>Currently configured hotkeys:</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
<value>URL shortener: {0}</value>
</data>
<data name="ro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_CreateListViewItem_History" xml:space="preserve">
<value>History</value>
</data>
@ -312,8 +315,8 @@ Would you like to restart ShareX?</value>
<data name="TaskHelpers_OpenQuickScreenColorPicker_Copied_to_clipboard___0_" xml:space="preserve">
<value>Copied to clipboard: {0}</value>
</data>
<data name="network_cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\network-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__File__Count___0__" xml:space="preserve">
<value>Clipboard content: File (Count: {0})</value>
@ -330,6 +333,12 @@ Would you like to restart ShareX?</value>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FileExistForm_txtNewName_TextChanged_Use_new_name__" xml:space="preserve">
<value>Use new name: </value>
</data>
<data name="clipboard_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadTask_DoUploadJob_First_time_upload_warning_text" xml:space="preserve">
<value>Are you sure you want to upload this screenshot?
Press 'No' to cancel the current upload and disable screenshot auto uploading.</value>
@ -414,8 +423,8 @@ Would you like to automatically download it?</value>
<data name="AutoCaptureForm_UpdateRegion_X___0___Y___1___Width___2___Height___3_" xml:space="preserve">
<value>X: {0}, Y: {1}, Width: {2}, Height: {3}</value>
</data>
<data name="ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings" xml:space="preserve">
<value>Would you like to reset ShareX settings?</value>
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="BeforeUploadForm_BeforeUploadForm__0__is_about_to_be_uploaded_to__1___You_may_choose_a_different_destination_" xml:space="preserve">
<value>{0} is about to be uploaded to {1}. You may choose a different destination.</value>
@ -450,6 +459,9 @@ Are you sure you want to continue?</value>
<data name="application_list" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="images-flickr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-flickr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadTask_DoAfterCaptureJobs_Choose_a_folder_to_save" xml:space="preserve">
<value>Choose a folder to save</value>
</data>
@ -471,8 +483,8 @@ Are you sure you want to continue?</value>
<data name="application_monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FileExistForm_txtNewName_TextChanged_Use_new_name__" xml:space="preserve">
<value>Use new name: </value>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -498,8 +510,11 @@ Are you sure you want to continue?</value>
<data name="ApplicationSettingsForm_cbStartWithWindows_EnabledByPolicy_Text" xml:space="preserve">
<value>Startup has been enabled by your organization</value>
</data>
<data name="ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_Choose_ShareX_personal_folder_path" xml:space="preserve">
<value>Choose ShareX personal folder path</value>
<data name="clock_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Language_ro" xml:space="preserve">
<value>Romanian</value>
</data>
<data name="WorkerTask_GetInvalidConfigResult__0__configuration_is_invalid_or_missing__Please_check__Destination_settings__window_to_configure_it_" xml:space="preserve">
<value>{0} configuration is invalid or missing. Please check "Destination settings" window to configure it.</value>
@ -575,6 +590,9 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="IntegrationHelpers_EditWithShareX" xml:space="preserve">
<value>Edit with ShareX</value>
</data>
<data name="ApplicationSettingsForm_btnBrowseCustomScreenshotsPath_Click_Choose_screenshots_folder_path" xml:space="preserve">
<value>Choose screenshots folder path</value>
</data>
<data name="AboutForm_AboutForm_Links" xml:space="preserve">
<value>Links</value>
</data>
@ -587,8 +605,8 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="disk_rename" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clipboard_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -605,9 +623,6 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_After_capture___0_" xml:space="preserve">
<value>After capture: {0}</value>
</data>
<data name="UploadTask_Prepare_Starting" xml:space="preserve">
<value>Starting</value>
</data>
<data name="RecentManager_UpdateRecentMenu_Left_click_to_copy_URL_to_clipboard__Right_click_to_open_URL_" xml:space="preserve">
<value>Left click to copy URL to clipboard. Right click to open URL.</value>
</data>
@ -662,8 +677,8 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="film" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ApplicationSettingsForm_btnBrowseCustomScreenshotsPath_Click_Choose_screenshots_folder_path" xml:space="preserve">
<value>Choose screenshots folder path</value>
<data name="TaskHelpers_ToggleHotkeys_Hotkeys_enabled_" xml:space="preserve">
<value>Hotkeys enabled.</value>
</data>
<data name="Exclamation_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Exclamation-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -730,14 +745,17 @@ Would you like to restart ShareX?</value>
<data name="AboutForm_AboutForm_Language_uk" xml:space="preserve">
<value>Ukrainian</value>
</data>
<data name="FFmpeg_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
</data>
<data name="folder_stand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Error" xml:space="preserve">
<value>Error</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
<value>URL shortener: {0}</value>
<data name="ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_Choose_ShareX_personal_folder_path" xml:space="preserve">
<value>Choose ShareX personal folder path</value>
</data>
<data name="pt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -766,8 +784,8 @@ Would you like to restart ShareX?</value>
<data name="UploadManager_ShowShortenURLDialog_Shorten" xml:space="preserve">
<value>Shorten</value>
</data>
<data name="FFmpeg_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
<data name="keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_CreateListViewItem_In_queue" xml:space="preserve">
<value>In queue</value>
@ -790,6 +808,9 @@ Would you like to restart ShareX?</value>
<data name="UploadTask_DownloadAndUpload_Downloading" xml:space="preserve">
<value>Downloading</value>
</data>
<data name="network_cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\network-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Language_fr" xml:space="preserve">
<value>French</value>
</data>
@ -844,9 +865,6 @@ Would you like to restart ShareX?</value>
<data name="IntegrationHelpers_UploadWithShareX" xml:space="preserve">
<value>Upload with ShareX</value>
</data>
<data name="clock_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="inbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\inbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -896,8 +914,8 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="images_stack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OCRForm_AutoComplete" xml:space="preserve">
<value>The OCR output has been copied to your clipboard.</value>
<data name="ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings" xml:space="preserve">
<value>Would you like to reset ShareX settings?</value>
</data>
<data name="FailedToSaveSettings" xml:space="preserve">
<value>Failed to save settings</value>
@ -908,15 +926,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="OCRForm_AutoCompleteFail" xml:space="preserve">
<value>Error occurred during OCR processing, or no text was returned.</value>
</data>
<data name="TaskHelpers_ToggleHotkeys_Hotkeys_enabled_" xml:space="preserve">
<value>Hotkeys enabled.</value>
</data>
<data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InspectWindow_ClientRectangle" xml:space="preserve">
<value>Client rectangle</value>
</data>
@ -938,6 +950,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="MainForm_UpdateToggleHotkeyButton_Enable_hotkeys" xml:space="preserve">
<value>Enable hotkeys</value>
</data>
<data name="application-tile-horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-tile-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeySettingsForm_Reset_all_hotkeys_to_defaults_Confirmation" xml:space="preserve">
<value>Reset all hotkeys to defaults?</value>
</data>
@ -953,9 +968,6 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="upload_cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -986,8 +998,8 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Language_zh_TW" xml:space="preserve">
<value>Traditional Chinese</value>
<data name="UploadTask_Prepare_Starting" xml:space="preserve">
<value>Starting</value>
</data>
<data name="document_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -1018,9 +1030,6 @@ Middle click to close</value>
<data name="drive_upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_Hotkey_registration_failed" xml:space="preserve">
<value>Hotkey registration failed</value>
</data>
@ -1039,8 +1048,8 @@ Middle click to close</value>
<data name="ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_is_empty_or_contains_unknown_data_" xml:space="preserve">
<value>Clipboard is empty or contains unknown data.</value>
</data>
<data name="application-tile-horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-tile-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="OCRForm_AutoComplete" xml:space="preserve">
<value>The OCR output has been copied to your clipboard.</value>
</data>
<data name="ScreenshotDelay0S" xml:space="preserve">
<value>Screenshot delay: {0}s</value>
@ -1082,13 +1091,7 @@ Middle click to close</value>
<data name="TaskCompletedSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="images-flickr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-flickr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Language_ro" xml:space="preserve">
<value>Romanian</value>
<data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

View file

@ -1982,6 +1982,9 @@
<ItemGroup>
<None Include="Resources\ro.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\question.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>