actInsertCue added

diff --git a/bottleclient/LogForm.dfm b/bottleclient/LogForm.dfm
index e417378..2efdead 100755 (executable)
--- a/bottleclient/LogForm.dfm
+++ b/bottleclient/LogForm.dfm
@@ -65,16 +65,21 @@ object frmLog: TfrmLog
       ImageIndex = 29
       Style = tbsSeparator
     end
-    object tbtnFindBottle: TToolButton
+    object tbtnInsertCue: TToolButton
       Left = 111
       Top = 0
+      Action = frmSender.actInsertCue
+    end
+    object tbtnFindBottle: TToolButton
+      Left = 134
+      Top = 0
       Hint = #12508#12488#12523#12434#26908#32034#12377#12427
       Caption = #26908#32034'(&F)'
       ImageIndex = 37
       OnClick = tbtnFindBottleClick
     end
     object tbtnPreviewStyle: TToolButton
-      Left = 134
+      Left = 157
       Top = 0
       Hint = #12525#12464#12503#12524#12499#12517#12540#12398#34920#31034#24418#24335#12434#22793#26356#12375#12414#12377
       Caption = 'tbtnPreviewStyle'
@@ -84,7 +89,7 @@ object frmLog: TfrmLog
       OnClick = tbtnPreviewStyleClick
     end
     object ToolButton2: TToolButton
-      Left = 168
+      Left = 191
       Top = 0
       Width = 8
       Caption = 'ToolButton2'
@@ -92,12 +97,12 @@ object frmLog: TfrmLog
       Style = tbsSeparator
     end
     object tbtnVoteMessage: TToolButton
-      Left = 176
+      Left = 199
       Top = 0
       Action = frmSender.actVoteMessage
     end
     object tbtnAgreeMessage: TToolButton
-      Left = 199
+      Left = 222
       Top = 0
       Action = frmSender.actAgreeMessage
     end
@@ -260,6 +265,9 @@ object frmLog: TfrmLog
     object mnPopUpAgreeMessage: TMenuItem
       Action = frmSender.actAgreeMessage
     end
+    object mnInsertCue: TMenuItem
+      Action = frmSender.actInsertCue
+    end
     object mnJumpURL: TMenuItem
       Caption = '&URL'#12472#12515#12531#12503
       Enabled = False

diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas
index f2476b9..e9073ad 100755 (executable)
--- a/bottleclient/LogForm.pas
+++ b/bottleclient/LogForm.pas
@@ -53,6 +53,8 @@ type
     XMLDocument: TXMLDocument;
     tbtnOpenLog: TToolButton;
     OpenDialog: TOpenDialog;
