mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-03 02:36:50 +13:00
Added Pomf settings tab
This commit is contained in:
parent
7fb92b3a3c
commit
e2f3aeabf1
10 changed files with 6008 additions and 1332 deletions
BIN
ShareX.UploadersLib/Favicons/Pomf.ico
Normal file
BIN
ShareX.UploadersLib/Favicons/Pomf.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
|
@ -61,6 +61,12 @@ public Pomf(PomfUploader uploader)
|
||||||
|
|
||||||
public override UploadResult Upload(Stream stream, string fileName)
|
public override UploadResult Upload(Stream stream, string fileName)
|
||||||
{
|
{
|
||||||
|
if (Uploader == null || string.IsNullOrEmpty(Uploader.UploadURL))
|
||||||
|
{
|
||||||
|
Errors.Add("Please select one of Pomf uploaders from \"Destination settings -> Pomf tab\".");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
UploadResult result = UploadData(stream, Uploader.UploadURL, fileName, "files[]");
|
UploadResult result = UploadData(stream, Uploader.UploadURL, fileName, "files[]");
|
||||||
|
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
|
|
|
@ -36,11 +36,25 @@ public class PomfUploader
|
||||||
public string UploadURL { get; set; }
|
public string UploadURL { get; set; }
|
||||||
public string ResultURL { get; set; }
|
public string ResultURL { get; set; }
|
||||||
|
|
||||||
|
public PomfUploader()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public PomfUploader(string name, string uploadURL, string resultURL = null)
|
public PomfUploader(string name, string uploadURL, string resultURL = null)
|
||||||
{
|
{
|
||||||
Name = name;
|
Name = name;
|
||||||
UploadURL = uploadURL;
|
UploadURL = uploadURL;
|
||||||
ResultURL = resultURL;
|
ResultURL = resultURL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(Name))
|
||||||
|
{
|
||||||
|
return Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
return UploadURL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -295,6 +295,13 @@ private void InitializeComponent()
|
||||||
this.lblLambdaInfo = new System.Windows.Forms.Label();
|
this.lblLambdaInfo = new System.Windows.Forms.Label();
|
||||||
this.lblLambdaApiKey = new System.Windows.Forms.Label();
|
this.lblLambdaApiKey = new System.Windows.Forms.Label();
|
||||||
this.txtLambdaApiKey = new System.Windows.Forms.TextBox();
|
this.txtLambdaApiKey = new System.Windows.Forms.TextBox();
|
||||||
|
this.tpPomf = new System.Windows.Forms.TabPage();
|
||||||
|
this.txtPomfResultURL = new System.Windows.Forms.TextBox();
|
||||||
|
this.txtPomfUploadURL = new System.Windows.Forms.TextBox();
|
||||||
|
this.lblPomfResultURL = new System.Windows.Forms.Label();
|
||||||
|
this.lblPomfUploadURL = new System.Windows.Forms.Label();
|
||||||
|
this.lblPomfUploaders = new System.Windows.Forms.Label();
|
||||||
|
this.cbPomfUploaders = new System.Windows.Forms.ComboBox();
|
||||||
this.tpUp1 = new System.Windows.Forms.TabPage();
|
this.tpUp1 = new System.Windows.Forms.TabPage();
|
||||||
this.txtUp1Key = new System.Windows.Forms.TextBox();
|
this.txtUp1Key = new System.Windows.Forms.TextBox();
|
||||||
this.txtUp1Host = new System.Windows.Forms.TextBox();
|
this.txtUp1Host = new System.Windows.Forms.TextBox();
|
||||||
|
@ -480,6 +487,7 @@ private void InitializeComponent()
|
||||||
this.tpJira.SuspendLayout();
|
this.tpJira.SuspendLayout();
|
||||||
this.gpJiraServer.SuspendLayout();
|
this.gpJiraServer.SuspendLayout();
|
||||||
this.tpLambda.SuspendLayout();
|
this.tpLambda.SuspendLayout();
|
||||||
|
this.tpPomf.SuspendLayout();
|
||||||
this.tpUp1.SuspendLayout();
|
this.tpUp1.SuspendLayout();
|
||||||
this.tpEmail.SuspendLayout();
|
this.tpEmail.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.nudEmailSmtpPort)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.nudEmailSmtpPort)).BeginInit();
|
||||||
|
@ -1325,6 +1333,7 @@ private void InitializeComponent()
|
||||||
this.tcFileUploaders.Controls.Add(this.tpMinus);
|
this.tcFileUploaders.Controls.Add(this.tpMinus);
|
||||||
this.tcFileUploaders.Controls.Add(this.tpJira);
|
this.tcFileUploaders.Controls.Add(this.tpJira);
|
||||||
this.tcFileUploaders.Controls.Add(this.tpLambda);
|
this.tcFileUploaders.Controls.Add(this.tpLambda);
|
||||||
|
this.tcFileUploaders.Controls.Add(this.tpPomf);
|
||||||
this.tcFileUploaders.Controls.Add(this.tpUp1);
|
this.tcFileUploaders.Controls.Add(this.tpUp1);
|
||||||
this.tcFileUploaders.Controls.Add(this.tpEmail);
|
this.tcFileUploaders.Controls.Add(this.tpEmail);
|
||||||
this.tcFileUploaders.Controls.Add(this.tpSharedFolder);
|
this.tcFileUploaders.Controls.Add(this.tpSharedFolder);
|
||||||
|
@ -2439,6 +2448,53 @@ private void InitializeComponent()
|
||||||
this.txtLambdaApiKey.UseSystemPasswordChar = true;
|
this.txtLambdaApiKey.UseSystemPasswordChar = true;
|
||||||
this.txtLambdaApiKey.TextChanged += new System.EventHandler(this.txtLambdaApiKey_TextChanged);
|
this.txtLambdaApiKey.TextChanged += new System.EventHandler(this.txtLambdaApiKey_TextChanged);
|
||||||
//
|
//
|
||||||
|
// tpPomf
|
||||||
|
//
|
||||||
|
this.tpPomf.Controls.Add(this.txtPomfResultURL);
|
||||||
|
this.tpPomf.Controls.Add(this.txtPomfUploadURL);
|
||||||
|
this.tpPomf.Controls.Add(this.lblPomfResultURL);
|
||||||
|
this.tpPomf.Controls.Add(this.lblPomfUploadURL);
|
||||||
|
this.tpPomf.Controls.Add(this.lblPomfUploaders);
|
||||||
|
this.tpPomf.Controls.Add(this.cbPomfUploaders);
|
||||||
|
resources.ApplyResources(this.tpPomf, "tpPomf");
|
||||||
|
this.tpPomf.Name = "tpPomf";
|
||||||
|
this.tpPomf.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// txtPomfResultURL
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.txtPomfResultURL, "txtPomfResultURL");
|
||||||
|
this.txtPomfResultURL.Name = "txtPomfResultURL";
|
||||||
|
this.txtPomfResultURL.TextChanged += new System.EventHandler(this.txtPomfResultURL_TextChanged);
|
||||||
|
//
|
||||||
|
// txtPomfUploadURL
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.txtPomfUploadURL, "txtPomfUploadURL");
|
||||||
|
this.txtPomfUploadURL.Name = "txtPomfUploadURL";
|
||||||
|
this.txtPomfUploadURL.TextChanged += new System.EventHandler(this.txtPomfUploadURL_TextChanged);
|
||||||
|
//
|
||||||
|
// lblPomfResultURL
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.lblPomfResultURL, "lblPomfResultURL");
|
||||||
|
this.lblPomfResultURL.Name = "lblPomfResultURL";
|
||||||
|
//
|
||||||
|
// lblPomfUploadURL
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.lblPomfUploadURL, "lblPomfUploadURL");
|
||||||
|
this.lblPomfUploadURL.Name = "lblPomfUploadURL";
|
||||||
|
//
|
||||||
|
// lblPomfUploaders
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.lblPomfUploaders, "lblPomfUploaders");
|
||||||
|
this.lblPomfUploaders.Name = "lblPomfUploaders";
|
||||||
|
//
|
||||||
|
// cbPomfUploaders
|
||||||
|
//
|
||||||
|
this.cbPomfUploaders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||||
|
this.cbPomfUploaders.FormattingEnabled = true;
|
||||||
|
resources.ApplyResources(this.cbPomfUploaders, "cbPomfUploaders");
|
||||||
|
this.cbPomfUploaders.Name = "cbPomfUploaders";
|
||||||
|
this.cbPomfUploaders.SelectedIndexChanged += new System.EventHandler(this.cbPomfUploaders_SelectedIndexChanged);
|
||||||
|
//
|
||||||
// tpUp1
|
// tpUp1
|
||||||
//
|
//
|
||||||
this.tpUp1.Controls.Add(this.txtUp1Key);
|
this.tpUp1.Controls.Add(this.txtUp1Key);
|
||||||
|
@ -3573,6 +3629,8 @@ private void InitializeComponent()
|
||||||
this.gpJiraServer.PerformLayout();
|
this.gpJiraServer.PerformLayout();
|
||||||
this.tpLambda.ResumeLayout(false);
|
this.tpLambda.ResumeLayout(false);
|
||||||
this.tpLambda.PerformLayout();
|
this.tpLambda.PerformLayout();
|
||||||
|
this.tpPomf.ResumeLayout(false);
|
||||||
|
this.tpPomf.PerformLayout();
|
||||||
this.tpUp1.ResumeLayout(false);
|
this.tpUp1.ResumeLayout(false);
|
||||||
this.tpUp1.PerformLayout();
|
this.tpUp1.PerformLayout();
|
||||||
this.tpEmail.ResumeLayout(false);
|
this.tpEmail.ResumeLayout(false);
|
||||||
|
@ -4032,5 +4090,12 @@ private void InitializeComponent()
|
||||||
private System.Windows.Forms.CheckBox cbImgurUseGIFV;
|
private System.Windows.Forms.CheckBox cbImgurUseGIFV;
|
||||||
private System.Windows.Forms.ListBox lbTwitterAccounts;
|
private System.Windows.Forms.ListBox lbTwitterAccounts;
|
||||||
private System.Windows.Forms.Button btnTwitterNameUpdate;
|
private System.Windows.Forms.Button btnTwitterNameUpdate;
|
||||||
|
private System.Windows.Forms.TabPage tpPomf;
|
||||||
|
private System.Windows.Forms.Label lblPomfResultURL;
|
||||||
|
private System.Windows.Forms.Label lblPomfUploadURL;
|
||||||
|
private System.Windows.Forms.Label lblPomfUploaders;
|
||||||
|
private System.Windows.Forms.ComboBox cbPomfUploaders;
|
||||||
|
private System.Windows.Forms.TextBox txtPomfUploadURL;
|
||||||
|
private System.Windows.Forms.TextBox txtPomfResultURL;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -76,9 +76,9 @@ private void FormSettings()
|
||||||
AddIconToTab(tpAmazonS3, Resources.AmazonS3);
|
AddIconToTab(tpAmazonS3, Resources.AmazonS3);
|
||||||
AddIconToTab(tpBitly, Resources.Bitly);
|
AddIconToTab(tpBitly, Resources.Bitly);
|
||||||
AddIconToTab(tpBox, Resources.Box);
|
AddIconToTab(tpBox, Resources.Box);
|
||||||
AddIconToTab(tpCopy, Resources.Copy);
|
|
||||||
AddIconToTab(tpChevereto, Resources.Chevereto);
|
AddIconToTab(tpChevereto, Resources.Chevereto);
|
||||||
AddIconToTab(tpCoinURL, Resources.CoinURL);
|
AddIconToTab(tpCoinURL, Resources.CoinURL);
|
||||||
|
AddIconToTab(tpCopy, Resources.Copy);
|
||||||
AddIconToTab(tpCustomUploaders, Resources.globe_network);
|
AddIconToTab(tpCustomUploaders, Resources.globe_network);
|
||||||
AddIconToTab(tpDropbox, Resources.Dropbox);
|
AddIconToTab(tpDropbox, Resources.Dropbox);
|
||||||
AddIconToTab(tpEmail, Resources.mail);
|
AddIconToTab(tpEmail, Resources.mail);
|
||||||
|
@ -93,26 +93,27 @@ private void FormSettings()
|
||||||
AddIconToTab(tpImageShack, Resources.ImageShack);
|
AddIconToTab(tpImageShack, Resources.ImageShack);
|
||||||
AddIconToTab(tpImgur, Resources.Imgur);
|
AddIconToTab(tpImgur, Resources.Imgur);
|
||||||
AddIconToTab(tpJira, Resources.jira);
|
AddIconToTab(tpJira, Resources.jira);
|
||||||
|
AddIconToTab(tpLambda, Resources.Lambda);
|
||||||
AddIconToTab(tpMediaFire, Resources.MediaFire);
|
AddIconToTab(tpMediaFire, Resources.MediaFire);
|
||||||
AddIconToTab(tpMega, Resources.Mega);
|
AddIconToTab(tpMega, Resources.Mega);
|
||||||
AddIconToTab(tpMinus, Resources.Minus);
|
AddIconToTab(tpMinus, Resources.Minus);
|
||||||
AddIconToTab(tpOneDrive, Resources.OneDrive);
|
AddIconToTab(tpOneDrive, Resources.OneDrive);
|
||||||
|
AddIconToTab(tpOneTimeSecret, Resources.OneTimeSecret);
|
||||||
AddIconToTab(tpOwnCloud, Resources.OwnCloud);
|
AddIconToTab(tpOwnCloud, Resources.OwnCloud);
|
||||||
AddIconToTab(tpPastebin, Resources.Pastebin);
|
|
||||||
AddIconToTab(tpPaste_ee, Resources.page_white_text);
|
AddIconToTab(tpPaste_ee, Resources.page_white_text);
|
||||||
|
AddIconToTab(tpPastebin, Resources.Pastebin);
|
||||||
AddIconToTab(tpPhotobucket, Resources.Photobucket);
|
AddIconToTab(tpPhotobucket, Resources.Photobucket);
|
||||||
AddIconToTab(tpPicasa, Resources.Picasa);
|
AddIconToTab(tpPicasa, Resources.Picasa);
|
||||||
|
AddIconToTab(tpPolr, Resources.Polr);
|
||||||
|
AddIconToTab(tpPomf, Resources.Pomf);
|
||||||
AddIconToTab(tpPushbullet, Resources.Pushbullet);
|
AddIconToTab(tpPushbullet, Resources.Pushbullet);
|
||||||
AddIconToTab(tpSendSpace, Resources.SendSpace);
|
AddIconToTab(tpSendSpace, Resources.SendSpace);
|
||||||
AddIconToTab(tpSharedFolder, Resources.server_network);
|
AddIconToTab(tpSharedFolder, Resources.server_network);
|
||||||
AddIconToTab(tpTinyPic, Resources.TinyPic);
|
AddIconToTab(tpTinyPic, Resources.TinyPic);
|
||||||
AddIconToTab(tpTwitter, Resources.Twitter);
|
AddIconToTab(tpTwitter, Resources.Twitter);
|
||||||
|
AddIconToTab(tpUp1, Resources.Up1);
|
||||||
AddIconToTab(tpUpaste, Resources.Upaste);
|
AddIconToTab(tpUpaste, Resources.Upaste);
|
||||||
AddIconToTab(tpYourls, Resources.Yourls);
|
AddIconToTab(tpYourls, Resources.Yourls);
|
||||||
AddIconToTab(tpLambda, Resources.Lambda);
|
|
||||||
AddIconToTab(tpUp1, Resources.Up1);
|
|
||||||
AddIconToTab(tpOneTimeSecret, Resources.OneTimeSecret);
|
|
||||||
AddIconToTab(tpPolr, Resources.Polr);
|
|
||||||
|
|
||||||
ttlvMain.ImageList = uploadersImageList;
|
ttlvMain.ImageList = uploadersImageList;
|
||||||
ttlvMain.MainTabControl = tcUploaders;
|
ttlvMain.MainTabControl = tcUploaders;
|
||||||
|
@ -550,6 +551,13 @@ public void LoadSettings()
|
||||||
|
|
||||||
txtLambdaApiKey.Text = Config.LambdaSettings.UserAPIKey;
|
txtLambdaApiKey.Text = Config.LambdaSettings.UserAPIKey;
|
||||||
|
|
||||||
|
// Pomf
|
||||||
|
|
||||||
|
if (Config.PomfUploader == null) Config.PomfUploader = new PomfUploader();
|
||||||
|
cbPomfUploaders.Items.AddRange(Pomf.Uploaders.ToArray());
|
||||||
|
txtPomfUploadURL.Text = Config.PomfUploader.UploadURL;
|
||||||
|
txtPomfResultURL.Text = Config.PomfUploader.ResultURL;
|
||||||
|
|
||||||
#endregion File uploaders
|
#endregion File uploaders
|
||||||
|
|
||||||
#region URL Shorteners
|
#region URL Shorteners
|
||||||
|
@ -2008,6 +2016,34 @@ private void txtLambdaApiKey_TextChanged(object sender, EventArgs e)
|
||||||
|
|
||||||
#endregion Lambda
|
#endregion Lambda
|
||||||
|
|
||||||
|
#region Pomf
|
||||||
|
|
||||||
|
private void cbPomfUploaders_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (cbPomfUploaders.SelectedIndex > -1)
|
||||||
|
{
|
||||||
|
PomfUploader uploader = cbPomfUploaders.SelectedItem as PomfUploader;
|
||||||
|
|
||||||
|
if (uploader != null)
|
||||||
|
{
|
||||||
|
txtPomfUploadURL.Text = uploader.UploadURL;
|
||||||
|
txtPomfResultURL.Text = uploader.ResultURL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void txtPomfUploadURL_TextChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Config.PomfUploader.UploadURL = txtPomfUploadURL.Text;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void txtPomfResultURL_TextChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Config.PomfUploader.ResultURL = txtPomfResultURL.Text;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion Pomf
|
||||||
|
|
||||||
#endregion File Uploaders
|
#endregion File Uploaders
|
||||||
|
|
||||||
#region URL Shorteners
|
#region URL Shorteners
|
||||||
|
|
File diff suppressed because it is too large
Load diff
10
ShareX.UploadersLib/Properties/Resources.Designer.cs
generated
10
ShareX.UploadersLib/Properties/Resources.Designer.cs
generated
|
@ -836,6 +836,16 @@ internal static System.Drawing.Icon Polr {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Icon Pomf {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("Pomf", resourceCulture);
|
||||||
|
return ((System.Drawing.Icon)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -473,4 +473,7 @@ Created folders:</value>
|
||||||
<data name="UploadersConfigForm_FTPOpenClient_Unable_to_find_valid_FTP_account_" xml:space="preserve">
|
<data name="UploadersConfigForm_FTPOpenClient_Unable_to_find_valid_FTP_account_" xml:space="preserve">
|
||||||
<value>Unable to find valid FTP account.</value>
|
<value>Unable to find valid FTP account.</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Pomf" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Favicons\Pomf.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -797,6 +797,9 @@
|
||||||
<Name>ShareX.HelpersLib</Name>
|
<Name>ShareX.HelpersLib</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Favicons\Pomf.ico" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -252,7 +252,7 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
|
||||||
|
|
||||||
// Pomf
|
// Pomf
|
||||||
|
|
||||||
public PomfUploader PomfUploader = null;
|
public PomfUploader PomfUploader = new PomfUploader();
|
||||||
|
|
||||||
#endregion File uploaders
|
#endregion File uploaders
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue