SendConfirm, ChannelListFormと変数JoinChannelsBackupをコメントアウト、

MainFormにUpdateJoinChannelListを追加

diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas
index 44cad86..7ddbb64 100755 (executable)
--- a/bottleclient/BottleDef.pas
+++ b/bottleclient/BottleDef.pas
@@ -348,7 +348,7 @@ var
   RegExp: TBRegExp;
   Pref: TBottlePrefs;
   ChannelList: TChannelList; //\83`\83\83\83\93\83l\83\8b\83\8a\83X\83g\82ð\95Û\8e\9d\82·\82é
-  JoinChannels: TStringList; // \8c»\8dÝ\8eQ\89Á\82µ\82Ä\82¢\82é\83`\83\83\83\93\83l\83\8b
+  //JoinChannels: TStringList; // \8c»\8dÝ\8eQ\89Á\82µ\82Ä\82¢\82é\83`\83\83\83\93\83l\83\8b
 
 const
   DefaultBottleServer    = 'bottle.mikage.to';
@@ -1311,14 +1311,14 @@ Classes.RegisterClass(TSsPlayTimeParams);
 
 Pref := TBottlePrefs.Create;
 ChannelList := TChannelList.Create;
-JoinChannels := TStringList.Create;
+//JoinChannels := TStringList.Create;
 
 finalization
 
 Pref.Free;
 RegExp.Free;
 ChannelList.Clear;
-JoinChannels.Free;
+//JoinChannels.Free;
 ChannelList.Free;
 
 end.

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index e0ef9b4..b5e6055 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -288,7 +288,7 @@ type
     FSppDir: String;
     //
 //    FNowChannel: String; //\8c»\8dÝ\91I\91ð\82³\82ê\82Ä\82¢\82é\83`\83\83\83\93\83l\83\8b
-    JoinChannelsBackup: TStringList; //\88ê\8e\9e\8eg\97p
+//    JoinChannelsBackup: TStringList; //\88ê\8e\9e\8eg\97p
     //
     FScriptModified: boolean; // \83X\83N\83\8a\83v\83g\82ª\95Ï\8dX\82³\82ê\82Ä\82¢\82é\82©\82Ç\82¤\82©\81B
                               // \83\8d\81[\83J\83\8b\8am\94F\8b­\90§\97p\83t\83\89\83O\81BTRichEdit.Modified\82Í
@@ -336,7 +336,8 @@ type
       Vote, Agree: integer);
     //\83`\83\83\83\93\83l\83\8b\8aÖ\8cW
 //    procedure UpdateChannelInfo(Dat: THeadValue);
-    procedure UpdateJoinChannelList(Dat: THeadValue);
+//    procedure UpdateJoinChannelList(Dat: THeadValue);
+    procedure UpdateJoinChannelList;
     procedure UpdateChannelList;
 //    procedure NoLuidError;
     procedure UpdateIfGhostBox;
@@ -418,8 +419,9 @@ function StringReplaceEx(const Before: String; List: THeadValue): String;
 
 implementation
 
-uses SendConfirm, SettingForm, ChannelListForm, LogForm,
+uses SettingForm, LogForm,
   MessageBox, FMOExplorer, EditorTalkShow;
+//SendConfirm, ChannelListForm, 
 
 {$R *.DFM}
 
@@ -617,7 +619,9 @@ begin
   // \83^\83X\83N\83g\83\8c\83C\82É\83A\83C\83R\83\93\82ð\92Ç\89Á
   ChangeTaskIcon;
   // \83`\83\83\83\93\83l\83\8b\8eQ\89Á\8aÖ\8cW\82Ì\83^\83u\82Ì\8f\88\97\9d\82È\82Ç(\83`\83\83\83\93\83l\83\8b\95s\8eQ\89Á\82Å\8f\89\8aú\89»)
