認証が必要なProxyへの対応(Basic認証のみ・環境がないので未テスト）

[winbottle/winbottle.git] / bottleclient / SettingForm.dfm

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index b2988c9..77e8e1b 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -36,7 +36,7 @@ object frmSetting: TfrmSetting
     Top = 32
     Width = 440
     Height = 291
-    ActivePage = tstGeneral
+    ActivePage = tstConnection
     Anchors = [akLeft, akTop, akRight, akBottom]
     MultiLine = True
     TabOrder = 0
@@ -735,7 +735,7 @@ object frmSetting: TfrmSetting
       TabVisible = False
       object lblReconnectWait: TLabel
         Left = 8
-        Top = 168
+        Top = 216
         Width = 156
         Height = 12
         Caption = #20877#25509#32154#12434#35430#12415#12427#12414#12391#12398#20998#25968'(&R):'
@@ -745,12 +745,12 @@ object frmSetting: TfrmSetting
         Left = 8
         Top = 8
         Width = 417
-        Height = 145
+        Height = 193
         Caption = 'HTTP Proxy'#35373#23450
         TabOrder = 0
         object lblProxyAddress: TLabel
           Left = 16
-          Top = 92
+          Top = 84
           Width = 56
           Height = 12
           Caption = #12450#12489#12524#12473'(&D)'
@@ -758,7 +758,7 @@ object frmSetting: TfrmSetting
         end
         object lblProxyPort: TLabel
           Left = 16
-          Top = 116
+          Top = 108
           Width = 47
           Height = 12
           Caption = #12509#12540#12488'(&O)'
@@ -777,9 +777,23 @@ object frmSetting: TfrmSetting
           Font.Style = []
           ParentFont = False
         end
+        object Label2: TLabel
+          Left = 16
+          Top = 164
+          Width = 48
+          Height = 12
+          Caption = #12518#12540#12470#21517
+        end
+        object Label3: TLabel
+          Left = 216
+          Top = 164
+          Width = 54
+          Height = 12
+          Caption = #12497#12473#12527#12540#12489
+        end
         object edtProxyAddress: TEdit
           Left = 80
-          Top = 88
+          Top = 80
           Width = 257
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12450#12489#12524#12473
@@ -787,7 +801,7 @@ object frmSetting: TfrmSetting
         end
         object edtProxyPort: TEdit
           Left = 80
-          Top = 112
+          Top = 104
           Width = 81
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12509#12540#12488#30058#21495
@@ -805,17 +819,42 @@ object frmSetting: TfrmSetting
         end
         object cbxAskUseHttpProxy: TCheckBox
           Left = 16
-          Top = 64
+          Top = 56
           Width = 305
           Height = 17
           Hint = #12463#12521#12452#12450#12531#12488#36215#21205#26178#12395#12289'Proxy'#12434#21033#29992#12377#12427#12363#12393#12358#12363#30906#35469#12375#12414#12377
           Caption = #36215#21205#26178#12395'Proxy'#12434#21033#29992#12377#12427#12363#12393#12358#12363#12383#12378#12397#12427'(&A)'
           TabOrder = 3
         end
+        object cbxProxyNeedAuthentication: TCheckBox
+          Left = 16
+          Top = 136
+          Width = 273
+          Height = 17
+          Hint = #35469#35388#12364#24517#35201#12394'Proxy'#12434#21033#29992#12377#12427#22580#21512#12395#12481#12455#12483#12463#12375#12414#12377#12290#36890#24120#12399#12481#12455#12483#12463#12377#12427#24517#35201#12399#12354#12426#12414#12379#12435#12290
+          Caption = #12371#12398'Proxy'#12399#35469#35388#12364#24517#35201
+          TabOrder = 4
+        end
+        object edtProxyUser: TEdit
+          Left = 80
+          Top = 160
+          Width = 121
+          Height = 20
+          Hint = 'Proxy'#12469#12540#12496#12398#12518#12540#12470#21517
+          TabOrder = 5
+        end
+        object edtProxyPass: TEdit
+          Left = 280
+          Top = 160
+          Width = 121
+          Height = 20
+          Hint = 'Proxy'#12469#12540#12496#12398#12497#12473#12527#12540#12489
+          TabOrder = 6
+        end
       end
       object spnReconnectWait: TSpinEdit
         Left = 168
-        Top = 164
+        Top = 212
         Width = 57
         Height = 21
         Hint = #28961#36890#20449#29366#24907#12391#20877#25509#32154#12434#35430#12415#12427#12414#12391#12398#20998#25968#12290#36890#24120#12399#22793#26356#12377#12427#24517#35201#12399#12394#12356