ユーザ名・パスワード入力欄のレイアウトや挙動を少し変更。

生パスワードをINIファイルに入れたくないけどどうしよう…

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index 77e8e1b..a5699d3 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -735,7 +735,7 @@ object frmSetting: TfrmSetting
       TabVisible = False
       object lblReconnectWait: TLabel
         Left = 8
-        Top = 216
+        Top = 240
         Width = 156
         Height = 12
         Caption = #20877#25509#32154#12434#35430#12415#12427#12414#12391#12398#20998#25968'(&R):'
@@ -745,7 +745,7 @@ object frmSetting: TfrmSetting
         Left = 8
         Top = 8
         Width = 417
-        Height = 193
+        Height = 209
         Caption = 'HTTP Proxy'#35373#23450
         TabOrder = 0
         object lblProxyAddress: TLabel
@@ -777,19 +777,21 @@ object frmSetting: TfrmSetting
           Font.Style = []
           ParentFont = False
         end
-        object Label2: TLabel
-          Left = 16
+        object lblProxyUser: TLabel
+          Left = 48
           Top = 164
-          Width = 48
+          Width = 64
           Height = 12
-          Caption = #12518#12540#12470#21517
+          Caption = #12518#12540#12470#21517'(&U)'
+          FocusControl = edtProxyUser
         end
-        object Label3: TLabel
-          Left = 216
-          Top = 164
-          Width = 54
+        object lblProxyPass: TLabel
+          Left = 48
+          Top = 188
+          Width = 69
           Height = 12
-          Caption = #12497#12473#12527#12540#12489
+          Caption = #12497#12473#12527#12540#12489'(&P)'
+          FocusControl = edtProxyPass
         end
         object edtProxyAddress: TEdit
           Left = 80
@@ -832,21 +834,22 @@ object frmSetting: TfrmSetting
           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
+          Caption = #12371#12398'Proxy'#12399#35469#35388#12364#24517#35201'(&K)'
           TabOrder = 4
+          OnClick = cbxProxyNeedAuthenticationClick
         end
         object edtProxyUser: TEdit
-          Left = 80
+          Left = 120
           Top = 160
-          Width = 121
+          Width = 217
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12518#12540#12470#21517
           TabOrder = 5
         end
         object edtProxyPass: TEdit
-          Left = 280
-          Top = 160
-          Width = 121
+          Left = 120
+          Top = 184
+          Width = 217
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12497#12473#12527#12540#12489
           TabOrder = 6
@@ -854,7 +857,7 @@ object frmSetting: TfrmSetting
       end
       object spnReconnectWait: TSpinEdit
         Left = 168
-        Top = 212
+        Top = 236
         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

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 11706c0..f76a538 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -112,8 +112,8 @@ type
     cbxProxyNeedAuthentication: TCheckBox;
     edtProxyUser: TEdit;
     edtProxyPass: TEdit;
-    Label2: TLabel;
-    Label3: TLabel;
+    lblProxyUser: TLabel;
+    lblProxyPass: TLabel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure ctvBottleNodeChecked(Sender: TObject;
@@ -141,6 +141,7 @@ type
     procedure cbxAutoTabWidthClick(Sender: TObject);
     procedure btnBrowserLocateClick(Sender: TObject);
     procedure tstPresetReplaceShow(Sender: TObject);
+    procedure cbxProxyNeedAuthenticationClick(Sender: TObject);
   private
     { Private \90é\8c¾ }
     FOldLUID: String;
@@ -240,6 +241,7 @@ begin
   cbxUseHttpProxy.Checked := Pref.UseHttpProxy;
   cbxAskUseHttpProxy.Checked := Pref.AskUseHttpProxy;
   cbxProxyNeedAuthentication.Checked := Pref.ProxyNeedAuthentication;
+  cbxProxyNeedAuthenticationClick(Self);
   edtProxyAddress.Text := Pref.ProxyAddress;
   edtProxyPort.Text := IntToStr(Pref.ProxyPort);
   edtProxyUser.Text := Pref.ProxyUser;
@@ -780,4 +782,15 @@ begin
   ReplacePresetList.UpdateControls;
 end;
 
+procedure TfrmSetting.cbxProxyNeedAuthenticationClick(Sender: TObject);
+begin
+  with cbxProxyNeedAuthentication do
+  begin
+    edtProxyUser.Enabled := Checked;
+    edtProxyPass.Enabled := Checked;
+    lblProxyUser.Enabled := Checked;
+    lblProxyPass.Enabled := Checked;
+  end;
+end;
+
 end.