+    tbtnInsertCue: TToolButton;
+    mnInsertCue: TMenuItem;
     procedure tbtnClearClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure lvwLogChange(Sender: TObject; Item: TListItem;
@@ -116,8 +118,7 @@ type
     procedure AddCurrentSystemLog(const LogName, MessageString: String);
     procedure VoteLog(const MID: String; const Vote: integer);
     procedure AgreeLog(const MID: String; const Agree: integer);
-    procedure SetBottleStatusToPlaying(const MID: String);
-    procedure SetBottleStatusToOpened(const MID: String);
+    procedure SetBottleState(const MID: String; State: TLogState);
     procedure AllBottleOpened;
     procedure LogLoaded(Sender: TObject);
     procedure LogLoadFailure(Sender: TObject; const Message: String);
@@ -261,17 +262,20 @@ begin
           Script := Log.Script;
           frmSender.actVoteMessage.Enabled := true;
           frmSender.actAgreeMessage.Enabled := true;
+          frmSender.actInsertCue.Enabled := true;
           mnPopUpCopyScript.Enabled := true;
           UpdateScript(Script);
         end else begin
           frmSender.actVoteMessage.Enabled := false;
           frmSender.actAgreeMessage.Enabled := false;
+          frmSender.actInsertCue.Enabled := false;
           mnPopUpCopyScript.Enabled := false;
           UpdateScript(''); // \83\8d\83O\83v\83\8c\83r\83\85\81[\95\94\82ð\83N\83\8a\83A
         end;
       end else begin
         frmSender.actVoteMessage.Enabled := false;
         frmSender.actAgreeMessage.Enabled := false;
+        frmSender.actInsertCue.Enabled := false;
         mnPopUpCopyScript.Enabled := false;
         UpdateScript(Script); // \83\8d\83O\83v\83\8c\83r\83\85\81[\95\94\83N\83\8a\83A
       end;
@@ -474,29 +478,14 @@ begin
   Clip.SetTextBuf(PChar(Log.Script));
 end;
 
-procedure TfrmLog.SetBottleStatusToOpened(const MID: String);
+procedure TfrmLog.SetBottleState(const MID: String; State: TLogState);
 var i: integer;
     Bottle: TLogItem;
 begin
   for i := 0 to FBottleLogList.Count-1 do begin
     Bottle := (FBottleLogList[i] as TBottleLogList).Bottle(MID);
     if Bottle <> nil then begin
-      Bottle.State := lsOpened;
-      lvwLog.OnChange := nil;
-      lvwLog.Invalidate;
-      lvwLog.OnChange := lvwLogChange;
-    end;
-  end;
-end;
-
-procedure TfrmLog.SetBottleStatusToPlaying(const MID: String);
-var i: integer;
-    Bottle: TLogItem;
-begin
-  for i := 0 to FBottleLogList.Count-1 do begin
-    Bottle := (FBottleLogList[i] as TBottleLogList).Bottle(MID);
-    if Bottle <> nil then begin
-      Bottle.State := lsPlaying;
+      Bottle.State := State;
       lvwLog.OnChange := nil;
       lvwLog.Invalidate;
       lvwLog.OnChange := lvwLogChange;

diff --git a/bottleclient/MainForm.dfm b/bottleclient/MainForm.dfm
index dfb3bda..84682e1 100755 (executable)
--- a/bottleclient/MainForm.dfm
+++ b/bottleclient/MainForm.dfm
@@ -623,6 +623,13 @@ object frmSender: TfrmSender
       ImageIndex = 6
       OnExecute = actFMOExplorerExecute
     end
+    object actInsertCue: TAction
+      Caption = #12371#12371#12363#12425#19978#12434#36899#32154#20877#29983
+      Enabled = False
+      Hint = #36984#25246#34892#12424#12426#19978#12398#12508#12488#12523#12434#20877#36865#12461#12517#12540#12395#20837#12428#12427
+      ImageIndex = 39
+      OnExecute = actInsertCueExecute
+    end
   end
   object mnPopUp: TPopupMenu
     Images = imgIcon
@@ -711,7 +718,7 @@ object frmSender: TfrmSender
     Left = 8
     Top = 72
     Bitmap = {
-      494C010127002C00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010128002C00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000B0000000010020000000000000B0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -855,104 +862,104 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FF000000FF0000000000
       0000B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2
       FF00B1E2FF00B1E2FF00B1E2FF00000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFF3300FFFFFF00FFFF
+      FF00FFFFFF00FFFF330000000000000000000000000033FFCC0033CC00000000
       00000000000000000000000000000000000000000000FF000000FF0000000000
       0000B1E2FF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000FFFFFF000000000000000000000000000000000000000000808080008080
       8000808080008080800080808000808080008080800080808000808080008080
-      8000808080008080800000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      80008080800080808000000000000000000000000000FFFF3300FFFFFF00FFFF
+      FF00FFFFFF00FFFF330000000000000000000000000033FFCC0033FF660033CC
       00000000000000000000000000000000000000000000FF000000FF6B8F000000
       0000B1E2FF00B1E2FF0000000000000000000000000000000000000000000000
       0000B1E2FF00B1E2FF00B1E2FF00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000000000000080808000FFFF
       FF0000FFFF000000000000FFFF000000000000FFFF000000000000FFFF000000
-      000000FFFF008080800000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FF6B8F00FF6B8F000000
+      000000FFFF0080808000000000000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000033FFCC0033FF660033FF
+      660033CC000000000000000000000000000000000000FF6B8F00FF6B8F000000
       00000000000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF
       000000000000000000000000000000000000000000000000000000000000FFFF
       FF00000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000080808000FFFFFF0000FF
       FF000000000000FFFF000000000000FFFF000000000000FFFF000000000000FF
-      FF00000000000000000080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FF000000000000000000808080000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000033FFCC0033FF660033FF
+      660033FF660033CC000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000F0FBFF00F0FBFF00FFFF0000FFFF0000FFFF
       000000000000000000000000000000000000000000000000000000000000FFFF
       FF00000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000080808000FFFFFF000000
       000000FFFF000000000000FFFF000000000000FFFF000000000000FFFF000000
       0000808080000000000080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000033FFCC0033FF660033FF
+      660033FF660033FF660033CC0000000000000000000000000000000000000000
       00000000000000000000FFFF0000F0FBFF00F0FBFF00F0FBFF00FFFF0000FFFF
       000000000000000000000000000000000000000000000000000000000000FFFF
       FF00000000000000000000000000000000000000000000000000FFFFFF000000
       00000000000000000000000000000000000080808000FFFFFF000000000000FF
       FF000000000000FFFF000000000000FFFF000000000000FFFF000000000000FF
-      FF00000000008080800080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FF00000000008080800080808000000000000000000000000000CC330000CC33
+      0000CC3300000000000000000000000000000000000033FFCC0033FF660033FF
+      660033FF660033FF660000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000F0FBFF00F0FBFF00F0FBFF00FFFF0000FFFF
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000080808000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008080
       8000000000000000000080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000033FFCC0033FF660033FF
+      660033FF66000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000FFFF0000F0FBFF00F0FBFF00F0FBFF00FFFF
       0000000000000000000000000000000000000000000000000000000000000000
       0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000008080800080808000808080008080
       8000808080008080800080808000808080008080800080808000808080008080
-      80008080800000FFFF0080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      80008080800000FFFF00808080000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000033FFCC0033FF660033FF
+      6600000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000FFFF0000F0FBFF00F0FBFF00FFFF0000FFFF
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000080808000FFFFFF000000
       000000FFFF000000000000FFFF000000000000FFFF000000000000FFFF000000
-      000000FFFF000000000080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      000000FFFF0000000000808080000000000000000000FFFF3300FFFFFF00FFFF
+      FF00FFFFFF00FFFF330000000000000000000000000033FFCC0033FF66000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000080808000FFFFFF0000FF
       FF000000000000FFFF000000000000FFFF0000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF0080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FF00FFFFFF00FFFFFF00808080000000000000000000FFFF3300FFFFFF00FFFF
+      FF00FFFFFF00FFFF330000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF000000969600009696000096960000969600FFFF
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000FFFFFF000000000000000000000000000000000000000000FFFF
       FF00000000000000000000000000000000000000000080808000FFFFFF000000
       000000FFFF000000000000FFFF0000000000FFFFFF0080808000808080008080
-      8000808080008080800080808000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      80008080800080808000808080000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000000000000080808000FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008080800000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFF3300FFFF3300FFFF
+      3300FFFF3300FFFF330000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000009696000096960000969600009696000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -967,8 +974,8 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000CC330000CC33
+      0000CC3300000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2127,11 +2134,11 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000F01FFFFFFFFF0000000183E0FFFF0000
-      000083E0E0000000000183E0C000000000008080C5500000000180008AA80000
-      0807810095500000F80781002AA00000F807C00100040000F807E08300000000
-      F807E08395540000F807F1C78A800000F807F1C795010000FC0FF1C7C07F0000
-      FE1FFFFFE0FF0000FE1FFFFFFFFF0000E0FFFFFFFFFFFFFF807FFFFFFFFFFFFF
+      00000000000000000000000000000000F01FFFFFFFFF83FF000183E0FFFF011F
+      000083E0E000010F000183E0C000010700008080C5500103000180008AA80101
+      0807810095508300F80781002AA0C701F807C00100048303F807E08300000107
+      F807E0839554010FF807F1C78A80011FF807F1C7950101FFFC0FF1C7C07F01FF
+      FE1FFFFFE0FF83FFFE1FFFFFFFFFC7FFE0FFFFFFFFFFFFFF807FFFFFFFFFFFFF
       807F0000FFFFFFFFC1FF0000FF7FFEFFF1FF0000FE7FFE7FF0E70000FC7FFE3F
       C0E30000F807E01FC0630000F007E00FE0630000E007E007F0010000F007E00F
       F8010000F807E01FFC010000FC7FFE3FFE010000FE7FFE7FFF000001FF7FFEFF
@@ -2167,8 +2174,7 @@ object frmSender: TfrmSender
       F00BFFFFFC018000F00BFB7FFC010000F00BF93FFC010000F00BF81F00010000
       F00B800F00010001F00B800700010003B00B8003000100038003800700030003
       C027800F00070003802FF81F000F0FC3C01FF93F00FF0003C0FFFB7F01FF8007
-      93FFFFFF03FFF87FB33FFFFFFFFFFFFF00000000000000000000000000000000
-      000000000000}
+      93FFFFFF03FFF87FB33FFFFFFFFFFFFF}
   end
   object mnPopupConst: TPopupMenu
     Images = imgIcon

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index 028dc69..7b76184 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -145,6 +145,7 @@ type
     tbtnFMOExplorer: TToolButton;
     mnFMOExplorer: TMenuItem;
     mnLine: TMenuItem;
