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

OneDrive UI interim commit

Browse source
This commit is contained in:
mcored 2014-12-26 21:58:38 +08:00
parent 7ca9c3cd57
commit 1af3dc6a9d
8 changed files with 337 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.UploadersLib/FileUploaders/OneDrive.cs
View file

@ -39,6 +39,12 @@ public sealed class OneDrive : FileUploader, IOAuth2
public string FolderID { get; set; }
public bool AutoCreateShareableLink { get; set; }
public static OneDriveFileInfo RootFolder = new OneDriveFileInfo
{
id = "me/skydrive",
name = "Root folder"
};
public OneDrive(OAuth2Info authInfo)
{
AuthInfo = authInfo;
@ -135,8 +141,6 @@ public override UploadResult Upload(Stream stream, string fileName)
{
if (!CheckAuthorization()) return null;
GetPathInfo("me/skydrive/files");
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("access_token", AuthInfo.Token.access_token);
args.Add("overwrite", "true");
@ -211,6 +215,8 @@ public string CreateShareableLink(string id, OneDriveLinkType linkType = OneDriv
public OneDrivePathInfo GetPathInfo(string path)
{
if (!CheckAuthorization()) return null;
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("access_token", AuthInfo.Token.access_token);

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

@ -143,6 +143,14 @@ private void InitializeComponent()
this.lblDropboxPathTip = new System.Windows.Forms.Label();
this.lblDropboxPath = new System.Windows.Forms.Label();
this.txtDropboxPath = new System.Windows.Forms.TextBox();
this.tpOneDrive = new System.Windows.Forms.TabPage();
this.lblOneDriveFolderTip = new System.Windows.Forms.Label();
this.lvOneDriveFolders = new ShareX.HelpersLib.MyListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lblOneDriveFolderID = new System.Windows.Forms.Label();
this.btnOneDriveRefreshFolders = new System.Windows.Forms.Button();
this.cbOneDriveCreateShareableLink = new System.Windows.Forms.CheckBox();
this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl();
this.tpGoogleDrive = new System.Windows.Forms.TabPage();
this.cbGoogleDriveUseFolder = new System.Windows.Forms.CheckBox();
this.txtGoogleDriveFolderID = new System.Windows.Forms.TextBox();
@ -170,8 +178,6 @@ private void InitializeComponent()
this.lblCopyPath = new System.Windows.Forms.Label();
this.txtCopyPath = new System.Windows.Forms.TextBox();
this.oAuthCopy = new ShareX.UploadersLib.OAuthControl();
this.tpOneDrive = new System.Windows.Forms.TabPage();
this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl();
this.tpAmazonS3 = new System.Windows.Forms.TabPage();
this.txtAmazonS3CustomDomain = new System.Windows.Forms.TextBox();
this.lblAmazonS3PathPreviewLabel = new System.Windows.Forms.Label();
@ -417,7 +423,6 @@ private void InitializeComponent()
this.lblWidthHint = new System.Windows.Forms.Label();
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.cbOneDriveCreateShareableLink = new System.Windows.Forms.CheckBox();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpCustomUploaders.SuspendLayout();
@ -436,11 +441,11 @@ private void InitializeComponent()
this.tpFTP.SuspendLayout();
this.tpDropbox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbDropboxLogo)).BeginInit();
this.tpOneDrive.SuspendLayout();
this.tpGoogleDrive.SuspendLayout();
this.tpBox.SuspendLayout();
this.tpCopy.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbCopyLogo)).BeginInit();
this.tpOneDrive.SuspendLayout();
this.tpAmazonS3.SuspendLayout();
this.tpMega.SuspendLayout();
this.tpOwnCloud.SuspendLayout();
@ -1334,6 +1339,68 @@ private void InitializeComponent()
this.txtDropboxPath.Name = "txtDropboxPath";
this.txtDropboxPath.TextChanged += new System.EventHandler(this.txtDropboxPath_TextChanged);
//
// tpOneDrive
//
this.tpOneDrive.Controls.Add(this.lblOneDriveFolderTip);
this.tpOneDrive.Controls.Add(this.lvOneDriveFolders);
this.tpOneDrive.Controls.Add(this.lblOneDriveFolderID);
this.tpOneDrive.Controls.Add(this.btnOneDriveRefreshFolders);
this.tpOneDrive.Controls.Add(this.cbOneDriveCreateShareableLink);
this.tpOneDrive.Controls.Add(this.oAuth2OneDrive);
resources.ApplyResources(this.tpOneDrive, "tpOneDrive");
this.tpOneDrive.Name = "tpOneDrive";
this.tpOneDrive.UseVisualStyleBackColor = true;
//
// lblOneDriveFolderTip
//
resources.ApplyResources(this.lblOneDriveFolderTip, "lblOneDriveFolderTip");
this.lblOneDriveFolderTip.Name = "lblOneDriveFolderTip";
//
// lvOneDriveFolders
//
this.lvOneDriveFolders.AutoFillColumn = true;
this.lvOneDriveFolders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1});
this.lvOneDriveFolders.FullRowSelect = true;
resources.ApplyResources(this.lvOneDriveFolders, "lvOneDriveFolders");
this.lvOneDriveFolders.Name = "lvOneDriveFolders";
this.lvOneDriveFolders.UseCompatibleStateImageBehavior = false;
this.lvOneDriveFolders.View = System.Windows.Forms.View.Details;
this.lvOneDriveFolders.SelectedIndexChanged += new System.EventHandler(this.lvOneDriveFolders_SelectedIndexChanged);
this.lvOneDriveFolders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvOneDriveFolders_MouseDoubleClick);
//
// columnHeader1
//
resources.ApplyResources(this.columnHeader1, "columnHeader1");
//
// lblOneDriveFolderID
//
resources.ApplyResources(this.lblOneDriveFolderID, "lblOneDriveFolderID");
this.lblOneDriveFolderID.Name = "lblOneDriveFolderID";
//
// btnOneDriveRefreshFolders
//
resources.ApplyResources(this.btnOneDriveRefreshFolders, "btnOneDriveRefreshFolders");
this.btnOneDriveRefreshFolders.Name = "btnOneDriveRefreshFolders";
this.btnOneDriveRefreshFolders.UseVisualStyleBackColor = true;
this.btnOneDriveRefreshFolders.Click += new System.EventHandler(this.btnOneDriveRefreshFolders_Click);
//
// cbOneDriveCreateShareableLink
//
resources.ApplyResources(this.cbOneDriveCreateShareableLink, "cbOneDriveCreateShareableLink");
this.cbOneDriveCreateShareableLink.Name = "cbOneDriveCreateShareableLink";
this.cbOneDriveCreateShareableLink.UseVisualStyleBackColor = true;
this.cbOneDriveCreateShareableLink.CheckedChanged += new System.EventHandler(this.cbOneDriveCreateShareableLink_CheckedChanged);
//
// oAuth2OneDrive
//
resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive");
this.oAuth2OneDrive.Name = "oAuth2OneDrive";
this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked);
this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked);
this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked);
this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked);
//
// tpGoogleDrive
//
this.tpGoogleDrive.Controls.Add(this.cbGoogleDriveUseFolder);
@ -1539,23 +1606,6 @@ private void InitializeComponent()
this.oAuthCopy.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked);
this.oAuthCopy.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked);
//
// tpOneDrive
//
this.tpOneDrive.Controls.Add(this.cbOneDriveCreateShareableLink);
this.tpOneDrive.Controls.Add(this.oAuth2OneDrive);
resources.ApplyResources(this.tpOneDrive, "tpOneDrive");
this.tpOneDrive.Name = "tpOneDrive";
this.tpOneDrive.UseVisualStyleBackColor = true;
//
// oAuth2OneDrive
//
resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive");
this.oAuth2OneDrive.Name = "oAuth2OneDrive";
this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked);
this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked);
this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked);
this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked);
//
// tpAmazonS3
//
this.tpAmazonS3.Controls.Add(this.txtAmazonS3CustomDomain);
@ -3305,13 +3355,6 @@ private void InitializeComponent()
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
//
// cbOneDriveCreateShareableLink
//
resources.ApplyResources(this.cbOneDriveCreateShareableLink, "cbOneDriveCreateShareableLink");
this.cbOneDriveCreateShareableLink.Name = "cbOneDriveCreateShareableLink";
this.cbOneDriveCreateShareableLink.UseVisualStyleBackColor = true;
this.cbOneDriveCreateShareableLink.CheckedChanged += new System.EventHandler(this.cbOneDriveCreateShareableLink_CheckedChanged);
//
// UploadersConfigForm
//
resources.ApplyResources(this, "$this");
@ -3351,6 +3394,8 @@ private void InitializeComponent()
this.tpDropbox.ResumeLayout(false);
this.tpDropbox.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbDropboxLogo)).EndInit();
this.tpOneDrive.ResumeLayout(false);
this.tpOneDrive.PerformLayout();
this.tpGoogleDrive.ResumeLayout(false);
this.tpGoogleDrive.PerformLayout();
this.tpBox.ResumeLayout(false);
@ -3358,8 +3403,6 @@ private void InitializeComponent()
this.tpCopy.ResumeLayout(false);
this.tpCopy.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbCopyLogo)).EndInit();
this.tpOneDrive.ResumeLayout(false);
this.tpOneDrive.PerformLayout();
this.tpAmazonS3.ResumeLayout(false);
this.tpAmazonS3.PerformLayout();
this.tpMega.ResumeLayout(false);
@ -3821,6 +3864,11 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtHastebinCustomDomain;
private System.Windows.Forms.Label lblHastebinSyntaxHighlighting;
private System.Windows.Forms.Label lblHastebinCustomDomain;
private System.Windows.Forms.CheckBox cbOneDriveCreateShareableLink;
private System.Windows.Forms.CheckBox cbOneDriveCreateShareableLink;
private System.Windows.Forms.Label lblOneDriveFolderTip;
private HelpersLib.MyListView lvOneDriveFolders;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.Label lblOneDriveFolderID;
private System.Windows.Forms.Button btnOneDriveRefreshFolders;
}
}

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

