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

Revert "#1298 update"

Browse source 
This reverts commit f7e8324664.
This commit is contained in:
Jevan Pipitone 2016-02-10 20:57:33 +11:00
parent f7e8324664
commit 0fade80a2e
5 changed files with 7092 additions and 1557 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -526,6 +526,8 @@ private void InitializeComponent()
this.lblWidthHint = new System.Windows.Forms.Label();
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.lblSomeImageAPIKey = new System.Windows.Forms.Label();
this.txtSomeImageAPIKey = new System.Windows.Forms.TextBox();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpTwitter.SuspendLayout();
@ -4174,6 +4176,8 @@ private void InitializeComponent()
//
// tpSomeImage
//
this.tpSomeImage.Controls.Add(this.txtSomeImageAPIKey);
this.tpSomeImage.Controls.Add(this.lblSomeImageAPIKey);
this.tpSomeImage.Controls.Add(this.cbSomeImageDirectURL);
resources.ApplyResources(this.tpSomeImage, "tpSomeImage");
this.tpSomeImage.Name = "tpSomeImage";
@ -4217,6 +4221,17 @@ private void InitializeComponent()
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
//
// lblSomeImageAPIKey
//
resources.ApplyResources(this.lblSomeImageAPIKey, "lblSomeImageAPIKey");
this.lblSomeImageAPIKey.Name = "lblSomeImageAPIKey";
//
// txtSomeImageAPIKey
//
resources.ApplyResources(this.txtSomeImageAPIKey, "txtSomeImageAPIKey");
this.txtSomeImageAPIKey.Name = "txtSomeImageAPIKey";
this.txtSomeImageAPIKey.TextChanged += new System.EventHandler(this.txtSomeImageAPIKey_TextChanged);
//
// UploadersConfigForm
//
resources.ApplyResources(this, "$this");
@ -4867,5 +4882,7 @@ private void InitializeComponent()
private System.Windows.Forms.Button btnCustomUploadersExportAll;
private System.Windows.Forms.TabPage tpSomeImage;
private System.Windows.Forms.CheckBox cbSomeImageDirectURL;
private System.Windows.Forms.TextBox txtSomeImageAPIKey;
private System.Windows.Forms.Label lblSomeImageAPIKey;
}
}

6
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -243,6 +243,7 @@ public void LoadSettings()
// SomeImage
txtSomeImageAPIKey.Text = Config.SomeImageAPIKey;
cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL;
#endregion Image uploaders
@ -999,6 +1000,11 @@ private void cbCheveretoDirectURL_CheckedChanged(object sender, EventArgs e)
#region SomeImage
private void txtSomeImageAPIKey_TextChanged(object sender, EventArgs e)
{
Config.SomeImageAPIKey = txtSomeImageAPIKey.Text;
}
private void cbSomeImageDirectURL_CheckedChanged(object sender, EventArgs e)
{
Config.SomeImageDirectURL = cbSomeImageDirectURL.Checked;

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

File diff suppressed because it is too large Load diff

5
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -83,7 +83,8 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
public bool CheveretoDirectURL = true;
// SomeImage
public bool SomeImageDirectURL = false;
public string SomeImageAPIKey = string.Empty;
public bool SomeImageDirectURL = true;
#endregion Image uploaders
@ -391,6 +392,8 @@ public bool IsValid(ImageDestination destination)
return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]);
case ImageDestination.Chevereto:
return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey);
case ImageDestination.SomeImage:
return !string.IsNullOrEmpty(SomeImageAPIKey);
case ImageDestination.CustomImageUploader:
return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected);
}

3
ShareX/WorkerTask.cs
View file

@ -824,7 +824,8 @@ public UploadResult UploadImage(Stream stream, string fileName)
imageUploader = new VgymeUploader();
break;
case ImageDestination.SomeImage:
imageUploader = new SomeImage(APIKeys.SomeImageKey)
//imageUploader = new SomeImage(APIKeys.SomeImageKey)
imageUploader = new SomeImage(Program.UploadersConfig.SomeImageAPIKey)
{
DirectURL = Program.UploadersConfig.SomeImageDirectURL
};