Changed layout

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index 0cd76a5..2302aaa 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -40,14 +40,6 @@ object frmSetting: TfrmSetting
         Caption = #12463#12522#12450#26178#12398#21021#26399#12473#12463#12522#12503#12488'('#32294#26834'"|"'#12398#20301#32622#12395#12459#12540#12477#12523')(&I)'
         FocusControl = memDefaultScript
       end
-      object lblGhostDropDownCount: TLabel
-        Left = 16
-        Top = 208
-        Width = 159
-        Height = 12
-        Caption = 'IfGhost'#26368#22823#12489#12525#12483#12503#12480#12454#12531#25968'(&N)'
-        FocusControl = spnGhostDropDownCount
-      end
       object memDefaultScript: TMemo
         Left = 8
         Top = 24
@@ -65,11 +57,11 @@ object frmSetting: TfrmSetting
       end
       object grpLocalConfirm: TGroupBox
         Left = 8
-        Top = 112
+        Top = 104
         Width = 409
         Height = 41
         Caption = #12525#12540#12459#12523#30906#35469
-        TabOrder = 2
+        TabOrder = 1
         object cbxIgnoreTimeCritical: TCheckBox
           Left = 16
           Top = 17
@@ -82,60 +74,36 @@ object frmSetting: TfrmSetting
           TabOrder = 0
         end
       end
-      object rgpTabPosition: TRadioGroup
-        Left = 8
-        Top = 160
-        Width = 409
-        Height = 41
-        Hint = #12481#12515#12531#12493#12523#12479#12502#12398#20301#32622#12434#22793#26356
-        Caption = #12481#12515#12531#12493#12523#12479#12502#12398#20301#32622
-        Columns = 2
-        Items.Strings = (
-          #19978'(&U)'
-          #19979'(&D)')
-        TabOrder = 3
-      end
       object cbxNoSendGhostList: TCheckBox
         Left = 16
-        Top = 232
+        Top = 168
         Width = 281
         Height = 17
         Hint = 'SSTP Bottle'#22269#21218#35519#26619#12398#12383#12417#12398#12468#12540#12473#12488#12522#12473#12488#12434#36865#20449#12375#12414#12379#12435
         Caption = #22269#21218#35519#26619#12395#21332#21147#12375#12394#12356'(&X)'
-        TabOrder = 5
+        TabOrder = 2
       end
       object cbxConfirmOnExit: TCheckBox
         Left = 16
-        Top = 256
+        Top = 192
         Width = 281
         Height = 17
         Hint = 'Client'#12398#32066#20102#26178#12395#30906#35469#12513#12483#12475#12540#12472#12434#20986#12375#12414#12377
         Caption = #12450#12503#12522#12465#12540#12471#12519#12531#12398#32066#20102#26178#12395#30906#35469#12377#12427'(&O)'
-        TabOrder = 6
-      end
-      object spnGhostDropDownCount: TSpinEdit
-        Left = 184
-        Top = 203
-        Width = 65
-        Height = 21
-        MaxValue = 100
-        MinValue = 3
-        TabOrder = 4
-        Value = 40
-      end
-      object cbxShowRuler: TCheckBox
-        Left = 8
-        Top = 88
-        Width = 209
-        Height = 17
-        Hint = #32232#38598#12454#12451#12531#12489#12454#12395#27700#24179#12523#12540#12521#12434#34920#31034#12377#12427
-        Caption = #12523#12540#12521#12540#12434#34920#31034#12377#12427'(&R)'
-        TabOrder = 1
+        TabOrder = 3
       end
     end
-    object tstColor: TTabSheet
-      Caption = #33394#20998#12369
+    object tstDisplay: TTabSheet
+      Caption = #34920#31034
       ImageIndex = 1
+      object lblGhostDropDownCount: TLabel
+        Left = 8
+        Top = 256
+        Width = 159
+        Height = 12
+        Caption = 'IfGhost'#26368#22823#12489#12525#12483#12503#12480#12454#12531#25968'(&N)'
+        FocusControl = spnGhostDropDownCount
+      end
       object gbxColor: TGroupBox
         Left = 8
         Top = 8
@@ -170,6 +138,38 @@ object frmSetting: TfrmSetting
           end
         end
       end
+      object cbxShowRuler: TCheckBox
+        Left = 8
+        Top = 224
+        Width = 297
+        Height = 17
+        Hint = #32232#38598#12454#12451#12531#12489#12454#12395#27700#24179#12523#12540#12521#12434#34920#31034#12377#12427
+        Caption = #32232#38598#12454#12451#12531#12489#12454#12398#12523#12540#12521#12540#12434#34920#31034#12377#12427'(&H)'
+        TabOrder = 1
+      end
+      object rgpTabPosition: TRadioGroup
+        Left = 8
+        Top = 168
+        Width = 409
+        Height = 41
+        Hint = #12481#12515#12531#12493#12523#12479#12502#12398#20301#32622#12434#22793#26356
+        Caption = #12481#12515#12531#12493#12523#12479#12502#12398#20301#32622
+        Columns = 2
+        Items.Strings = (
+          #19978'(&U)'
+          #19979'(&D)')
+        TabOrder = 2
+      end
+      object spnGhostDropDownCount: TSpinEdit
+        Left = 176
+        Top = 251
+        Width = 65
+        Height = 21
+        MaxValue = 100
+        MinValue = 3
+        TabOrder = 3
+        Value = 40
+      end
     end
     object tstKeys: TTabSheet
       Caption = #12461#12540

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 4a6514d..135595f 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -18,7 +18,7 @@ type
     PageControl: TPageControl;
     btnClose: TButton;
     tstGeneral: TTabSheet;
-    tstColor: TTabSheet;
+    tstDisplay: TTabSheet;
     tstKeys: TTabSheet;
     rgpWhenReturn: TRadioGroup;
     rgpWhenShiftReturn: TRadioGroup;
@@ -28,15 +28,12 @@ type
     grpLocalConfirm: TGroupBox;
     cbxIgnoreTimeCritical: TCheckBox;
     tstReceive: TTabSheet;
-    rgpTabPosition: TRadioGroup;
     OpenDialog: TOpenDialog;
     spnWaitScriptEnd: TSpinEdit;
     lblWaitScriptEnd: TLabel;
     cbxNoSendGhostList: TCheckBox;
     cbxConfirmOnExit: TCheckBox;
     ctvBottle: TCPCConfigTreeView;
-    lblGhostDropDownCount: TLabel;
-    spnGhostDropDownCount: TSpinEdit;
     gbxColor: TGroupBox;
     frmColorSetting: TfrmColorSetting;
     tstRule: TTabSheet;
@@ -57,7 +54,6 @@ type
     btnUseCurrentJoinChannels: TButton;
     Label6: TLabel;
     ImageList: TImageList;
-    cbxShowRuler: TCheckBox;
     tstSurfacePreview: TTabSheet;
     lblSurfacePreview: TLabel;
     lvwPluginList: TListView;
@@ -68,6 +64,10 @@ type
     cbxNoExtraSSTPHeaders: TCheckBox;
     lblLUID: TLabel;
     edtLUID: TEdit;
+    cbxShowRuler: TCheckBox;
+    rgpTabPosition: TRadioGroup;
+    lblGhostDropDownCount: TLabel;
+    spnGhostDropDownCount: TSpinEdit;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure ctvBottleNodeChecked(Sender: TObject;