mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
Some Pushbullet changes
This commit is contained in:
parent
e2d5b40759
commit
c80f5d2021
3 changed files with 205 additions and 226 deletions
364
UploadersLib/GUI/UploadersConfigForm.Designer.cs
generated
364
UploadersLib/GUI/UploadersConfigForm.Designer.cs
generated
|
@ -34,6 +34,7 @@ private void InitializeComponent()
|
|||
this.tpImageUploaders = new System.Windows.Forms.TabPage();
|
||||
this.tcImageUploaders = new System.Windows.Forms.TabControl();
|
||||
this.tpImgur = new System.Windows.Forms.TabPage();
|
||||
this.oauth2Imgur = new UploadersLib.GUI.OAuth2Control();
|
||||
this.txtImgurAlbumID = new System.Windows.Forms.TextBox();
|
||||
this.lblImgurAlbumID = new System.Windows.Forms.Label();
|
||||
this.lvImgurAlbumList = new System.Windows.Forms.ListView();
|
||||
|
@ -43,7 +44,9 @@ private void InitializeComponent()
|
|||
this.btnImgurRefreshAlbumList = new System.Windows.Forms.Button();
|
||||
this.cbImgurThumbnailType = new System.Windows.Forms.ComboBox();
|
||||
this.lblImgurThumbnailType = new System.Windows.Forms.Label();
|
||||
this.atcImgurAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.tpImageShack = new System.Windows.Forms.TabPage();
|
||||
this.atcImageShackAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.btnImageShackLogin = new System.Windows.Forms.Button();
|
||||
this.btnImageShackOpenPublicProfile = new System.Windows.Forms.Button();
|
||||
this.cbImageShackIsPublic = new System.Windows.Forms.CheckBox();
|
||||
|
@ -53,6 +56,7 @@ private void InitializeComponent()
|
|||
this.txtImageShackPassword = new System.Windows.Forms.TextBox();
|
||||
this.lblImageShackPassword = new System.Windows.Forms.Label();
|
||||
this.tpTinyPic = new System.Windows.Forms.TabPage();
|
||||
this.atcTinyPicAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.btnTinyPicLogin = new System.Windows.Forms.Button();
|
||||
this.txtTinyPicPassword = new System.Windows.Forms.TextBox();
|
||||
this.lblTinyPicPassword = new System.Windows.Forms.Label();
|
||||
|
@ -105,6 +109,7 @@ private void InitializeComponent()
|
|||
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.btnPicasaRefreshAlbumList = new System.Windows.Forms.Button();
|
||||
this.oauth2Picasa = new UploadersLib.GUI.OAuth2Control();
|
||||
this.tpTextUploaders = new System.Windows.Forms.TabPage();
|
||||
this.tcTextUploaders = new System.Windows.Forms.TabControl();
|
||||
this.tpPastebin = new System.Windows.Forms.TabPage();
|
||||
|
@ -115,6 +120,8 @@ private void InitializeComponent()
|
|||
this.txtPaste_eeUserAPIKey = new System.Windows.Forms.TextBox();
|
||||
this.tpGist = new System.Windows.Forms.TabPage();
|
||||
this.chkGistPublishPublic = new System.Windows.Forms.CheckBox();
|
||||
this.oAuth2Gist = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcGistAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.tpUpaste = new System.Windows.Forms.TabPage();
|
||||
this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox();
|
||||
this.lblUpasteUserKey = new System.Windows.Forms.Label();
|
||||
|
@ -146,6 +153,7 @@ private void InitializeComponent()
|
|||
this.btnFtpClient = new System.Windows.Forms.Button();
|
||||
this.btnFTPExport = new System.Windows.Forms.Button();
|
||||
this.btnFTPImport = new System.Windows.Forms.Button();
|
||||
this.ucFTPAccounts = new UploadersLib.AccountsControl();
|
||||
this.gbFtpSettings = new System.Windows.Forms.GroupBox();
|
||||
this.lblFtpFiles = new System.Windows.Forms.Label();
|
||||
this.lblFtpText = new System.Windows.Forms.Label();
|
||||
|
@ -168,6 +176,7 @@ private void InitializeComponent()
|
|||
this.lblMegaStatusTitle = new System.Windows.Forms.Label();
|
||||
this.tpGoogleDrive = new System.Windows.Forms.TabPage();
|
||||
this.cbGoogleDriveIsPublic = new System.Windows.Forms.CheckBox();
|
||||
this.oauth2GoogleDrive = new UploadersLib.GUI.OAuth2Control();
|
||||
this.tpBox = new System.Windows.Forms.TabPage();
|
||||
this.txtBoxFolderID = new System.Windows.Forms.TextBox();
|
||||
this.lblBoxFolderID = new System.Windows.Forms.Label();
|
||||
|
@ -190,6 +199,7 @@ private void InitializeComponent()
|
|||
this.lblSendSpaceUsername = new System.Windows.Forms.Label();
|
||||
this.txtSendSpacePassword = new System.Windows.Forms.TextBox();
|
||||
this.txtSendSpaceUserName = new System.Windows.Forms.TextBox();
|
||||
this.atcSendSpaceAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.tpGe_tt = new System.Windows.Forms.TabPage();
|
||||
this.lblGe_ttAccessToken = new System.Windows.Forms.Label();
|
||||
this.lblGe_ttPassword = new System.Windows.Forms.Label();
|
||||
|
@ -210,6 +220,7 @@ private void InitializeComponent()
|
|||
this.txtJiraConfigHelp = new System.Windows.Forms.TextBox();
|
||||
this.txtJiraHost = new System.Windows.Forms.TextBox();
|
||||
this.lblJiraHost = new System.Windows.Forms.Label();
|
||||
this.oAuthJira = new UploadersLib.GUI.OAuth2Control();
|
||||
this.tpMinus = new System.Windows.Forms.TabPage();
|
||||
this.lblMinusURLType = new System.Windows.Forms.Label();
|
||||
this.cbMinusURLType = new System.Windows.Forms.ComboBox();
|
||||
|
@ -244,6 +255,7 @@ private void InitializeComponent()
|
|||
this.txtEmailDefaultSubject = new System.Windows.Forms.TextBox();
|
||||
this.tpSharedFolder = new System.Windows.Forms.TabPage();
|
||||
this.tlpSharedFolders = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.ucLocalhostAccounts = new UploadersLib.AccountsControl();
|
||||
this.gbSharedFolder = new System.Windows.Forms.GroupBox();
|
||||
this.lblSharedFolderFiles = new System.Windows.Forms.Label();
|
||||
this.lblSharedFolderText = new System.Windows.Forms.Label();
|
||||
|
@ -267,7 +279,10 @@ private void InitializeComponent()
|
|||
this.tpURLShorteners = new System.Windows.Forms.TabPage();
|
||||
this.tcURLShorteners = new System.Windows.Forms.TabControl();
|
||||
this.tpBitly = new System.Windows.Forms.TabPage();
|
||||
this.oauth2Bitly = new UploadersLib.GUI.OAuth2Control();
|
||||
this.tpGoogleURLShortener = new System.Windows.Forms.TabPage();
|
||||
this.oauth2GoogleURLShortener = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcGoogleURLShortenerAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.tpYourls = new System.Windows.Forms.TabPage();
|
||||
this.txtYourlsPassword = new System.Windows.Forms.TextBox();
|
||||
this.txtYourlsUsername = new System.Windows.Forms.TextBox();
|
||||
|
@ -282,6 +297,7 @@ private void InitializeComponent()
|
|||
this.tcSocialNetworkingServices = new System.Windows.Forms.TabControl();
|
||||
this.tpTwitter = new System.Windows.Forms.TabPage();
|
||||
this.btnTwitterLogin = new System.Windows.Forms.Button();
|
||||
this.ucTwitterAccounts = new UploadersLib.AccountsControl();
|
||||
this.tpCustomUploaders = new System.Windows.Forms.TabPage();
|
||||
this.btnCustomUploaderHelp = new System.Windows.Forms.Button();
|
||||
this.lblCustomUploaderImageUploader = new System.Windows.Forms.Label();
|
||||
|
@ -340,22 +356,6 @@ private void InitializeComponent()
|
|||
this.txtCustomUploaderArgName = new System.Windows.Forms.TextBox();
|
||||
this.txtRapidSharePremiumUserName = new System.Windows.Forms.TextBox();
|
||||
this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.oauth2Imgur = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcImgurAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.atcImageShackAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.atcTinyPicAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.oauth2Picasa = new UploadersLib.GUI.OAuth2Control();
|
||||
this.oAuth2Gist = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcGistAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.ucFTPAccounts = new UploadersLib.AccountsControl();
|
||||
this.oauth2GoogleDrive = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcSendSpaceAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.oAuthJira = new UploadersLib.GUI.OAuth2Control();
|
||||
this.ucLocalhostAccounts = new UploadersLib.AccountsControl();
|
||||
this.oauth2Bitly = new UploadersLib.GUI.OAuth2Control();
|
||||
this.oauth2GoogleURLShortener = new UploadersLib.GUI.OAuth2Control();
|
||||
this.atcGoogleURLShortenerAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.ucTwitterAccounts = new UploadersLib.AccountsControl();
|
||||
this.actRapidShareAccountType = new UploadersLib.GUI.AccountTypeControl();
|
||||
this.tcUploaders.SuspendLayout();
|
||||
this.tpImageUploaders.SuspendLayout();
|
||||
|
@ -483,6 +483,18 @@ private void InitializeComponent()
|
|||
this.tpImgur.Text = "Imgur";
|
||||
this.tpImgur.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// oauth2Imgur
|
||||
//
|
||||
this.oauth2Imgur.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Imgur.LoginStatus = false;
|
||||
this.oauth2Imgur.Name = "oauth2Imgur";
|
||||
this.oauth2Imgur.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2Imgur.Status = "Status: Login required.";
|
||||
this.oauth2Imgur.TabIndex = 6;
|
||||
this.oauth2Imgur.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked);
|
||||
this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked);
|
||||
this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked);
|
||||
//
|
||||
// txtImgurAlbumID
|
||||
//
|
||||
this.txtImgurAlbumID.Location = new System.Drawing.Point(592, 28);
|
||||
|
@ -561,6 +573,15 @@ private void InitializeComponent()
|
|||
this.lblImgurThumbnailType.TabIndex = 1;
|
||||
this.lblImgurThumbnailType.Text = "Thumbnail type:";
|
||||
//
|
||||
// atcImgurAccountType
|
||||
//
|
||||
this.atcImgurAccountType.Location = new System.Drawing.Point(8, 232);
|
||||
this.atcImgurAccountType.Name = "atcImgurAccountType";
|
||||
this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcImgurAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcImgurAccountType.TabIndex = 0;
|
||||
this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged);
|
||||
//
|
||||
// tpImageShack
|
||||
//
|
||||
this.tpImageShack.Controls.Add(this.atcImageShackAccountType);
|
||||
|
@ -580,6 +601,15 @@ private void InitializeComponent()
|
|||
this.tpImageShack.Text = "ImageShack";
|
||||
this.tpImageShack.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// atcImageShackAccountType
|
||||
//
|
||||
this.atcImageShackAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcImageShackAccountType.Name = "atcImageShackAccountType";
|
||||
this.atcImageShackAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcImageShackAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcImageShackAccountType.TabIndex = 10;
|
||||
this.atcImageShackAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImageShackAccountType_AccountTypeChanged);
|
||||
//
|
||||
// btnImageShackLogin
|
||||
//
|
||||
this.btnImageShackLogin.Location = new System.Drawing.Point(296, 82);
|
||||
|
@ -673,6 +703,15 @@ private void InitializeComponent()
|
|||
this.tpTinyPic.Text = "TinyPic";
|
||||
this.tpTinyPic.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// atcTinyPicAccountType
|
||||
//
|
||||
this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcTinyPicAccountType.Name = "atcTinyPicAccountType";
|
||||
this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcTinyPicAccountType.TabIndex = 0;
|
||||
this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged);
|
||||
//
|
||||
// btnTinyPicLogin
|
||||
//
|
||||
this.btnTinyPicLogin.Location = new System.Drawing.Point(296, 82);
|
||||
|
@ -1204,6 +1243,18 @@ private void InitializeComponent()
|
|||
this.btnPicasaRefreshAlbumList.UseVisualStyleBackColor = true;
|
||||
this.btnPicasaRefreshAlbumList.Click += new System.EventHandler(this.btnPicasaRefreshAlbumList_Click);
|
||||
//
|
||||
// oauth2Picasa
|
||||
//
|
||||
this.oauth2Picasa.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Picasa.LoginStatus = false;
|
||||
this.oauth2Picasa.Name = "oauth2Picasa";
|
||||
this.oauth2Picasa.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2Picasa.Status = "Login required.";
|
||||
this.oauth2Picasa.TabIndex = 0;
|
||||
this.oauth2Picasa.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked);
|
||||
this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked);
|
||||
this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked);
|
||||
//
|
||||
// tpTextUploaders
|
||||
//
|
||||
this.tpTextUploaders.Controls.Add(this.tcTextUploaders);
|
||||
|
@ -1312,6 +1363,28 @@ private void InitializeComponent()
|
|||
this.chkGistPublishPublic.UseVisualStyleBackColor = true;
|
||||
this.chkGistPublishPublic.CheckedChanged += new System.EventHandler(this.chkGistPublishPublic_CheckedChanged);
|
||||
//
|
||||
// oAuth2Gist
|
||||
//
|
||||
this.oAuth2Gist.Enabled = false;
|
||||
this.oAuth2Gist.IsRefreshable = false;
|
||||
this.oAuth2Gist.Location = new System.Drawing.Point(16, 51);
|
||||
this.oAuth2Gist.LoginStatus = false;
|
||||
this.oAuth2Gist.Name = "oAuth2Gist";
|
||||
this.oAuth2Gist.Size = new System.Drawing.Size(328, 173);
|
||||
this.oAuth2Gist.Status = "Status: Login required.";
|
||||
this.oAuth2Gist.TabIndex = 16;
|
||||
this.oAuth2Gist.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked);
|
||||
this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked);
|
||||
//
|
||||
// atcGistAccountType
|
||||
//
|
||||
this.atcGistAccountType.Location = new System.Drawing.Point(15, 16);
|
||||
this.atcGistAccountType.Name = "atcGistAccountType";
|
||||
this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcGistAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcGistAccountType.TabIndex = 15;
|
||||
this.atcGistAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged);
|
||||
//
|
||||
// tpUpaste
|
||||
//
|
||||
this.tpUpaste.Controls.Add(this.cbUpasteIsPublic);
|
||||
|
@ -1409,7 +1482,7 @@ private void InitializeComponent()
|
|||
this.btnPushbulletGetDeviceList.Name = "btnPushbulletGetDeviceList";
|
||||
this.btnPushbulletGetDeviceList.Size = new System.Drawing.Size(107, 23);
|
||||
this.btnPushbulletGetDeviceList.TabIndex = 2;
|
||||
this.btnPushbulletGetDeviceList.Text = "Get Device List";
|
||||
this.btnPushbulletGetDeviceList.Text = "Get device list";
|
||||
this.btnPushbulletGetDeviceList.UseVisualStyleBackColor = true;
|
||||
this.btnPushbulletGetDeviceList.Click += new System.EventHandler(this.btnPushbulletGetDeviceList_Click);
|
||||
//
|
||||
|
@ -1672,6 +1745,15 @@ private void InitializeComponent()
|
|||
this.btnFTPImport.UseVisualStyleBackColor = true;
|
||||
this.btnFTPImport.Click += new System.EventHandler(this.btnFTPImport_Click);
|
||||
//
|
||||
// ucFTPAccounts
|
||||
//
|
||||
this.ucFTPAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucFTPAccounts.Location = new System.Drawing.Point(0, 0);
|
||||
this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.ucFTPAccounts.Name = "ucFTPAccounts";
|
||||
this.ucFTPAccounts.Size = new System.Drawing.Size(792, 345);
|
||||
this.ucFTPAccounts.TabIndex = 0;
|
||||
//
|
||||
// gbFtpSettings
|
||||
//
|
||||
this.gbFtpSettings.Controls.Add(this.lblFtpFiles);
|
||||
|
@ -1898,6 +1980,18 @@ private void InitializeComponent()
|
|||
this.cbGoogleDriveIsPublic.UseVisualStyleBackColor = true;
|
||||
this.cbGoogleDriveIsPublic.CheckedChanged += new System.EventHandler(this.cbGoogleDriveIsPublic_CheckedChanged);
|
||||
//
|
||||
// oauth2GoogleDrive
|
||||
//
|
||||
this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2GoogleDrive.LoginStatus = false;
|
||||
this.oauth2GoogleDrive.Name = "oauth2GoogleDrive";
|
||||
this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2GoogleDrive.Status = "Status: Login required.";
|
||||
this.oauth2GoogleDrive.TabIndex = 0;
|
||||
this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked);
|
||||
this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked);
|
||||
this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked);
|
||||
//
|
||||
// tpBox
|
||||
//
|
||||
this.tpBox.Controls.Add(this.txtBoxFolderID);
|
||||
|
@ -2119,6 +2213,15 @@ private void InitializeComponent()
|
|||
this.txtSendSpaceUserName.TabIndex = 3;
|
||||
this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged);
|
||||
//
|
||||
// atcSendSpaceAccountType
|
||||
//
|
||||
this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType";
|
||||
this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcSendSpaceAccountType.TabIndex = 0;
|
||||
this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged);
|
||||
//
|
||||
// tpGe_tt
|
||||
//
|
||||
this.tpGe_tt.Controls.Add(this.lblGe_ttAccessToken);
|
||||
|
@ -2321,6 +2424,18 @@ private void InitializeComponent()
|
|||
this.lblJiraHost.TabIndex = 0;
|
||||
this.lblJiraHost.Text = "Jira host: ";
|
||||
//
|
||||
// oAuthJira
|
||||
//
|
||||
this.oAuthJira.Location = new System.Drawing.Point(473, 13);
|
||||
this.oAuthJira.LoginStatus = false;
|
||||
this.oAuthJira.Name = "oAuthJira";
|
||||
this.oAuthJira.Size = new System.Drawing.Size(328, 207);
|
||||
this.oAuthJira.Status = "Status: Login required.";
|
||||
this.oAuthJira.TabIndex = 1;
|
||||
this.oAuthJira.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked);
|
||||
this.oAuthJira.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked);
|
||||
this.oAuthJira.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked);
|
||||
//
|
||||
// tpMinus
|
||||
//
|
||||
this.tpMinus.Controls.Add(this.lblMinusURLType);
|
||||
|
@ -2689,6 +2804,15 @@ private void InitializeComponent()
|
|||
this.tlpSharedFolders.Size = new System.Drawing.Size(798, 469);
|
||||
this.tlpSharedFolders.TabIndex = 0;
|
||||
//
|
||||
// ucLocalhostAccounts
|
||||
//
|
||||
this.ucLocalhostAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucLocalhostAccounts.Location = new System.Drawing.Point(4, 4);
|
||||
this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.ucLocalhostAccounts.Name = "ucLocalhostAccounts";
|
||||
this.ucLocalhostAccounts.Size = new System.Drawing.Size(790, 343);
|
||||
this.ucLocalhostAccounts.TabIndex = 0;
|
||||
//
|
||||
// gbSharedFolder
|
||||
//
|
||||
this.gbSharedFolder.Controls.Add(this.lblSharedFolderFiles);
|
||||
|
@ -2944,6 +3068,18 @@ private void InitializeComponent()
|
|||
this.tpBitly.Text = "bit.ly";
|
||||
this.tpBitly.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// oauth2Bitly
|
||||
//
|
||||
this.oauth2Bitly.IsRefreshable = false;
|
||||
this.oauth2Bitly.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Bitly.LoginStatus = false;
|
||||
this.oauth2Bitly.Name = "oauth2Bitly";
|
||||
this.oauth2Bitly.Size = new System.Drawing.Size(328, 168);
|
||||
this.oauth2Bitly.Status = "Login required.";
|
||||
this.oauth2Bitly.TabIndex = 0;
|
||||
this.oauth2Bitly.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked);
|
||||
this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked);
|
||||
//
|
||||
// tpGoogleURLShortener
|
||||
//
|
||||
this.tpGoogleURLShortener.Controls.Add(this.oauth2GoogleURLShortener);
|
||||
|
@ -2956,6 +3092,27 @@ private void InitializeComponent()
|
|||
this.tpGoogleURLShortener.Text = "Google";
|
||||
this.tpGoogleURLShortener.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// oauth2GoogleURLShortener
|
||||
//
|
||||
this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56);
|
||||
this.oauth2GoogleURLShortener.LoginStatus = false;
|
||||
this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener";
|
||||
this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2GoogleURLShortener.Status = "Status: Login required.";
|
||||
this.oauth2GoogleURLShortener.TabIndex = 1;
|
||||
this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked);
|
||||
this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked);
|
||||
this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked);
|
||||
//
|
||||
// atcGoogleURLShortenerAccountType
|
||||
//
|
||||
this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType";
|
||||
this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcGoogleURLShortenerAccountType.TabIndex = 0;
|
||||
this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged);
|
||||
//
|
||||
// tpYourls
|
||||
//
|
||||
this.tpYourls.Controls.Add(this.txtYourlsPassword);
|
||||
|
@ -3096,6 +3253,14 @@ private void InitializeComponent()
|
|||
this.btnTwitterLogin.UseVisualStyleBackColor = true;
|
||||
this.btnTwitterLogin.Click += new System.EventHandler(this.btnTwitterLogin_Click);
|
||||
//
|
||||
// ucTwitterAccounts
|
||||
//
|
||||
this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucTwitterAccounts.Location = new System.Drawing.Point(3, 3);
|
||||
this.ucTwitterAccounts.Name = "ucTwitterAccounts";
|
||||
this.ucTwitterAccounts.Size = new System.Drawing.Size(798, 469);
|
||||
this.ucTwitterAccounts.TabIndex = 0;
|
||||
//
|
||||
// tpCustomUploaders
|
||||
//
|
||||
this.tpCustomUploaders.Controls.Add(this.btnCustomUploaderHelp);
|
||||
|
@ -3687,171 +3852,6 @@ private void InitializeComponent()
|
|||
this.ttHelpTip.UseAnimation = false;
|
||||
this.ttHelpTip.UseFading = false;
|
||||
//
|
||||
// oauth2Imgur
|
||||
//
|
||||
this.oauth2Imgur.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Imgur.LoginStatus = false;
|
||||
this.oauth2Imgur.Name = "oauth2Imgur";
|
||||
this.oauth2Imgur.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2Imgur.Status = "Status: Login required.";
|
||||
this.oauth2Imgur.TabIndex = 6;
|
||||
this.oauth2Imgur.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked);
|
||||
this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked);
|
||||
this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked);
|
||||
//
|
||||
// atcImgurAccountType
|
||||
//
|
||||
this.atcImgurAccountType.Location = new System.Drawing.Point(8, 232);
|
||||
this.atcImgurAccountType.Name = "atcImgurAccountType";
|
||||
this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcImgurAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcImgurAccountType.TabIndex = 0;
|
||||
this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged);
|
||||
//
|
||||
// atcImageShackAccountType
|
||||
//
|
||||
this.atcImageShackAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcImageShackAccountType.Name = "atcImageShackAccountType";
|
||||
this.atcImageShackAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcImageShackAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcImageShackAccountType.TabIndex = 10;
|
||||
this.atcImageShackAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImageShackAccountType_AccountTypeChanged);
|
||||
//
|
||||
// atcTinyPicAccountType
|
||||
//
|
||||
this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcTinyPicAccountType.Name = "atcTinyPicAccountType";
|
||||
this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29);
|
||||
this.atcTinyPicAccountType.TabIndex = 0;
|
||||
this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged);
|
||||
//
|
||||
// oauth2Picasa
|
||||
//
|
||||
this.oauth2Picasa.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Picasa.LoginStatus = false;
|
||||
this.oauth2Picasa.Name = "oauth2Picasa";
|
||||
this.oauth2Picasa.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2Picasa.Status = "Login required.";
|
||||
this.oauth2Picasa.TabIndex = 0;
|
||||
this.oauth2Picasa.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked);
|
||||
this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked);
|
||||
this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked);
|
||||
//
|
||||
// oAuth2Gist
|
||||
//
|
||||
this.oAuth2Gist.Enabled = false;
|
||||
this.oAuth2Gist.IsRefreshable = false;
|
||||
this.oAuth2Gist.Location = new System.Drawing.Point(16, 51);
|
||||
this.oAuth2Gist.LoginStatus = false;
|
||||
this.oAuth2Gist.Name = "oAuth2Gist";
|
||||
this.oAuth2Gist.Size = new System.Drawing.Size(328, 173);
|
||||
this.oAuth2Gist.Status = "Status: Login required.";
|
||||
this.oAuth2Gist.TabIndex = 16;
|
||||
this.oAuth2Gist.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked);
|
||||
this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked);
|
||||
//
|
||||
// atcGistAccountType
|
||||
//
|
||||
this.atcGistAccountType.Location = new System.Drawing.Point(15, 16);
|
||||
this.atcGistAccountType.Name = "atcGistAccountType";
|
||||
this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcGistAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcGistAccountType.TabIndex = 15;
|
||||
this.atcGistAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged);
|
||||
//
|
||||
// ucFTPAccounts
|
||||
//
|
||||
this.ucFTPAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucFTPAccounts.Location = new System.Drawing.Point(0, 0);
|
||||
this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.ucFTPAccounts.Name = "ucFTPAccounts";
|
||||
this.ucFTPAccounts.Size = new System.Drawing.Size(792, 345);
|
||||
this.ucFTPAccounts.TabIndex = 0;
|
||||
//
|
||||
// oauth2GoogleDrive
|
||||
//
|
||||
this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2GoogleDrive.LoginStatus = false;
|
||||
this.oauth2GoogleDrive.Name = "oauth2GoogleDrive";
|
||||
this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2GoogleDrive.Status = "Status: Login required.";
|
||||
this.oauth2GoogleDrive.TabIndex = 0;
|
||||
this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked);
|
||||
this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked);
|
||||
this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked);
|
||||
//
|
||||
// atcSendSpaceAccountType
|
||||
//
|
||||
this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType";
|
||||
this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcSendSpaceAccountType.TabIndex = 0;
|
||||
this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged);
|
||||
//
|
||||
// oAuthJira
|
||||
//
|
||||
this.oAuthJira.Location = new System.Drawing.Point(473, 13);
|
||||
this.oAuthJira.LoginStatus = false;
|
||||
this.oAuthJira.Name = "oAuthJira";
|
||||
this.oAuthJira.Size = new System.Drawing.Size(328, 207);
|
||||
this.oAuthJira.Status = "Status: Login required.";
|
||||
this.oAuthJira.TabIndex = 1;
|
||||
this.oAuthJira.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked);
|
||||
this.oAuthJira.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked);
|
||||
this.oAuthJira.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked);
|
||||
//
|
||||
// ucLocalhostAccounts
|
||||
//
|
||||
this.ucLocalhostAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucLocalhostAccounts.Location = new System.Drawing.Point(4, 4);
|
||||
this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.ucLocalhostAccounts.Name = "ucLocalhostAccounts";
|
||||
this.ucLocalhostAccounts.Size = new System.Drawing.Size(790, 343);
|
||||
this.ucLocalhostAccounts.TabIndex = 0;
|
||||
//
|
||||
// oauth2Bitly
|
||||
//
|
||||
this.oauth2Bitly.IsRefreshable = false;
|
||||
this.oauth2Bitly.Location = new System.Drawing.Point(16, 16);
|
||||
this.oauth2Bitly.LoginStatus = false;
|
||||
this.oauth2Bitly.Name = "oauth2Bitly";
|
||||
this.oauth2Bitly.Size = new System.Drawing.Size(328, 168);
|
||||
this.oauth2Bitly.Status = "Login required.";
|
||||
this.oauth2Bitly.TabIndex = 0;
|
||||
this.oauth2Bitly.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked);
|
||||
this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked);
|
||||
//
|
||||
// oauth2GoogleURLShortener
|
||||
//
|
||||
this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56);
|
||||
this.oauth2GoogleURLShortener.LoginStatus = false;
|
||||
this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener";
|
||||
this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 207);
|
||||
this.oauth2GoogleURLShortener.Status = "Status: Login required.";
|
||||
this.oauth2GoogleURLShortener.TabIndex = 1;
|
||||
this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked);
|
||||
this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked);
|
||||
this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked);
|
||||
//
|
||||
// atcGoogleURLShortenerAccountType
|
||||
//
|
||||
this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType";
|
||||
this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous;
|
||||
this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29);
|
||||
this.atcGoogleURLShortenerAccountType.TabIndex = 0;
|
||||
this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged);
|
||||
//
|
||||
// ucTwitterAccounts
|
||||
//
|
||||
this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ucTwitterAccounts.Location = new System.Drawing.Point(3, 3);
|
||||
this.ucTwitterAccounts.Name = "ucTwitterAccounts";
|
||||
this.ucTwitterAccounts.Size = new System.Drawing.Size(798, 469);
|
||||
this.ucTwitterAccounts.TabIndex = 0;
|
||||
//
|
||||
// actRapidShareAccountType
|
||||
//
|
||||
this.actRapidShareAccountType.Location = new System.Drawing.Point(8, 16);
|
||||
|
|
|
@ -242,9 +242,6 @@
|
|||
With this option, objects are cheaper to store, but have 99.99% durability, instead of 99.999999999%.
|
||||
This means that they may be lost from Amazon S3 at some point.</value>
|
||||
</data>
|
||||
<metadata name="ttHelpTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>72</value>
|
||||
</metadata>
|
||||
|
|
|
@ -50,7 +50,6 @@ public override UploadResult UploadText(string text, string fileName)
|
|||
if (Config.CurrentDevice == null) throw new Exception("No device set to push to.");
|
||||
|
||||
string strDeviceKey = Config.CurrentDevice.Key;
|
||||
|
||||
if (string.IsNullOrEmpty(strDeviceKey)) throw new Exception("For some reason, the device key was empty.");
|
||||
|
||||
UploadResult result = new UploadResult();
|
||||
|
@ -67,7 +66,7 @@ public override UploadResult UploadText(string text, string fileName)
|
|||
|
||||
pushData += "device_iden=" + strDeviceKey + "&";
|
||||
pushData += "type=note&"; // For now set it to 'note' until it's dynamic w/ ShareX...
|
||||
pushData += "title=ShareX: " + DateTime.UtcNow + "&";
|
||||
pushData += "title=ShareX&";
|
||||
pushData += "body=" + text;
|
||||
|
||||
byte[] postBytes = Encoding.UTF8.GetBytes(pushData);
|
||||
|
@ -79,14 +78,9 @@ public override UploadResult UploadText(string text, string fileName)
|
|||
requestStream.Write(postBytes, 0, postBytes.Length);
|
||||
}
|
||||
|
||||
string strPushURL = "";
|
||||
|
||||
if (Config.ReturnPushURL)
|
||||
{
|
||||
WebResponse response = request.GetResponse();
|
||||
|
||||
JObject jObject = null;
|
||||
|
||||
using (WebResponse response = request.GetResponse())
|
||||
using (StreamReader reader = new StreamReader(response.GetResponseStream()))
|
||||
{
|
||||
string strResponse = reader.ReadLine();
|
||||
|
@ -101,9 +95,9 @@ public override UploadResult UploadText(string text, string fileName)
|
|||
jObject = JObject.Parse(strResponse);
|
||||
}
|
||||
|
||||
strPushURL = "https://www.pushbullet.com/pushes?push_iden=" + jObject["iden"];
|
||||
|
||||
result.URL = strPushURL;
|
||||
if (Config.ReturnPushURL)
|
||||
{
|
||||
result.URL = "https://www.pushbullet.com/pushes?push_iden=" + jObject["iden"];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -111,13 +105,11 @@ public override UploadResult UploadText(string text, string fileName)
|
|||
}
|
||||
|
||||
result.IsSuccess = true;
|
||||
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Errors.Add(ex.ToString());
|
||||
|
||||
result.IsSuccess = false;
|
||||
}
|
||||
|
||||
|
@ -134,8 +126,7 @@ public List<PushbulletDevice> GetDeviceList()
|
|||
request.Credentials = new NetworkCredential(Config.UserAPIKey, "");
|
||||
request.Method = "GET";
|
||||
|
||||
WebResponse response = request.GetResponse();
|
||||
|
||||
using (WebResponse response = request.GetResponse())
|
||||
using (StreamReader reader = new StreamReader(response.GetResponseStream()))
|
||||
{
|
||||
string strResponse = reader.ReadLine();
|
||||
|
@ -143,7 +134,6 @@ public List<PushbulletDevice> GetDeviceList()
|
|||
if (!string.IsNullOrEmpty(strResponse) && strResponse.StartsWith("error"))
|
||||
{
|
||||
Errors.Add(strResponse);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -167,7 +157,6 @@ public List<PushbulletDevice> GetDeviceList()
|
|||
catch (Exception ex)
|
||||
{
|
||||
Errors.Add(ex.ToString());
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -177,20 +166,13 @@ public class PushbulletDevice
|
|||
{
|
||||
public string Name = string.Empty;
|
||||
public string Key = string.Empty;
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Format("Name: {0} ({1})", Name, Key);
|
||||
}
|
||||
}
|
||||
|
||||
public class PushbulletSettings
|
||||
{
|
||||
public string UserAPIKey = string.Empty;
|
||||
public bool ReturnPushURL = false;
|
||||
|
||||
public List<PushbulletDevice> DeviceList { get; set; }
|
||||
|
||||
public PushbulletDevice CurrentDevice { get; set; } // TODO: Use int SelectedDevice
|
||||
public bool ReturnPushURL = true;
|
||||
public List<PushbulletDevice> DeviceList = new List<PushbulletDevice>();
|
||||
public PushbulletDevice CurrentDevice = null; // TODO: Use int SelectedDevice
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue