瀏覽代碼

S3 Default region can be configured on Advanced Site Settings dialog

Source commit: 65aa0fd406613acbf97bd099c7b342e3b7ee9514
Martin Prikryl 6 年之前
父節點
當前提交
01e4007f08
共有 3 個文件被更改,包括 97 次插入14 次删除
  1. 9 0
      source/forms/SiteAdvanced.cpp
  2. 82 14
      source/forms/SiteAdvanced.dfm
  3. 6 0
      source/forms/SiteAdvanced.h

+ 9 - 0
source/forms/SiteAdvanced.cpp

@@ -213,6 +213,9 @@ void __fastcall TSiteAdvancedDialog::LoadSession()
     ComboAutoSwitchLoad(FtpForcePasvIpCombo, FSessionData->FtpForcePasvIp);
     ComboAutoSwitchLoad(FtpHostCombo, FSessionData->FtpHost);
 
+    // S3 page
+    S3DefaultReqionCombo->Text = FSessionData->S3DefaultRegion;
+
     // Authentication page
     SshNoUserAuthCheck->Checked = FSessionData->SshNoUserAuth;
     TryAgentCheck->Checked = FSessionData->TryAgent;
@@ -596,6 +599,9 @@ void __fastcall TSiteAdvancedDialog::SaveSession()
   FSessionData->FtpForcePasvIp = ComboAutoSwitchSave(FtpForcePasvIpCombo);
   FSessionData->FtpHost = ComboAutoSwitchSave(FtpHostCombo);
 
+  // S3 page
+  FSessionData->S3DefaultRegion = S3DefaultReqionCombo->Text;
+
   // Proxy page
   FSessionData->ProxyMethod = GetProxyMethod();
   FSessionData->FtpProxyLogonType = GetFtpProxyLogonType();
@@ -995,6 +1001,9 @@ void __fastcall TSiteAdvancedDialog::UpdateControls()
       (IPAutoButton->Checked || IPv4Button->Checked));
     EnableControl(FtpForcePasvIpLabel, FtpForcePasvIpCombo->Enabled);
 
+    // environment/s3
+    S3Sheet->Enabled = S3Protocol;
+
     // tunnel sheet
     TunnelSheet->Enabled = SshProtocol;
     // probably needless

+ 82 - 14
source/forms/SiteAdvanced.dfm

@@ -934,6 +934,72 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
         end
       end
+      object S3Sheet: TTabSheet
+        Tag = 2
+        HelpType = htKeyword
+        HelpKeyword = 'ui_login_s3'
+        Caption = 'S3'
+        ImageIndex = 16
+        TabVisible = False
+        DesignSize = (
+          401
+          382)
+        object S3Group: TGroupBox
+          Left = 0
+          Top = 6
+          Width = 393
+          Height = 46
+          Anchors = [akLeft, akTop, akRight]
+          Caption = 'Protocol options'
+          TabOrder = 0
+          DesignSize = (
+            393
+            46)
+          object Label27: TLabel
+            Left = 12
+            Top = 20
+            Width = 72
+            Height = 13
+            Caption = '&Default region:'
+            FocusControl = S3DefaultReqionCombo
+          end
+          object S3DefaultReqionCombo: TComboBox
+            Left = 168
+            Top = 15
+            Width = 213
+            Height = 21
+            Anchors = [akLeft, akTop, akRight]
+            MaxLength = 100
+            TabOrder = 0
+            Text = 'S3DefaultRegionCombo'
+            OnChange = DataChange
+            Items.Strings = (
+              'ap-east-1'
+              'ap-northeast-1'
+              'ap-northeast-2'
+              'ap-northeast-3'
+              'ap-south-1'
+              'ap-southeast-1'
+              'ap-southeast-2'
+              'ca-central-1'
+              'cn-north-1'
+              'cn-northwest-1'
+              'eu-central-1'
+              'eu-north-1'
+              'eu-west-1'
+              'eu-west-2'
+              'eu-west-3'
+              'me-south-1'
+              'sa-east-1'
+              'us-east-1'
+              'us-east-2'
+              'us-gov-east-1'
+              'us-gov-west-1'
+              'us-west-1'
+              'us-west-2')
+          end
+        end
+      end
       object ConnSheet: TTabSheet
         Tag = 1
         HelpType = htKeyword
