From 5e71f9994537e1447674659438de331f85ec1570 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 5 Apr 2018 23:50:54 +0300 Subject: [PATCH] Update UploadersConfigForm --- .../Forms/UploadersConfigForm.resx | 70 +++++++++---------- ShareX.UploadersLib/TextUploaders/Paste_ee.cs | 8 ++- ShareX.UploadersLib/UploadersConfig.cs | 1 + 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 9314fb4b6..1ba62e2c6 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -210,7 +210,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ mbCustomUploaderDestinationType - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null pCustomUploader @@ -369,7 +369,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ oauthTwitter - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpTwitter @@ -1140,7 +1140,7 @@ store.book[0].title lvCustomUploaderRegexps - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpCustomUploaderRegexParse @@ -1374,7 +1374,7 @@ store.book[0].title lvCustomUploaderArguments - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpCustomUploaderArguments @@ -1557,7 +1557,7 @@ store.book[0].title lvCustomUploaderHeaders - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpCustomUploaderHeaders @@ -2328,7 +2328,7 @@ store.book[0].title eiCustomUploaders - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null gbCustomUploaders @@ -2760,7 +2760,7 @@ store.book[0].title oauth2Bitly - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpBitly @@ -2808,7 +2808,7 @@ store.book[0].title oauth2GoogleURLShortener - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGoogleURLShortener @@ -2829,7 +2829,7 @@ store.book[0].title atcGoogleURLShortenerAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGoogleURLShortener @@ -3675,7 +3675,7 @@ store.book[0].title 3, 3, 3, 3 - 972, 537 + 178, 42 7 @@ -4110,7 +4110,7 @@ store.book[0].title eiFTP - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null gbFTPAccount @@ -5483,7 +5483,7 @@ store.book[0].title oauth2Dropbox - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpDropbox @@ -5615,7 +5615,7 @@ store.book[0].title oAuth2OneDrive - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpOneDrive @@ -5786,7 +5786,7 @@ store.book[0].title lvGoogleDriveFoldersList - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGoogleDrive @@ -5867,7 +5867,7 @@ store.book[0].title oauth2GoogleDrive - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGoogleDrive @@ -6245,7 +6245,7 @@ store.book[0].title lvBoxFolders - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpBox @@ -6326,7 +6326,7 @@ store.book[0].title oauth2Box - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpBox @@ -7529,7 +7529,7 @@ store.book[0].title atcGfycatAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGfycat @@ -7550,7 +7550,7 @@ store.book[0].title oauth2Gfycat - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGfycat @@ -8798,7 +8798,7 @@ store.book[0].title atcSendSpaceAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpSendSpace @@ -9353,7 +9353,7 @@ store.book[0].title oAuthJira - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpJira @@ -10013,7 +10013,7 @@ store.book[0].title lvSeafileLibraries - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpSeafile @@ -11925,7 +11925,7 @@ Using an encrypted library disables sharing. 4, 4, 4, 4 - 792, 999 + 792, 472 6 @@ -11934,7 +11934,7 @@ Using an encrypted library disables sharing. ucLocalhostAccounts - ShareX.UploadersLib.AccountsControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountsControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpSharedFolder @@ -11943,13 +11943,13 @@ Using an encrypted library disables sharing. 6 - 4, 184 + 4, 40 3, 3, 3, 3 - 178, 0 + 972, 519 9 @@ -13194,7 +13194,7 @@ Using an encrypted library disables sharing. oAuth2Gist - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGist @@ -13206,7 +13206,7 @@ Using an encrypted library disables sharing. 4, 22 - 972, 537 + 178, 42 2 @@ -13833,7 +13833,7 @@ Using an encrypted library disables sharing. atcImgurAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpImgur @@ -13854,7 +13854,7 @@ Using an encrypted library disables sharing. oauth2Imgur - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpImgur @@ -14259,7 +14259,7 @@ Using an encrypted library disables sharing. atcTinyPicAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpTinyPic @@ -14493,7 +14493,7 @@ Using an encrypted library disables sharing. oauthFlickr - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpFlickr @@ -15153,7 +15153,7 @@ Using an encrypted library disables sharing. oauth2Picasa - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null tpGooglePhotos @@ -15693,7 +15693,7 @@ Using an encrypted library disables sharing. ttlvMain - ShareX.HelpersLib.TabToListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.TabToListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null $this @@ -15714,7 +15714,7 @@ Using an encrypted library disables sharing. actRapidShareAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null True diff --git a/ShareX.UploadersLib/TextUploaders/Paste_ee.cs b/ShareX.UploadersLib/TextUploaders/Paste_ee.cs index 8c5b709e9..583f7e3a8 100644 --- a/ShareX.UploadersLib/TextUploaders/Paste_ee.cs +++ b/ShareX.UploadersLib/TextUploaders/Paste_ee.cs @@ -53,7 +53,10 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer apiKey = APIKeys.Paste_eeApplicationKey; } - return new Paste_ee(apiKey); + return new Paste_ee(apiKey) + { + EncryptPaste = config.Paste_eeEncryptPaste + }; } public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpPaste_ee; @@ -62,6 +65,7 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer public sealed class Paste_ee : TextUploader { public string APIKey { get; private set; } + public bool EncryptPaste { get; set; } public Paste_ee(string apiKey) { @@ -81,7 +85,7 @@ public override UploadResult UploadText(string text, string fileName) { Paste_eeSubmitRequestBody requestBody = new Paste_eeSubmitRequestBody() { - encrypted = false, + encrypted = EncryptPaste, description = "", expiration = "never", sections = new Paste_eeSubmitRequestBodySection[] diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index a2a2ba66f..f4d4f6505 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -111,6 +111,7 @@ public class UploadersConfig : SettingsBase #region Paste.ee public string Paste_eeUserKey = ""; + public bool Paste_eeEncryptPaste = false; #endregion Paste.ee