Set categories to actions

diff --git a/bottleclient/MainForm.dfm b/bottleclient/MainForm.dfm
index 2684e90..89d94af 100755 (executable)
--- a/bottleclient/MainForm.dfm
+++ b/bottleclient/MainForm.dfm
@@ -1,6 +1,6 @@
 object frmSender: TfrmSender
   Left = 540
-  Top = 421
+  Top = 431
   Width = 534
   Height = 306
   Caption = 'SSTP Bottle Client'
@@ -576,10 +576,7 @@ object frmSender: TfrmSender
         Caption = '-'
       end
       object mnAbout: TMenuItem
-        Caption = #12496#12540#12472#12519#12531#24773#22577'(&A)...'
-        Hint = #12496#12540#12472#12519#12531#24773#22577
-        ImageIndex = 15
-        OnClick = mnAboutClick
+        Action = actAbout
       end
     end
   end
@@ -588,6 +585,7 @@ object frmSender: TfrmSender
     Left = 200
     Top = 72
     object actStart: TAction
+      Category = #30331#37682
       Caption = #12481#12515#12531#12493#12523#21442#21152'(&S)'
       Hint = #12481#12515#12531#12493#12523#21442#21152'|SSTP Bottle'#12469#12540#12496#12395#25509#32154#12375#12289#12481#12515#12531#12493#12523#12395#21442#21152
       ImageIndex = 17
@@ -595,6 +593,7 @@ object frmSender: TfrmSender
       OnExecute = actStartClick
     end
     object actStop: TAction
+      Category = #30331#37682
       Caption = #20840#12481#12515#12531#12493#12523#12363#12425#33073#36864#12375#12390#24375#21046#20877#25509#32154'(&E)'
       Hint = #12481#12515#12531#12493#12523#20840#33073#36864'|'#12377#12409#12390#12398#12481#12515#12531#12493#12523#12363#12425#33073#36864#12375#12289#12508#12488#12523#12469#12540#12496#12395#20877#25509#32154#12434#35430#12415#12414#12377
       ImageIndex = 18
@@ -602,6 +601,7 @@ object frmSender: TfrmSender
       OnExecute = actStopExecute
     end
     object actSend: TAction
+      Category = #12473#12463#12522#12503#12488
       Caption = #36865#20449'(&S)'
       Hint = #36865#20449'|'#12508#12488#12523#12398#36865#20449
       ImageIndex = 10
@@ -609,6 +609,7 @@ object frmSender: TfrmSender
       OnExecute = actSendExecute
     end
     object actConfirm: TAction
+      Category = #12473#12463#12522#12503#12488
       Caption = #30906#35469'(&L)'
       Hint = #30906#35469'|'#12525#12540#12459#12523#12395'SSTP'#12434#30330#34892#12375#12390#25991#12473#12463#12522#12503#12488#12398#30906#35469
       ImageIndex = 13
@@ -616,6 +617,7 @@ object frmSender: TfrmSender
       OnExecute = actConfirmExecute
     end
     object actClear: TAction
+      Category = #12473#12463#12522#12503#12488
       Caption = #12463#12522#12450'(&N)'
       Hint = #12463#12522#12450'|'#26032#12375#12356#12513#12483#12475#12540#12472#12434#20316#25104
       ImageIndex = 0
@@ -623,22 +625,26 @@ object frmSender: TfrmSender
       OnExecute = actClearExecute
     end
     object actEditConst: TAction
+      Category = #34920#31034
       Caption = #23450#22411#21477#12456#12487#12451#12479'(&E)'
       Hint = #23450#22411#21477#12456#12487#12451#12479#34920#31034'|'#23450#22411#21477#12456#12487#12451#12479#12434#34920#31034
       ImageIndex = 22
       OnExecute = actEditConstExecute
     end
     object actCopyAll: TAction
+      Category = #32232#38598
       Caption = #12377#12409#12390#12434#12467#12500#12540'(&B)'
       Hint = #32232#38598#20013#12398#20840#12390#12398#12473#12463#12522#12503#12488#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540
       OnExecute = actCopyAllExecute
     end
     object actCopyAllNoReturn: TAction
+      Category = #32232#38598
       Caption = #12377#12409#12390#12434#25913#34892#12434#38500#12356#12390#12467#12500#12540'(&R)'
       Hint = #25913#34892#12434#21462#12426#38500#12356#12390'1'#34892#12391#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540
       OnExecute = actCopyAllNoReturnExecute
     end
     object actSetting: TAction
