Removed FastSstp, SocketSSTP options removed

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index 06c4489..7f44193 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -24,7 +24,7 @@ object frmSetting: TfrmSetting
     Top = 8
     Width = 356
     Height = 306
-    ActivePage = tstGeneral
+    ActivePage = tstReceive
     Anchors = [akLeft, akTop, akRight, akBottom]
     TabOrder = 0
     object tstGeneral: TTabSheet
@@ -377,13 +377,6 @@ object frmSetting: TfrmSetting
     object tstReceive: TTabSheet
       Caption = '\8eó\90M/\91\97\90M'
       ImageIndex = 4
-      object Label9: TLabel
-        Left = 40
-        Top = 254
-        Width = 95
-        Height = 12
-        Caption = 'SSTP\83T\81[\83o\83|\81[\83g'
-      end
       object lblWaitScriptEnd: TLabel
         Left = 16
         Top = 208
@@ -391,32 +384,6 @@ object frmSetting: TfrmSetting
         Height = 12
         Caption = '\83X\83N\83\8a\83v\83g\82Ì\8dÅ\8cã\82É\83E\83F\83C\83g\91}\93ü'
       end
-      object cbxPort: TComboBox
-        Left = 136
-        Top = 248
-        Width = 73
-        Height = 20
-        Hint = 'SSTP\83T\81[\83o\83|\81[\83g\81B9801\82ð\90\84\8f§'
-        Style = csDropDownList
-        Enabled = False
-        ItemHeight = 12
-        TabOrder = 0
-        OnChange = cbxPortChange
-        Items.Strings = (
-          '11000'
-          '9801'
-          '\82»\82Ì\91¼...')
-      end
-      object cbxUsePort: TCheckBox
-        Left = 16
-        Top = 232
-        Width = 313
-        Height = 17
-        Hint = '\83\\83P\83b\83g\82ð\8eg\82¤\82ÆIfGhost\82Ì\90U\82è\95ª\82¯\82ª\88ê\90Ø\95s\89Â\94\\82É\82È\82é\82Ì\82Å\92\8d\88Ó'
-        Caption = 'SSTP\91\97\90M\82É\83\\83P\83b\83g\82ð\8eg\82¤(\94ñ\90\84\8f§)[\82±\82Ì\8b@\94\\82Í\8dí\8f\9c\97\\92è]'
-        TabOrder = 1
-        OnClick = cbxUsePortClick
-      end
       object spnWaitScriptEnd: TSpinEdit
         Left = 184
         Top = 202
@@ -425,7 +392,7 @@ object frmSetting: TfrmSetting
         Hint = '\92P\88Ê\82Í50ms\81B9\82Å\w9\82ð\91}\93ü\82·\82é'
         MaxValue = 100
         MinValue = 0
-        TabOrder = 2
+        TabOrder = 0
         Value = 0
       end
       object ctvBottle: TCPCConfigTreeView
@@ -440,7 +407,7 @@ object frmSetting: TfrmSetting
         ShowButtons = False
         ShowLines = False
         ShowRoot = False
