CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Few Gist changes

Browse source
This commit is contained in:
Jaex 2017-03-05 16:53:50 +03:00
parent c7eb94ff7d
commit eefb1de22a
4 changed files with 71 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs generated
View file

@ -479,6 +479,7 @@ private void InitializeComponent()
this.lblPaste_eeUserAPIKey = new System.Windows.Forms.Label();
this.txtPaste_eeUserAPIKey = new System.Windows.Forms.TextBox();
this.tpGist = new System.Windows.Forms.TabPage();
this.lblGistOAuthInfo = new System.Windows.Forms.Label();
this.lblGistCustomURL = new System.Windows.Forms.Label();
this.txtGistCustomURL = new System.Windows.Forms.TextBox();
this.cbGistUseRawURL = new System.Windows.Forms.CheckBox();
@ -593,7 +594,7 @@ private void InitializeComponent()
this.lblWidthHint = new System.Windows.Forms.Label();
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.lblGistOAuthInfo = new System.Windows.Forms.Label();
this.lblGistCustomURLExample = new System.Windows.Forms.Label();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpTwitter.SuspendLayout();
@ -3956,6 +3957,7 @@ private void InitializeComponent()
//
// tpGist
//
this.tpGist.Controls.Add(this.lblGistCustomURLExample);
this.tpGist.Controls.Add(this.lblGistOAuthInfo);
this.tpGist.Controls.Add(this.lblGistCustomURL);
this.tpGist.Controls.Add(this.txtGistCustomURL);
@ -3967,6 +3969,11 @@ private void InitializeComponent()
this.tpGist.Name = "tpGist";
this.tpGist.UseVisualStyleBackColor = true;
//
// lblGistOAuthInfo
//
resources.ApplyResources(this.lblGistOAuthInfo, "lblGistOAuthInfo");
this.lblGistOAuthInfo.Name = "lblGistOAuthInfo";
//
// lblGistCustomURL
//
resources.ApplyResources(this.lblGistCustomURL, "lblGistCustomURL");
@ -4791,10 +4798,10 @@ private void InitializeComponent()
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
//
// lblGistOAuthInfo
// lblGistCustomURLExample
//
resources.ApplyResources(this.lblGistOAuthInfo, "lblGistOAuthInfo");
this.lblGistOAuthInfo.Name = "lblGistOAuthInfo";
resources.ApplyResources(this.lblGistCustomURLExample, "lblGistCustomURLExample");
this.lblGistCustomURLExample.Name = "lblGistCustomURLExample";
//
// UploadersConfigForm
//
@ -5531,5 +5538,6 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtGistCustomURL;
private System.Windows.Forms.Label lblGistCustomURL;
private System.Windows.Forms.Label lblGistOAuthInfo;
private System.Windows.Forms.Label lblGistCustomURLExample;
}
}

57
ShareX.UploadersLib/Forms/UploadersConfigForm.resx
View file