+      Category = #12501#12449#12452#12523
       Caption = #35373#23450'(&S)...'
       Hint = #35373#23450'|'#21508#31278#35373#23450#12480#12452#12450#12525#12464#12434#34920#31034
       ImageIndex = 5
@@ -646,18 +652,21 @@ object frmSender: TfrmSender
       OnExecute = actSettingExecute
     end
     object actExitClient: TAction
+      Category = #12501#12449#12452#12523
       Caption = 'Client'#32066#20102'(&X)'
       Hint = 'SSTP Bottle Client'#12398#32066#20102
       ImageIndex = 14
       OnExecute = actExitClientExecute
     end
     object actClearBottles: TAction
+      Category = #30331#37682
       Caption = #26410#37197#36865#12508#12488#12523#21066#38500'(&D)'
       Hint = #12414#12384#37197#36865#12373#12428#12390#12356#12394#12356'Bottle'#12364#12354#12428#12400#12289#12381#12428#12434#20840#37096#28040#21435#12375#12414#12377#12290
       ImageIndex = 21
       OnExecute = actClearBottlesExecute
     end
     object actPrevChannel: TAction
+      Category = #30331#37682
       Caption = #21069#12398#12481#12515#12531#12493#12523'(&P)'
       Hint = #21069#12398#12481#12515#12531#12493#12523#12395#31227#21205
       ImageIndex = 34
@@ -665,6 +674,7 @@ object frmSender: TfrmSender
       OnExecute = actPrevChannelExecute
     end
     object actNextChannel: TAction
+      Category = #30331#37682
       Caption = #27425#12398#12481#12515#12531#12493#12523'(&N)'
       Hint = #27425#12398#12481#12515#12531#12493#12523#12395#31227#21205
       ImageIndex = 35
@@ -672,12 +682,14 @@ object frmSender: TfrmSender
       OnExecute = actNextChannelExecute
     end
     object actShowLog: TAction
+      Category = #34920#31034
       Caption = #12525#12464#30011#38754#34920#31034'(&L)'
       Hint = #12525#12464#34920#31034'|Bottle'#12525#12464#12454#12451#12531#12489#12454#12434#34920#31034#12375#12414#12377
       ImageIndex = 25
       OnExecute = actShowLogExecute
     end
     object actSleep: TAction
+      Category = #30331#37682
       Caption = #37197#36865#12473#12522#12540#12503'(&L)'
       Hint = #37197#36865#12473#12522#12540#12503'|'#21463#20449#12375#12383#12508#12488#12523#12398#37197#36865#12434#12473#12522#12540#12503#12375#12414#12377
       ImageIndex = 19
@@ -685,6 +697,7 @@ object frmSender: TfrmSender
       OnExecute = actSleepExecute
     end
     object actVoteMessage: TAction
+      Category = #12525#12464#25805#20316
       Caption = #12371#12398#12508#12488#12523#12395#25237#31080'(&V)'
       Enabled = False
       Hint = #12371#12398'Bottle'#12395#25237#31080#12377#12427
@@ -693,6 +706,7 @@ object frmSender: TfrmSender
       OnExecute = actVoteMessageExecute
     end
     object actAgreeMessage: TAction
+      Category = #12525#12464#25805#20316
       Caption = #12371#12398#12508#12488#12523#12395#21516#24847'(&A)'
       Enabled = False
       Hint = #12371#12398'Bottle'#12395#21516#24847#12377#12427
@@ -701,6 +715,7 @@ object frmSender: TfrmSender
       OnExecute = actAgreeMessageExecute
     end
     object actPrevGhost: TAction
+      Category = #30331#37682
       Caption = #21069#12398#12468#12540#12473#12488'(&B)'
       Hint = #21069#12398#36865#20449#20808#12468#12540#12473#12488#12434#36984#25246
       ImageIndex = 23
@@ -708,6 +723,7 @@ object frmSender: TfrmSender
       OnExecute = actPrevGhostExecute
     end
     object actNextGhost: TAction
+      Category = #30331#37682
       Caption = #27425#12398#12468#12540#12473#12488'(&F)'
       Hint = #27425#12398#36865#20449#20808#12468#12540#12473#12488#12434#36984#25246
       ImageIndex = 24
