起動時プロクシ使用確認チェックボックスのHintを修正

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

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index cc4e1ad..b2988c9 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -1,6 +1,6 @@
 object frmSetting: TfrmSetting
-  Left = 282
-  Top = 289
+  Left = 447
+  Top = 154
   Anchors = [akLeft, akTop, akRight, akBottom]
   BorderStyle = bsDialog
   Caption = #35373#23450
@@ -36,7 +36,7 @@ object frmSetting: TfrmSetting
     Top = 32
     Width = 440
     Height = 291
-    ActivePage = tstPresetReplace
+    ActivePage = tstGeneral
     Anchors = [akLeft, akTop, akRight, akBottom]
     MultiLine = True
     TabOrder = 0
@@ -135,6 +135,15 @@ object frmSetting: TfrmSetting
         Caption = #33258#21205#12391#37096#20998#30906#35469#12377#12427'(&A)'
         TabOrder = 6
       end
+      object cbxNoWarnOfEmptyFMO: TCheckBox
+        Left = 8
+        Top = 256
+        Width = 249
+        Height = 17
+        Hint = #36215#21205#26178#12395#12468#12540#12473#12488#12364#12402#12392#12388#12418#36215#21205#12375#12390#12356#12394#12356#22580#21512#12398#35686#21578#12513#12483#12475#12540#12472#12434#38750#34920#31034#12395#12375#12414#12377
+        Caption = #12468#12540#12473#12488#12364#35211#12388#12363#12425#12394#12367#12390#12418#35686#21578#12375#12394#12356'(&G)'
+        TabOrder = 7
+      end
     end
     object tstDisplay: TTabSheet
       Caption = #34920#31034': '#30011#38754#34920#31034#38306#20418#12398#35373#23450
@@ -443,8 +452,8 @@ object frmSetting: TfrmSetting
       inline frmRuleList: TfrmBottleChainList
         Left = 4
         Top = 7
-        Width = 420
-        Height = 260
+        Width = 423
+        Height = 265
         TabOrder = 0
       end
     end
@@ -452,15 +461,13 @@ object frmSetting: TfrmSetting
       Caption = #12503#12522#12475#12483#12488#32622#25563': '#12513#12491#12517#12540#12363#12425#21628#12403#20986#12379#12427#25991#23383#21015#32622#25563#12398#35373#23450
       ImageIndex = 10
       TabVisible = False
-      inline frmReplacePresetList1: TfrmReplacePresetList
+      OnShow = tstPresetReplaceShow
+      inline ReplacePresetList: TfrmReplacePresetList
         Left = 4
         Top = 7
-        Width = 420
-        Height = 260
+        Width = 423
+        Height = 265
         TabOrder = 0
-        DesignSize = (
-          420
-          260)
       end
     end
     object tstPlayTime: TTabSheet
@@ -637,7 +644,7 @@ object frmSetting: TfrmSetting
         Height = 20
         Hint = #20104#28204#12497#12521#12513#12540#12479#12398#12463#12452#12483#12463#35373#23450
         Style = csDropDownList
-        ItemHeight = 0
+        ItemHeight = 12
         TabOrder = 0
         OnChange = cbxPlayTimeProfileChange
       end
@@ -728,7 +735,7 @@ object frmSetting: TfrmSetting
       TabVisible = False
       object lblReconnectWait: TLabel
         Left = 8
-        Top = 144
+        Top = 168
         Width = 156
         Height = 12
         Caption = #20877#25509#32154#12434#35430#12415#12427#12414#12391#12398#20998#25968'(&R):'
@@ -738,12 +745,12 @@ object frmSetting: TfrmSetting
         Left = 8
         Top = 8
         Width = 417
-        Height = 121
+        Height = 145
         Caption = 'HTTP Proxy'#35373#23450
         TabOrder = 0
         object lblProxyAddress: TLabel
           Left = 16
-          Top = 68
+          Top = 92
           Width = 56
           Height = 12
           Caption = #12450#12489#12524#12473'(&D)'
@@ -751,7 +758,7 @@ object frmSetting: TfrmSetting
         end
         object lblProxyPort: TLabel
           Left = 16
-          Top = 92
+          Top = 116
           Width = 47
           Height = 12
           Caption = #12509#12540#12488'(&O)'
@@ -772,7 +779,7 @@ object frmSetting: TfrmSetting
         end
         object edtProxyAddress: TEdit
           Left = 80
-          Top = 64
+          Top = 88
           Width = 257
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12450#12489#12524#12473
@@ -780,7 +787,7 @@ object frmSetting: TfrmSetting
         end
         object edtProxyPort: TEdit
           Left = 80
-          Top = 88
+          Top = 112
           Width = 81
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12509#12540#12488#30058#21495
@@ -796,10 +803,19 @@ object frmSetting: TfrmSetting
           Caption = 'HTTP Proxy'#12434#20351#29992#12377#12427'(&E)'
           TabOrder = 0
         end
+        object cbxAskUseHttpProxy: TCheckBox
+          Left = 16
+          Top = 64
+          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
       end
       object spnReconnectWait: TSpinEdit
         Left = 168
-        Top = 140
+        Top = 164
         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