AdditionalFMOName property does not need reboot anymore

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index 6016a36..54d218c 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -27,7 +27,7 @@ object frmSetting: TfrmSetting
     Top = 8
     Width = 379
     Height = 306
-    ActivePage = tstReceive
+    ActivePage = tstDetailed
     Anchors = [akLeft, akTop, akRight, akBottom]
     TabOrder = 0
     object tstGeneral: TTabSheet
@@ -390,28 +390,15 @@ object frmSetting: TfrmSetting
       ImageIndex = 6
       object lblAdditionalFMOName: TLabel
         Left = 8
-        Top = 40
+        Top = 16
         Width = 132
         Height = 12
         Caption = #36861#21152#12391#21033#29992#12377#12427'FMO'#21517'(&F)'
         FocusControl = memAdditionalFMOName
       end
-      object Label6: TLabel
-        Left = 8
-        Top = 16
-        Width = 197
-        Height = 12
-        Caption = #8251#22793#26356#12399#27425#22238#20877#25509#32154#26178#12363#12425#26377#21177#12391#12377#12290
-        Font.Charset = SHIFTJIS_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -12
-        Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
-        Font.Style = []
-        ParentFont = False
-      end
       object memAdditionalFMOName: TMemo
         Left = 8
-        Top = 56
+        Top = 32
         Width = 353
         Height = 73
         Hint = 'FMO'#21517#12434'1'#34892#12395'1'#12388#35352#20837#12290#35352#20837#20869#23481#12395#12388#12356#12390#12399'SSTP'#12469#12540#12496#20596#12398#12489#12461#12517#12513#12531#12488#12434#21442#29031
@@ -421,14 +408,14 @@ object frmSetting: TfrmSetting
       end
       object grpProxy: TGroupBox
         Left = 8
-        Top = 144
+        Top = 120
         Width = 353
-        Height = 113
+        Height = 137
         Caption = 'HTTP Proxy'#35373#23450
         TabOrder = 1
         object lblProxyAddress: TLabel
           Left = 16
-          Top = 60
+          Top = 84
           Width = 56
           Height = 12
           Caption = #12450#12489#12524#12473'(&D)'
@@ -436,15 +423,28 @@ object frmSetting: TfrmSetting
         end
         object lblProxyPort: TLabel
           Left = 16
-          Top = 84
+          Top = 108
           Width = 47
           Height = 12
           Caption = #12509#12540#12488'(&O)'
           FocusControl = edtProxyPort
         end
+        object Label6: TLabel
+          Left = 16
+          Top = 21
+          Width = 197
+          Height = 12
+          Caption = #8251#22793#26356#12399#27425#22238#20877#25509#32154#26178#12363#12425#26377#21177#12391#12377#12290
+          Font.Charset = SHIFTJIS_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -12
+          Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
+          Font.Style = []
+          ParentFont = False
+        end
         object edtProxyAddress: TEdit
           Left = 80
-          Top = 56
+          Top = 80
           Width = 257
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12450#12489#12524#12473
@@ -452,7 +452,7 @@ object frmSetting: TfrmSetting
         end
         object edtProxyPort: TEdit
           Left = 80
-          Top = 80
+          Top = 104
           Width = 81
           Height = 20
           Hint = 'Proxy'#12469#12540#12496#12398#12509#12540#12488#30058#21495
@@ -461,7 +461,7 @@ object frmSetting: TfrmSetting
         end
         object cbxUseHttpProxy: TCheckBox
           Left = 16
-          Top = 24
+          Top = 48
           Width = 153
           Height = 17
           Hint = 'HTTP Proxy'#12434#36890#12376#12390#12508#12488#12523#12469#12540#12496#12395#25509#32154#12375#12414#12377

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 10841b1..c86e6f4 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -43,7 +43,6 @@ type
     tstDetailed: TTabSheet;
     lblAdditionalFMOName: TLabel;
     memAdditionalFMOName: TMemo;
-    Label6: TLabel;
     grpProxy: TGroupBox;
     lblProxyAddress: TLabel;
     lblProxyPort: TLabel;
@@ -55,6 +54,7 @@ type
     memAutoJoinChannels: TMemo;
     cbxAutoStart: TCheckBox;
     btnUseCurrentJoinChannels: TButton;
+    Label6: TLabel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure ctvBottleNodeChecked(Sender: TObject;
@@ -190,6 +190,9 @@ begin
   Pref.ProxyPort := StrToInt(edtProxyPort.Text);
   //
   Pref.AdditionalFMOName := memAdditionalFMOName.Lines;
+  while SakuraSeeker.FileMappingTarget.Count >= 2 do
+    SakuraSeeker.FileMappingTarget.Delete(1); // 'Sakura' \88È\8aO\82ð\8fÁ\8b\8e
+  SakuraSeeker.FileMappingTarget.AddStrings(Pref.AdditionalFMOName);
   //
   Pref.AutoJoinChannels := memAutoJoinChannels.Lines;
 end;