@@ -2460,7 +2526,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
         OnCollapsing = NavigationTreeCollapsing
         Items.NodeData = {
           030400000036000000000000000000000000000000FFFFFFFF00000000000000
-          0006000000010C45006E007600690072006F006E006D0065006E007400580036
+          0007000000010C45006E007600690072006F006E006D0065006E007400580036
           000000000000000000000000000000FFFFFFFF00000000000000000000000001
           0C4400690072006500630074006F007200690065007300580036000000000000
           000000000000000000FFFFFFFF000000000000000000000000010C5200650063
@@ -2470,19 +2536,21 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           0000000000000000000000010553004600540050005800260000000000000000
           00000000000000FFFFFFFF000000000000000000000000010453004300500058
           00260000000000000000000000FFFFFFFFFFFFFFFF0000000000000000000000
-          000104460054005000580034000000000000000000000000000000FFFFFFFF00
-          0000000000000002000000010B43006F006E006E0065006300740069006F006E
-          0058002A000000000000000000000000000000FFFFFFFF000000000000000000
-          0000000106500072006F007800790058002C0000000000000000000000000000
-          00FFFFFFFF0000000000000000000000000107540075006E006E0065006C0058
-          0026000000000000000000000000000000FFFFFFFF0000000000000000030000
-          000104530053004800580038000000000000000000000000000000FFFFFFFF00
-          0000000000000000000000010D4B00650078002000650078006300680061006E
-          006700650058003C000000000000000000000000000000FFFFFFFF0000000000
-          00000000000000010F410075007400680065006E007400690063006100740069
-          006F006E00580028000000000000000000000000000000FFFFFFFF0000000000
-          0000000000000001054200750067007300580028000000000000000000000000
-          000000FFFFFFFF00000000000000000000000001054E006F00740065005800}
+          000104460054005000580024000000000000000000000000000000FFFFFFFF00
+          0000000000000000000000010353003300580034000000000000000000000000
+          000000FFFFFFFF000000000000000002000000010B43006F006E006E00650063
+          00740069006F006E0058002A000000000000000000000000000000FFFFFFFF00
+          00000000000000000000000106500072006F007800790058002C000000000000
+          000000000000000000FFFFFFFF0000000000000000000000000107540075006E
+          006E0065006C00580026000000000000000000000000000000FFFFFFFF000000
+          0000000000030000000104530053004800580038000000000000000000000000
+          000000FFFFFFFF000000000000000000000000010D4B00650078002000650078
+          006300680061006E006700650058003C000000000000000000000000000000FF
+          FFFFFF000000000000000000000000010F410075007400680065006E00740069
+          0063006100740069006F006E00580028000000000000000000000000000000FF
+          FFFFFF0000000000000000000000000105420075006700730058002800000000
+          0000000000000000000000FFFFFFFF00000000000000000000000001054E006F
+          00740065005800}
       end
     end
   end

+ 6 - 0
source/forms/SiteAdvanced.h

@@ -270,6 +270,12 @@ __published:
   TCheckBox *ShowEncryptionKeyCheck;
   TButton *GenerateKeyButton;
   TEdit *EncryptKeyVisibleEdit;
+  TTabSheet *S3Sheet;
+  TGroupBox *S3Group;
+  TLabel *Label27;
+  TComboBox *S3DefaultReqionCombo;
+  TLabel *Label5;
+  TComboBox *S3UrlStyleCombo;
   void __fastcall DataChange(TObject *Sender);
   void __fastcall FormShow(TObject *Sender);
   void __fastcall PageControlChange(TObject *Sender);