mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Removed FTP proxy settings
This commit is contained in:
Jaex
parent
bd7a57c0cb
commit
568b8ab627
5 changed files with 153 additions and 214 deletions
|
|
@ -297,16 +297,4 @@ public enum ProxyMethod
|
|||
Manual,
|
||||
Automatic
|
||||
}
|
||||
|
||||
public enum ProxyType
|
||||
{
|
||||
[Description("HTTP proxy")]
|
||||
HTTP,
|
||||
[Description("SOCKS v4 proxy")]
|
||||
SOCKS4,
|
||||
[Description("SOCKS v4a proxy")]
|
||||
SOCKS4a,
|
||||
[Description("SOCKS v5 proxy")]
|
||||
SOCKS5
|
||||
}
|
||||
}
|
||||
|
|
@ -51,7 +51,6 @@ public static ProxyInfo Current
|
|||
}
|
||||
|
||||
public ProxyMethod ProxyMethod { get; set; }
|
||||
public ProxyType ProxyType { get; set; }
|
||||
public string Host { get; set; }
|
||||
public int Port { get; set; }
|
||||
public string Username { get; set; }
|
||||
|
|
@ -60,7 +59,6 @@ public static ProxyInfo Current
|
|||
public ProxyInfo()
|
||||
{
|
||||
ProxyMethod = ProxyMethod.Manual;
|
||||
ProxyType = ProxyType.HTTP;
|
||||
}
|
||||
|
||||
public bool IsValidProxy()
|
||||
|
|
@ -78,7 +76,6 @@ public bool IsValidProxy()
|
|||
{
|
||||
Host = systemProxy.Address.Host;
|
||||
Port = systemProxy.Address.Port;
|
||||
ProxyType = ProxyType.HTTP;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -86,7 +83,6 @@ public bool IsValidProxy()
|
|||
return false;
|
||||
}
|
||||
|
||||
// Proxy for HTTP
|
||||
public IWebProxy GetWebProxy()
|
||||
{
|
||||
if (IsValidProxy())
|
||||
|
|
@ -117,7 +113,7 @@ private WebProxy GetDefaultWebProxy()
|
|||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Format("{0} - {1}:{2} ({3})", Username, Host, Port, ProxyType);
|
||||
return string.Format("{0} - {1}:{2}", Username, Host, Port);
|
||||
}
|
||||
}
|
||||
}
|
||||
331
ShareX/Forms/ApplicationSettingsForm.Designer.cs
generated
331
ShareX/Forms/ApplicationSettingsForm.Designer.cs
generated
|
|
@ -55,11 +55,8 @@ private void InitializeComponent()
|
|||
this.lblSaveImageSubFolderPatternPreview = new System.Windows.Forms.Label();
|
||||
this.txtSaveImageSubFolderPattern = new System.Windows.Forms.TextBox();
|
||||
this.tpProxy = new System.Windows.Forms.TabPage();
|
||||
this.lblProxyNote = new System.Windows.Forms.Label();
|
||||
this.cbProxyMethod = new System.Windows.Forms.ComboBox();
|
||||
this.lblProxyMethod = new System.Windows.Forms.Label();
|
||||
this.cbProxyType = new System.Windows.Forms.ComboBox();
|
||||
this.lblProxyType = new System.Windows.Forms.Label();
|
||||
this.lblProxyHost = new System.Windows.Forms.Label();
|
||||
this.txtProxyHost = new System.Windows.Forms.TextBox();
|
||||
this.nudProxyPort = new System.Windows.Forms.NumericUpDown();
|
||||
|
|
@ -82,21 +79,12 @@ private void InitializeComponent()
|
|||
this.btnClipboardFormatEdit = new System.Windows.Forms.Button();
|
||||
this.btnClipboardFormatRemove = new System.Windows.Forms.Button();
|
||||
this.btnClipboardFormatAdd = new System.Windows.Forms.Button();
|
||||
this.lvClipboardFormats = new HelpersLib.MyListView();
|
||||
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.tpUploadRetry = new System.Windows.Forms.TabPage();
|
||||
this.chkUseSecondaryUploaders = new System.Windows.Forms.CheckBox();
|
||||
this.tlpBackupDestinations = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.gbSecondaryImageUploaders = new System.Windows.Forms.GroupBox();
|
||||
this.lvSecondaryImageUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.gbSecondaryFileUploaders = new System.Windows.Forms.GroupBox();
|
||||
this.lvSecondaryFileUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.gbSecondaryTextUploaders = new System.Windows.Forms.GroupBox();
|
||||
this.lvSecondaryTextUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.cbIfUploadFailRetryOnce = new System.Windows.Forms.Label();
|
||||
this.nudRetryUpload = new System.Windows.Forms.NumericUpDown();
|
||||
this.tpPrint = new System.Windows.Forms.TabPage();
|
||||
|
|
@ -107,16 +95,25 @@ private void InitializeComponent()
|
|||
this.tcProfiles = new System.Windows.Forms.TabControl();
|
||||
this.tpEncodersCLI = new System.Windows.Forms.TabPage();
|
||||
this.btnEncoderDuplicate = new System.Windows.Forms.Button();
|
||||
this.lvEncoders = new HelpersLib.MyListView();
|
||||
this.chEncoderDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderOutputExtension = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.btnEncodersAdd = new System.Windows.Forms.Button();
|
||||
this.btnEncodersEdit = new System.Windows.Forms.Button();
|
||||
this.btnEncodersRemove = new System.Windows.Forms.Button();
|
||||
this.tpAdvanced = new System.Windows.Forms.TabPage();
|
||||
this.pgSettings = new System.Windows.Forms.PropertyGrid();
|
||||
this.lvClipboardFormats = new HelpersLib.MyListView();
|
||||
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.lvSecondaryImageUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.lvSecondaryFileUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.lvSecondaryTextUploaders = new HelpersLib.MyListView();
|
||||
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.lvEncoders = new HelpersLib.MyListView();
|
||||
this.chEncoderDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.chEncoderOutputExtension = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.tcSettings.SuspendLayout();
|
||||
this.tpGeneral.SuspendLayout();
|
||||
this.tpPaths.SuspendLayout();
|
||||
|
|
@ -421,11 +418,8 @@ private void InitializeComponent()
|
|||
//
|
||||
// tpProxy
|
||||
//
|
||||
this.tpProxy.Controls.Add(this.lblProxyNote);
|
||||
this.tpProxy.Controls.Add(this.cbProxyMethod);
|
||||
this.tpProxy.Controls.Add(this.lblProxyMethod);
|
||||
this.tpProxy.Controls.Add(this.cbProxyType);
|
||||
this.tpProxy.Controls.Add(this.lblProxyType);
|
||||
this.tpProxy.Controls.Add(this.lblProxyHost);
|
||||
this.tpProxy.Controls.Add(this.txtProxyHost);
|
||||
this.tpProxy.Controls.Add(this.nudProxyPort);
|
||||
|
|
@ -442,20 +436,11 @@ private void InitializeComponent()
|
|||
this.tpProxy.Text = "Proxy";
|
||||
this.tpProxy.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// lblProxyNote
|
||||
//
|
||||
this.lblProxyNote.AutoSize = true;
|
||||
this.lblProxyNote.Location = new System.Drawing.Point(264, 48);
|
||||
this.lblProxyNote.Name = "lblProxyNote";
|
||||
this.lblProxyNote.Size = new System.Drawing.Size(196, 13);
|
||||
this.lblProxyNote.TabIndex = 4;
|
||||
this.lblProxyNote.Text = "SOCKS proxy is only supported by FTP. ";
|
||||
//
|
||||
// cbProxyMethod
|
||||
//
|
||||
this.cbProxyMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cbProxyMethod.FormattingEnabled = true;
|
||||
this.cbProxyMethod.Location = new System.Drawing.Point(120, 12);
|
||||
this.cbProxyMethod.Location = new System.Drawing.Point(128, 12);
|
||||
this.cbProxyMethod.Name = "cbProxyMethod";
|
||||
this.cbProxyMethod.Size = new System.Drawing.Size(136, 21);
|
||||
this.cbProxyMethod.TabIndex = 1;
|
||||
|
|
@ -470,29 +455,10 @@ private void InitializeComponent()
|
|||
this.lblProxyMethod.TabIndex = 0;
|
||||
this.lblProxyMethod.Text = "Proxy configuration:";
|
||||
//
|
||||
// cbProxyType
|
||||
//
|
||||
this.cbProxyType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cbProxyType.FormattingEnabled = true;
|
||||
this.cbProxyType.Location = new System.Drawing.Point(120, 44);
|
||||
this.cbProxyType.Name = "cbProxyType";
|
||||
this.cbProxyType.Size = new System.Drawing.Size(136, 21);
|
||||
this.cbProxyType.TabIndex = 3;
|
||||
this.cbProxyType.SelectedIndexChanged += new System.EventHandler(this.cboProxyType_SelectedIndexChanged);
|
||||
//
|
||||
// lblProxyType
|
||||
//
|
||||
this.lblProxyType.AutoSize = true;
|
||||
this.lblProxyType.Location = new System.Drawing.Point(16, 48);
|
||||
this.lblProxyType.Name = "lblProxyType";
|
||||
this.lblProxyType.Size = new System.Drawing.Size(34, 13);
|
||||
this.lblProxyType.TabIndex = 2;
|
||||
this.lblProxyType.Text = "Type:";
|
||||
//
|
||||
// lblProxyHost
|
||||
//
|
||||
this.lblProxyHost.AutoSize = true;
|
||||
this.lblProxyHost.Location = new System.Drawing.Point(16, 80);
|
||||
this.lblProxyHost.Location = new System.Drawing.Point(16, 48);
|
||||
this.lblProxyHost.Name = "lblProxyHost";
|
||||
this.lblProxyHost.Size = new System.Drawing.Size(32, 13);
|
||||
this.lblProxyHost.TabIndex = 5;
|
||||
|
|
@ -500,7 +466,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// txtProxyHost
|
||||
//
|
||||
this.txtProxyHost.Location = new System.Drawing.Point(120, 76);
|
||||
this.txtProxyHost.Location = new System.Drawing.Point(128, 44);
|
||||
this.txtProxyHost.Name = "txtProxyHost";
|
||||
this.txtProxyHost.Size = new System.Drawing.Size(232, 20);
|
||||
this.txtProxyHost.TabIndex = 6;
|
||||
|
|
@ -508,7 +474,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// nudProxyPort
|
||||
//
|
||||
this.nudProxyPort.Location = new System.Drawing.Point(392, 76);
|
||||
this.nudProxyPort.Location = new System.Drawing.Point(400, 44);
|
||||
this.nudProxyPort.Maximum = new decimal(new int[] {
|
||||
65535,
|
||||
0,
|
||||
|
|
@ -523,7 +489,7 @@ private void InitializeComponent()
|
|||
// lblProxyPort
|
||||
//
|
||||
this.lblProxyPort.AutoSize = true;
|
||||
this.lblProxyPort.Location = new System.Drawing.Point(360, 80);
|
||||
this.lblProxyPort.Location = new System.Drawing.Point(368, 48);
|
||||
this.lblProxyPort.Name = "lblProxyPort";
|
||||
this.lblProxyPort.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
|
||||
this.lblProxyPort.Size = new System.Drawing.Size(26, 13);
|
||||
|
|
@ -533,7 +499,7 @@ private void InitializeComponent()
|
|||
// lblProxyPassword
|
||||
//
|
||||
this.lblProxyPassword.AutoSize = true;
|
||||
this.lblProxyPassword.Location = new System.Drawing.Point(16, 144);
|
||||
this.lblProxyPassword.Location = new System.Drawing.Point(16, 112);
|
||||
this.lblProxyPassword.Name = "lblProxyPassword";
|
||||
this.lblProxyPassword.Size = new System.Drawing.Size(56, 13);
|
||||
this.lblProxyPassword.TabIndex = 11;
|
||||
|
|
@ -541,7 +507,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// txtProxyPassword
|
||||
//
|
||||
this.txtProxyPassword.Location = new System.Drawing.Point(120, 140);
|
||||
this.txtProxyPassword.Location = new System.Drawing.Point(128, 108);
|
||||
this.txtProxyPassword.Name = "txtProxyPassword";
|
||||
this.txtProxyPassword.PasswordChar = '●';
|
||||
this.txtProxyPassword.Size = new System.Drawing.Size(232, 20);
|
||||
|
|
@ -551,7 +517,7 @@ private void InitializeComponent()
|
|||
// lblProxyUsername
|
||||
//
|
||||
this.lblProxyUsername.AutoSize = true;
|
||||
this.lblProxyUsername.Location = new System.Drawing.Point(16, 112);
|
||||
this.lblProxyUsername.Location = new System.Drawing.Point(16, 80);
|
||||
this.lblProxyUsername.Name = "lblProxyUsername";
|
||||
this.lblProxyUsername.Size = new System.Drawing.Size(58, 13);
|
||||
this.lblProxyUsername.TabIndex = 9;
|
||||
|
|
@ -559,7 +525,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// txtProxyUsername
|
||||
//
|
||||
this.txtProxyUsername.Location = new System.Drawing.Point(120, 108);
|
||||
this.txtProxyUsername.Location = new System.Drawing.Point(128, 76);
|
||||
this.txtProxyUsername.Name = "txtProxyUsername";
|
||||
this.txtProxyUsername.Size = new System.Drawing.Size(232, 20);
|
||||
this.txtProxyUsername.TabIndex = 10;
|
||||
|
|
@ -723,31 +689,6 @@ private void InitializeComponent()
|
|||
this.btnClipboardFormatAdd.UseVisualStyleBackColor = true;
|
||||
this.btnClipboardFormatAdd.Click += new System.EventHandler(this.btnAddClipboardFormat_Click);
|
||||
//
|
||||
// lvClipboardFormats
|
||||
//
|
||||
this.lvClipboardFormats.AutoFillColumn = true;
|
||||
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.chDescription,
|
||||
this.chFormat});
|
||||
this.lvClipboardFormats.FullRowSelect = true;
|
||||
this.lvClipboardFormats.Location = new System.Drawing.Point(8, 48);
|
||||
this.lvClipboardFormats.Name = "lvClipboardFormats";
|
||||
this.lvClipboardFormats.Size = new System.Drawing.Size(560, 264);
|
||||
this.lvClipboardFormats.TabIndex = 3;
|
||||
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
|
||||
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
|
||||
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
|
||||
//
|
||||
// chDescription
|
||||
//
|
||||
this.chDescription.Text = "Description";
|
||||
this.chDescription.Width = 135;
|
||||
//
|
||||
// chFormat
|
||||
//
|
||||
this.chFormat.Text = "Format";
|
||||
this.chFormat.Width = 320;
|
||||
//
|
||||
// tpUploadRetry
|
||||
//
|
||||
this.tpUploadRetry.Controls.Add(this.chkUseSecondaryUploaders);
|
||||
|
|
@ -804,26 +745,6 @@ private void InitializeComponent()
|
|||
this.gbSecondaryImageUploaders.TabStop = false;
|
||||
this.gbSecondaryImageUploaders.Text = "Secondary image uploaders";
|
||||
//
|
||||
// lvSecondaryImageUploaders
|
||||
//
|
||||
this.lvSecondaryImageUploaders.AllowDrop = true;
|
||||
this.lvSecondaryImageUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader1});
|
||||
this.lvSecondaryImageUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryImageUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryImageUploaders.HideSelection = false;
|
||||
this.lvSecondaryImageUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryImageUploaders.MultiSelect = false;
|
||||
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
|
||||
this.lvSecondaryImageUploaders.Size = new System.Drawing.Size(179, 258);
|
||||
this.lvSecondaryImageUploaders.TabIndex = 0;
|
||||
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// gbSecondaryFileUploaders
|
||||
//
|
||||
this.gbSecondaryFileUploaders.Controls.Add(this.lvSecondaryFileUploaders);
|
||||
|
|
@ -836,25 +757,6 @@ private void InitializeComponent()
|
|||
this.gbSecondaryFileUploaders.TabStop = false;
|
||||
this.gbSecondaryFileUploaders.Text = "Secondary file uploaders";
|
||||
//
|
||||
// lvSecondaryFileUploaders
|
||||
//
|
||||
this.lvSecondaryFileUploaders.AllowDrop = true;
|
||||
this.lvSecondaryFileUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader3});
|
||||
this.lvSecondaryFileUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryFileUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryFileUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryFileUploaders.MultiSelect = false;
|
||||
this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
|
||||
this.lvSecondaryFileUploaders.Size = new System.Drawing.Size(180, 258);
|
||||
this.lvSecondaryFileUploaders.TabIndex = 0;
|
||||
this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// gbSecondaryTextUploaders
|
||||
//
|
||||
this.gbSecondaryTextUploaders.Controls.Add(this.lvSecondaryTextUploaders);
|
||||
|
|
@ -867,25 +769,6 @@ private void InitializeComponent()
|
|||
this.gbSecondaryTextUploaders.TabStop = false;
|
||||
this.gbSecondaryTextUploaders.Text = "Secondary text uploaders";
|
||||
//
|
||||
// lvSecondaryTextUploaders
|
||||
//
|
||||
this.lvSecondaryTextUploaders.AllowDrop = true;
|
||||
this.lvSecondaryTextUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader2});
|
||||
this.lvSecondaryTextUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryTextUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryTextUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryTextUploaders.MultiSelect = false;
|
||||
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
|
||||
this.lvSecondaryTextUploaders.Size = new System.Drawing.Size(185, 258);
|
||||
this.lvSecondaryTextUploaders.TabIndex = 0;
|
||||
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// cbIfUploadFailRetryOnce
|
||||
//
|
||||
this.cbIfUploadFailRetryOnce.AutoSize = true;
|
||||
|
|
@ -999,47 +882,6 @@ private void InitializeComponent()
|
|||
this.btnEncoderDuplicate.UseVisualStyleBackColor = true;
|
||||
this.btnEncoderDuplicate.Click += new System.EventHandler(this.btnEncoderDuplicate_Click);
|
||||
//
|
||||
// lvEncoders
|
||||
//
|
||||
this.lvEncoders.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.lvEncoders.AutoFillColumn = true;
|
||||
this.lvEncoders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.chEncoderDescription,
|
||||
this.chEncoderPath,
|
||||
this.chEncoderArgs,
|
||||
this.chEncoderOutputExtension});
|
||||
this.lvEncoders.FullRowSelect = true;
|
||||
this.lvEncoders.Location = new System.Drawing.Point(8, 40);
|
||||
this.lvEncoders.MultiSelect = false;
|
||||
this.lvEncoders.Name = "lvEncoders";
|
||||
this.lvEncoders.Size = new System.Drawing.Size(576, 289);
|
||||
this.lvEncoders.TabIndex = 4;
|
||||
this.lvEncoders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvEncoders.View = System.Windows.Forms.View.Details;
|
||||
this.lvEncoders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvEncoders_MouseDoubleClick);
|
||||
//
|
||||
// chEncoderDescription
|
||||
//
|
||||
this.chEncoderDescription.Text = "Description";
|
||||
this.chEncoderDescription.Width = 130;
|
||||
//
|
||||
// chEncoderPath
|
||||
//
|
||||
this.chEncoderPath.Text = "Path";
|
||||
this.chEncoderPath.Width = 80;
|
||||
//
|
||||
// chEncoderArgs
|
||||
//
|
||||
this.chEncoderArgs.Text = "Args";
|
||||
this.chEncoderArgs.Width = 230;
|
||||
//
|
||||
// chEncoderOutputExtension
|
||||
//
|
||||
this.chEncoderOutputExtension.Text = "Output extension";
|
||||
this.chEncoderOutputExtension.Width = 100;
|
||||
//
|
||||
// btnEncodersAdd
|
||||
//
|
||||
this.btnEncodersAdd.Location = new System.Drawing.Point(8, 8);
|
||||
|
|
@ -1091,6 +933,130 @@ private void InitializeComponent()
|
|||
this.pgSettings.TabIndex = 0;
|
||||
this.pgSettings.ToolbarVisible = false;
|
||||
//
|
||||
// lvClipboardFormats
|
||||
//
|
||||
this.lvClipboardFormats.AutoFillColumn = true;
|
||||
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.chDescription,
|
||||
this.chFormat});
|
||||
this.lvClipboardFormats.FullRowSelect = true;
|
||||
this.lvClipboardFormats.Location = new System.Drawing.Point(8, 48);
|
||||
this.lvClipboardFormats.Name = "lvClipboardFormats";
|
||||
this.lvClipboardFormats.Size = new System.Drawing.Size(560, 264);
|
||||
this.lvClipboardFormats.TabIndex = 3;
|
||||
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
|
||||
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
|
||||
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
|
||||
//
|
||||
// chDescription
|
||||
//
|
||||
this.chDescription.Text = "Description";
|
||||
this.chDescription.Width = 135;
|
||||
//
|
||||
// chFormat
|
||||
//
|
||||
this.chFormat.Text = "Format";
|
||||
this.chFormat.Width = 320;
|
||||
//
|
||||
// lvSecondaryImageUploaders
|
||||
//
|
||||
this.lvSecondaryImageUploaders.AllowDrop = true;
|
||||
this.lvSecondaryImageUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader1});
|
||||
this.lvSecondaryImageUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryImageUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryImageUploaders.HideSelection = false;
|
||||
this.lvSecondaryImageUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryImageUploaders.MultiSelect = false;
|
||||
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
|
||||
this.lvSecondaryImageUploaders.Size = new System.Drawing.Size(179, 258);
|
||||
this.lvSecondaryImageUploaders.TabIndex = 0;
|
||||
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// lvSecondaryFileUploaders
|
||||
//
|
||||
this.lvSecondaryFileUploaders.AllowDrop = true;
|
||||
this.lvSecondaryFileUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader3});
|
||||
this.lvSecondaryFileUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryFileUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryFileUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryFileUploaders.MultiSelect = false;
|
||||
this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
|
||||
this.lvSecondaryFileUploaders.Size = new System.Drawing.Size(180, 258);
|
||||
this.lvSecondaryFileUploaders.TabIndex = 0;
|
||||
this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// lvSecondaryTextUploaders
|
||||
//
|
||||
this.lvSecondaryTextUploaders.AllowDrop = true;
|
||||
this.lvSecondaryTextUploaders.AutoFillColumn = true;
|
||||
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader2});
|
||||
this.lvSecondaryTextUploaders.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lvSecondaryTextUploaders.FullRowSelect = true;
|
||||
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||
this.lvSecondaryTextUploaders.Location = new System.Drawing.Point(3, 18);
|
||||
this.lvSecondaryTextUploaders.MultiSelect = false;
|
||||
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
|
||||
this.lvSecondaryTextUploaders.Size = new System.Drawing.Size(185, 258);
|
||||
this.lvSecondaryTextUploaders.TabIndex = 0;
|
||||
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
|
||||
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
|
||||
//
|
||||
// lvEncoders
|
||||
//
|
||||
this.lvEncoders.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.lvEncoders.AutoFillColumn = true;
|
||||
this.lvEncoders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.chEncoderDescription,
|
||||
this.chEncoderPath,
|
||||
this.chEncoderArgs,
|
||||
this.chEncoderOutputExtension});
|
||||
this.lvEncoders.FullRowSelect = true;
|
||||
this.lvEncoders.Location = new System.Drawing.Point(8, 40);
|
||||
this.lvEncoders.MultiSelect = false;
|
||||
this.lvEncoders.Name = "lvEncoders";
|
||||
this.lvEncoders.Size = new System.Drawing.Size(576, 289);
|
||||
this.lvEncoders.TabIndex = 4;
|
||||
this.lvEncoders.UseCompatibleStateImageBehavior = false;
|
||||
this.lvEncoders.View = System.Windows.Forms.View.Details;
|
||||
this.lvEncoders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvEncoders_MouseDoubleClick);
|
||||
//
|
||||
// chEncoderDescription
|
||||
//
|
||||
this.chEncoderDescription.Text = "Description";
|
||||
this.chEncoderDescription.Width = 130;
|
||||
//
|
||||
// chEncoderPath
|
||||
//
|
||||
this.chEncoderPath.Text = "Path";
|
||||
this.chEncoderPath.Width = 80;
|
||||
//
|
||||
// chEncoderArgs
|
||||
//
|
||||
this.chEncoderArgs.Text = "Args";
|
||||
this.chEncoderArgs.Width = 230;
|
||||
//
|
||||
// chEncoderOutputExtension
|
||||
//
|
||||
this.chEncoderOutputExtension.Text = "Output extension";
|
||||
this.chEncoderOutputExtension.Width = 100;
|
||||
//
|
||||
// ApplicationSettingsForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
|
|
@ -1167,12 +1133,9 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.TextBox txtProxyPassword;
|
||||
private System.Windows.Forms.Label lblProxyUsername;
|
||||
private System.Windows.Forms.TextBox txtProxyUsername;
|
||||
private System.Windows.Forms.ComboBox cbProxyType;
|
||||
private System.Windows.Forms.Label lblProxyType;
|
||||
private System.Windows.Forms.CheckBox cbShellContextMenu;
|
||||
private System.Windows.Forms.ComboBox cbProxyMethod;
|
||||
private System.Windows.Forms.Label lblProxyMethod;
|
||||
private System.Windows.Forms.Label lblProxyNote;
|
||||
private System.Windows.Forms.TabPage tpUpload;
|
||||
private System.Windows.Forms.Label cbIfUploadFailRetryOnce;
|
||||
private System.Windows.Forms.Label lblUploadLimit;
|
||||
|
|
|
|||
|
|
@ -75,13 +75,11 @@ private void LoadSettings()
|
|||
|
||||
// Proxy
|
||||
cbProxyMethod.Items.AddRange(Enum.GetNames(typeof(ProxyMethod)));
|
||||
cbProxyType.Items.AddRange(Helpers.GetEnumDescriptions<ProxyType>());
|
||||
cbProxyMethod.SelectedIndex = (int)Program.Settings.ProxySettings.ProxyMethod;
|
||||
txtProxyUsername.Text = Program.Settings.ProxySettings.Username;
|
||||
txtProxyPassword.Text = Program.Settings.ProxySettings.Password;
|
||||
txtProxyHost.Text = Program.Settings.ProxySettings.Host ?? string.Empty;
|
||||
nudProxyPort.Value = Program.Settings.ProxySettings.Port;
|
||||
cbProxyType.SelectedIndex = (int)Program.Settings.ProxySettings.ProxyType;
|
||||
UpdateProxyControls();
|
||||
|
||||
// Upload
|
||||
|
|
@ -155,14 +153,14 @@ private void UpdateProxyControls()
|
|||
switch (Program.Settings.ProxySettings.ProxyMethod)
|
||||
{
|
||||
case ProxyMethod.None:
|
||||
txtProxyUsername.Enabled = txtProxyPassword.Enabled = txtProxyHost.Enabled = nudProxyPort.Enabled = cbProxyType.Enabled = false;
|
||||
txtProxyUsername.Enabled = txtProxyPassword.Enabled = txtProxyHost.Enabled = nudProxyPort.Enabled = false;
|
||||
break;
|
||||
case ProxyMethod.Manual:
|
||||
txtProxyUsername.Enabled = txtProxyPassword.Enabled = txtProxyHost.Enabled = nudProxyPort.Enabled = cbProxyType.Enabled = true;
|
||||
txtProxyUsername.Enabled = txtProxyPassword.Enabled = txtProxyHost.Enabled = nudProxyPort.Enabled = true;
|
||||
break;
|
||||
case ProxyMethod.Automatic:
|
||||
txtProxyUsername.Enabled = txtProxyPassword.Enabled = true;
|
||||
txtProxyHost.Enabled = nudProxyPort.Enabled = cbProxyType.Enabled = false;
|
||||
txtProxyHost.Enabled = nudProxyPort.Enabled = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -318,7 +316,6 @@ private void cbProxyMethod_SelectedIndexChanged(object sender, EventArgs e)
|
|||
Program.Settings.ProxySettings.IsValidProxy();
|
||||
txtProxyHost.Text = Program.Settings.ProxySettings.Host ?? string.Empty;
|
||||
nudProxyPort.Value = Program.Settings.ProxySettings.Port;
|
||||
cbProxyType.SelectedIndex = (int)Program.Settings.ProxySettings.ProxyType;
|
||||
}
|
||||
|
||||
UpdateProxyControls();
|
||||
|
|
@ -344,11 +341,6 @@ private void nudProxyPort_ValueChanged(object sender, EventArgs e)
|
|||
Program.Settings.ProxySettings.Port = (int)nudProxyPort.Value;
|
||||
}
|
||||
|
||||
private void cboProxyType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
Program.Settings.ProxySettings.ProxyType = (ProxyType)cbProxyType.SelectedIndex;
|
||||
}
|
||||
|
||||
#endregion Proxy
|
||||
|
||||
#region Upload
|
||||
|
|
|
|||
|
|
@ -112,9 +112,9 @@
|
|||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
Loading…
Reference in a new issue