mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-28 23:42:13 +12:00
Added download button to right click menu in task list to allow downloading file if file path is not exist
This commit is contained in:
Jaex
parent
f2fb46696f
commit
48a5211b1b
12 changed files with 205 additions and 122 deletions
|
|
@ -74,6 +74,7 @@ public enum TaskJob
|
|||
TextUpload,
|
||||
ShortenURL,
|
||||
ShareURL,
|
||||
Download,
|
||||
DownloadUpload
|
||||
}
|
||||
|
||||
|
|
|
|||
12
ShareX/Forms/MainForm.Designer.cs
generated
12
ShareX/Forms/MainForm.Designer.cs
generated
|
|
@ -151,6 +151,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.tsmiDownloadSelectedURL = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiEditSelectedFile = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiDeleteSelectedFile = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiShortenSelectedURL = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
|
@ -930,6 +931,7 @@ private void InitializeComponent()
|
|||
this.tsmiOpen,
|
||||
this.tsmiCopy,
|
||||
this.tsmiUploadSelectedFile,
|
||||
this.tsmiDownloadSelectedURL,
|
||||
this.tsmiEditSelectedFile,
|
||||
this.tsmiDeleteSelectedFile,
|
||||
this.tsmiShortenSelectedURL,
|
||||
|
|
@ -1194,11 +1196,18 @@ private void InitializeComponent()
|
|||
//
|
||||
// tsmiUploadSelectedFile
|
||||
//
|
||||
this.tsmiUploadSelectedFile.Image = global::ShareX.Properties.Resources.arrow_090;
|
||||
this.tsmiUploadSelectedFile.Image = global::ShareX.Properties.Resources.drive_upload;
|
||||
this.tsmiUploadSelectedFile.Name = "tsmiUploadSelectedFile";
|
||||
resources.ApplyResources(this.tsmiUploadSelectedFile, "tsmiUploadSelectedFile");
|
||||
this.tsmiUploadSelectedFile.Click += new System.EventHandler(this.tsmiUploadSelectedFile_Click);
|
||||
//
|
||||
// tsmiDownloadSelectedURL
|
||||
//
|
||||
this.tsmiDownloadSelectedURL.Image = global::ShareX.Properties.Resources.drive_download;
|
||||
this.tsmiDownloadSelectedURL.Name = "tsmiDownloadSelectedURL";
|
||||
resources.ApplyResources(this.tsmiDownloadSelectedURL, "tsmiDownloadSelectedURL");
|
||||
this.tsmiDownloadSelectedURL.Click += new System.EventHandler(this.tsmiDownloadSelectedURL_Click);
|
||||
//
|
||||
// tsmiEditSelectedFile
|
||||
//
|
||||
this.tsmiEditSelectedFile.Image = global::ShareX.Properties.Resources.image_pencil;
|
||||
|
|
@ -2145,5 +2154,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.PictureBox pbPatreonOpen;
|
||||
private System.Windows.Forms.PictureBox pbPatreonHide;
|
||||
private System.Windows.Forms.ToolTip ttMain;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiDownloadSelectedURL;
|
||||
}
|
||||
}
|
||||
|
|
@ -1650,6 +1650,11 @@ private void tsmiUploadSelectedFile_Click(object sender, EventArgs e)
|
|||
uim.Upload();
|
||||
}
|
||||
|
||||
private void tsmiDownloadSelectedURL_Click(object sender, EventArgs e)
|
||||
{
|
||||
uim.Download();
|
||||
}
|
||||
|
||||
private void tsmiDeleteSelectedFile_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (MessageBox.Show(Resources.MainForm_tsmiDeleteSelectedFile_Click_Do_you_really_want_to_delete_this_file_,
|
||||
|
|
|
|||
|
|
@ -1170,6 +1170,12 @@
|
|||
<data name="tsmiUploadSelectedFile.Text" xml:space="preserve">
|
||||
<value>Upload</value>
|
||||
</data>
|
||||
<data name="tsmiDownloadSelectedURL.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>172, 22</value>
|
||||
</data>
|
||||
<data name="tsmiDownloadSelectedURL.Text" xml:space="preserve">
|
||||
<value>Download</value>
|
||||
</data>
|
||||
<data name="tsmiEditSelectedFile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>172, 22</value>
|
||||
</data>
|
||||
|
|
@ -1252,7 +1258,7 @@
|
|||
<value>Image preview</value>
|
||||
</data>
|
||||
<data name="cmsTaskInfo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>173, 340</value>
|
||||
<value>173, 362</value>
|
||||
</data>
|
||||
<data name=">>cmsTaskInfo.Name" xml:space="preserve">
|
||||
<value>cmsTaskInfo</value>
|
||||
|
|
@ -1694,7 +1700,7 @@
|
|||
</data>
|
||||
<data name="niTray.Text" xml:space="preserve">
|
||||
<value>ShareX</value>
|
||||
<comment>@Invariant</comment></data>
|
||||
</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>
|
||||
|
|
@ -2439,6 +2445,12 @@
|
|||
<data name=">>tsmiUploadSelectedFile.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=">>tsmiDownloadSelectedURL.Name" xml:space="preserve">
|
||||
<value>tsmiDownloadSelectedURL</value>
|
||||
</data>
|
||||
<data name=">>tsmiDownloadSelectedURL.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=">>tsmiEditSelectedFile.Name" xml:space="preserve">
|
||||
<value>tsmiEditSelectedFile</value>
|
||||
</data>
|
||||
|
|
@ -2971,6 +2983,6 @@
|
|||
<value>MainForm</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>ShareX.HotkeyForm, ShareX, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HotkeyForm, ShareX, Version=11.1.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
20
ShareX/Properties/Resources.Designer.cs
generated
20
ShareX/Properties/Resources.Designer.cs
generated
|
|
@ -752,6 +752,16 @@ public static System.Drawing.Bitmap drive {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap drive_download {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("drive_download", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -762,6 +772,16 @@ public static System.Drawing.Bitmap drive_globe {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap drive_upload {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("drive_upload", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Drop
|
||||
///here.
|
||||
|
|
|
|||
|
|
@ -135,20 +135,26 @@ Are you sure you want to continue?</value>
|
|||
<data name="UploadManager_IsUploadConfirmed_Are_you_sure_you_want_to_upload__0__files_" xml:space="preserve">
|
||||
<value>Are you sure you want to upload {0} files?</value>
|
||||
</data>
|
||||
<data name="application__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="BeforeUploadControl_AddDestination_Custom" xml:space="preserve">
|
||||
<value>Custom</value>
|
||||
</data>
|
||||
<data name="UploadTask_Stop_Stopping" xml:space="preserve">
|
||||
<value>Stopping</value>
|
||||
</data>
|
||||
<data name="Patreon_Button_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Patreon_Button_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="UploadTask_CreateURLShortenerTask_Shorten_URL___0__" xml:space="preserve">
|
||||
<value>Shorten URL ({0})</value>
|
||||
</data>
|
||||
<data name="layer_transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_StartRecording_There_is_no_valid_CLI_video_encoder_selected_" xml:space="preserve">
|
||||
<value>There is no valid CLI video encoder selected.</value>
|
||||
</data>
|
||||
<data name="globe__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="edit_scale" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\edit-scale.png;System.Drawing.Bitmap, System.Drawing, Version=2.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?
|
||||
|
|
@ -157,14 +163,14 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
|
|||
<data name="UploadTask_DoUploadJob_Uploading" xml:space="preserve">
|
||||
<value>Uploading</value>
|
||||
</data>
|
||||
<data name="BeforeUploadControl_AddDestination_Custom" xml:space="preserve">
|
||||
<value>Custom</value>
|
||||
<data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="vn" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -175,11 +181,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
|
|||
<data name="checkbox_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_DownloaderForm_InstallRequested_FFmpeg_successfully_downloaded_" xml:space="preserve">
|
||||
<value>FFmpeg successfully downloaded.</value>
|
||||
</data>
|
||||
<data name="CaptureSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\CaptureSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<data name="application_text_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="document_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\document-globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -187,14 +190,14 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
|
|||
<data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="AboutForm_AboutForm_External_libraries" xml:space="preserve">
|
||||
<value>External libraries</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="TaskHelpers_OpenFTPClient_Unable_to_find_valid_FTP_account_" xml:space="preserve">
|
||||
<value>Unable to find a valid FTP account.</value>
|
||||
</data>
|
||||
<data name="Rectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="CaptureSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\CaptureSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tick_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -202,8 +205,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
|
|||
<data name="control_record" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="AutoCaptureForm_UpdateStatus_Timeleft___0_s___1____Total___2_" xml:space="preserve">
|
||||
<value>Timeleft: {0}s ({1}%) Total: {2}</value>
|
||||
<data name="keyboard__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\keyboard--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_blog" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-blog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -284,17 +287,20 @@ Please select a different hotkey or quit the conflicting application and reopen
|
|||
<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="UploadManager_IsUploadConfirmed_Don_t_show_this_message_again_" xml:space="preserve">
|
||||
<value>Don't show this message again.</value>
|
||||
<data name="tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_Task___0_" xml:space="preserve">
|
||||
<value>Task: {0}</value>
|
||||
</data>
|
||||
<data name="HotkeySettingsForm_Reset_all_hotkeys_to_defaults_Confirmation" xml:space="preserve">
|
||||
<value>Reset all hotkeys to defaults?</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_StartRecording_FFmpeg_video_and_audio_source_both_can_t_be__None__" xml:space="preserve">
|
||||
<value>FFmpeg video and audio source can't both be "None".</value>
|
||||
</data>
|
||||
<data name="edit_scale" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\edit-scale.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="toolbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="keyboard__minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\keyboard--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -314,6 +320,9 @@ Please select a different hotkey or quit the conflicting application and reopen
|
|||
<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="UploadManager_IsUploadConfirmed_Don_t_show_this_message_again_" xml:space="preserve">
|
||||
<value>Don't show this message again.</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings" xml:space="preserve">
|
||||
<value>Task settings</value>
|
||||
</data>
|
||||
|
|
@ -328,8 +337,8 @@ Please select a different hotkey or quit the conflicting application and reopen
|
|||
|
||||
Would you like to automatically download it?</value>
|
||||
</data>
|
||||
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="application_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-block.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>
|
||||
|
|
@ -364,23 +373,20 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
|
|||
<data name="MainForm_UpdateMenu_Hide_menu" xml:space="preserve">
|
||||
<value>Hide menu</value>
|
||||
</data>
|
||||
<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="TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_" xml:space="preserve">
|
||||
<value>Unable to find a valid Twitter account.</value>
|
||||
</data>
|
||||
<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="ScreenColorPicker_btnCopyAll_Click_Cursor_position" xml:space="preserve">
|
||||
<value>Cursor position (X, Y) = {0}, {1}</value>
|
||||
<data name="application__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="document_break" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\document-break.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="edit_drop_cap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\edit-drop-cap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MainForm_UpdateMenu_Show_menu" xml:space="preserve">
|
||||
<value>Show menu</value>
|
||||
|
|
@ -418,15 +424,9 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
|
|||
<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="clipboard_paste_document_text" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\clipboard-paste-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskHelpers_ToggleHotkeys_Hotkeys_disabled_" xml:space="preserve">
|
||||
<value>Hotkeys disabled.</value>
|
||||
</data>
|
||||
<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="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
|
||||
<value>Upload files</value>
|
||||
</data>
|
||||
|
|
@ -476,9 +476,6 @@ here</value>
|
|||
<data name="layers" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="edit_drop_cap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\edit-drop-cap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="traffic_cone" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -504,8 +501,8 @@ here</value>
|
|||
<value>Can't access to "{0}" file.
|
||||
Please run ShareX as administrator to change personal folder path.</value>
|
||||
</data>
|
||||
<data name="application_text_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_sharing_service___0_" xml:space="preserve">
|
||||
<value>URL sharing service: {0}</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_StartRecording_CLI_video_encoder_file_does_not_exist__" xml:space="preserve">
|
||||
<value>CLI video encoder file does not exist: </value>
|
||||
|
|
@ -516,8 +513,8 @@ Please run ShareX as administrator to change personal folder path.</value>
|
|||
<data name="TaskManager_CreateListViewItem_History" xml:space="preserve">
|
||||
<value>History</value>
|
||||
</data>
|
||||
<data name="Program_Run_Error" xml:space="preserve">
|
||||
<value>Error</value>
|
||||
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_" xml:space="preserve">
|
||||
<value>Click to stop recording.</value>
|
||||
|
|
@ -526,8 +523,8 @@ Please run ShareX as administrator to change personal folder path.</value>
|
|||
<data name="MainForm_UpdateWorkflowsMenu_You_can_add_workflows_from_hotkey_settings___" xml:space="preserve">
|
||||
<value>You can add workflows from hotkey settings...</value>
|
||||
</data>
|
||||
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="globe__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskHelpers_OpenFTPClient_FTP_client_only_supports_FTP_or_FTPS_" xml:space="preserve">
|
||||
<value>FTP client only supports FTP or FTPS.</value>
|
||||
|
|
@ -535,8 +532,8 @@ Please run ShareX as administrator to change personal folder path.</value>
|
|||
<data name="arrow_090" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="es" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Rectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ImageData_Write_Error" xml:space="preserve">
|
||||
<value>Could not write image to path {0}.</value>
|
||||
|
|
@ -545,8 +542,28 @@ Please run ShareX as administrator to change personal folder path.</value>
|
|||
<value>ShareX needs to be restarted for the language changes to apply.
|
||||
Would you like to restart ShareX?</value>
|
||||
</data>
|
||||
<data name="layer_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="MainForm_UpdateMainFormTip_Tips" xml:space="preserve">
|
||||
<value>Main window tips:
|
||||
- Drag files, image or text to main window to upload them.
|
||||
- Drag items from task list to copy files to anywhere. Hold "Ctrl" before dragging to copy URL or file path instead of file.
|
||||
|
||||
Main window task list hotkeys:
|
||||
[Enter] Open URL or file
|
||||
[Ctrl + Enter] Open file
|
||||
[Ctrl + C] Copy URL or file path
|
||||
[Shift + C] Copy file
|
||||
[Ctrl + Shift + C] Copy file path
|
||||
[Ctrl + X] Copy URL or file path then remove selected items from list
|
||||
[Ctrl + V] Open clipboard content viewer so you can upload your clipboard content
|
||||
[Delete] Remove selected items from list
|
||||
[Shift + Delete] Delete files locally then remove them from list
|
||||
[Esc] Close main window
|
||||
|
||||
Tray icon tasks:
|
||||
[Left click] {0}
|
||||
[Double left click] {1}
|
||||
[Middle click] {2}
|
||||
- You can change these tray icon tasks from "Application settings" window.</value>
|
||||
</data>
|
||||
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -557,6 +574,9 @@ Would you like to restart ShareX?</value>
|
|||
<data name="image_saturation" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Program_Run_Error" xml:space="preserve">
|
||||
<value>Error</value>
|
||||
</data>
|
||||
<data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -584,8 +604,8 @@ Would you like to restart ShareX?</value>
|
|||
<data name="nl" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\nl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_ConfigureEncoder_Configure_CLI_video_encoders_____" xml:space="preserve">
|
||||
<value>Configure CLI video encoders ---></value>
|
||||
<data name="ScreenColorPicker_btnCopyAll_Click_Cursor_position" xml:space="preserve">
|
||||
<value>Cursor position (X, Y) = {0}, {1}</value>
|
||||
</data>
|
||||
<data name="folder_open_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -593,6 +613,9 @@ Would you like to restart ShareX?</value>
|
|||
<data name="drive_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder_tree" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -605,8 +628,11 @@ Would you like to restart ShareX?</value>
|
|||
<data name="ruler_triangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="AutoCaptureForm_Execute_Start" xml:space="preserve">
|
||||
<value>Start</value>
|
||||
<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>
|
||||
</data>
|
||||
<data name="ChromeForm_btnRegister_Click_Chrome_support_enabled_" xml:space="preserve">
|
||||
<value>Chrome support enabled.</value>
|
||||
</data>
|
||||
<data name="camcorder_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\camcorder-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -617,9 +643,15 @@ Would you like to restart ShareX?</value>
|
|||
<data name="UploadManager_UploadFolder_Folder_upload" xml:space="preserve">
|
||||
<value>Folder upload</value>
|
||||
</data>
|
||||
<data name="AboutForm_AboutForm_External_libraries" xml:space="preserve">
|
||||
<value>External libraries</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_After_capture___0_" xml:space="preserve">
|
||||
<value>After capture: {0}</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_ConfigureEncoder_Configure_CLI_video_encoders_____" xml:space="preserve">
|
||||
<value>Configure CLI video encoders ---></value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
|
||||
<value>URL shortener: {0}</value>
|
||||
</data>
|
||||
|
|
@ -629,6 +661,9 @@ Would you like to restart ShareX?</value>
|
|||
<data name="UploadInfoManager_ShowErrors_Upload_errors" xml:space="preserve">
|
||||
<value>Upload errors</value>
|
||||
</data>
|
||||
<data name="globe_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -681,6 +716,9 @@ Would you like to restart ShareX?</value>
|
|||
<value>Download failed:
|
||||
{0}</value>
|
||||
</data>
|
||||
<data name="Patreon_Button_02" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Patreon_Button_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_Text_uploader___0_" xml:space="preserve">
|
||||
<value>Text uploader: {0}</value>
|
||||
</data>
|
||||
|
|
@ -696,17 +734,17 @@ Would you like to restart ShareX?</value>
|
|||
<data name="UploadTask_Prepare_Preparing" xml:space="preserve">
|
||||
<value>Preparing</value>
|
||||
</data>
|
||||
<data name="application_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="es" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="vn" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="QuickTaskMenuEditorForm_Reset_all_quick_tasks_to_defaults_Confirmation" xml:space="preserve">
|
||||
<value>Reset all quick tasks to defaults?</value>
|
||||
</data>
|
||||
<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="toolbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="AutoCaptureForm_UpdateStatus_Timeleft___0_s___1____Total___2_" xml:space="preserve">
|
||||
<value>Timeleft: {0}s ({1}%) Total: {2}</value>
|
||||
</data>
|
||||
<data name="QuickTaskMenu_ShowMenu_Edit_this_menu___" xml:space="preserve">
|
||||
<value>Edit this menu...</value>
|
||||
|
|
@ -714,8 +752,8 @@ Would you like to restart ShareX?</value>
|
|||
<data name="UploadTask_OnUploadCompleted_Stopped" xml:space="preserve">
|
||||
<value>Stopped</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_sharing_service___0_" xml:space="preserve">
|
||||
<value>URL sharing service: {0}</value>
|
||||
<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>
|
||||
</data>
|
||||
<data name="cross_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -729,14 +767,14 @@ Would you like to restart ShareX?</value>
|
|||
<data name="AboutForm_AboutForm_Issues" xml:space="preserve">
|
||||
<value>Issues</value>
|
||||
</data>
|
||||
<data name="ChromeForm_btnRegister_Click_Chrome_support_enabled_" xml:space="preserve">
|
||||
<value>Chrome support enabled.</value>
|
||||
<data name="clipboard_paste_document_text" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\clipboard-paste-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="globe_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="AutoCaptureForm_Execute_Start" xml:space="preserve">
|
||||
<value>Start</value>
|
||||
</data>
|
||||
<data name="layer_transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="layer_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape.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>
|
||||
|
|
@ -759,12 +797,18 @@ Would you like to restart ShareX?</value>
|
|||
<data name="MainForm_UpdateMainWindowLayout_Hide_columns" xml:space="preserve">
|
||||
<value>Hide columns</value>
|
||||
</data>
|
||||
<data name="ScreenRecordForm_DownloaderForm_InstallRequested_FFmpeg_successfully_downloaded_" xml:space="preserve">
|
||||
<value>FFmpeg successfully downloaded.</value>
|
||||
</data>
|
||||
<data name="notebook" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\notebook.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Twitter.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="drive_download" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\drive-download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings_for__0_" xml:space="preserve">
|
||||
<value>Task settings for {0}</value>
|
||||
</data>
|
||||
|
|
@ -789,17 +833,14 @@ Would you like to restart ShareX?</value>
|
|||
<data name="QuickTaskMenu_ShowMenu_Continue" xml:space="preserve">
|
||||
<value>Continue</value>
|
||||
</data>
|
||||
<data name="keyboard__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\keyboard--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="UploadTask_OnUploadCompleted_Done" xml:space="preserve">
|
||||
<value>Done</value>
|
||||
</data>
|
||||
<data name="application_icon_large" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\application-icon-large.png;System.Drawing.Bitmap, System.Drawing, Version=2.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>
|
||||
<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="AboutForm_AboutForm_Website" xml:space="preserve">
|
||||
<value>Website</value>
|
||||
|
|
@ -832,42 +873,7 @@ Would you like to restart ShareX?</value>
|
|||
<data name="ScreenColorPicker_UpdateControls_Start_screen_color_picker" xml:space="preserve">
|
||||
<value>Start screen color picker</value>
|
||||
</data>
|
||||
<data name="Patreon_Button_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Patreon_Button_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Patreon_Button_02" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Patreon_Button_02.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>
|
||||
<data name="QuickTaskMenuEditorForm_Reset_all_quick_tasks_to_defaults_Confirmation" xml:space="preserve">
|
||||
<value>Reset all quick tasks to defaults?</value>
|
||||
</data>
|
||||
<data name="MainForm_UpdateMainFormTip_Tips" xml:space="preserve">
|
||||
<value>Main window tips:
|
||||
- Drag files, image or text to main window to upload them.
|
||||
- Drag items from task list to copy files to anywhere. Hold "Ctrl" before dragging to copy URL or file path instead of file.
|
||||
|
||||
Main window task list hotkeys:
|
||||
[Enter] Open URL or file
|
||||
[Ctrl + Enter] Open file
|
||||
[Ctrl + C] Copy URL or file path
|
||||
[Shift + C] Copy file
|
||||
[Ctrl + Shift + C] Copy file path
|
||||
[Ctrl + X] Copy URL or file path then remove selected items from list
|
||||
[Ctrl + V] Open clipboard content viewer so you can upload your clipboard content
|
||||
[Delete] Remove selected items from list
|
||||
[Shift + Delete] Delete files locally then remove them from list
|
||||
[Esc] Close main window
|
||||
|
||||
Tray icon tasks:
|
||||
[Left click] {0}
|
||||
[Double left click] {1}
|
||||
[Middle click] {2}
|
||||
- You can change these tray icon tasks from "Application settings" window.</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>
|
||||
<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>
|
||||
</root>
|
||||
BIN
ShareX/Resources/drive-download.png
Normal file
BIN
ShareX/Resources/drive-download.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 698 B |
BIN
ShareX/Resources/drive-upload.png
Normal file
BIN
ShareX/Resources/drive-upload.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 674 B |
|
|
@ -1266,6 +1266,8 @@
|
|||
<None Include="Resources\globe--arrow.png" />
|
||||
<None Include="Resources\Patreon_Button_01.png" />
|
||||
<None Include="Resources\Patreon_Button_02.png" />
|
||||
<None Include="Resources\drive-download.png" />
|
||||
<None Include="Resources\drive-upload.png" />
|
||||
<Content Include="ShareX_Icon.ico" />
|
||||
<None Include="Resources\globe--pencil.png" />
|
||||
<None Include="Resources\camcorder--pencil.png" />
|
||||
|
|
|
|||
|
|
@ -303,6 +303,11 @@ public void Upload()
|
|||
if (IsItemSelected && SelectedItem.IsFileExist) UploadManager.UploadFile(SelectedItem.Info.FilePath);
|
||||
}
|
||||
|
||||
public void Download()
|
||||
{
|
||||
if (IsItemSelected && SelectedItem.IsURLExist) UploadManager.DownloadFile(SelectedItem.Info.Result.URL);
|
||||
}
|
||||
|
||||
public void EditImage()
|
||||
{
|
||||
if (IsItemSelected && SelectedItem.IsImageFile) TaskHelpers.OpenImageEditor(SelectedItem.Info.FilePath);
|
||||
|
|
|
|||
|
|
@ -441,13 +441,23 @@ public static void ShareURL(string url, URLSharingServices urlSharingService)
|
|||
}
|
||||
}
|
||||
|
||||
public static void DownloadFile(string url, TaskSettings taskSettings = null)
|
||||
{
|
||||
DownloadFile(url, false, taskSettings);
|
||||
}
|
||||
|
||||
public static void DownloadAndUploadFile(string url, TaskSettings taskSettings = null)
|
||||
{
|
||||
DownloadFile(url, true, taskSettings);
|
||||
}
|
||||
|
||||
private static void DownloadFile(string url, bool upload, TaskSettings taskSettings = null)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
|
||||
WorkerTask task = WorkerTask.CreateDownloadUploadTask(url, taskSettings);
|
||||
WorkerTask task = WorkerTask.CreateDownloadTask(url, true, taskSettings);
|
||||
|
||||
if (task != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -223,10 +223,10 @@ public static WorkerTask CreateFileJobTask(string filePath, TaskSettings taskSet
|
|||
return task;
|
||||
}
|
||||
|
||||
public static WorkerTask CreateDownloadUploadTask(string url, TaskSettings taskSettings)
|
||||
public static WorkerTask CreateDownloadTask(string url, bool upload, TaskSettings taskSettings)
|
||||
{
|
||||
WorkerTask task = new WorkerTask(taskSettings);
|
||||
task.Info.Job = TaskJob.DownloadUpload;
|
||||
task.Info.Job = upload ? TaskJob.DownloadUpload : TaskJob.Download;
|
||||
task.Info.DataType = TaskHelpers.FindDataType(url, taskSettings);
|
||||
|
||||
string filename = URLHelpers.URLDecode(url, 10);
|
||||
|
|
@ -531,9 +531,18 @@ private bool DoThreadJob()
|
|||
ClipboardHelpers.Clear();
|
||||
}
|
||||
|
||||
if (Info.Job == TaskJob.DownloadUpload && !DownloadAndUpload())
|
||||
if (Info.Job == TaskJob.Download || Info.Job == TaskJob.DownloadUpload)
|
||||
{
|
||||
return false;
|
||||
bool downloadResult = !DownloadFromURL(Info.Job == TaskJob.DownloadUpload);
|
||||
|
||||
if (!downloadResult)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (Info.Job == TaskJob.Download)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (Info.Job == TaskJob.Job)
|
||||
|
|
@ -941,7 +950,7 @@ private UploadResult GetInvalidConfigResult(IUploaderService uploaderService)
|
|||
return ur;
|
||||
}
|
||||
|
||||
private bool DownloadAndUpload()
|
||||
private bool DownloadFromURL(bool upload)
|
||||
{
|
||||
string url = Info.Result.URL.Trim();
|
||||
Info.Result.URL = "";
|
||||
|
|
@ -962,7 +971,10 @@ private bool DownloadAndUpload()
|
|||
wc.DownloadFile(url, Info.FilePath);
|
||||
}
|
||||
|
||||
LoadFileStream();
|
||||
if (upload)
|
||||
{
|
||||
LoadFileStream();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue