Add shortcuts to vote and agree message action

actDeleteLogItem added and implemented

diff --git a/bottleclient/LogForm.dfm b/bottleclient/LogForm.dfm
index ddc2b4e..d7694a2 100755 (executable)
--- a/bottleclient/LogForm.dfm
+++ b/bottleclient/LogForm.dfm
@@ -309,7 +309,7 @@ object frmLog: TfrmLog
     Left = 376
     Top = 56
     object mnPopUpCopyScript: TMenuItem
-      Caption = #12371#12398'Bottle'#12473#12463#12522#12503#12488#12434#12467#12500#12540'(&C)'
+      Caption = #12371#12398#12473#12463#12522#12503#12488#12434#12467#12500#12540'(&C)'
       Enabled = False
       Hint = #12473#12463#12522#12503#12488#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540
       ImageIndex = 2
@@ -321,9 +321,18 @@ object frmLog: TfrmLog
     object mnPopUpAgreeMessage: TMenuItem
       Action = frmSender.actAgreeMessage
     end
+    object N1: TMenuItem
+      Caption = '-'
+    end
     object mnSendEditor: TMenuItem
       Action = frmSender.actSendEditor
     end
+    object mnDeleteLogItem: TMenuItem
+      Action = frmSender.actDeleteLogItem
+    end
+    object N2: TMenuItem
+      Caption = '-'
+    end
     object mnInsertCue: TMenuItem
       Action = frmSender.actInsertCue
     end

diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas
index e5e65eb..d017404 100755 (executable)
--- a/bottleclient/LogForm.pas
+++ b/bottleclient/LogForm.pas
@@ -71,6 +71,9 @@ type
     mnSendEditor: TMenuItem;
     timScrollTimer: TTimer;
     mnChangeTabName: TMenuItem;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    mnDeleteLogItem: TMenuItem;
     procedure tbtnClearClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure lvwLogChange(Sender: TObject; Item: TListItem;
@@ -309,54 +312,45 @@ procedure TfrmLog.lvwLogChange(Sender: TObject; Item: TListItem;
   Change: TItemChange);
 var Script: String;
     Log: TLogItem;
+    Selected, IsNormalBottle: boolean;
 begin
+  Selected := false;
+  IsNormalBottle := false;
   if SelectedBottleLog <> nil then begin
     StatusBar.Panels[0].Text := IntToStr(SelectedBottleLog.Count) + '\8c\8f';
     if Change = ctState then begin
       Script := '';
       if lvwLog.Selected <> nil then begin
+        Selected := true;
         Log := SelectedBottleLog.Bottles[lvwLog.Selected.Index];
         if (Log.LogType = ltBottle) and not frmSender.Connecting then begin
+          IsNormalBottle := true;
           Script := Log.Script;
-          frmSender.actVoteMessage.Enabled := true;
-          frmSender.actAgreeMessage.Enabled := true;
-          frmSender.actSendEditor.Enabled := true;
-          frmSender.actInsertCue.Enabled := true;
-          mnPopUpCopyScript.Enabled := true;
           StatusBar.Panels[1].Text := Format('%d\83o\83C\83g - \83_\83u\83\8b\83N\83\8a\83b\83N\82Å\8dÄ\90¶', [Length(Log.Script)]);
           if Pref.LogWindowPreviewStyle = psImageConversation then
             TalkShowFrame.View(Log)
           else
             UpdateScript(Script);
         end else begin
-          frmSender.actVoteMessage.Enabled := false;
-          frmSender.actAgreeMessage.Enabled := false;
-          frmSender.actSendEditor.Enabled := false;
-          frmSender.actInsertCue.Enabled := false;
-          mnPopUpCopyScript.Enabled := false;
           StatusBar.Panels[1].Text := '';
           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.actSendEditor.Enabled := false;
-        frmSender.actInsertCue.Enabled := false;
-        mnPopUpCopyScript.Enabled := false;
         StatusBar.Panels[1].Text := '';
         UpdateScript(Script); // \83\8d\83O\83v\83\8c\83r\83\85\81[\95\94\83N\83\8a\83A
       end;
     end;
     tbtnSaveLog.Enabled := lvwLog.Items.Count > 0;
   end else begin
-    frmSender.actVoteMessage.Enabled := false;
-    frmSender.actAgreeMessage.Enabled := false;
-    frmSender.actSendEditor.Enabled := false;
-    frmSender.actInsertCue.Enabled := false;
-    mnPopUpCopyScript.Enabled := false;
     StatusBar.Panels[0].Text := '';
     UpdateScript(''); // \83\8d\83O\83v\83\8c\83r\83\85\81[\95\94\83N\83\8a\83A
   end;
+  frmSender.actVoteMessage.Enabled := Selected and IsNormalBottle;
+  frmSender.actAgreeMessage.Enabled := Selected and IsNormalBottle;
+  frmSender.actSendEditor.Enabled := Selected and IsNormalBottle;
+  frmSender.actInsertCue.Enabled := Selected;
+  frmSender.actDeleteLogItem.Enabled := Selected;
+  mnPopUpCopyScript.Enabled := Selected and IsNormalBottle;
 end;
 
 procedure TfrmLog.lvwLogDblClick(Sender: TObject);

diff --git a/bottleclient/MainForm.dfm b/bottleclient/MainForm.dfm
index 174a053..f12d6b4 100755 (executable)
--- a/bottleclient/MainForm.dfm
+++ b/bottleclient/MainForm.dfm
@@ -689,6 +689,7 @@ object frmSender: TfrmSender
       Enabled = False
       Hint = #12371#12398'Bottle'#12395#25237#31080#12377#12427
       ImageIndex = 28
+      ShortCut = 16470
       OnExecute = actVoteMessageExecute
     end
     object actAgreeMessage: TAction
@@ -696,6 +697,7 @@ object frmSender: TfrmSender
       Enabled = False
       Hint = #12371#12398'Bottle'#12395#21516#24847#12377#12427
       ImageIndex = 32
+      ShortCut = 16449
       OnExecute = actAgreeMessageExecute
     end
     object actPrevGhost: TAction
@@ -807,6 +809,14 @@ object frmSender: TfrmSender
       ShortCut = 24654
       OnExecute = actSendLogWindowExecute
     end
+    object actDeleteLogItem: TAction
+      Caption = #12371#12398#38917#30446#12434#21066#38500'(&D)'
+      Enabled = False
+      Hint = #12371#12398#38917#30446#12434#21066#38500'|'#36984#25246#12373#12428#12383#12525#12464#38917#30446#12434#21066#38500#12377#12427
+      ImageIndex = 1
+      ShortCut = 46
+      OnExecute = actDeleteLogItemExecute
+    end
   end
   object mnPopUp: TPopupMenu
     Images = imgIcon
@@ -895,7 +905,7 @@ object frmSender: TfrmSender
     Left = 8
     Top = 72
     Bitmap = {
-      494C01012C003100040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01012C003100040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000D0000000010020000000000000D0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2058,7 +2068,7 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000000000009079BA00B3A4
-      D900B3A4D900B3A4D900B3A4D900FE1F1F00FDFAFF00B3A4D900B3A4D900B3A4
+      D900B3A4D900B3A4D900B3A4D900E38E6600FDFAFF00FDFAFF00B3A4D900B3A4
       D900B3A4D9009079BA0061616300000000000000000000000000000000007171
       F8007171F8007171F8007171F8002825240028252400282524008C6F6E00A390
       9000B0A5A600B0A5A600A39090008C6F6E000000000000000000000000000000
@@ -2066,55 +2076,55 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000848484008484840000000000000000000000
       0000000000000000000000000000000000000000000000000000FDFAFF00FDFA
-      FF00FDFAFF00FDFAFF00FDFAFF00FE1F1F00FE1F1F00FDFAFF00DDABFF00DDAB
+      FF00FDFAFF00FDFAFF00FDFAFF00E38E6600E38E6600E38E6600FDFAFF00FDFA
       FF00DDABFF00C6B4E70061616300000000007171F8007171F8007171F8007171
       F8007171F8007171F8007171F8007171F8007171F80028252400282524008C6F
       6E00A3909000B0A5A600A39090008C6F6E000000000000000000000000000000
       000000000000000000000000000000000000FFFF000000000000848400000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000008484840084848400000000000000
-      0000000000000000000000000000000000000000000000000000FE1F1F00FE1F
-      1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FDFAFF00FDFA
-      FF00DDABFF00C6B4E70061616300000000002E2EEB002E2EEB002E2EEB002E2E
+      0000000000000000000000000000000000000000000000000000FD555900FD55
+      5900FD555900FD555900FD555900FD555900FD555900FD555900FD555900FD55
+      5900FDFAFF00C6B4E70061616300000000002E2EEB002E2EEB002E2EEB002E2E
       EB002E2EEB002E2EEB002E2EEB002E2EEB002E2EEB002E2EEB002E2EEB00A390
       9000A3909000A39090008C6F6E00FDC594000000000000000000000000000000
       000000000000000000000000000000000000FFFF000000000000848400008484
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000FFFF0000FFFF000000000084848400848484000000
       00000000000000000000000000000000000000000000FE1F1F00FE1F1F00FE1F
-      1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FDFA
-      FF00DDABFF00C6B4E70061616300000000002E2EEB002E2EEB002E2EEB002E2E
+      1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F
+      1F00FE1F1F00C6B4E70061616300000000002E2EEB002E2EEB002E2EEB002E2E
       EB002E2EEB002E2EEB002E2EEB002E2EEB002E2EEB00A3909000B0A5A600B0A5
       A600B19D9D00A390900000000000000000000000000000000000000000000000
       0000CED6DE00CED6DE00CED6DE0000000000FFFF000000000000848400008484
       0000848400000000000000000000000000000000000000000000000000000000
       00000000000000FFFF0000FFFF0000FFFF0000FFFF0000000000848484008484
-      840000000000000000000000000000000000FE1F1F00FE1F1F00FE1F1F00FE1F
-      1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00FE1F1F00E3BAFF00E3BA
-      FF00E3BAFF00C6B4E70061616300000000000000000000000000000000002E2E
+      840000000000000000000000000000000000FE1F1F00FE1F1F00AE200600AE20
+      0600AE200600AE200600AE200600FE1F1F00FE1F1F00FE1F1F00AE200600AE20
+      0600E3BAFF00C6B4E70061616300000000000000000000000000000000002E2E
       EB002E2EEB002E2EEB002E2EEB00B19D9D00D1C4C300D1C4C300D1C4C300D1C4
       C300D1C4C3000000000000000000000000000000000000000000000000000000
       0000CED6DE00CED6DE00CED6DE0000000000FFFF000000000000848400008484
       0000848400000000000000000000000000000000000000000000000000000000
       00000000000000FFFF0000FFFF00000000008484840000000000000000000000
-      000000000000000000000000000000000000FE1F1F00FE1F1F00FDFAFF00FDFA
-      FF00F5E5FF00F5E5FF00F0D9FF00FE1F1F00FE1F1F00E8C5FF00E8C5FF00E3BA
+      000000000000000000000000000000000000FE1F1F00AE200600FDFAFF00FDFA
+      FF00F5E5FF00F5E5FF00F0D9FF00AE200600AE200600AE200600E8C5FF00E3BA
       FF00E3BAFF00C6B4E70061616300000000000000000000000000000000002E2E
       EB002E2EEB009A8382009A838200A3909000A3909000A3909000A3909000A390
       9000A39090008C6F6E008C6F6E00FDC594000000000000000000000000000000
       0000CED6DE00CED6DE00CED6DE0000000000FFFF000000000000CED6DE008484
       0000848400000000000000000000000000000000000000000000000000000000
       0000000000008484840000FFFF0000FFFF000000000000000000000000000000
-      00000000000000000000000000000000000000000000FE1F1F00FE1F1F00FE1F
-      1F00F5E5FF00F5E5FF00F5E5FF00FE1F1F00EDD1FF00EDD1FF00E8C5FF00E8C5
+      00000000000000000000000000000000000000000000FE1F1F00AE200600AE20
+      0600F5E5FF00F5E5FF00F5E5FF00AE200600EDD1FF00EDD1FF00E8C5FF00E8C5
       FF00E3BAFF00C6B4E70061616300000000000000000000000000000000000000
       000000000000B19D9D00C3B1B000C3B1B000C3B1B000C3B1B000D1C4C300C3B1
       B000C3B1B000A39090008C6F6E008C6F6E000000000000000000000000000000
       0000CED6DE00CED6DE00CED6DE0000000000FFFF000000000000848400008484
       0000848400000000000000000000000000000000000000000000000000000000
       0000000000000000000000FFFF0000FFFF008484840084848400848484000000
-      0000000000000000000000000000000000000000000000000000FE1F1F00FE1F
-      1F00FE1F1F00FE1F1F00F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5
+      0000000000000000000000000000000000000000000000000000AE200600AE20
+      0600AE200600AE200600F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5
       FF00E8C5FF00C6B4E70061616300000000000000000000000000000000000000
       000000000000B19D9D008C6F6E00FFFE8F00FFFE8F00FFFEAE00FFFEAE00FFFE
       D100FFFED100FFFED100A39090008C6F6E000000000000000000000000000000
@@ -2460,7 +2470,7 @@ object frmSender: TfrmSender
       FF00FFFFFF00FFFFFF00FFFFFF008400000000000000000000009079BA00F0D9
       FF00EDD1FF00EDD1FF00E8C5FF00E8C5FF00E3BAFF00E3BAFF00DDABFF00DDAB
       FF00DDABFF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000808080000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000000000000000000084848400008484008484
@@ -2468,7 +2478,7 @@ object frmSender: TfrmSender
       00008400000084000000FFFFFF008400000000000000000000009079BA00F5E5
       FF00F0D9FF00EDD1FF00EDD1FF00E8C5FF00E8C5FF00E3BAFF00E3BAFF00DDAB
       FF00DDABFF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000080000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000084000000FFFFFF000000000000000000000000000000
       000000000000FFFFFF0084000000000000000000000000848400848484000084
@@ -2476,39 +2486,39 @@ object frmSender: TfrmSender
       FF00FFFFFF00FFFFFF00FFFFFF008400000000000000000000009079BA00F5E5
       FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5FF00E8C5FF00E3BAFF00E3BA
       FF00E3BAFF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000084840000000000000000000084840000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000080000000800000000000000000000000000000000000808080000000
+      8000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000000000000000000084848400008484008484
       8400008484008484840084000000FFFFFF00840000008400000084000000FFFF
       FF00840000008400000084000000840000000000000000000000B085DB00F5E5
       FF00F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5FF00E8C5FF00E3BA
       FF00E3BAFF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000084840000848400000000000084840000848400000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      0000808080000000800080808000000000000000000080808000000080008080
+      80000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000FFFFFF000000000000000000000000000000
       000000000000FFFFFF0084000000000000000000000000848400848484000084
       8400848484000084840084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF0084000000FFFFFF0084000000000000000000000000000000B085DB00FDFA
       FF00F5E5FF00F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5FF00E8C5
-      FF00E3BAFF00C6B4E70061616300000000000000000000000000848400008484
-      0000848400008484000084840000848400008484000000000000848400008484
+      FF00E3BAFF00C6B4E70061616300000000000000000000000000000000000000
+      0000000000000000800000008000808080000000000000008000000080000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000000000000000000084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000000000000000000084848400008484008484
       8400008484008484840084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00840000008400000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00F5E5FF00F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1FF00E8C5
-      FF00E8C5FF00C6B4E70061616300000000000000000000000000848400008484
-      0000848400008484000084840000848400008484000084840000000000008484
-      00008484000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00E8C5FF00C6B4E70061616300000000000000000000000000000000000000
+      0000000000008080800000008000000080000000800000008000000000000000
+      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000FFFFFF000000000000000000FFFFFF008400
       0000840000008400000084000000000000000000000000848400848484000084
       8400848484000084840084000000840000008400000084000000840000008400
       0000840000000000000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00FDFAFF00F5E5FF00F5E5FF00F5E5FF00F0D9FF00EDD1FF00EDD1
-      FF00E8C5FF00C6B4E70061616300000000000000000000000000848400008484
-      0000848400008484000084840000848400008484000000000000848400008484
+      FF00E8C5FF00C6B4E70061616300000000000000000000000000000000000000
+      0000000000008080800000008000000080000000800000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000000000000000000084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF008400
       0000FFFFFF008400000000000000000000000000000084848400008484008484
@@ -2516,7 +2526,7 @@ object frmSender: TfrmSender
       8400008484000000000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00FDFAFF00FDFAFF00F5E5FF00F5E5FF00F5E5FF00F0D9FF00EDD1
       FF00EDD1FF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000084840000848400000000000084840000848400000000
+      0000808080000000800000008000000080000000800080808000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0084000000FFFFFF00FFFFFF00FFFFFF00FFFFFF008400
       0000840000000000000000000000000000000000000000848400848484000000
@@ -2524,7 +2534,7 @@ object frmSender: TfrmSender
       8400848484000000000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00F5E5FF00F5E5FF00F5E5FF00F0D9
       FF00EDD1FF00C6B4E70061616300000000000000000000000000000000000000
-      0000000000000000000084840000000000000000000084840000000000000000
+      0000000080000000800080808000000000000000800000008000808080000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000FFFFFF000000000084000000840000008400000084000000840000008400
       0000000000000000000000000000000000000000000084848400848484000000
@@ -2532,16 +2542,16 @@ object frmSender: TfrmSender
       8400008484000000000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00F5E5FF00DACCFF00DACC
       FF00BAAAF5006161630061616300000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      0000000000000000000000000000000000000000000000008000000080008080
+      80000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF0000000000FFFFFF00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000848400848484000084
       84000000000000FFFF00000000000000000000FFFF0000000000848484000084
       8400848484000000000000000000000000000000000000000000B085DB00FDFA
       FF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00FDFAFF00AD42EC00AD42
       EC00AD42EC006161630000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      0000000000000000000000000000000000000000000000000000000080000000
+      80008080800000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000FFFF0000FFFF000000000000000000000000000000
@@ -2612,11 +2622,10 @@ object frmSender: TfrmSender
       FD1F800300070003FC7F800300030003FEFF800300010003FC7F800300010003
       FD7F800300010003F93F800300030003FBBF800380070003FBBF8003C00F0003
       FBBF8003E00F0007FFFF8007F00FFFFFE001FFFFFFFFFFFFC001FFFFFFFFFC00
-      C001FFFFFC018000C001FB7FFC010000C001F93FFC010000C001F81F00010000
-      C001800F00010001C001800700010003C001800300010003C001800700030003
-      C001800F00070003C001F81F000F0FC3C001F93F00FF0003C003FB7F01FF8007
-      C007FFFF03FFF87FC00FFFFFFFFFFFFF00000000000000000000000000000000
-      000000000000}
+      C001FFFFFC018000C001F7FFFC010000C001F7FFFC010000C001F3CF00010000
+      C001F18F00010001C001F89F00010003C001F83F00010003C001F87F00030003
+      C001F03F00070003C001F11F000F0FC3C001FF8F00FF0003C003FFC701FF8007
+      C007FFFF03FFF87FC00FFFFFFFFFFFFF}
   end
   object mnPopupConst: TPopupMenu
     Images = imgIcon

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index 15fee81..bf4f4a8 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -168,6 +168,7 @@ type
     actSendEditor: TAction;
     actSendLogWindow: TAction;
     mnSendLogWindow: TMenuItem;
+    actDeleteLogItem: TAction;
     procedure actConfirmExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -260,6 +261,7 @@ type
     procedure memScriptDragOver(Sender, Source: TObject; X, Y: Integer;
       State: TDragState; var Accept: Boolean);
     procedure memScriptDragDrop(Sender, Source: TObject; X, Y: Integer);
+    procedure actDeleteLogItemExecute(Sender: TObject);
   private
     FSleeping: boolean;  // \94z\91\97\83X\83\8a\81[\83v\92\86\82©\82Ç\82¤\82©
     FStatusText: String;
@@ -2895,7 +2897,8 @@ procedure TfrmSender.memScriptDragOver(Sender, Source: TObject; X,
   Y: Integer; State: TDragState; var Accept: Boolean);
 begin
   // \83\8d\83O\83E\83B\83\93\83h\83E\82©\82ç\82Ì\83\8d\83O\83A\83C\83e\83\80\82Ì\92¼\90ÚD&D\82ð\8b\96\89Â\82·\82é
-  Accept := Source is TBottleLogDragObject;
+  if Source is TBottleLogDragObject then
+    Accept := (Source as TBottleLogDragObject).LogItem.LogType = ltBottle
 end;
 
 procedure TfrmSender.memScriptDragDrop(Sender, Source: TObject; X,
@@ -2906,6 +2909,8 @@ begin
   // \83\8d\83O\83E\83B\83\93\83h\83E\82©\82ç\83\8d\83O\83A\83C\83e\83\80\82ðD&D\82µ\82Ä\82­\82é
   if not (Source is TBottleLogDragObject) then
     Exit;
+  if (Source as TBottleLogDragObject).LogItem.LogType <> ltBottle then
+    Exit;
   Src := Source as TBottleLogDragObject;
   Log := Src.LogItem;
   CopyFromLogToEditor(Log);
@@ -2930,4 +2935,16 @@ begin
   memScript.SetFocus;
 end;
 
+procedure TfrmSender.actDeleteLogItemExecute(Sender: TObject);
+begin
+  // \83\8d\83O\83E\83B\83\93\83h\83E\82Ì\8cÂ\95Ê\83\8d\83O\82ð\8dí\8f\9c\82·\82é
+  if frmLog.SelectedBottleLog = nil then
+    Exit;
+  if frmLog.lvwLog.Selected = nil then
+    Exit;
+  frmLog.SelectedBottleLog.Delete(frmLog.lvwLog.Selected.Index);
+  frmLog.UpdateWindow;
+  frmLog.lvwLogChange(Self, nil, ctState);
+end;
+
 end.