@@ -715,24 +731,28 @@ object frmSender: TfrmSender
       OnExecute = actNextGhostExecute
     end
     object actResetGhost: TAction
+      Category = #30331#37682
       Caption = #36865#20449#20808#12468#12540#12473#12488#12522#12475#12483#12488'(&G)'
       Hint = #36865#20449#20808#12468#12540#12473#12488#12434'CH'#25512#22888#12395#25147#12377
       ShortCut = 16455
       OnExecute = actResetGhostExecute
     end
     object actDownloadLog: TAction
+      Category = #12525#12464#25805#20316
       Caption = #12525#12464#12480#12454#12531#12525#12540#12489
       Hint = #12508#12488#12523#12469#12540#12496#12363#12425#12508#12488#12523#12398#12525#12464#12434#12480#12454#12531#12525#12540#12489
       ImageIndex = 36
       OnExecute = actDownloadLogExecute
     end
     object actFMOExplorer: TAction
+      Category = #34920#31034
       Caption = '&FMO'#12456#12463#12473#12503#12525#12540#12521
       Hint = 'FMO'#12456#12463#12473#12503#12525#12540#12521'|FMO'#12456#12463#12473#12503#12525#12540#12521#12434#34920#31034
       ImageIndex = 6
       OnExecute = actFMOExplorerExecute
     end
     object actInsertCue: TAction
+      Category = #12525#12464#25805#20316
       Caption = #12371#12371#12363#12425#19978#12434#36899#32154#20877#29983'(&P)'
       Enabled = False
       Hint = #36984#25246#34892#12424#12426#19978#12398#12508#12488#12523#12434#20877#36865#12461#12517#12540#12395#20837#12428#12427
@@ -740,6 +760,7 @@ object frmSender: TfrmSender
       OnExecute = actInsertCueExecute
     end
     object actCopy: TAction
+      Category = #32232#38598
       Caption = #12467#12500#12540'(&C)'
       Hint = #12467#12500#12540'|'#36984#25246#31684#22258#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540
       ImageIndex = 2
@@ -747,6 +768,7 @@ object frmSender: TfrmSender
       OnExecute = actCopyExecute
     end
     object actPaste: TAction
+      Category = #32232#38598
       Caption = #36028#12426#20184#12369'(&P)'
       Hint = #36028#12426#20184#12369'|'#12463#12522#12483#12503#12508#12540#12489#12363#12425#12486#12461#12473#12488#12434#36028#12426#20184#12369
       ImageIndex = 3
@@ -754,6 +776,7 @@ object frmSender: TfrmSender
       OnExecute = actPasteExecute
     end
     object actCut: TAction
+      Category = #32232#38598
       Caption = #20999#12426#21462#12426'(&T)'
       Hint = #20999#12426#21462#12426'|'#36984#25246#31684#22258#12434#12463#12522#12483#12503#12508#12540#12489#12395#20999#12426#21462#12426
       ImageIndex = 4
@@ -761,48 +784,48 @@ object frmSender: TfrmSender
       OnExecute = actCutExecute
     end
     object actSelectAll: TAction
+      Category = #32232#38598
       Caption = #12377#12409#12390#12434#36984#25246'(&A)'
       Hint = #12377#12409#12390#12434#36984#25246
       ShortCut = 16449
       OnExecute = actSelectAllExecute
     end
-    object actEditCopy: TEditCopy
-      Category = #32232#38598
-      Caption = #12467#12500#12540'(&C)'
-      Hint = #12467#12500#12540'|'#36984#25246#31684#22258#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540
-      ImageIndex = 40
-      ShortCut = 16451
-    end
     object actRecallScriptBuffer: TAction
+      Category = #32232#38598
       Caption = #12473#12463#12522#12503#12488#12496#12483#12501#12449#12363#12425#21628#12403#20986#12375'(&R)'
       Hint = #12473#12463#12522#12503#12488#12496#12483#12501#12449#12363#12425#21628#12403#20986#12375
       ShortCut = 16466
       OnExecute = actRecallScriptBufferExecute
     end
     object actEditorPreview: TAction
+      Category = #34920#31034
       Caption = #12456#12487#12451#12479#12503#12524#12499#12517#12540#12454#12451#12531#12489#12454#34920#31034'(&P)'
       Hint = #12456#12487#12451#12479#12503#12524#12499#12517#12540#12454#12451#12531#12489#12454'|'#12456#12487#12451#12479#12503#12524#12499#12517#12540#12454#12451#12531#12489#12454#12434#34920#31034#12375#12414#12377
       ImageIndex = 42
       OnExecute = actEditorPreviewExecute
     end
     object actResetPlugins: TAction
