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

Change uploaders config tab name from "FTP" to "FTP / FTPS / SFTP"

Browse source
This commit is contained in:
Jaex 2017-03-24 13:31:25 +03:00
parent a991572ad3
commit df29f1d4fc
3 changed files with 2327 additions and 8175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ public void ChangeDirectory(string path, bool autoCreateDirectory = false)
catch (SftpPathNotFoundException) when (autoCreateDirectory)
{
CreateDirectory(path, true);
client.ChangeDirectory(path);
ChangeDirectory(path);
}
}
}
@ -227,15 +227,11 @@ private bool UploadStream(Stream stream, string remotePath, bool autoCreateDirec
// Happens when directory not exist, create directory and retry uploading
CreateDirectory(URLHelpers.GetDirectoryPath(remotePath), true);
using (SftpFileStream sftpStream = client.Create(remotePath))
{
return TransferData(stream, sftpStream);
}
UploadStream(stream, remotePath);
}
catch (NullReferenceException)
{
// Happens when disconnected while uploading
// Happens when disconnect while uploading
}
}

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

@ -222,6 +222,7 @@ private void InitializeComponent()
this.btnBoxRefreshFolders = new System.Windows.Forms.Button();
this.oauth2Box = new ShareX.UploadersLib.OAuthControl();
this.tpAmazonS3 = new System.Windows.Forms.TabPage();
this.cbAmazonS3UsePathStyle = new System.Windows.Forms.CheckBox();
this.lblAmazonS3Endpoint = new System.Windows.Forms.Label();
this.txtAmazonS3Endpoint = new System.Windows.Forms.TextBox();
this.lblAmazonS3Region = new System.Windows.Forms.Label();
@ -598,7 +599,6 @@ private void InitializeComponent()
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.cbAmazonS3UsePathStyle = new System.Windows.Forms.CheckBox();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpTwitter.SuspendLayout();
@ -2162,6 +2162,13 @@ private void InitializeComponent()
this.tpAmazonS3.Name = "tpAmazonS3";
this.tpAmazonS3.UseVisualStyleBackColor = true;
//
// cbAmazonS3UsePathStyle
//
resources.ApplyResources(this.cbAmazonS3UsePathStyle, "cbAmazonS3UsePathStyle");
this.cbAmazonS3UsePathStyle.Name = "cbAmazonS3UsePathStyle";
this.cbAmazonS3UsePathStyle.UseVisualStyleBackColor = true;
this.cbAmazonS3UsePathStyle.CheckedChanged += new System.EventHandler(this.cbAmazonS3UsePathStyle_CheckedChanged);
//
// lblAmazonS3Endpoint
//
resources.ApplyResources(this.lblAmazonS3Endpoint, "lblAmazonS3Endpoint");
@ -4821,13 +4828,6 @@ private void InitializeComponent()
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
//
// cbAmazonS3UsePathStyle
//
resources.ApplyResources(this.cbAmazonS3UsePathStyle, "cbAmazonS3UsePathStyle");
this.cbAmazonS3UsePathStyle.Name = "cbAmazonS3UsePathStyle";
this.cbAmazonS3UsePathStyle.UseVisualStyleBackColor = true;
this.cbAmazonS3UsePathStyle.CheckedChanged += new System.EventHandler(this.cbAmazonS3UsePathStyle_CheckedChanged);
//
// UploadersConfigForm
//
resources.ApplyResources(this, "$this");

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

File diff suppressed because it is too large Load diff