@ -11689,20 +11689,47 @@ Using an encrypted library disables sharing.</value>
<data name="&gt;&gt;tpPaste_ee.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblGistCustomURLExample.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblGistCustomURLExample.Location" type="System.Drawing.Point, System.Drawing">
<value>224, 364</value>
</data>
<data name="lblGistCustomURLExample.Size" type="System.Drawing.Size, System.Drawing">
<value>158, 13</value>
</data>
<data name="lblGistCustomURLExample.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="lblGistCustomURLExample.Text" xml:space="preserve">
<value>Example: https://api.github.com</value>
</data>
<data name="&gt;&gt;lblGistCustomURLExample.Name" xml:space="preserve">
<value>lblGistCustomURLExample</value>
</data>
<data name="&gt;&gt;lblGistCustomURLExample.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblGistCustomURLExample.Parent" xml:space="preserve">
<value>tpGist</value>
</data>
<data name="&gt;&gt;lblGistCustomURLExample.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblGistOAuthInfo.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblGistOAuthInfo.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 59</value>
<value>16, 64</value>
</data>
<data name="lblGistOAuthInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>299, 13</value>
<value>282, 13</value>
</data>
<data name="lblGistOAuthInfo.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
</data>
<data name="lblGistOAuthInfo.Text" xml:space="preserve">
<value>OAuth is only working for Github directly (no Github Enterprise)</value>
<value>Note: User account is not supported for GitHub Enterprise.</value>
</data>
<data name="&gt;&gt;lblGistOAuthInfo.Name" xml:space="preserve">
<value>lblGistOAuthInfo</value>
@ -11714,7 +11741,7 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;lblGistOAuthInfo.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="lblGistCustomURL.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -11723,7 +11750,7 @@ Using an encrypted library disables sharing.</value>
<value>NoControl</value>
</data>
<data name="lblGistCustomURL.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 327</value>
<value>13, 344</value>
</data>
<data name="lblGistCustomURL.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 13</value>
@ -11744,10 +11771,10 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;lblGistCustomURL.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="txtGistCustomURL.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 343</value>
<value>16, 360</value>
</data>
<data name="txtGistCustomURL.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 20</value>
@ -11765,7 +11792,7 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;txtGistCustomURL.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="cbGistUseRawURL.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -11774,7 +11801,7 @@ Using an encrypted library disables sharing.</value>
<value>NoControl</value>
</data>
<data name="cbGistUseRawURL.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 307</value>
<value>16, 320</value>
</data>
<data name="cbGistUseRawURL.Size" type="System.Drawing.Size, System.Drawing">
<value>90, 17</value>
@ -11795,7 +11822,7 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;cbGistUseRawURL.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="cbGistPublishPublic.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -11804,7 +11831,7 @@ Using an encrypted library disables sharing.</value>
<value>NoControl</value>
</data>
<data name="cbGistPublishPublic.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 283</value>
<value>16, 296</value>
</data>
<data name="cbGistPublishPublic.Size" type="System.Drawing.Size, System.Drawing">
<value>109, 17</value>
@ -11825,13 +11852,13 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;cbGistPublishPublic.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="oAuth2Gist.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="oAuth2Gist.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 75</value>
<value>16, 88</value>
</data>
<data name="oAuth2Gist.Size" type="System.Drawing.Size, System.Drawing">
<value>328, 205</value>
@ -11849,7 +11876,7 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;oAuth2Gist.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="atcGistAccountType.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 16</value>
@ -11870,7 +11897,7 @@ Using an encrypted library disables sharing.</value>
<value>tpGist</value>
</data>
<data name="&gt;&gt;atcGistAccountType.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="tpGist.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>

19
ShareX.UploadersLib/TextUploaders/GitHubGist.cs
View file

@ -56,7 +56,7 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
{
PublicUpload = config.GistPublishPublic,
RawURL = config.GistRawURL,
URLAPI = config.GistCustomURL
CustomURLAPI = config.GistCustomURL
};
}
@ -65,11 +65,13 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
public sealed class GitHubGist : TextUploader, IOAuth2Basic
{
private const string URLAPI = "https://api.github.com/";
public OAuth2Info AuthInfo { get; private set; }
public bool PublicUpload { get; set; }
public bool RawURL { get; set; }
public string URLAPI { get; set; }
public string CustomURLAPI { get; set; }
public GitHubGist()
{
@ -133,7 +135,18 @@ public override UploadResult UploadText(string text, string fileName)
string json = JsonConvert.SerializeObject(gistUploadObject);
string url = $"{URLAPI}/gists";
string url;
if (!string.IsNullOrEmpty(CustomURLAPI))
{
url = CustomURLAPI;
}
else
{
url = URLAPI;
}
url = URLHelpers.CombineURL(url, "gists");
if (AuthInfo != null)
{

2
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -107,7 +107,7 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
public OAuth2Info GistOAuth2Info = null;
public bool GistPublishPublic = false;
public bool GistRawURL = false;
public string GistCustomURL = "https://api.github.com";
public string GistCustomURL = "";
// uPaste