1berry/ShareX
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Export button have "Upload as text"

Browse Source
This commit is contained in:
Jaex 2014-06-06 21:51:09 +03:00
parent 316e559b47
commit d1316c1b56
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
HelpersLib/UserControls/ExportImportControl.Designer.cs generated
View File

@ -28,14 +28,16 @@
/// </summary>
private void InitializeComponent()
{
this.cmsExport = new System.Windows.Forms.ContextMenuStrip();
this.components = new System.ComponentModel.Container();
this.cmsExport = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiExportClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiExportFile = new System.Windows.Forms.ToolStripMenuItem();
this.cmsImport = new System.Windows.Forms.ContextMenuStrip();
this.cmsImport = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImportFile = new System.Windows.Forms.ToolStripMenuItem();
this.btnImport = new HelpersLib.MenuButton();
this.btnExport = new HelpersLib.MenuButton();
this.tsmiExportUpload = new System.Windows.Forms.ToolStripMenuItem();
this.cmsExport.SuspendLayout();
this.cmsImport.SuspendLayout();
this.SuspendLayout();
@ -44,23 +46,24 @@
//
this.cmsExport.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsmiExportClipboard,
this.tsmiExportFile});
this.tsmiExportFile,
this.tsmiExportUpload});
this.cmsExport.Name = "cmsExport";
this.cmsExport.ShowImageMargin = false;
this.cmsExport.Size = new System.Drawing.Size(117, 48);
this.cmsExport.Size = new System.Drawing.Size(145, 92);
//
// tsmiExportClipboard
//
this.tsmiExportClipboard.Name = "tsmiExportClipboard";
this.tsmiExportClipboard.Size = new System.Drawing.Size(116, 22);
this.tsmiExportClipboard.Text = "To clipboard";
this.tsmiExportClipboard.Size = new System.Drawing.Size(144, 22);
this.tsmiExportClipboard.Text = "Copy to clipboard";
this.tsmiExportClipboard.Click += new System.EventHandler(this.tsmiExportClipboard_Click);
//
// tsmiExportFile
//
this.tsmiExportFile.Name = "tsmiExportFile";
this.tsmiExportFile.Size = new System.Drawing.Size(116, 22);
this.tsmiExportFile.Text = "To file...";
this.tsmiExportFile.Size = new System.Drawing.Size(144, 22);
this.tsmiExportFile.Text = "Save to file...";
this.tsmiExportFile.Click += new System.EventHandler(this.tsmiExportFile_Click);
//
// cmsImport
@ -94,7 +97,7 @@
this.btnImport.Name = "btnImport";
this.btnImport.Size = new System.Drawing.Size(64, 24);
this.btnImport.TabIndex = 3;
this.btnImport.Text = "Import";
this.btnImport.Text = " Import";
this.btnImport.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnImport.UseVisualStyleBackColor = true;
//
@ -106,10 +109,17 @@
this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(64, 24);
this.btnExport.TabIndex = 2;
this.btnExport.Text = "Export";
this.btnExport.Text = " Export";
this.btnExport.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnExport.UseVisualStyleBackColor = true;
//
// tsmiExportUpload
//
this.tsmiExportUpload.Name = "tsmiExportUpload";
this.tsmiExportUpload.Size = new System.Drawing.Size(144, 22);
this.tsmiExportUpload.Text = "Upload as text";
this.tsmiExportUpload.Click += new System.EventHandler(this.tsmiExportUpload_Click);
//
// ExportImportControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -134,5 +144,6 @@
private System.Windows.Forms.ToolStripMenuItem tsmiImportFile;
private MenuButton btnExport;
private MenuButton btnImport;
private System.Windows.Forms.ToolStripMenuItem tsmiExportUpload;
}
}

18
HelpersLib/UserControls/ExportImportControl.cs
View File

@ -46,6 +46,9 @@ namespace HelpersLib.UserControls
public delegate void ImportEventHandler(object obj);
public event ImportEventHandler ImportRequested;
public delegate void UploadEventHandler(string json);
public static event UploadEventHandler UploadRequested;
// Can't use generic class because not works in form designer
public Type ObjectType { get; set; }
@ -122,6 +125,21 @@ namespace HelpersLib.UserControls
}
}
private void tsmiExportUpload_Click(object sender, EventArgs e)
{
if (ExportRequested != null && UploadRequested != null)
{
object obj = ExportRequested();
string json = Export(obj);
if (!string.IsNullOrEmpty(json))
{
UploadRequested(json);
}
}
}
public object Import(string json)
{
try

3
ShareX/Forms/MainForm.cs
View File

@ -24,6 +24,7 @@
#endregion License Information (GPL v3)
using HelpersLib;
using HelpersLib.UserControls;
using HistoryLib;
using ScreenCaptureLib;
using ShareX.Properties;
@ -119,6 +120,8 @@ namespace ShareX
TaskManager.ListViewControl = lvUploads;
uim = new UploadInfoManager(lvUploads);
ExportImportControl.UploadRequested += json => UploadManager.UploadText(json);
}
private void UpdateWorkflowsMenu()