-  UpdateJoinChannelList(nil);
+//  UpdateJoinChannelList(nil);
+  //\8f\89\8aú\89»
+  UpdateJoinChannelList;
 
   // SSTP\8dÄ\91\97\83I\83u\83W\83F\83N\83g
   FBottleSstp := TBottleSstp.Create(false);
@@ -645,7 +649,7 @@ begin
     Bottom := Self.Top + Self.Height - 1;
   end;
 
-  if JoinChannelsBackup <> nil then JoinChannelsBackup.Free;
+//  if JoinChannelsBackup <> nil then JoinChannelsBackup.Free;
 
   ScriptConstList.Save;
 
@@ -976,8 +980,6 @@ begin
   SakuraSeekerDetectResultChanged(self);
   //\8e©\93®\95Û\91¶\90Ý\92è\82Ì\83\8d\81[\83h
   SetScriptAutoBackUp;
-  //\83`\83\83\83\93\83l\83\8b\83S\81[\83X\83g\83\8d\81[\83h
-  UpdateChannelList;
 {
   if SakuraSeeker.Count = 0 then
     frmMessageBox.ShowMessage('\83S\81[\83X\83g(SSTP\83T\81[\83o)\82ª1\82Â\82à\8bN\93®\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B'#13#10 +
@@ -1670,37 +1672,33 @@ begin
 }
 end;
 
+{
 procedure TfrmSender.UpdateJoinChannelList(Dat: THeadValue);
 var
-//  i: integer;
+  i: integer;
   nodat: boolean;
 begin
   nodat := Dat = nil; //nil\82È\82ç\83`\83\83\83\93\83l\83\8b\91S\89ð\8f\9c
   if nodat then Dat := THeadValue.Create('');
   JoinChannels.Clear;
-{
   for i := 0 to Dat.Count-1 do
     if Dat.KeyAt[i] = 'Entry' then begin
       if RegExp.Match('m/^(.+?) \((\d+?)\)$/', Dat.ValueAt[i]) then
         JoinChannels.Add(RegExp[1]);
     end;
-}
   with tabChannel do begin
     OnChange := nil;
     JoinChannels.Sort;
     Tabs.BeginUpdate;
     Tabs.Clear;
-{
     for i := 0 to JoinChannels.Count-1 do begin
       //\8eó\90M\90ê\97p\83`\83\83\83\93\83l\83\8b\82Í\95\\8e¦\82µ\82È\82¢
       if not ChannelList.Channel[JoinChannels[i]].NoPost then
         Tabs.Add(JoinChannels[i]);
     end;
-}
     Tabs.EndUpdate;
     // \8c³\82©\82ç\83`\83\83\83\93\83l\83\8b\82É\8eQ\89Á\82µ\82Ä\82¢\82½\8fê\8d\87\82Í
     // \91I\91ð\82³\82ê\82Ä\82¢\82½\83`\83\83\83\93\83l\83\8b\82ª\95Ï\82í\82ç\82È\82¢\82æ\82¤\82É\82·\82é(\83^\83u\82ª\82¸\82ê\82È\82¢\8f\88\97\9d)
-{
     TabIndex := 0;
     for i := 0 to Tabs.Count-1 do
       if Tabs[i] = FNowChannel then TabIndex := i;
@@ -1708,10 +1706,9 @@ begin
       FNowChannel := Tabs[TabIndex];
       actSend.Hint := Format('\81u%s\81v\82É\91\97\90M|%s', [FNowChannel, SendButtonLongHint]);
     end else begin
-}
-//      FNowChannel := '';
+      FNowChannel := '';
       actSend.Hint := Format('\91\97\90M|%s', [SendButtonLongHint]);
-//    end;
+    end;
     Visible := Tabs.Count > 0;
     if Tabs.Count > 1 then begin
       actNextChannel.Enabled := true;
@@ -1723,7 +1720,6 @@ begin
     OnChange := tabChannelChange;
   end;
   if nodat then Dat.Free;
-{
   if JoinChannels.Count = 0 then begin
     Self.Caption := FOriginalCaption + ' - \83`\83\83\83\93\83l\83\8b\82É\8eQ\89Á\82µ\82Ä\82¢\82Ü\82¹\82ñ';
     actSend.Enabled := false;
@@ -1731,8 +1727,8 @@ begin
     Self.Caption := FOriginalCaption;
     actSend.Enabled := true;
   end;
-}
 end;
+}
 
 procedure TfrmSender.cbxTargetGhostDropDown(Sender: TObject);
 begin
@@ -2046,13 +2042,15 @@ end;
 
 procedure TfrmSender.tabChannelContextPopup(Sender: TObject;
   MousePos: TPoint; var Handled: Boolean);
-var Ch: String;
+//var Ch: String;
 begin
+{
   with tabChannel do begin
     Tag := IndexOfTabAt(MousePos.X, MousePos.Y);
     if Tag < 0 then Handled := true;
     Ch := Tabs[Tag];
   end;
+}
 end;
 
 {
@@ -2198,9 +2196,11 @@ end;
 procedure TfrmSender.tabChannelEndDrag(Sender, Target: TObject; X,
   Y: Integer);
 begin
+{
   //\8b­\90§\93I\82É\83^\83u\82ð\8dÄ\95`\89æ\82³\82¹\82é\81B\98g\90ü\8fÁ\82µ\91Î\8dô
   tabChannel.Tabs.BeginUpdate;
   tabChannel.Tabs.EndUpdate;
+}
 end;
 
 procedure TfrmSender.cbxTargetGhostDrawItem(Control: TWinControl;
@@ -3435,9 +3435,24 @@ begin
     Ch.Members := 0;
     Ch.WarnPost:= false;
     ChannelList.Add(Ch);
-    JoinChannels.Add(Ch.Name);
     i := i + 2;
   end;
 end;
 
+procedure TfrmSender.UpdateJoinChannelList;
+begin
+  UpdateChannelList;  //\83`\83\83\83\93\83l\83\8b\90Ý\92è
+  with tabChannel do begin
+    OnChange := nil;
+    Tabs.BeginUpdate;
+    Tabs.Clear;
+    Tabs.EndUpdate;
+    actSend.Hint := Format('\91\97\90M|%s', [SendButtonLongHint]);
+    actNextChannel.Enabled := false;
+    actPrevChannel.Enabled := false;
+    OnChange := tabChannelChange;
+  end;
+end;
+
+
 end.

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index 9cca04d..9a46a97 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -420,7 +420,7 @@ end;
 
 procedure TfrmSetting.btnUseCurrentJoinChannelsClick(Sender: TObject);
 begin
-  memAutoJoinChannels.Lines := JoinChannels;
+//  memAutoJoinChannels.Lines := JoinChannels;
 end;
 
 procedure TfrmSetting.btnVisibleGhostsClick(Sender: TObject);

diff --git a/bottleclient/SstpBottle.dpr b/bottleclient/SstpBottle.dpr
index ef5b60f..a474ee8 100755 (executable)
--- a/bottleclient/SstpBottle.dpr
+++ b/bottleclient/SstpBottle.dpr
@@ -28,11 +28,11 @@ uses
   BRegExp in 'BRegExp.pas',
   BottleDef in 'BottleDef.pas',
   ConstEditor in 'ConstEditor.pas' {frmConstEditor},
-  SendConfirm in 'SendConfirm.pas' {frmConfirmSend},
+//  SendConfirm in 'SendConfirm.pas' {frmConfirmSend},
   SettingForm in 'SettingForm.pas' {frmSetting},
   LogForm in 'LogForm.pas' {frmLog},
   HeadValue in 'HeadValue.pas',
-  ChannelListForm in 'ChannelListForm.pas' {frmChannelList},
+//  ChannelListForm in 'ChannelListForm.pas' {frmChannelList},
   MessageBox in 'MessageBox.pas' {frmMessageBox},
   Logs in 'Logs.pas',
 //  HttpThread in 'HttpThread.pas',