+      Category = #12504#12523#12503
       Caption = #12503#12521#12464#12452#12531#12522#12475#12483#12488'(&P)'
       Hint = #12503#12521#12464#12452#12531#12434#20877#35501#36796#12375#12289#12469#12540#12501#12451#12473#12461#12515#12483#12471#12517#12434#12463#12522#12450
       OnExecute = actResetPluginsExecute
     end
     object actReplace: TAction
+      Category = #32232#38598
       Caption = #32622#25563'(&H)...'
       Hint = #12473#12463#12522#12503#12488#25991#23383#21015#12398#32622#25563#12434#34892#12358
       OnExecute = actReplaceExecute
     end
-    object actSendEditor: TAction
+    object actSendToEditor: TAction
+      Category = #12525#12464#25805#20316
       Caption = #32232#38598#12454#12451#12531#12489#12454#12395#36865#12427'(&E)'
       Enabled = False
       Hint = #32232#38598#12454#12451#12531#12489#12454#12395#36865#12427'|'#32232#38598#12454#12451#12531#12489#12454#12398#12456#12487#12451#12479#37096#20998#12395#12473#12463#12522#12503#12488#12392#12468#12540#12473#12488#12434#36865#12427
       ImageIndex = 11
-      OnExecute = actSendEditorExecute
+      OnExecute = actSendToEditorExecute
     end
     object actSendToLogWindow: TAction
+      Category = #12473#12463#12522#12503#12488
       Caption = #12525#12464#12454#12451#12531#12489#12454#12408#12463#12522#12483#12503'(&L)'
       Hint = #29694#22312#12398#12473#12463#12522#12503#12488#12392#12468#12540#12473#12488#21517#12434#12525#12464#12454#12451#12531#12489#12454#12395#36865#12426#12414#12377
       ImageIndex = 12
@@ -810,6 +833,7 @@ object frmSender: TfrmSender
       OnExecute = actSendToLogWindowExecute
     end
     object actDeleteLogItem: TAction
+      Category = #12525#12464#25805#20316
       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
@@ -817,6 +841,12 @@ object frmSender: TfrmSender
       ShortCut = 46
       OnExecute = actDeleteLogItemExecute
     end
+    object actAbout: TAction
+      Category = #12504#12523#12503
+      Caption = #12496#12540#12472#12519#12531#24773#22577'(&A)...'
+      Hint = #12496#12540#12472#12519#12531#24773#22577#12480#12452#12450#12525#12464#12434#34920#31034
+      ImageIndex = 15
+    end
   end
   object mnPopUp: TPopupMenu
     Images = imgIcon

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index 6a61554..db7cf38 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -151,7 +151,6 @@ type
     actPaste: TAction;
     actCut: TAction;
     actSelectAll: TAction;
-    actEditCopy: TEditCopy;
     actRecallScriptBuffer: TAction;
     N5: TMenuItem;
     mnRecallScriptBuffer: TMenuItem;
@@ -165,10 +164,11 @@ type
     actReplace: TAction;
     N10: TMenuItem;
     mnReplace: TMenuItem;
-    actSendEditor: TAction;
+    actSendToEditor: TAction;
     actSendToLogWindow: TAction;
     mnSendLogWindow: TMenuItem;
     actDeleteLogItem: TAction;
+    actAbout: TAction;
     procedure actConfirmExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -256,7 +256,7 @@ type
     procedure actReplaceExecute(Sender: TObject);
     procedure ReplaceDialogFind(Sender: TObject);
     procedure ReplaceDialogReplace(Sender: TObject);
-    procedure actSendEditorExecute(Sender: TObject);
+    procedure actSendToEditorExecute(Sender: TObject);
     procedure actSendToLogWindowExecute(Sender: TObject);
     procedure memScriptDragOver(Sender, Source: TObject; X, Y: Integer;
       State: TDragState; var Accept: Boolean);
@@ -2844,7 +2844,7 @@ begin
   end;
 end;
 
-procedure TfrmSender.actSendEditorExecute(Sender: TObject);
+procedure TfrmSender.actSendToEditorExecute(Sender: TObject);
 var Log: TLogItem;
 begin
   if frmLog.lvwLog.Selected = nil then Exit;