mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-29 17:02:05 +13:00
Added Upload URL
This commit is contained in:
parent
eb6698bdc5
commit
9e3438777f
11 changed files with 142 additions and 86 deletions
|
@ -95,9 +95,9 @@ private void InitializeComponent()
|
|||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.txtInputText = new System.Windows.Forms.TextBox();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
//
|
||||
this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnOK.Location = new System.Drawing.Point(208, 32);
|
||||
this.btnOK.Name = "btnOK";
|
||||
|
@ -106,9 +106,9 @@ private void InitializeComponent()
|
|||
this.btnOK.Text = "OK";
|
||||
this.btnOK.UseVisualStyleBackColor = true;
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
//
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
//
|
||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnCancel.Location = new System.Drawing.Point(288, 32);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
|
@ -117,18 +117,18 @@ private void InitializeComponent()
|
|||
this.btnCancel.Text = "Cancel";
|
||||
this.btnCancel.UseVisualStyleBackColor = true;
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
//
|
||||
//
|
||||
// txtInputText
|
||||
//
|
||||
this.txtInputText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
//
|
||||
this.txtInputText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtInputText.Location = new System.Drawing.Point(8, 8);
|
||||
this.txtInputText.Name = "txtInputText";
|
||||
this.txtInputText.Size = new System.Drawing.Size(352, 20);
|
||||
this.txtInputText.TabIndex = 0;
|
||||
//
|
||||
//
|
||||
// InputBox
|
||||
//
|
||||
//
|
||||
this.AcceptButton = this.btnOK;
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
|
@ -137,7 +137,9 @@ private void InitializeComponent()
|
|||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.btnOK);
|
||||
this.MaximizeBox = false;
|
||||
this.MaximumSize = new System.Drawing.Size(1000, 102);
|
||||
this.MinimizeBox = false;
|
||||
this.MinimumSize = new System.Drawing.Size(384, 102);
|
||||
this.Name = "InputBox";
|
||||
this.ShowInTaskbar = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
|
@ -146,6 +148,7 @@ private void InitializeComponent()
|
|||
this.Shown += new System.EventHandler(this.InputBox_Shown);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
private System.Windows.Forms.Button btnOK;
|
||||
|
|
|
@ -128,16 +128,18 @@ public enum HotkeyType
|
|||
{
|
||||
[Description("None")]
|
||||
None,
|
||||
[Description("Stop all active uploads")]
|
||||
StopUploads,
|
||||
[Description("Clipboard upload")]
|
||||
ClipboardUpload,
|
||||
[Description("Clipboard upload with content viewer")]
|
||||
ClipboardUploadWithContentViewer,
|
||||
[Description("File upload")]
|
||||
[Description("Upload file")]
|
||||
FileUpload,
|
||||
[Description("Upload from clipboard")]
|
||||
ClipboardUpload,
|
||||
[Description("Upload from clipboard with content viewer")]
|
||||
ClipboardUploadWithContentViewer,
|
||||
[Description("Upload from URL")]
|
||||
UploadURL,
|
||||
[Description("Drag and drop upload")]
|
||||
DragDropUpload,
|
||||
[Description("Stop all active uploads")]
|
||||
StopUploads,
|
||||
[Description("Capture entire screen")]
|
||||
PrintScreen,
|
||||
[Description("Capture active window")]
|
||||
|
|
88
ShareX/Forms/MainForm.Designer.cs
generated
88
ShareX/Forms/MainForm.Designer.cs
generated
|
@ -172,8 +172,8 @@ private void InitializeComponent()
|
|||
this.tsmiTrayLastRegion = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayScreenRecorder = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayClipboardUpload = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayFileUpload = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayClipboardUpload = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayDragDropUpload = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayWorkflows = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayTools = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
@ -211,6 +211,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayUploadURL = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsMain.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
|
@ -434,6 +435,7 @@ private void InitializeComponent()
|
|||
this.tsmiUploadURL.Name = "tsmiUploadURL";
|
||||
this.tsmiUploadURL.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiUploadURL.Text = "Upload from URL...";
|
||||
this.tsmiUploadURL.Click += new System.EventHandler(this.tsmiUploadURL_Click);
|
||||
//
|
||||
// tsmiUploadDragDrop
|
||||
//
|
||||
|
@ -792,7 +794,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// tsmiDonate
|
||||
//
|
||||
this.tsmiDonate.Image = global::ShareX.Properties.Resources.present;
|
||||
this.tsmiDonate.Image = global::ShareX.Properties.Resources.heart;
|
||||
this.tsmiDonate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.tsmiDonate.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.tsmiDonate.Name = "tsmiDonate";
|
||||
|
@ -802,7 +804,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// tsmiAbout
|
||||
//
|
||||
this.tsmiAbout.Image = global::ShareX.Properties.Resources.application_browser;
|
||||
this.tsmiAbout.Image = global::ShareX.Properties.Resources.crown;
|
||||
this.tsmiAbout.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.tsmiAbout.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.tsmiAbout.Name = "tsmiAbout";
|
||||
|
@ -1333,8 +1335,9 @@ private void InitializeComponent()
|
|||
//
|
||||
this.cmsTray.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.tsmiTrayCapture,
|
||||
this.tsmiTrayClipboardUpload,
|
||||
this.tsmiTrayFileUpload,
|
||||
this.tsmiTrayClipboardUpload,
|
||||
this.tsmiTrayUploadURL,
|
||||
this.tsmiTrayDragDropUpload,
|
||||
this.tsmiTrayWorkflows,
|
||||
this.tsmiTrayTools,
|
||||
|
@ -1356,7 +1359,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayShow,
|
||||
this.tsmiTrayExit});
|
||||
this.cmsTray.Name = "cmsTray";
|
||||
this.cmsTray.Size = new System.Drawing.Size(200, 462);
|
||||
this.cmsTray.Size = new System.Drawing.Size(204, 484);
|
||||
//
|
||||
// tsmiTrayCapture
|
||||
//
|
||||
|
@ -1378,7 +1381,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayAutoCapture});
|
||||
this.tsmiTrayCapture.Image = global::ShareX.Properties.Resources.camera;
|
||||
this.tsmiTrayCapture.Name = "tsmiTrayCapture";
|
||||
this.tsmiTrayCapture.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayCapture.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayCapture.Text = "Capture";
|
||||
this.tsmiTrayCapture.DropDownOpening += new System.EventHandler(this.tsmiCapture_DropDownOpening);
|
||||
//
|
||||
|
@ -1500,27 +1503,27 @@ private void InitializeComponent()
|
|||
this.tsmiTrayAutoCapture.Text = "Auto capture...";
|
||||
this.tsmiTrayAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click);
|
||||
//
|
||||
// tsmiTrayClipboardUpload
|
||||
//
|
||||
this.tsmiTrayClipboardUpload.Image = global::ShareX.Properties.Resources.clipboard;
|
||||
this.tsmiTrayClipboardUpload.Name = "tsmiTrayClipboardUpload";
|
||||
this.tsmiTrayClipboardUpload.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayClipboardUpload.Text = "Clipboard upload...";
|
||||
this.tsmiTrayClipboardUpload.Click += new System.EventHandler(this.tsbClipboardUpload_Click);
|
||||
//
|
||||
// tsmiTrayFileUpload
|
||||
//
|
||||
this.tsmiTrayFileUpload.Image = global::ShareX.Properties.Resources.folder;
|
||||
this.tsmiTrayFileUpload.Name = "tsmiTrayFileUpload";
|
||||
this.tsmiTrayFileUpload.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayFileUpload.Text = "File upload...";
|
||||
this.tsmiTrayFileUpload.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayFileUpload.Text = "Upload file...";
|
||||
this.tsmiTrayFileUpload.Click += new System.EventHandler(this.tsbFileUpload_Click);
|
||||
//
|
||||
// tsmiTrayClipboardUpload
|
||||
//
|
||||
this.tsmiTrayClipboardUpload.Image = global::ShareX.Properties.Resources.clipboard;
|
||||
this.tsmiTrayClipboardUpload.Name = "tsmiTrayClipboardUpload";
|
||||
this.tsmiTrayClipboardUpload.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayClipboardUpload.Text = "Upload from clipboard...";
|
||||
this.tsmiTrayClipboardUpload.Click += new System.EventHandler(this.tsbClipboardUpload_Click);
|
||||
//
|
||||
// tsmiTrayDragDropUpload
|
||||
//
|
||||
this.tsmiTrayDragDropUpload.Image = global::ShareX.Properties.Resources.inbox;
|
||||
this.tsmiTrayDragDropUpload.Name = "tsmiTrayDragDropUpload";
|
||||
this.tsmiTrayDragDropUpload.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayDragDropUpload.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayDragDropUpload.Text = "Drag and drop upload...";
|
||||
this.tsmiTrayDragDropUpload.Click += new System.EventHandler(this.tsbDragDropUpload_Click);
|
||||
//
|
||||
|
@ -1528,7 +1531,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayWorkflows.Image = global::ShareX.Properties.Resources.categories;
|
||||
this.tsmiTrayWorkflows.Name = "tsmiTrayWorkflows";
|
||||
this.tsmiTrayWorkflows.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayWorkflows.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayWorkflows.Text = "Workflows";
|
||||
//
|
||||
// tsmiTrayTools
|
||||
|
@ -1547,7 +1550,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayTweetMessage});
|
||||
this.tsmiTrayTools.Image = global::ShareX.Properties.Resources.toolbox;
|
||||
this.tsmiTrayTools.Name = "tsmiTrayTools";
|
||||
this.tsmiTrayTools.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayTools.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayTools.Text = "Tools";
|
||||
//
|
||||
// tsmiTrayScreenColorPicker
|
||||
|
@ -1641,20 +1644,20 @@ private void InitializeComponent()
|
|||
// tssTray1
|
||||
//
|
||||
this.tssTray1.Name = "tssTray1";
|
||||
this.tssTray1.Size = new System.Drawing.Size(196, 6);
|
||||
this.tssTray1.Size = new System.Drawing.Size(200, 6);
|
||||
//
|
||||
// tsmiTrayAfterCaptureTasks
|
||||
//
|
||||
this.tsmiTrayAfterCaptureTasks.Image = global::ShareX.Properties.Resources.image_export;
|
||||
this.tsmiTrayAfterCaptureTasks.Name = "tsmiTrayAfterCaptureTasks";
|
||||
this.tsmiTrayAfterCaptureTasks.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayAfterCaptureTasks.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayAfterCaptureTasks.Text = "After capture";
|
||||
//
|
||||
// tsmiTrayAfterUploadTasks
|
||||
//
|
||||
this.tsmiTrayAfterUploadTasks.Image = global::ShareX.Properties.Resources.upload_cloud;
|
||||
this.tsmiTrayAfterUploadTasks.Name = "tsmiTrayAfterUploadTasks";
|
||||
this.tsmiTrayAfterUploadTasks.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayAfterUploadTasks.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayAfterUploadTasks.Text = "After upload";
|
||||
//
|
||||
// tsmiTrayDestinations
|
||||
|
@ -1667,7 +1670,7 @@ private void InitializeComponent()
|
|||
this.tsmiTraySocialServices});
|
||||
this.tsmiTrayDestinations.Image = global::ShareX.Properties.Resources.drive_globe;
|
||||
this.tsmiTrayDestinations.Name = "tsmiTrayDestinations";
|
||||
this.tsmiTrayDestinations.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayDestinations.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayDestinations.Text = "Destinations";
|
||||
this.tsmiTrayDestinations.DropDownOpened += new System.EventHandler(this.tsddbDestinations_DropDownOpened);
|
||||
//
|
||||
|
@ -1710,7 +1713,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayApplicationSettings.Image = global::ShareX.Properties.Resources.wrench_screwdriver;
|
||||
this.tsmiTrayApplicationSettings.Name = "tsmiTrayApplicationSettings";
|
||||
this.tsmiTrayApplicationSettings.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayApplicationSettings.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayApplicationSettings.Text = "Application settings...";
|
||||
this.tsmiTrayApplicationSettings.Click += new System.EventHandler(this.tsbApplicationSettings_Click);
|
||||
//
|
||||
|
@ -1718,7 +1721,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayTaskSettings.Image = global::ShareX.Properties.Resources.gear;
|
||||
this.tsmiTrayTaskSettings.Name = "tsmiTrayTaskSettings";
|
||||
this.tsmiTrayTaskSettings.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayTaskSettings.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayTaskSettings.Text = "Task settings...";
|
||||
this.tsmiTrayTaskSettings.Click += new System.EventHandler(this.tsbTaskSettings_Click);
|
||||
//
|
||||
|
@ -1726,7 +1729,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayHotkeySettings.Image = global::ShareX.Properties.Resources.keyboard;
|
||||
this.tsmiTrayHotkeySettings.Name = "tsmiTrayHotkeySettings";
|
||||
this.tsmiTrayHotkeySettings.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayHotkeySettings.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayHotkeySettings.Text = "Hotkey settings...";
|
||||
this.tsmiTrayHotkeySettings.Click += new System.EventHandler(this.tsbHotkeySettings_Click);
|
||||
//
|
||||
|
@ -1734,20 +1737,20 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayDestinationSettings.Image = global::ShareX.Properties.Resources.globe_pencil;
|
||||
this.tsmiTrayDestinationSettings.Name = "tsmiTrayDestinationSettings";
|
||||
this.tsmiTrayDestinationSettings.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayDestinationSettings.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayDestinationSettings.Text = "Destination settings...";
|
||||
this.tsmiTrayDestinationSettings.Click += new System.EventHandler(this.tsbDestinationSettings_Click);
|
||||
//
|
||||
// tssTray2
|
||||
//
|
||||
this.tssTray2.Name = "tssTray2";
|
||||
this.tssTray2.Size = new System.Drawing.Size(196, 6);
|
||||
this.tssTray2.Size = new System.Drawing.Size(200, 6);
|
||||
//
|
||||
// tsmiScreenshotsFolder
|
||||
//
|
||||
this.tsmiScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
|
||||
this.tsmiScreenshotsFolder.Name = "tsmiScreenshotsFolder";
|
||||
this.tsmiScreenshotsFolder.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiScreenshotsFolder.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiScreenshotsFolder.Text = "Screenshots folder...";
|
||||
this.tsmiScreenshotsFolder.Click += new System.EventHandler(this.tsbScreenshotsFolder_Click);
|
||||
//
|
||||
|
@ -1755,7 +1758,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayHistory.Image = global::ShareX.Properties.Resources.application_blog;
|
||||
this.tsmiTrayHistory.Name = "tsmiTrayHistory";
|
||||
this.tsmiTrayHistory.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayHistory.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayHistory.Text = "History...";
|
||||
this.tsmiTrayHistory.Click += new System.EventHandler(this.tsbHistory_Click);
|
||||
//
|
||||
|
@ -1763,36 +1766,36 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayImageHistory.Image = global::ShareX.Properties.Resources.application_icon_large;
|
||||
this.tsmiTrayImageHistory.Name = "tsmiTrayImageHistory";
|
||||
this.tsmiTrayImageHistory.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayImageHistory.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayImageHistory.Text = "Image history...";
|
||||
this.tsmiTrayImageHistory.Click += new System.EventHandler(this.tsbImageHistory_Click);
|
||||
//
|
||||
// tsmiTrayDonate
|
||||
//
|
||||
this.tsmiTrayDonate.Image = global::ShareX.Properties.Resources.present;
|
||||
this.tsmiTrayDonate.Image = global::ShareX.Properties.Resources.heart;
|
||||
this.tsmiTrayDonate.Name = "tsmiTrayDonate";
|
||||
this.tsmiTrayDonate.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayDonate.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayDonate.Text = "Donate...";
|
||||
this.tsmiTrayDonate.Click += new System.EventHandler(this.tsbDonate_Click);
|
||||
//
|
||||
// tsmiTrayAbout
|
||||
//
|
||||
this.tsmiTrayAbout.Image = global::ShareX.Properties.Resources.application_browser;
|
||||
this.tsmiTrayAbout.Image = global::ShareX.Properties.Resources.crown;
|
||||
this.tsmiTrayAbout.Name = "tsmiTrayAbout";
|
||||
this.tsmiTrayAbout.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayAbout.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayAbout.Text = "About...";
|
||||
this.tsmiTrayAbout.Click += new System.EventHandler(this.tsbAbout_Click);
|
||||
//
|
||||
// tssTray3
|
||||
//
|
||||
this.tssTray3.Name = "tssTray3";
|
||||
this.tssTray3.Size = new System.Drawing.Size(196, 6);
|
||||
this.tssTray3.Size = new System.Drawing.Size(200, 6);
|
||||
//
|
||||
// tsmiTrayShow
|
||||
//
|
||||
this.tsmiTrayShow.Image = global::ShareX.Properties.Resources.tick_button;
|
||||
this.tsmiTrayShow.Name = "tsmiTrayShow";
|
||||
this.tsmiTrayShow.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayShow.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayShow.Text = "Show ShareX window";
|
||||
this.tsmiTrayShow.Click += new System.EventHandler(this.tsmiTrayShow_Click);
|
||||
//
|
||||
|
@ -1800,7 +1803,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTrayExit.Image = global::ShareX.Properties.Resources.cross_button;
|
||||
this.tsmiTrayExit.Name = "tsmiTrayExit";
|
||||
this.tsmiTrayExit.Size = new System.Drawing.Size(199, 22);
|
||||
this.tsmiTrayExit.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayExit.Text = "Exit";
|
||||
this.tsmiTrayExit.Click += new System.EventHandler(this.tsmiTrayExit_Click);
|
||||
//
|
||||
|
@ -1810,6 +1813,14 @@ private void InitializeComponent()
|
|||
this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.ssToolStripMenuItem.Text = "ss";
|
||||
//
|
||||
// tsmiTrayUploadURL
|
||||
//
|
||||
this.tsmiTrayUploadURL.Image = global::ShareX.Properties.Resources.drive;
|
||||
this.tsmiTrayUploadURL.Name = "tsmiTrayUploadURL";
|
||||
this.tsmiTrayUploadURL.Size = new System.Drawing.Size(203, 22);
|
||||
this.tsmiTrayUploadURL.Text = "Upload from URL...";
|
||||
this.tsmiTrayUploadURL.Click += new System.EventHandler(this.tsmiUploadURL_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
|
@ -2025,5 +2036,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ToolStripMenuItem tsmiUploadDragDrop;
|
||||
private System.Windows.Forms.ToolStripSeparator tssDestinations1;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiDestinationSettings;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayUploadURL;
|
||||
}
|
||||
}
|
|
@ -670,14 +670,19 @@ private void MainForm_DragDrop(object sender, DragEventArgs e)
|
|||
UploadManager.DragDropUpload(e.Data);
|
||||
}
|
||||
|
||||
private void tsbFileUpload_Click(object sender, EventArgs e)
|
||||
{
|
||||
UploadManager.UploadFile();
|
||||
}
|
||||
|
||||
private void tsbClipboardUpload_Click(object sender, EventArgs e)
|
||||
{
|
||||
UploadManager.ClipboardUploadMainWindow();
|
||||
}
|
||||
|
||||
private void tsbFileUpload_Click(object sender, EventArgs e)
|
||||
private void tsmiUploadURL_Click(object sender, EventArgs e)
|
||||
{
|
||||
UploadManager.UploadFile();
|
||||
UploadManager.UploadURL();
|
||||
}
|
||||
|
||||
private void tsbDragDropUpload_Click(object sender, EventArgs e)
|
||||
|
@ -1259,8 +1264,8 @@ private void HandleTask(TaskSettings taskSettings)
|
|||
|
||||
switch (safeTaskSettings.Job)
|
||||
{
|
||||
case HotkeyType.StopUploads:
|
||||
TaskManager.StopAllTasks();
|
||||
case HotkeyType.FileUpload:
|
||||
UploadManager.UploadFile(safeTaskSettings);
|
||||
break;
|
||||
case HotkeyType.ClipboardUpload:
|
||||
UploadManager.ClipboardUpload(safeTaskSettings);
|
||||
|
@ -1268,12 +1273,15 @@ private void HandleTask(TaskSettings taskSettings)
|
|||
case HotkeyType.ClipboardUploadWithContentViewer:
|
||||
UploadManager.ClipboardUploadWithContentViewer(safeTaskSettings);
|
||||
break;
|
||||
case HotkeyType.FileUpload:
|
||||
UploadManager.UploadFile(safeTaskSettings);
|
||||
case HotkeyType.UploadURL:
|
||||
UploadManager.UploadURL(safeTaskSettings);
|
||||
break;
|
||||
case HotkeyType.DragDropUpload:
|
||||
TaskHelpers.OpenDropWindow();
|
||||
break;
|
||||
case HotkeyType.StopUploads:
|
||||
TaskManager.StopAllTasks();
|
||||
break;
|
||||
case HotkeyType.PrintScreen:
|
||||
CaptureScreenshot(CaptureType.Screen, safeTaskSettings, false);
|
||||
break;
|
||||
|
|
30
ShareX/Properties/Resources.Designer.cs
generated
30
ShareX/Properties/Resources.Designer.cs
generated
|
@ -299,6 +299,16 @@ public static System.Drawing.Bitmap cross_button {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap crown {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("crown", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
@ -449,6 +459,16 @@ public static System.Drawing.Bitmap Greenshot {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap heart {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("heart", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
@ -659,16 +679,6 @@ public static System.Drawing.Bitmap Polygon {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap present {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("present", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
|
@ -172,9 +172,6 @@
|
|||
<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>
|
||||
</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="layers_ungroup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-ungroup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -196,9 +193,15 @@
|
|||
<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>
|
||||
</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>
|
||||
</data>
|
||||
<data name="application_network" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-network.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -211,9 +214,6 @@
|
|||
<data name="GitHub" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\GitHub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="present" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\present.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<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>
|
||||
|
@ -238,9 +238,6 @@
|
|||
<data name="Triangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<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="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>
|
||||
|
@ -262,6 +259,9 @@
|
|||
<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="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="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>
|
||||
|
@ -307,6 +307,9 @@
|
|||
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.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="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>
|
||||
|
@ -322,8 +325,8 @@
|
|||
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.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>
|
||||
<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="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>
|
||||
|
@ -334,10 +337,10 @@
|
|||
<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>
|
||||
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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="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 name="crown" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
BIN
ShareX/Resources/crown.png
Normal file
BIN
ShareX/Resources/crown.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 608 B |
BIN
ShareX/Resources/heart.png
Normal file
BIN
ShareX/Resources/heart.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 775 B |
Binary file not shown.
Before Width: | Height: | Size: 771 B |
|
@ -372,7 +372,6 @@
|
|||
<None Include="Resources\image.png" />
|
||||
<None Include="Resources\application-browser.png" />
|
||||
<None Include="Resources\gear.png" />
|
||||
<None Include="Resources\present.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
|
@ -473,6 +472,8 @@
|
|||
<None Include="Resources\keyboard.png" />
|
||||
<None Include="Resources\wrench-screwdriver.png" />
|
||||
<None Include="Resources\clock.png" />
|
||||
<None Include="Resources\heart.png" />
|
||||
<None Include="Resources\crown.png" />
|
||||
<Content Include="ShareX_Icon.ico" />
|
||||
<None Include="Resources\globe--pencil.png" />
|
||||
<None Include="Resources\camcorder--pencil.png" />
|
||||
|
|
|
@ -262,6 +262,23 @@ public static void DragDropUpload(IDataObject data, TaskSettings taskSettings =
|
|||
}
|
||||
}
|
||||
|
||||
public static void UploadURL(TaskSettings taskSettings = null)
|
||||
{
|
||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
|
||||
string url = InputBox.GetInputText("ShareX - URL to download from and upload");
|
||||
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
string filename = URLHelpers.GetFileName(url, true);
|
||||
|
||||
if (!string.IsNullOrEmpty(filename))
|
||||
{
|
||||
DownloadAndUploadFile(url, filename, taskSettings);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void RunImageTask(Image img, TaskSettings taskSettings)
|
||||
{
|
||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
|
|
Loading…
Reference in a new issue