-        TabOrder = 3
+        TabOrder = 1
         OnNodeChecking = ctvBottleNodeChecking
         OnNodeChecked = ctvBottleNodeChecked
         ItemData = {

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 7efabf9..0cb9a7d 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -41,8 +41,6 @@ type
     colBgColor: TColorCBox;
     Label8: TLabel;
     tstReceive: TTabSheet;
-    cbxPort: TComboBox;
-    Label9: TLabel;
     cbxAutoStart: TCheckBox;
     tstChannel: TTabSheet;
     tvwChannels: TTreeView;
@@ -53,7 +51,6 @@ type
     rgpTargetGhost: TGroupBox;
     cbxIgnoreIfGhost: TCheckBox;
     cbxTargetGhost: TComboBox;
-    cbxUsePort: TCheckBox;
     rgpTabPosition: TRadioGroup;
     cbxCanAutoAdd: TCheckBox;
     OpenDialog: TOpenDialog;
@@ -75,7 +72,6 @@ type
     spnGhostDropDownCount: TSpinEdit;
     procedure ColorPick(Sender: TObject; var Col: TColor);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure cbxPortChange(Sender: TObject);
     procedure edtSoundFileButtonClick(Sender: TObject);
     procedure tvwChannelsCompare(Sender: TObject; Node1, Node2: TTreeNode;
       Data: Integer; var Compare: Integer);
@@ -85,7 +81,6 @@ type
     procedure edtSoundFileChange(Sender: TObject);
     procedure cbxTargetGhostChange(Sender: TObject);
     procedure cbxIgnoreIfGhostClick(Sender: TObject);
-    procedure cbxUsePortClick(Sender: TObject);
     procedure cbxCanAutoAddClick(Sender: TObject);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure cbxWarnPostClick(Sender: TObject);
@@ -175,16 +170,6 @@ begin
   rgpWhenReturn.ItemIndex := Ord(Pref.WhenReturn);
   rgpWhenShiftReturn.ItemIndex := Ord(Pref.WhenShiftReturn);
   rgpWhenCtrlReturn.ItemIndex := Ord(Pref.WhenCtrlReturn);
-  //
-  cbxPort.ItemIndex := cbxPort.Items.Count-1; //\81u\82»\82Ì\91¼\81v
-  for i := 0 to cbxPort.Items.Count-2 do begin
-    if StrToIntDef(cbxPort.Items[i], 0) = Pref.ServerPort then
-      cbxPort.ItemIndex := i;
-  end;
-  cbxUsePort.Checked := Pref.UsePort;
-  cbxPort.Enabled := cbxUsePort.Checked;
-  cbxUsePort.OnClick := cbxUsePortClick; //Dialog\8aJ\82¢\82½\8fu\8aÔ\82É\8cx\8d\90\82³\82ê\82È\82¢\82æ\82¤
-  //
   //Channels
   tvwChannels.Items.Clear;
   Node := tvwChannels.Items.Add(nil, '\83f\83t\83H\83\8b\83g');
@@ -251,33 +236,11 @@ begin
   Pref.WhenShiftReturn := TReturnKeyFunction(rgpWhenShiftReturn.ItemIndex);
   Pref.WhenCtrlReturn := TReturnKeyFunction(rgpWhenCtrlReturn.ItemIndex);
   //
-  Pref.UsePort := cbxUsePort.Checked;
-  //
   Pref.UseHttpProxy := cbxUseHttpProxy.Checked;
   Pref.ProxyAddress := edtProxyAddress.Text;
   Pref.ProxyPort := StrToInt(edtProxyPort.Text);
 end;
 
-procedure TfrmSetting.cbxPortChange(Sender: TObject);
-var Str: String;
-    i: integer;
-begin
-  with cbxPort do begin
-    if ItemIndex = Items.Count-1 then begin
-      //\82»\82Ì\91¼
-      Str := IntToStr(Pref.ServerPort);
-      if InputQuery('\83|\81[\83g\94Ô\8d\86\82Ì\8ew\92è', '\83|\81[\83g\94Ô\8d\86', Str) then begin
-        Pref.ServerPort := StrToIntDef(Str, Pref.ServerPort);
-      end;
-    end else begin
-      Pref.ServerPort := StrToIntDef(Items[ItemIndex], Pref.ServerPort);
-    end;
-    for i := 0 to Items.Count-2 do begin
-      if Pref.ServerPort = StrToInt(Items[i]) then ItemIndex := i;
-    end;
-  end;
-end;
-
 procedure TfrmSetting.edtSoundFileButtonClick(Sender: TObject);
 begin
   if OpenDialog.Execute then begin
@@ -382,19 +345,6 @@ begin
   SelChPref.IgnoreIfGhost := cbxIgnoreIfGhost.Checked;
 end;
 
-procedure TfrmSetting.cbxUsePortClick(Sender: TObject);
-var Re: integer;
-const Mes = '\8f]\97\88\82Ì\95û\96@\82ð\91I\91ð\82µ\82½\8fê\8d\87\81ASSTP\82ð\8eó\90M\82Å\82«\82é\83S\81[\83X\83g\82Í'+
-            '\83\89\83\93\83_\83\80\82È\88ê\91Ì\82¾\82¯\82Æ\82È\82è\81AIfGhost\82ª\88ê\90Ø\8eg\97p\82Å\82«\82È\82­\82È\82è\82Ü\82·\81B';
-begin
-  if cbxUsePort.Checked then begin
-    Re := MessageDlg(Mes, mtWarning, mbOkCancel, 0);
-    if Re = mrCancel then cbxUsePort.Checked := false;
-  end;
-  cbxPort.Enabled := cbxUsePort.Checked;
-  Pref.UsePort := cbxUsePort.Checked;
-end;
-
 procedure TfrmSetting.cbxCanAutoAddClick(Sender: TObject);
 begin
   SelChPref.CanAutoAdd := cbxCanAutoAdd.Checked;