NoExtraSSTPHeaders option added

diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas
index 66dfd2a..2b3b4d8 100755 (executable)
--- a/bottleclient/BottleDef.pas
+++ b/bottleclient/BottleDef.pas
@@ -80,6 +80,7 @@ type
     FSurfacePreviewOnHint: boolean;
     FSurfacePreviewOnScriptPoint: boolean;
     FSurfacePreviewOnScriptPointPosition: TSurfacePreviewOnScriptPointPosition;
+    FNoExtraSSTPHeaders: boolean;
     procedure SetDblClkInsert(const Value: boolean);
     procedure SetDefaultScript(const Value: String);
     procedure SetIgnoreTimeCritical(const Value: boolean);
@@ -135,6 +136,7 @@ type
     procedure SetSurfacePreviewOnScriptPoint(const Value: boolean);
     procedure SetSurfacePreviewOnScriptPointPosition(
       const Value: TSurfacePreviewOnScriptPointPosition);
+    procedure SetNoExtraSSTPHeaders(const Value: boolean);
   public
     property NoSendGhostList: boolean read FNoSendGhostList write SetNoSendGhostList;
     property ConfirmOnExit: boolean read FConfirmOnExit write SetConfirmOnExit;
@@ -206,6 +208,7 @@ type
     property FMOName: TStrings read FFMOName write SetFMOName;
     property HideGhosts: boolean read FHideGhosts write SetHideGhosts;
     property VisibleGhostsList: TStringList read FVisibleGhostsList write SetVisibleGhostsList;
+    property NoExtraSSTPHeaders: boolean read FNoExtraSSTPHeaders write SetNoExtraSSTPHeaders;
     //\83T\81[\83t\83B\83X\83v\83\8c\83r\83\85\81[
     property SurfacePreviewOnHint: boolean
       read FSurfacePreviewOnHint write SetSurfacePreviewOnHint;
@@ -404,6 +407,7 @@ begin
     FMOName.CommaText := FIni.ReadString('System', 'FMOName', 'Sakura');
     HideGhosts := FIni.ReadBool('System', 'HideGhosts', false);
     VisibleGhostsList.CommaText := FIni.ReadString('System', 'VisibleGhostsList', '');
+    NoExtraSSTPHeaders := FIni.ReadBool('System', 'NoExtraSSTPHeaders', false);
     //\83T\81[\83t\83B\83X\83v\83\8c\83r\83\85\81[
     SurfacePreviewOnHint := FIni.ReadBool('System', 'SurfacePreviewOnHint', false);
     SurfacePreviewOnScriptPoint := FIni.ReadBool('System', 'SurfacePreviewOnScriptPoint', false);
@@ -709,6 +713,7 @@ begin
   FIni.WriteString('System', 'FMOName', FFMOName.CommaText);
   FIni.WriteBool('System', 'HideGhosts', HideGhosts);
   FIni.WriteString('System', 'VisibleGhostsList', VisibleGhostsList.CommaText);
+  FIni.WriteBool('System', 'NoExtraSSTPHeaders', NoExtraSSTPHeaders);
   //
   FIni.WriteBool('System', 'SurfacePreviewOnHint', SurfacePreviewOnHint);
   FIni.WriteBool('System', 'SurfacePreviewOnScriptPoint', SurfacePreviewOnScriptPoint);
@@ -773,6 +778,11 @@ begin
   FSurfacePreviewOnScriptPointPosition := Value;
 end;
 
+procedure TBottlePrefs.SetNoExtraSSTPHeaders(const Value: boolean);
+begin
+  FNoExtraSSTPHeaders := Value;
+end;
+
 { TChannelListItem }
 
 procedure TChannelListItem.SetGhost(const Value: String);

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index b79ac99..2fe3aec 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -27,7 +27,7 @@ object frmSetting: TfrmSetting
     Top = 8
     Width = 439
     Height = 306
-    ActivePage = tstSurfacePreview
+    ActivePage = tstDetailed
     Anchors = [akLeft, akTop, akRight, akBottom]
     TabOrder = 0
     object tstGeneral: TTabSheet
@@ -225,7 +225,7 @@ object frmSetting: TfrmSetting
       ImageIndex = 4
       object lblWaitScriptEnd: TLabel
         Left = 16
-        Top = 240
+        Top = 216
         Width = 175
         Height = 12
         Caption = #12473#12463#12522#12503#12488#12398#26368#24460#12395#12454#12455#12452#12488#25407#20837'(&W)'
@@ -233,7 +233,7 @@ object frmSetting: TfrmSetting
       end
       object spnWaitScriptEnd: TSpinEdit
         Left = 208