+    actInsertCue: TAction;
     procedure actConfirmExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -222,6 +223,7 @@ type
     procedure actDownloadLogExecute(Sender: TObject);
     procedure cbxTargetGhostChange(Sender: TObject);
     procedure actFMOExplorerExecute(Sender: TObject);
+    procedure actInsertCueExecute(Sender: TObject);
   private
     FSleeping: boolean;
     FStatusText: String;
@@ -1683,7 +1685,7 @@ begin
       for i := 0 to LogNameList.Count-1 do
         frmLog.AddCurrentScriptLog(LogNameList[i], Dat['Script'], Sender, Dat['MID'], Dat['IfGhost']);
       if NoDispatch then begin
-        frmLog.SetBottleStatusToOpened(Dat['MID']);
+        frmLog.SetBottleState(Dat['MID'], lsOpened);
       end else begin
         {Ghost := Dat['TargetGhost']; // \83I\81[\83o\81[\83\89\83C\83h\82³\82ê\82Ä\82¢\82é\89Â\94\\90«\82ª\82 \82é
         CueID := DirectSstp.SstpSENDCue(Script, false, Opt, GhostNameToSetName(Ghost));
@@ -2341,12 +2343,36 @@ end;
 
 procedure TfrmSender.BottleSstpResendEnd(Sender: TObject; MID: String);
 begin
-  frmLog.SetBottleStatusToOpened(MID);
+  frmLog.SetBottleState(MID, lsOpened);
 end;
 
 procedure TfrmSender.BottleSstpResendTrying(Sender: TObject; MID: String);
 begin
-  frmLog.SetBottleStatusToPlaying(MID);
+  frmLog.SetBottleState(MID, lsPlaying);
+end;
+
+procedure TfrmSender.actInsertCueExecute(Sender: TObject);
+var InsertItem: TLogItem;
+    i: integer;
+    Log: TBottleLogList;
+begin
+  if FBottleSstp.CueCount > 0 then
+    actClearBottlesExecute(self); // \8dÄ\91\97\83L\83\85\81[\82ð\88ê\92U\83N\83\8a\83A\82·\82é\82©\82Ç\82¤\82©\8am\94F
+  if frmLog.lvwLog.Selected = nil then Exit;
+  Log := frmLog.SelectedBottleLog;
+  if Log = nil then Exit;
+  FBottleSSTP.OnResendCountChange := nil;
+  for i := frmLog.lvwLog.Selected.Index downto 0 do begin
+    InsertItem := TLogItem.Create(Log[i] as TLogItem);
+    try
+      FBottleSSTP.Push(InsertItem);
+      frmLog.SetBottleState(InsertItem.MID, lsUnopened);
+    except
+      InsertItem.Free;
+    end;
+  end;
+  FBottleSSTP.OnResendCountChange := BottleSstpResendCountChange;
+  BottleSstpResendCountChange(self);
 end;
 
 end.