CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #211 from WebFreak001/master

Browse source 
Fixed #210
This commit is contained in:
Jaex 2014-07-28 00:37:03 +03:00
commit 4142dac23e
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,6 +89,7 @@ private void InitializeComponent()
this.tsmiTestTextUpload = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestFileUpload = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestURLShortener = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestURLSharing = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestUploaders = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiDonate = new System.Windows.Forms.ToolStripButton();
this.tsmiAbout = new System.Windows.Forms.ToolStripButton();
@ -215,7 +216,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.tsmiTestURLSharing = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiDeleteSelectedFile = new System.Windows.Forms.ToolStripMenuItem();
this.tsMain.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
@ -789,6 +790,14 @@ private void InitializeComponent()
this.tsmiTestURLShortener.Text = "Test URL shortener";
this.tsmiTestURLShortener.Click += new System.EventHandler(this.tsmiTestURLShortener_Click);
//
// tsmiTestURLSharing
//
this.tsmiTestURLSharing.Image = global::ShareX.Properties.Resources.globe_share;
this.tsmiTestURLSharing.Name = "tsmiTestURLSharing";
this.tsmiTestURLSharing.Size = new System.Drawing.Size(173, 22);
this.tsmiTestURLSharing.Text = "Test URL sharing";
this.tsmiTestURLSharing.Click += new System.EventHandler(this.tsmiTestURLSharing_Click);
//
// tsmiTestUploaders
//
this.tsmiTestUploaders.Image = global::ShareX.Properties.Resources.application_browser;
@ -950,6 +959,7 @@ private void InitializeComponent()
this.tsmiOpen,
this.tsmiCopy,
this.tsmiUploadSelectedFile,
this.tsmiDeleteSelectedFile,
this.tsmiEditSelectedFile,
this.tsmiShortenSelectedURL,
this.tsmiShareSelectedURL,
@ -960,7 +970,7 @@ private void InitializeComponent()
this.tsmiHideMenu,
this.tsmiImagePreview});
this.cmsTaskInfo.Name = "cmsHistory";
this.cmsTaskInfo.Size = new System.Drawing.Size(154, 296);
this.cmsTaskInfo.Size = new System.Drawing.Size(154, 340);
//
// tsmiShowErrors
//
@ -1862,13 +1872,12 @@ private void InitializeComponent()
this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.ssToolStripMenuItem.Text = "ss";
//
// tsmiTestURLSharing
// tsmiDeleteSelectedFile
//
this.tsmiTestURLSharing.Image = global::ShareX.Properties.Resources.globe_share;
this.tsmiTestURLSharing.Name = "tsmiTestURLSharing";
this.tsmiTestURLSharing.Size = new System.Drawing.Size(173, 22);
this.tsmiTestURLSharing.Text = "Test URL sharing";
this.tsmiTestURLSharing.Click += new System.EventHandler(this.tsmiTestURLSharing_Click);
this.tsmiDeleteSelectedFile.Name = "tsmiDeleteSelectedFile";
this.tsmiDeleteSelectedFile.Size = new System.Drawing.Size(153, 22);
this.tsmiDeleteSelectedFile.Text = "Delete file";
this.tsmiDeleteSelectedFile.Click += new System.EventHandler(this.tsmiDeleteSelectedFile_Click);
//
// MainForm
//
@ -2090,5 +2099,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayRectangleAnnotate;
private System.Windows.Forms.ToolStripMenuItem tsmiEditSelectedFile;
private System.Windows.Forms.ToolStripMenuItem tsmiTestURLSharing;
private System.Windows.Forms.ToolStripMenuItem tsmiDeleteSelectedFile;
}
}

14
ShareX/Forms/MainForm.cs
View file

@ -297,7 +297,7 @@ private void UpdateControls()
cmsTaskInfo.SuspendLayout();
tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiShowQRCode.Visible = tsmiUploadSelectedFile.Visible =
tsmiEditSelectedFile.Visible = tsmiShortenSelectedURL.Visible = tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = false;
tsmiEditSelectedFile.Visible = tsmiShortenSelectedURL.Visible = tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = tsmiDeleteSelectedFile.Visible = false;
pbPreview.Reset();
uim.RefreshSelectedItems();
@ -379,6 +379,7 @@ private void UpdateControls()
}
tsmiUploadSelectedFile.Visible = uim.SelectedItem.IsFileExist;
tsmiDeleteSelectedFile.Visible = uim.SelectedItem.IsFileExist;
tsmiEditSelectedFile.Visible = uim.SelectedItem.IsImageFile;
tsmiShortenSelectedURL.Visible = uim.SelectedItem.IsURLExist;
tsmiShareSelectedURL.Visible = uim.SelectedItem.IsURLExist;
@ -1192,6 +1193,16 @@ private void tsmiUploadSelectedFile_Click(object sender, EventArgs e)
uim.Upload();
}
private void tsmiDeleteSelectedFile_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("Do you really want to delete this file?", "Are you sure?", MessageBoxButtons.YesNo);
if(result == DialogResult.Yes)
{
uim.Delete();
RemoveSelectedItems();
}
}
private void tsmiEditSelectedFile_Click(object sender, EventArgs e)
{
uim.EditImage();
@ -1979,6 +1990,7 @@ private void tsmiTrayLastRegion_Click(object sender, EventArgs e)
#endregion Tray events
#endregion Hotkey/Capture codes and form events
}
}

5
ShareX/UploadInfoManager.cs
View file

@ -277,6 +277,11 @@ public void ShowErrors()
}
}
public void Delete()
{
if (IsItemSelected && SelectedItem.IsFileExist) File.Delete(SelectedItem.Info.FilePath);
}
public void Upload()
{
if (IsItemSelected && SelectedItem.IsFileExist) UploadManager.UploadFile(SelectedItem.Info.FilePath);