-        Top = 234
+        Top = 210
         Width = 65
         Height = 21
         Hint = #21336#20301#12399'50ms'#12290'9'#12391'\w9'#12434#25407#20837#12377#12427
@@ -246,7 +246,7 @@ object frmSetting: TfrmSetting
         Left = 8
         Top = 8
         Width = 409
-        Height = 217
+        Height = 185
         Images = ImageList
         Indent = 19
         Options = []
@@ -297,6 +297,24 @@ object frmSetting: TfrmSetting
           616E6765496E53796E6368726F6E697A65020001000802000001080000090200
           000102020000090200000102000000}
       end
+      object btnVisibleGhosts: TButton
+        Left = 288
+        Top = 244
+        Width = 123
+        Height = 25
+        Caption = #12468#12540#12473#12488#25351#23450'(&G)...'
+        TabOrder = 2
+        OnClick = btnVisibleGhostsClick
+      end
+      object cbxHideGhosts: TCheckBox
+        Left = 8
+        Top = 248
+        Width = 273
+        Height = 17
+        Hint = 'IfGhost'#36984#25246#12508#12483#12463#12473#12395#25351#23450#12375#12383#12468#12540#12473#12488#20197#22806#12364#29694#12428#12394#12356#12424#12358#12395#12375#12414#12377#12290#20182#12399#21463#20449#23554#29992#12468#12540#12473#12488#12395
+        Caption = #25351#23450#12468#12540#12473#12488#20197#22806#12434#36984#25246#12508#12483#12463#12473#12363#12425#38560#12377'(&H)'
+        TabOrder = 3
+      end
     end
     object tstChannel: TTabSheet
       Caption = #33258#21205#21442#21152
@@ -459,24 +477,14 @@ object frmSetting: TfrmSetting
           TabOrder = 0
         end
       end
-      object cbxHideGhosts: TCheckBox
+      object cbxNoExtraSSTPHeaders: TCheckBox
         Left = 8
-        Top = 128
-        Width = 249
+        Top = 120
+        Width = 417
         Height = 17
-        Hint = 'IfGhost'#36984#25246#12508#12483#12463#12473#12395#25351#23450#12375#12383#12468#12540#12473#12488#12364#29694#12428#12394#12356#12424#12358#12395#12375#12414#12377#12290#21463#20449#23554#29992#12468#12540#12473#12488#12398#25351#23450#12364#21487#33021
-        Caption = #25351#23450#12468#12540#12473#12488#20197#22806#12434#36984#25246#12508#12483#12463#12473#12363#12425#38560#12377'(&H)'
+        Caption = #36578#36865#26178#12395'SSTP'#36861#21152#12504#12483#12480'(X-Bottle-*)'#12434#36865#20986#12375#12394#12356'(&X)'
         TabOrder = 2
       end
-      object btnVisibleGhosts: TButton
-        Left = 304
-        Top = 124
-        Width = 123
-        Height = 25
-        Caption = #12468#12540#12473#12488#25351#23450'(&G)...'
-        TabOrder = 3
-        OnClick = btnVisibleGhostsClick
-      end
     end
     object tstSurfacePreview: TTabSheet
       Caption = #12503#12524#12499#12517#12540

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 11fde33..c2b6aac 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -53,13 +53,14 @@ type
     Label6: TLabel;
     ImageList: TImageList;
     cbxShowRuler: TCheckBox;
-    cbxHideGhosts: TCheckBox;
-    btnVisibleGhosts: TButton;
     tstSurfacePreview: TTabSheet;
     lblSurfacePreview: TLabel;
     lvwPluginList: TListView;
     lblPluginList: TLabel;
     ctvSurfacePreview: TCPCConfigTreeView;
+    btnVisibleGhosts: TButton;
+    cbxHideGhosts: TCheckBox;
+    cbxNoExtraSSTPHeaders: TCheckBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure ctvBottleNodeChecked(Sender: TObject;
@@ -148,6 +149,7 @@ begin
   memFMOName.Lines := Pref.FMOName;
   cbxHideGhosts.Checked := Pref.HideGhosts;
   memAutoJoinChannels.Lines := Pref.AutoJoinChannels;
+  cbxNoExtraSSTPHeaders.Checked := Pref.NoExtraSSTPHeaders;
   //
   with ctvSurfacePreview do
   begin
@@ -223,6 +225,7 @@ begin
   Pref.FMOName := memFMOName.Lines;
   SakuraSeeker.FileMappingTarget := Pref.FMOName;
   Pref.HideGhosts := cbxHideGhosts.Checked;
+  Pref.NoExtraSSTPHeaders := cbxNoExtraSSTPHeaders.Checked;
   //
   Pref.AutoJoinChannels := memAutoJoinChannels.Lines;
   //