@ -335,6 +335,7 @@ public void LoadSettings(UploadersConfig uploadersConfig)
if (OAuth2Info.CheckOAuth(Config.OneDriveOAuth2Info))
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginSuccessful;
btnOneDriveRefreshFolders.Enabled = true;
}
cbOneDriveCreateShareableLink.Checked = Config.OneDriveAutoCreateShareableLink;
@ -1142,6 +1143,25 @@ private void cbOneDriveCreateShareableLink_CheckedChanged(object sender, EventAr
Config.OneDriveAutoCreateShareableLink = cbOneDriveCreateShareableLink.Checked;
}
private void btnOneDriveRefreshFolders_Click(object sender, EventArgs e)
{
OneDriveListFolders();
}
private void lvOneDriveFolders_MouseDoubleClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left && lvOneDriveFolders.SelectedItems.Count > 0)
{
ListViewItem lvi = lvOneDriveFolders.SelectedItems[0];
OneDriveFileInfo file = lvi.Tag as OneDriveFileInfo;
if (file != null)
{
lvOneDriveFolders.Items.Clear();
OneDriveListFolders(file);
}
}
}
#endregion OneDrive
#region Google Drive

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

@ -2552,7 +2552,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>4, 4, 4, 4</value>
</data>
<data name="ucFTPAccounts.Size" type="System.Drawing.Size, System.Drawing">
<value>792, 406</value>
<value>792, 388</value>
</data>
<data name="ucFTPAccounts.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -2980,13 +2980,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>9</value>
</data>
<data name="tpDropbox.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpDropbox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpDropbox.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpDropbox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -3006,9 +3006,129 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<data name="&gt;&gt;tpDropbox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblOneDriveFolderTip.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblOneDriveFolderTip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblOneDriveFolderTip.Location" type="System.Drawing.Point, System.Drawing">
<value>349, 425</value>
</data>
<data name="lblOneDriveFolderTip.Size" type="System.Drawing.Size, System.Drawing">
<value>371, 13</value>
</data>
<data name="lblOneDriveFolderTip.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="lblOneDriveFolderTip.Text" xml:space="preserve">
<value>Note: You can double click folder name to go inside that folder and choose it.</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderTip.Name" xml:space="preserve">
<value>lblOneDriveFolderTip</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderTip.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderTip.Parent" xml:space="preserve">
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderTip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="columnHeader1.Text" xml:space="preserve">
<value>Folder name</value>
</data>
<data name="columnHeader1.Width" type="System.Int32, mscorlib">
<value>435</value>
</data>
<data name="lvOneDriveFolders.Location" type="System.Drawing.Point, System.Drawing">
<value>352, 72</value>
</data>
<data name="lvOneDriveFolders.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 344</value>
</data>
<data name="lvOneDriveFolders.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;lvOneDriveFolders.Name" xml:space="preserve">
<value>lvOneDriveFolders</value>
</data>
<data name="&gt;&gt;lvOneDriveFolders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvOneDriveFolders.Parent" xml:space="preserve">
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;lvOneDriveFolders.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblOneDriveFolderID.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblOneDriveFolderID.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblOneDriveFolderID.Location" type="System.Drawing.Point, System.Drawing">
<value>349, 50</value>
</data>
<data name="lblOneDriveFolderID.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 13</value>
</data>
<data name="lblOneDriveFolderID.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="lblOneDriveFolderID.Text" xml:space="preserve">
<value>Selected folder:</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderID.Name" xml:space="preserve">
<value>lblOneDriveFolderID</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderID.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderID.Parent" xml:space="preserve">
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;lblOneDriveFolderID.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnOneDriveRefreshFolders.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="btnOneDriveRefreshFolders.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnOneDriveRefreshFolders.Location" type="System.Drawing.Point, System.Drawing">
<value>352, 16</value>
</data>
<data name="btnOneDriveRefreshFolders.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 23</value>
</data>
<data name="btnOneDriveRefreshFolders.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnOneDriveRefreshFolders.Text" xml:space="preserve">
<value>Refresh folders list</value>
</data>
<data name="&gt;&gt;btnOneDriveRefreshFolders.Name" xml:space="preserve">
<value>btnOneDriveRefreshFolders</value>
</data>
<data name="&gt;&gt;btnOneDriveRefreshFolders.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnOneDriveRefreshFolders.Parent" xml:space="preserve">
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;btnOneDriveRefreshFolders.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="cbOneDriveCreateShareableLink.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbOneDriveCreateShareableLink.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbOneDriveCreateShareableLink.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 264</value>
</data>
@ -3031,7 +3151,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;cbOneDriveCreateShareableLink.ZOrder" xml:space="preserve">
<value>0</value>
<value>4</value>
</data>
<data name="oAuth2OneDrive.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 16</value>
@ -3052,7 +3172,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>tpOneDrive</value>
</data>
<data name="&gt;&gt;oAuth2OneDrive.ZOrder" xml:space="preserve">
<value>1</value>
<value>5</value>
</data>
<data name="tpOneDrive.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
@ -3313,13 +3433,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>349, 425</value>
</data>
<data name="lblBoxFolderTip.Size" type="System.Drawing.Size, System.Drawing">
<value>304, 13</value>
<value>371, 13</value>
</data>
<data name="lblBoxFolderTip.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="lblBoxFolderTip.Text" xml:space="preserve">
<value>Note: You can double click folder name to go inside that folder.</value>
<value>Note: You can double click folder name to go inside that folder and choose it.</value>
</data>
<data name="&gt;&gt;lblBoxFolderTip.Name" xml:space="preserve">
<value>lblBoxFolderTip</value>
@ -3793,13 +3913,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>7</value>
</data>
<data name="tpCopy.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpCopy.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpCopy.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -4237,13 +4357,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>16</value>
</data>
<data name="tpAmazonS3.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpAmazonS3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpAmazonS3.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpAmazonS3.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -4558,10 +4678,10 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>10</value>
</data>
<data name="tpMega.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpMega.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpMega.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@ -4876,13 +4996,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>10</value>
</data>
<data name="tpOwnCloud.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpOwnCloud.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpOwnCloud.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpOwnCloud.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@ -5089,13 +5209,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>6</value>
</data>
<data name="tpMediaFire.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpMediaFire.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpMediaFire.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpMediaFire.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
@ -5251,13 +5371,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>4</value>
</data>
<data name="tpPushbullet.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpPushbullet.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpPushbullet.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpPushbullet.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -5479,13 +5599,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>7</value>
</data>
<data name="tpRapidShare.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpRapidShare.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpRapidShare.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpRapidShare.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -5656,13 +5776,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>5</value>
</data>
<data name="tpSendSpace.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpSendSpace.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpSendSpace.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpSendSpace.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -5713,13 +5833,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>0</value>
</data>
<data name="tpMediaCrush.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpMediaCrush.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpMediaCrush.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpMediaCrush.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
@ -5899,13 +6019,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>5</value>
</data>
<data name="tpGe_tt.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpGe_tt.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpGe_tt.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpGe_tt.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -6058,13 +6178,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>4</value>
</data>
<data name="tpHostr.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpHostr.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpHostr.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpHostr.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -6508,13 +6628,13 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>3</value>
</data>
<data name="tpMinus.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpMinus.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpMinus.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 493</value>
<value>972, 475</value>
</data>
<data name="tpMinus.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -10215,6 +10335,12 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<data name="&gt;&gt;chArgumentsValue.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
<value>columnHeader1</value>
</data>
<data name="&gt;&gt;columnHeader1.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chGoogleDriveTitle.Name" xml:space="preserve">
<value>chGoogleDriveTitle</value>
</data>

