From 98f5fc94a6244e9bd35d2942f2cc6530b5bd4bda Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 1 Feb 2014 00:11:25 +0200 Subject: [PATCH] Upaste privacy setting --- ShareX/UploadTask.cs | 5 ++++- UploadersLib/GUI/UploadersConfigForm.Designer.cs | 14 ++++++++++++++ UploadersLib/GUI/UploadersConfigForm.cs | 5 +++++ UploadersLib/GUI/UploadersConfigFormGUI.cs | 1 + UploadersLib/TextUploaders/Upaste.cs | 13 +++++++------ UploadersLib/UploadersConfig.cs | 2 ++ 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs index 95b53148e..8e197c175 100644 --- a/ShareX/UploadTask.cs +++ b/ShareX/UploadTask.cs @@ -673,7 +673,10 @@ public UploadResult UploadText(Stream stream, string fileName) : new Gist(Program.UploadersConfig.GistPublishPublic, Program.UploadersConfig.GistOAuth2Info); break; case TextDestination.Upaste: - textUploader = new Upaste(Program.UploadersConfig.UpasteUserKey); + textUploader = new Upaste(Program.UploadersConfig.UpasteUserKey) + { + IsPublic = Program.UploadersConfig.UpasteIsPublic + }; break; case TextDestination.CustomTextUploader: if (Program.UploadersConfig.CustomUploadersList.IsValidIndex(Program.UploadersConfig.CustomTextUploaderSelected)) diff --git a/UploadersLib/GUI/UploadersConfigForm.Designer.cs b/UploadersLib/GUI/UploadersConfigForm.Designer.cs index 3d3cbf341..dc9094584 100644 --- a/UploadersLib/GUI/UploadersConfigForm.Designer.cs +++ b/UploadersLib/GUI/UploadersConfigForm.Designer.cs @@ -336,6 +336,7 @@ private void InitializeComponent() this.txtRapidSharePremiumUserName = new System.Windows.Forms.TextBox(); this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components); this.actRapidShareAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox(); this.tcUploaders.SuspendLayout(); this.tpImageUploaders.SuspendLayout(); this.tcImageUploaders.SuspendLayout(); @@ -1363,6 +1364,7 @@ private void InitializeComponent() // // tpUpaste // + this.tpUpaste.Controls.Add(this.cbUpasteIsPublic); this.tpUpaste.Controls.Add(this.lblUpasteUserKey); this.tpUpaste.Controls.Add(this.txtUpasteUserKey); this.tpUpaste.Location = new System.Drawing.Point(4, 22); @@ -3598,6 +3600,17 @@ private void InitializeComponent() this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); this.actRapidShareAccountType.TabIndex = 16; // + // cbUpasteIsPublic + // + this.cbUpasteIsPublic.AutoSize = true; + this.cbUpasteIsPublic.Location = new System.Drawing.Point(16, 56); + this.cbUpasteIsPublic.Name = "cbUpasteIsPublic"; + this.cbUpasteIsPublic.Size = new System.Drawing.Size(106, 17); + this.cbUpasteIsPublic.TabIndex = 2; + this.cbUpasteIsPublic.Text = "Is public upload?"; + this.cbUpasteIsPublic.UseVisualStyleBackColor = true; + this.cbUpasteIsPublic.CheckedChanged += new System.EventHandler(this.cbUpasteIsPublic_CheckedChanged); + // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4018,5 +4031,6 @@ private void InitializeComponent() private System.Windows.Forms.TabPage tpUpaste; private System.Windows.Forms.Label lblUpasteUserKey; private System.Windows.Forms.TextBox txtUpasteUserKey; + private System.Windows.Forms.CheckBox cbUpasteIsPublic; } } \ No newline at end of file diff --git a/UploadersLib/GUI/UploadersConfigForm.cs b/UploadersLib/GUI/UploadersConfigForm.cs index 348552f3a..8a4a4236d 100644 --- a/UploadersLib/GUI/UploadersConfigForm.cs +++ b/UploadersLib/GUI/UploadersConfigForm.cs @@ -950,6 +950,11 @@ private void txtUpasteUserKey_TextChanged(object sender, EventArgs e) Config.UpasteUserKey = txtUpasteUserKey.Text; } + private void cbUpasteIsPublic_CheckedChanged(object sender, EventArgs e) + { + Config.UpasteIsPublic = cbUpasteIsPublic.Checked; + } + #endregion uPaste #endregion Text Uploaders diff --git a/UploadersLib/GUI/UploadersConfigFormGUI.cs b/UploadersLib/GUI/UploadersConfigFormGUI.cs index 78999d97e..1dd1533ad 100644 --- a/UploadersLib/GUI/UploadersConfigFormGUI.cs +++ b/UploadersLib/GUI/UploadersConfigFormGUI.cs @@ -234,6 +234,7 @@ public void LoadSettings(UploadersConfig uploadersConfig) // Upaste txtUpasteUserKey.Text = Config.UpasteUserKey; + cbUpasteIsPublic.Checked = Config.UpasteIsPublic; #endregion Text uploaders diff --git a/UploadersLib/TextUploaders/Upaste.cs b/UploadersLib/TextUploaders/Upaste.cs index b042a94fa..81abc4fa1 100644 --- a/UploadersLib/TextUploaders/Upaste.cs +++ b/UploadersLib/TextUploaders/Upaste.cs @@ -33,11 +33,12 @@ public sealed class Upaste : TextUploader { private const string APIURL = "http://upaste.me/api"; - public string APIKey { get; private set; } + public string UserKey { get; private set; } + public bool IsPublic { get; set; } - public Upaste(string apiKey) + public Upaste(string userKey) { - APIKey = apiKey; + UserKey = userKey; } public override UploadResult UploadText(string text, string fileName) @@ -47,14 +48,14 @@ public override UploadResult UploadText(string text, string fileName) if (!string.IsNullOrEmpty(text)) { Dictionary arguments = new Dictionary(); - if (!string.IsNullOrEmpty(APIKey)) + if (!string.IsNullOrEmpty(UserKey)) { - arguments.Add("api_key", APIKey); + arguments.Add("api_key", UserKey); } arguments.Add("paste", text); //arguments.Add("syntax", ""); //arguments.Add("name", ""); - arguments.Add("privacy", "1"); // 0 public 1 private + arguments.Add("privacy", IsPublic ? "0" : "1"); // 0 public 1 private arguments.Add("expire", "0"); arguments.Add("json", "true"); diff --git a/UploadersLib/UploadersConfig.cs b/UploadersLib/UploadersConfig.cs index baabaf529..cbdfbcc7b 100644 --- a/UploadersLib/UploadersConfig.cs +++ b/UploadersLib/UploadersConfig.cs @@ -40,6 +40,7 @@ public class UploadersConfig : SettingsBase #region Image uploaders // ImageShack + public ImageShackOptions ImageShackSettings = new ImageShackOptions(); // TinyPic @@ -103,6 +104,7 @@ public class UploadersConfig : SettingsBase // uPaste public string UpasteUserKey = string.Empty; + public bool UpasteIsPublic = false; #endregion Text uploaders