diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs
index a06d46f63..9a49556c7 100644
--- a/ShareX/Enums.cs
+++ b/ShareX/Enums.cs
@@ -74,6 +74,7 @@ public enum TaskJob
TextUpload,
ShortenURL,
ShareURL,
+ Download,
DownloadUpload
}
diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs
index e2e39e831..f4c07a3bc 100644
--- a/ShareX/Forms/MainForm.Designer.cs
+++ b/ShareX/Forms/MainForm.Designer.cs
@@ -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;
}
}
\ No newline at end of file
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index 052bb0004..4ba36ca12 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -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_,
diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx
index 5d40b71d9..858d622a3 100644
--- a/ShareX/Forms/MainForm.resx
+++ b/ShareX/Forms/MainForm.resx
@@ -1170,6 +1170,12 @@
Upload
+
+ 172, 22
+
+
+ Download
+
172, 22
@@ -1252,7 +1258,7 @@
Image preview
- 173, 340
+ 173, 362
cmsTaskInfo
@@ -1694,7 +1700,7 @@
ShareX
- @Invariant
+
405, 17
@@ -2439,6 +2445,12 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tsmiDownloadSelectedURL
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
tsmiEditSelectedFile
@@ -2971,6 +2983,6 @@
MainForm
- ShareX.HotkeyForm, ShareX, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HotkeyForm, ShareX, Version=11.1.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs
index 8895d5410..a45337a8c 100644
--- a/ShareX/Properties/Resources.Designer.cs
+++ b/ShareX/Properties/Resources.Designer.cs
@@ -752,6 +752,16 @@ public static System.Drawing.Bitmap drive {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap drive_download {
+ get {
+ object obj = ResourceManager.GetObject("drive_download", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -762,6 +772,16 @@ public static System.Drawing.Bitmap drive_globe {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap drive_upload {
+ get {
+ object obj = ResourceManager.GetObject("drive_upload", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized string similar to Drop
///here.
diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx
index 640c41410..edce4315f 100644
--- a/ShareX/Properties/Resources.resx
+++ b/ShareX/Properties/Resources.resx
@@ -135,20 +135,26 @@ Are you sure you want to continue?
Are you sure you want to upload {0} files?
-
- ..\Resources\application--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Custom
Stopping
+
+ ..\Resources\Patreon_Button_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Shorten URL ({0})
+
+ ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
There is no valid CLI video encoder selected.
-
- ..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-scale.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
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.
Uploading
-
- Custom
+
+ ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -175,11 +181,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.
..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- FFmpeg successfully downloaded.
-
-
- ..\Resources\CaptureSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\document-globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -187,14 +190,14 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.
..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- External libraries
+
+ ..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
Unable to find a valid FTP account.
-
- ..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\CaptureSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -202,8 +205,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.
..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Timeleft: {0}s ({1}%) Total: {2}
+
+ ..\Resources\keyboard--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\application-blog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -284,17 +287,20 @@ Please select a different hotkey or quit the conflicting application and reopen
X: {0}, Y: {1}, Width: {2}, Height: {3}
-
- Don't show this message again.
+
+ ..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Task: {0}
+
+ Reset all hotkeys to defaults?
+
FFmpeg video and audio source can't both be "None".
-
- ..\Resources\edit-scale.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\keyboard--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -314,6 +320,9 @@ Please select a different hotkey or quit the conflicting application and reopen
..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Don't show this message again.
+
Task settings
@@ -328,8 +337,8 @@ Please select a different hotkey or quit the conflicting application and reopen
Would you like to automatically download it?
-
- ..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -364,23 +373,20 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
Hide menu
-
- ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Unable to find a valid Twitter account.
..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Cursor position (X, Y) = {0}, {1}
+
+ ..\Resources\application--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\document-break.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-drop-cap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Show menu
@@ -418,15 +424,9 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
..\Resources\keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\clipboard-paste-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Hotkeys disabled.
-
- ..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
Upload files
@@ -476,9 +476,6 @@ here
..\Resources\layers.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\edit-drop-cap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -504,8 +501,8 @@ here
Can't access to "{0}" file.
Please run ShareX as administrator to change personal folder path.
-
- ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ URL sharing service: {0}
CLI video encoder file does not exist:
@@ -516,8 +513,8 @@ Please run ShareX as administrator to change personal folder path.
History
-
- Error
+
+ ..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Click to stop recording.
@@ -526,8 +523,8 @@ Please run ShareX as administrator to change personal folder path.
You can add workflows from hotkey settings...
-
- ..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
FTP client only supports FTP or FTPS.
@@ -535,8 +532,8 @@ Please run ShareX as administrator to change personal folder path.
..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Could not write image to path {0}.
@@ -545,8 +542,28 @@ Please run ShareX as administrator to change personal folder path.
ShareX needs to be restarted for the language changes to apply.
Would you like to restart ShareX?
-
- ..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ 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.
..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -557,6 +574,9 @@ Would you like to restart ShareX?
..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Error
+
..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -584,8 +604,8 @@ Would you like to restart ShareX?
..\Resources\nl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Configure CLI video encoders --->
+
+ Cursor position (X, Y) = {0}, {1}
..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -593,6 +613,9 @@ Would you like to restart ShareX?
..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -605,8 +628,11 @@ Would you like to restart ShareX?
..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Start
+
+ {0} is about to be uploaded to {1}. You may choose a different destination.
+
+
+ Chrome support enabled.
..\Resources\camcorder-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -617,9 +643,15 @@ Would you like to restart ShareX?
Folder upload
+
+ External libraries
+
After capture: {0}
+
+ Configure CLI video encoders --->
+
URL shortener: {0}
@@ -629,6 +661,9 @@ Would you like to restart ShareX?
Upload errors
+
+ ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -681,6 +716,9 @@ Would you like to restart ShareX?
Download failed:
{0}
+
+ ..\Resources\Patreon_Button_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Text uploader: {0}
@@ -696,17 +734,17 @@ Would you like to restart ShareX?
Preparing
-
- ..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Reset all quick tasks to defaults?
..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Timeleft: {0}s ({1}%) Total: {2}
Edit this menu...
@@ -714,8 +752,8 @@ Would you like to restart ShareX?
Stopped
-
- URL sharing service: {0}
+
+ {0} configuration is invalid or missing. Please check "Destination settings" window to configure it.
..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -729,14 +767,14 @@ Would you like to restart ShareX?
Issues
-
- Chrome support enabled.
+
+ ..\Resources\clipboard-paste-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Start
-
- ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -759,12 +797,18 @@ Would you like to restart ShareX?
Hide columns
+
+ FFmpeg successfully downloaded.
+
..\Resources\notebook.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\Twitter.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\drive-download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Task settings for {0}
@@ -789,17 +833,14 @@ Would you like to restart ShareX?
Continue
-
- ..\Resources\keyboard--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Done
..\Resources\application-icon-large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- {0} is about to be uploaded to {1}. You may choose a different destination.
+
+ ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Website
@@ -832,42 +873,7 @@ Would you like to restart ShareX?
Start screen color picker
-
- ..\Resources\Patreon_Button_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Patreon_Button_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Reset all hotkeys to defaults?
-
-
- Reset all quick tasks to defaults?
-
-
- 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.
-
-
- {0} configuration is invalid or missing. Please check "Destination settings" window to configure it.
+
+ ..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/ShareX/Resources/drive-download.png b/ShareX/Resources/drive-download.png
new file mode 100644
index 000000000..e7c019714
Binary files /dev/null and b/ShareX/Resources/drive-download.png differ
diff --git a/ShareX/Resources/drive-upload.png b/ShareX/Resources/drive-upload.png
new file mode 100644
index 000000000..369e814d1
Binary files /dev/null and b/ShareX/Resources/drive-upload.png differ
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index e61e550e0..ec5f86e4c 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -1266,6 +1266,8 @@
+
+
diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs
index ef45bc2a9..5e6803295 100644
--- a/ShareX/UploadInfoManager.cs
+++ b/ShareX/UploadInfoManager.cs
@@ -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);
diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs
index 01c851478..5fea3cf35 100644
--- a/ShareX/UploadManager.cs
+++ b/ShareX/UploadManager.cs
@@ -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)
{
diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs
index f63fc58b7..eb44e60b4 100644
--- a/ShareX/WorkerTask.cs
+++ b/ShareX/WorkerTask.cs
@@ -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;
}