50
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -868,7 +868,7 @@ public void BoxListFolders(BoxFileEntry fileEntry)
{
if (!OAuth2Info.CheckOAuth(Config.BoxOAuth2Info))
{
MessageBox.Show(Resources.UploadersConfigForm_BoxListFolders_Authentication_required_, Resources.UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed,
MessageBox.Show(Resources.UploadersConfigForm_ListFolders_Authentication_required_, Resources.UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed,
MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else
@ -975,6 +975,54 @@ public void OneDriveAuthRefresh()
}
}
private void OneDriveListFolders()
{
lvOneDriveFolders.Items.Clear();
OneDriveAddFolder(OneDrive.RootFolder);
OneDriveListFolders(OneDrive.RootFolder);
}
public void OneDriveListFolders(OneDriveFileInfo fileEntry)
{
if (!OAuth2Info.CheckOAuth(Config.OneDriveOAuth2Info))
{
MessageBox.Show(Resources.UploadersConfigForm_ListFolders_Authentication_required_, Resources.UploadersConfigForm_OneDriveListFolders_OneDrive_refresh_folders_list_failed,
MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else
{
OneDrive onedrive = new OneDrive(Config.OneDriveOAuth2Info);
//OneDriveFileInfo files = onedrive.GetFiles(fileEntry);
//if (files != null && files.entries != null && files.entries.Length > 0)
//{
// foreach (OneDriveFileInfo folder in files.entries.Where(x => x.type == "folder"))
// {
// OneDriveAddFolder(folder);
// }
//}
}
}
private void OneDriveAddFolder(OneDriveFileInfo folder)
{
ListViewItem lvi = new ListViewItem(folder.name);
lvi.Tag = folder;
lvOneDriveFolders.Items.Add(lvi);
}
private void lvOneDriveFolders_SelectedIndexChanged(object sender, EventArgs e)
{
if (lvOneDriveFolders.SelectedItems.Count > 0)
{
ListViewItem lvi = lvOneDriveFolders.SelectedItems[0];
OneDriveFileInfo file = lvi.Tag as OneDriveFileInfo;
if (file != null)
{
lblOneDriveFolderID.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + file.name;
}
}
}
#endregion OneDrive
#region Minus

29
ShareX.UploadersLib/Properties/Resources.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.0
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -876,15 +876,6 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Authentication required..
/// </summary>
internal static string UploadersConfigForm_BoxListFolders_Authentication_required_ {
get {
return ResourceManager.GetString("UploadersConfigForm_BoxListFolders_Authentication_required_", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Box refresh folders list failed.
/// </summary>
@ -942,6 +933,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Authentication required..
/// </summary>
internal static string UploadersConfigForm_ListFolders_Authentication_required_ {
get {
return ResourceManager.GetString("UploadersConfigForm_ListFolders_Authentication_required_", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Invalid device name.
/// </summary>
@ -1051,6 +1051,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to OneDrive refresh folders list failed.
/// </summary>
internal static string UploadersConfigForm_OneDriveListFolders_OneDrive_refresh_folders_list_failed {
get {
return ResourceManager.GetString("UploadersConfigForm_OneDriveListFolders_OneDrive_refresh_folders_list_failed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} successfully created..
/// </summary>

5
ShareX.UploadersLib/Properties/Resources.resx
View file

@ -373,7 +373,7 @@
<data name="UploadersConfigForm_DropboxAuthComplete_Login_successful_but_getting_account_info_failed_" xml:space="preserve">
<value>Login successful but getting account info failed.</value>
</data>
<data name="UploadersConfigForm_BoxListFolders_Authentication_required_" xml:space="preserve">
<data name="UploadersConfigForm_ListFolders_Authentication_required_" xml:space="preserve">
<value>Authentication required.</value>
</data>
<data name="UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed" xml:space="preserve">
@ -458,4 +458,7 @@ Created folders:</value>
<data name="OAuthInfo_OAuthInfo_New_account" xml:space="preserve">
<value>New account</value>
</data>
<data name="UploadersConfigForm_OneDriveListFolders_OneDrive_refresh_folders_list_failed" xml:space="preserve">
<value>OneDrive refresh folders list failed</value>
</data>
</root>

2
ShareX.UploadersLib/Properties/Resources.tr.resx
View file

@ -202,7 +202,7 @@ Oluşturulmuş dizinler:</value>
<data name="OAuthInfo_OAuthInfo_New_account" xml:space="preserve">
<value>Yeni hesap</value>
</data>
<data name="UploadersConfigForm_BoxListFolders_Authentication_required_" xml:space="preserve">
<data name="UploadersConfigForm_ListFolders_Authentication_required_" xml:space="preserve">
<value>Yetkilendirme gerekiyor.</value>
</data>
<data name="DropboxFilesForm_tsmiDelete_Click_Delete_file_" xml:space="preserve">