mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
#1298 update
This commit is contained in:
parent
46c26303f3
commit
f7e8324664
5 changed files with 1530 additions and 7065 deletions
|
@ -526,8 +526,6 @@ private void InitializeComponent()
|
||||||
this.lblWidthHint = new System.Windows.Forms.Label();
|
this.lblWidthHint = new System.Windows.Forms.Label();
|
||||||
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
|
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
|
||||||
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
|
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
|
||||||
this.lblSomeImageAPIKey = new System.Windows.Forms.Label();
|
|
||||||
this.txtSomeImageAPIKey = new System.Windows.Forms.TextBox();
|
|
||||||
this.tpOtherUploaders.SuspendLayout();
|
this.tpOtherUploaders.SuspendLayout();
|
||||||
this.tcOtherUploaders.SuspendLayout();
|
this.tcOtherUploaders.SuspendLayout();
|
||||||
this.tpTwitter.SuspendLayout();
|
this.tpTwitter.SuspendLayout();
|
||||||
|
@ -4176,8 +4174,6 @@ private void InitializeComponent()
|
||||||
//
|
//
|
||||||
// tpSomeImage
|
// tpSomeImage
|
||||||
//
|
//
|
||||||
this.tpSomeImage.Controls.Add(this.txtSomeImageAPIKey);
|
|
||||||
this.tpSomeImage.Controls.Add(this.lblSomeImageAPIKey);
|
|
||||||
this.tpSomeImage.Controls.Add(this.cbSomeImageDirectURL);
|
this.tpSomeImage.Controls.Add(this.cbSomeImageDirectURL);
|
||||||
resources.ApplyResources(this.tpSomeImage, "tpSomeImage");
|
resources.ApplyResources(this.tpSomeImage, "tpSomeImage");
|
||||||
this.tpSomeImage.Name = "tpSomeImage";
|
this.tpSomeImage.Name = "tpSomeImage";
|
||||||
|
@ -4221,17 +4217,6 @@ private void InitializeComponent()
|
||||||
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
|
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
|
||||||
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
|
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
|
// UploadersConfigForm
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this, "$this");
|
resources.ApplyResources(this, "$this");
|
||||||
|
@ -4882,7 +4867,5 @@ private void InitializeComponent()
|
||||||
private System.Windows.Forms.Button btnCustomUploadersExportAll;
|
private System.Windows.Forms.Button btnCustomUploadersExportAll;
|
||||||
private System.Windows.Forms.TabPage tpSomeImage;
|
private System.Windows.Forms.TabPage tpSomeImage;
|
||||||
private System.Windows.Forms.CheckBox cbSomeImageDirectURL;
|
private System.Windows.Forms.CheckBox cbSomeImageDirectURL;
|
||||||
private System.Windows.Forms.TextBox txtSomeImageAPIKey;
|
|
||||||
private System.Windows.Forms.Label lblSomeImageAPIKey;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -243,7 +243,6 @@ public void LoadSettings()
|
||||||
|
|
||||||
// SomeImage
|
// SomeImage
|
||||||
|
|
||||||
txtSomeImageAPIKey.Text = Config.SomeImageAPIKey;
|
|
||||||
cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL;
|
cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL;
|
||||||
|
|
||||||
#endregion Image uploaders
|
#endregion Image uploaders
|
||||||
|
@ -1000,11 +999,6 @@ private void cbCheveretoDirectURL_CheckedChanged(object sender, EventArgs e)
|
||||||
|
|
||||||
#region SomeImage
|
#region SomeImage
|
||||||
|
|
||||||
private void txtSomeImageAPIKey_TextChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Config.SomeImageAPIKey = txtSomeImageAPIKey.Text;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cbSomeImageDirectURL_CheckedChanged(object sender, EventArgs e)
|
private void cbSomeImageDirectURL_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Config.SomeImageDirectURL = cbSomeImageDirectURL.Checked;
|
Config.SomeImageDirectURL = cbSomeImageDirectURL.Checked;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -83,8 +83,7 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
|
||||||
public bool CheveretoDirectURL = true;
|
public bool CheveretoDirectURL = true;
|
||||||
|
|
||||||
// SomeImage
|
// SomeImage
|
||||||
public string SomeImageAPIKey = string.Empty;
|
public bool SomeImageDirectURL = false;
|
||||||
public bool SomeImageDirectURL = true;
|
|
||||||
|
|
||||||
#endregion Image uploaders
|
#endregion Image uploaders
|
||||||
|
|
||||||
|
@ -392,8 +391,6 @@ public bool IsValid(ImageDestination destination)
|
||||||
return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]);
|
return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]);
|
||||||
case ImageDestination.Chevereto:
|
case ImageDestination.Chevereto:
|
||||||
return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey);
|
return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey);
|
||||||
case ImageDestination.SomeImage:
|
|
||||||
return !string.IsNullOrEmpty(SomeImageAPIKey);
|
|
||||||
case ImageDestination.CustomImageUploader:
|
case ImageDestination.CustomImageUploader:
|
||||||
return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected);
|
return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected);
|
||||||
}
|
}
|
||||||
|
|
|
@ -824,8 +824,7 @@ public UploadResult UploadImage(Stream stream, string fileName)
|
||||||
imageUploader = new VgymeUploader();
|
imageUploader = new VgymeUploader();
|
||||||
break;
|
break;
|
||||||
case ImageDestination.SomeImage:
|
case ImageDestination.SomeImage:
|
||||||
//imageUploader = new SomeImage(APIKeys.SomeImageKey)
|
imageUploader = new SomeImage(APIKeys.SomeImageKey)
|
||||||
imageUploader = new SomeImage(Program.UploadersConfig.SomeImageAPIKey)
|
|
||||||
{
|
{
|
||||||
DirectURL = Program.UploadersConfig.SomeImageDirectURL
|
DirectURL = Program.UploadersConfig.SomeImageDirectURL
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue