Fixed a lil shortcuts bug, added exit to File menu, added Exit Icon, added Help menu, added About form.

Changed the exported mouse functions to use Integers & consts, rather than the current Enum (because PascalScript is worthless when it comes to Enums).


git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@229 3f818213-9676-44b0-a9b4-5e4c4e03d09d

Images/license.txt

@@ -1,5 +1,5 @@
 pause,stop: From Lazarus (http://lazarus.freepascal.org)
-cut,new,open,paste,redo,run,save,undo: Mark James http://www.famfamfam.com/lab/icons/silk/
+exit,cut,new,open,paste,redo,run,save,undo: Mark James http://www.famfamfam.com/lab/icons/silk/
 closetab,closetabs,addtab,eraser,terminate: Yusuke Kamiyamane http://www.pinvoke.com/
 pickcolor: From the Crystal Clear Project (http://www.everaldo.com/crystal/) licensed under LGPL
 crosshair: http://led24.de/iconset/ or http://led24.de/ would be appreciated. Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com 512 icons 20/05/2009

Projects/SAMufasaGUI/about.lfm

@@ -0,0 +1,21 @@
+object AboutForm: TAboutForm
+  Left = 622
+  Height = 300
+  Top = 271
+  Width = 400
+  Caption = 'AboutForm'
+  ClientHeight = 300
+  ClientWidth = 400
+  LCLVersion = '0.9.29'
+  object Memo1: TMemo
+    Left = 0
+    Height = 300
+    Top = 0
+    Width = 400
+    Align = alClient
+    Lines.Strings = (
+      'Mufasa is, and always will be, sick.'
+    )
+    TabOrder = 0
+  end
+end

Projects/SAMufasaGUI/about.lrs

@@ -0,0 +1,10 @@
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TAboutForm','FORMDATA',[
+  'TPF0'#10'TAboutForm'#9'AboutForm'#4'Left'#3'n'#2#6'Height'#3','#1#3'Top'#3#15
+  +#1#5'Width'#3#144#1#7'Caption'#6#9'AboutForm'#12'ClientHeight'#3','#1#11'Cli'
+  +'entWidth'#3#144#1#10'LCLVersion'#6#6'0.9.29'#0#5'TMemo'#5'Memo1'#4'Left'#2#0
+  +#6'Height'#3','#1#3'Top'#2#0#5'Width'#3#144#1#5'Align'#7#8'alClient'#13'Line'
+  +'s.Strings'#1#6'$Mufasa is, and always will be, sick.'#0#8'TabOrder'#2#0#0#0
+  +#0
+]);

Projects/SAMufasaGUI/about.pas

@@ -0,0 +1,32 @@
+unit about;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+  StdCtrls;
+
+type
+
+  { TAboutForm }
+
+  TAboutForm = class(TForm)
+    Memo1: TMemo;
+  private
+    { private declarations }
+  public
+    { public declarations }
+  end; 
+
+var
+  AboutForm: TAboutForm;
+
+implementation
+
+initialization
+  {$I about.lrs}
+
+end.
+

Projects/SAMufasaGUI/colourhistory.lrs

@@ -1,3 +1,5 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TColourHistoryForm','FORMDATA',[
   'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#145#1#6'Height'
   +#3#250#0#3'Top'#3'X'#1#5'Width'#3#233#1#13'ActiveControl'#7#13'SelectionName'

Projects/SAMufasaGUI/colourhistory.pas

@@ -183,12 +183,12 @@ end;
 
 procedure TColourHistoryForm.SetCHShowMenu(Sender: TObject);
 begin
-  Form1.View_CH_Menu.Checked := True;
+  Form1.MenuItemColourHistory.Checked := True;
 end;
 
 procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject);
 begin
-  Form1.View_CH_Menu.Checked := False;
+  Form1.MenuItemColourHistory.Checked := False;
 end;
 
 initialization

Projects/SAMufasaGUI/project1.lpr

@@ -30,7 +30,7 @@ uses
   cthreads, cmem,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, LResources, testunit,colourhistory;
+  Forms, LResources, testunit,colourhistory, About;
 
 {$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}
 
@@ -41,6 +41,7 @@ begin
 
   Application.CreateForm(TForm1, Form1);
   Application.CreateForm(TColourHistoryForm, ColourHistoryForm);
+  Application.CreateForm(TAboutForm, AboutForm);
   Application.Run;
 end.
 

Projects/SAMufasaGUI/testunit.lfm

@@ -373,7 +373,7 @@ object Form1: TForm1
   object MainMenu1: TMainMenu
     left = 528
     object MenuFile: TMenuItem
-      Caption = 'File'
+      Caption = '&File'
       SubMenuImages = Mufasa_Image_List
       object MenuItemNew: TMenuItem
         Action = ActionNewScript
@@ -590,7 +590,6 @@ object Form1: TForm1
       end
       object MenuItemCloseTab: TMenuItem
         Action = ActionCloseTab
-        Caption = 'Close Tab'
         Bitmap.Data = {
           36040000424D3604000000000000360000002800000010000000100000000100
           2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@@ -670,9 +669,52 @@ object Form1: TForm1
         ImageIndex = 20
         OnClick = MenuItemCloseTabsClick
       end
+      object MenuItemDivider6: TMenuItem
+        Caption = '-'
+      end
+      object MenuItemMainExit: TMenuItem
+        Action = ActionExit
+        Bitmap.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D63
+          9B1619609839145D9562105A92880D5890A4135C92FC0C578FED999999FF7171
+          71FF545454FF515151FF4F4F4FFF4C4C4CFF4A4A4AFF474747FF454545FF2567
+          9DFF3274A8FF3D7CAFFF4784B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFF
+          FF00585858FFA2A2A2FFA2A2A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6F
+          A5FF78ABD2FF78ABD3FF73A7D1FF69A0CDFF407FAEFF0F5991EAFFFFFF00FFFF
+          FF005C5C5CFFA1A1A1FF3C7340FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674
+          AAFF7DAFD4FF5B9AC9FF5495C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFF
+          FF00606060FFA0A0A0FF3D7641FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79
+          B0FF82B3D7FF629FCCFF5A9AC9FF5E9BCAFF4381AFFF196098EA37823EFF347E
+          3BFF317937FF2E7534FF499150FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457E
+          B4FF88B7D9FF67A3CFFF619ECCFF639FCCFF4583B1FF1F649CEA3B8742FF89CB
+          92FF84C88DFF80C688FF7BC383FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84
+          BAFF8DBBDBFF6EA8D1FF66A6D1FF5FB4DFFF4785B1FF2569A1EA3E8B46FF8FCE
+          99FF7DC687FF78C381FF73C07CFF74C07CFF79C281FF49904FFF547F57FF5489
+          BFFF94BFDDFF75ADD4FF63B8E1FF4BD4FFFF428BB8FF2C6EA6EA41904AFF94D2
+          9FFF91D09AFF8DCD96FF89CB92FF84C88DFF519858FF417C46FF9F9F9FFF5A8E
+          C4FF98C3E0FF7CB3D7FF74AFD6FF5EC4EDFF4B88B3FF3473ABEA44944DFF4291
+          4BFF3F8D48FF3D8945FF5DA465FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092
+          C9FF9EC7E2FF83B8DAFF7DB4D7FF7EB3D7FF4F89B4FF3B79B1EAFFFFFF00FFFF
+          FF00777777FF9A9A9AFF3D8A45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696
+          CCFFA2CBE3FF89BDDCFF83B9DAFF84B9DAFF518BB5FF437EB6EAFFFFFF00FFFF
+          FF007A7A7AFF999999FF529159FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9A
+          D0FFA7CEE5FF8FC1DFFF89BDDCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFF
+          FF007D7D7DFF999999FF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9D
+          D3FFAAD1E7FFABD1E7FF98C7E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFF
+          FF00808080FF7E7E7EFF7C7C7CFF7A7A7AFF777777FF757575FF727272FF719E
+          D4FF6F9ED6FF87B2DCFFABD3E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00709ED6DB6D9CD4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF006D9CD4896A9AD2FB6697CFEE
+        }
+        OnClick = ActionExitExecute
+      end
     end
     object MenuEdit: TMenuItem
-      Caption = 'Edit'
+      Caption = '&Edit'
       SubMenuImages = Mufasa_Image_List
       OnClick = MenuEditClick
       object MenuItemUndo: TMenuItem
@@ -930,7 +972,6 @@ object Form1: TForm1
       end
       object MenuItemFind: TMenuItem
         Action = ActionFindStart
-        Caption = 'Find...'
         OnClick = ActionFindstartExecute
       end
       object MenuItemFindNext: TMenuItem
@@ -943,7 +984,7 @@ object Form1: TForm1
       end
     end
     object MenuItemScript: TMenuItem
-      Caption = 'Script'
+      Caption = '&Script'
       SubMenuImages = Mufasa_Image_List
       object MenuItemRun: TMenuItem
         Action = ActionRunScript
@@ -1069,18 +1110,25 @@ object Form1: TForm1
         OnClick = ActionStopExecute
       end
     end
-    object ViewMenu: TMenuItem
+    object MenuView: TMenuItem
-      Caption = 'View'
+      Caption = '&View'
-      object View_CH_Menu: TMenuItem
+      object MenuItemColourHistory: TMenuItem
-        Caption = 'View Colour History'
+        Caption = '&View Colour History'
-        OnClick = ColourHistoryMenuClick
+        OnClick = MenuItemColourHistoryClick
+      end
+    end
+    object MenuHelp: TMenuItem
+      Caption = '&Help'
+      object MenuItemAbout: TMenuItem
+        Caption = '&About'
+        OnClick = MenuItemAboutClick
       end
     end
   end
   object Mufasa_Image_List: TImageList
     left = 488
     Bitmap = {
-      4C69190000001000000010000000424242004242420042424200424242004242
+      4C691A0000001000000010000000424242004242420042424200424242004242
       420042424200424242004242420042424200424242004242420042424200A155
       42FFA15542FFA15542FF4242420E424242004242420042424200424242004242
       4200424242004242420042424200424242004242420042424200A15542FFFFDA
@@ -1880,7 +1928,39 @@ object Form1: TForm1
       99FAA1A199FAA1A19AFAA1A19AFAA1A19AFAA1A19BFAA1A19BFAA2A29BFAA2A2
       9BFAA7A7A1F9BABAB6D9BCBCB85DFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF006D9CD4896A9AD2FB6697CFEEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00709ED6DB6D9C
+      D4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFFFF00808080FF7E7E7EFF7C7C
+      7CFF7A7A7AFF777777FF757575FF727272FF719ED4FF6F9ED6FF87B2DCFFABD3
+      E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFFFF007D7D7DFF999999FF9999
+      99FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9DD3FFAAD1E7FFABD1E7FF98C7
+      E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFFFF007A7A7AFF999999FF5291
+      59FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9AD0FFA7CEE5FF8FC1DFFF89BD
+      DCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFFFF00777777FF9A9A9AFF3D8A
+      45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696CCFFA2CBE3FF89BDDCFF83B9
+      DAFF84B9DAFF518BB5FF437EB6EA44944DFF42914BFF3F8D48FF3D8945FF5DA4
+      65FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092C9FF9EC7E2FF83B8DAFF7DB4
+      D7FF7EB3D7FF4F89B4FF3B79B1EA41904AFF94D29FFF91D09AFF8DCD96FF89CB
+      92FF84C88DFF519858FF417C46FF9F9F9FFF5A8EC4FF98C3E0FF7CB3D7FF74AF
+      D6FF5EC4EDFF4B88B3FF3473ABEA3E8B46FF8FCE99FF7DC687FF78C381FF73C0
+      7CFF74C07CFF79C281FF49904FFF547F57FF5489BFFF94BFDDFF75ADD4FF63B8
+      E1FF4BD4FFFF428BB8FF2C6EA6EA3B8742FF89CB92FF84C88DFF80C688FF7BC3
+      83FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84BAFF8DBBDBFF6EA8D1FF66A6
+      D1FF5FB4DFFF4785B1FF2569A1EA37823EFF347E3BFF317937FF2E7534FF4991
+      50FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457EB4FF88B7D9FF67A3CFFF619E
+      CCFF639FCCFF4583B1FF1F649CEAFFFFFF00FFFFFF00606060FFA0A0A0FF3D76
+      41FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79B0FF82B3D7FF629FCCFF5A9A
+      C9FF5E9BCAFF4381AFFF196098EAFFFFFF00FFFFFF005C5C5CFFA1A1A1FF3C73
+      40FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674AAFF7DAFD4FF5B9AC9FF5495
+      C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFFFF00585858FFA2A2A2FFA2A2
+      A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6FA5FF78ABD2FF78ABD3FF73A7
+      D1FF69A0CDFF407FAEFF0F5991EA999999FF717171FF545454FF515151FF4F4F
+      4FFF4C4C4CFF4A4A4AFF474747FF454545FF25679DFF3274A8FF3D7CAFFF4784
+      B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D639B1619609839145D9562105A
+      92880D5890A4135C92FC0C578FED
     }
   end
   object MTrayIcon: TTrayIcon
@@ -1948,8 +2028,44 @@ object Form1: TForm1
       OnClick = MenuItemShowClick
     end
     object MenuItemExit: TMenuItem
-      Caption = 'Exit'
+      Action = ActionExit
-      OnClick = MenuItemExitClick
+      Bitmap.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D63
+        9B1619609839145D9562105A92880D5890A4135C92FC0C578FED999999FF7171
+        71FF545454FF515151FF4F4F4FFF4C4C4CFF4A4A4AFF474747FF454545FF2567
+        9DFF3274A8FF3D7CAFFF4784B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFF
+        FF00585858FFA2A2A2FFA2A2A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6F
+        A5FF78ABD2FF78ABD3FF73A7D1FF69A0CDFF407FAEFF0F5991EAFFFFFF00FFFF
+        FF005C5C5CFFA1A1A1FF3C7340FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674
+        AAFF7DAFD4FF5B9AC9FF5495C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFF
+        FF00606060FFA0A0A0FF3D7641FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79
+        B0FF82B3D7FF629FCCFF5A9AC9FF5E9BCAFF4381AFFF196098EA37823EFF347E
+        3BFF317937FF2E7534FF499150FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457E
+        B4FF88B7D9FF67A3CFFF619ECCFF639FCCFF4583B1FF1F649CEA3B8742FF89CB
+        92FF84C88DFF80C688FF7BC383FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84
+        BAFF8DBBDBFF6EA8D1FF66A6D1FF5FB4DFFF4785B1FF2569A1EA3E8B46FF8FCE
+        99FF7DC687FF78C381FF73C07CFF74C07CFF79C281FF49904FFF547F57FF5489
+        BFFF94BFDDFF75ADD4FF63B8E1FF4BD4FFFF428BB8FF2C6EA6EA41904AFF94D2
+        9FFF91D09AFF8DCD96FF89CB92FF84C88DFF519858FF417C46FF9F9F9FFF5A8E
+        C4FF98C3E0FF7CB3D7FF74AFD6FF5EC4EDFF4B88B3FF3473ABEA44944DFF4291
+        4BFF3F8D48FF3D8945FF5DA465FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092
+        C9FF9EC7E2FF83B8DAFF7DB4D7FF7EB3D7FF4F89B4FF3B79B1EAFFFFFF00FFFF
+        FF00777777FF9A9A9AFF3D8A45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696
+        CCFFA2CBE3FF89BDDCFF83B9DAFF84B9DAFF518BB5FF437EB6EAFFFFFF00FFFF
+        FF007A7A7AFF999999FF529159FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9A
+        D0FFA7CEE5FF8FC1DFFF89BDDCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFF
+        FF007D7D7DFF999999FF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9D
+        D3FFAAD1E7FFABD1E7FF98C7E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFF
+        FF00808080FF7E7E7EFF7C7C7CFF7A7A7AFF777777FF757575FF727272FF719E
+        D4FF6F9ED6FF87B2DCFFABD3E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFF
+        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+        FF00FFFFFF00709ED6DB6D9CD4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFF
+        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+        FF00FFFFFF00FFFFFF00FFFFFF006D9CD4896A9AD2FB6697CFEE
+      }
+      OnClick = ActionExitExecute
     end
   end
   object TabPopup: TPopupMenu
@@ -2055,7 +2171,7 @@ object Form1: TForm1
       ShortCut = 24585
     end
     object ActionCloseTab: TAction
-      Caption = 'ActionCloseTab'
+      Caption = '&Close Tab'
       ImageIndex = 16
       OnExecute = ActionCloseTabExecute
       SecondaryShortCuts.Strings = (
@@ -2064,25 +2180,25 @@ object Form1: TForm1
       ShortCut = 16471
     end
     object ActionNewTab: TAction
-      Caption = 'New Tab'
+      Caption = 'New &Tab'
       ImageIndex = 15
       OnExecute = ActionNewTabExecute
       ShortCut = 16468
     end
     object ActionNewScript: TAction
-      Caption = 'New'
+      Caption = '&New'
       ImageIndex = 9
       OnExecute = ActionNewExecute
       ShortCut = 16462
     end
     object ActionOpenScript: TAction
-      Caption = 'Open'
+      Caption = '&Open'
       ImageIndex = 10
       OnExecute = ActionOpenExecute
       ShortCut = 16463
     end
     object ActionSaveScript: TAction
-      Caption = 'Save'
+      Caption = '&Save'
       ImageIndex = 14
       OnExecute = ActionSaveExecute
       ShortCut = 16467
@@ -2092,16 +2208,16 @@ object Form1: TForm1
       OnExecute = ActionSaveAsExecute
     end
     object ActionRunScript: TAction
-      Caption = 'Run'
+      Caption = '&Run'
       OnExecute = ActionRunExecute
       ShortCut = 120
     end
     object ActionPauseScript: TAction
-      Caption = 'Pause'
+      Caption = '&Pause'
       OnExecute = ActionPauseExecute
     end
     object ActionStopScript: TAction
-      Caption = 'Stop'
+      Caption = '&Stop'
       OnExecute = ActionStopExecute
     end
     object ActionSaveAll: TAction
@@ -2116,61 +2232,68 @@ object Form1: TForm1
       OnExecute = ActionClearDebugExecute
     end
     object ActionFindStart: TAction
-      Caption = 'Find ...'
+      Caption = '&Find ...'
       OnExecute = ActionFindstartExecute
       ShortCut = 16454
     end
     object ActionCut: TAction
-      Caption = 'Cut'
+      Caption = 'Cu&t'
       ImageIndex = 3
       OnExecute = ActionCutExecute
       ShortCut = 16472
     end
     object ActionCopy: TAction
-      Caption = 'Copy'
+      Caption = '&Copy'
       ImageIndex = 22
       OnExecute = ActionCopyExecute
       ShortCut = 16451
     end
     object ActionPaste: TAction
-      Caption = 'Paste'
+      Caption = '&Paste'
       ImageIndex = 11
       OnExecute = ActionPasteExecute
       ShortCut = 16470
     end
     object ActionDelete: TAction
-      Caption = 'Delete'
+      Caption = '&Delete'
       ImageIndex = 23
       OnExecute = ActionDeleteExecute
       ShortCut = 46
     end
     object ActionSelectAll: TAction
-      Caption = 'Select All'
+      Caption = '&Select All'
       OnExecute = ActionSelectAllExecute
       ShortCut = 16449
     end
     object ActionUndo: TAction
-      Caption = 'Undo'
+      Caption = '&Undo'
+      DisableIfNoHandler = False
       ImageIndex = 18
       OnExecute = ActionUndoExecute
       ShortCut = 16474
     end
     object ActionRedo: TAction
-      Caption = 'Redo'
+      Caption = '&Redo'
+      DisableIfNoHandler = False
       ImageIndex = 12
       OnExecute = ActionRedoExecute
       ShortCut = 16473
     end
     object ActionFindNext: TAction
-      Caption = 'Find next'
+      Caption = 'Find &next'
       OnExecute = ActionFindNextExecute
       ShortCut = 114
     end
     object ActionReplace: TAction
-      Caption = 'Replace...'
+      Caption = 'R&eplace...'
       OnExecute = ActionReplaceExecute
       ShortCut = 16466
     end
+    object ActionExit: TAction
+      Caption = '&Exit'
+      ImageIndex = 25
+      OnExecute = ActionExitExecute
+    end
   end
   object DebugTimer: TTimer
     OnTimer = ProcessDebugStream

Projects/SAMufasaGUI/testunit.pas

@@ -37,7 +37,7 @@ uses
   window, // for the comp picker and selector
   colourpicker, framescript, windowselector, lcltype, ActnList, StdActns,
   SynEditKeyCmds, SynEditHighlighter, SynEditMarkupSpecialLine,SynEditMarkupHighAll,
-  SynEditMiscClasses, LMessages, Buttons;
+  SynEditMiscClasses, LMessages, Buttons,about;
 
 type
 
@@ -58,6 +58,7 @@ type
   { TForm1 }
 
   TForm1 = class(TForm)
+    ActionExit: TAction;
     ActionReplace: TAction;
     ActionFindNext: TAction;
     ActionRedo: TAction;
@@ -87,11 +88,15 @@ type
     Memo1: TMemo;
     MenuFile: TMenuItem;
     MenuEdit: TMenuItem;
+    MenuHelp: TMenuItem;
+    MenuItemAbout: TMenuItem;
+    MenuItemMainExit: TMenuItem;
+    MenuItemDivider6: TMenuItem;
     PopupItemReplace: TMenuItem;
     MenuItemReplace: TMenuItem;
     dlgReplace: TReplaceDialog;
-    View_CH_Menu: TMenuItem;
+    MenuItemColourHistory: TMenuItem;
-    ViewMenu: TMenuItem;
+    MenuView: TMenuItem;
     MenuItemFindNext: TMenuItem;
     PopupItemDelete: TMenuItem;
     MenuItemDelete: TMenuItem;
@@ -177,6 +182,7 @@ type
     procedure ActionCopyExecute(Sender: TObject);
     procedure ActionCutExecute(Sender: TObject);
     procedure ActionDeleteExecute(Sender: TObject);
+    procedure ActionExitExecute(Sender: TObject);
     procedure ActionFindNextExecute(Sender: TObject);
     procedure ActionFindstartExecute(Sender: TObject);
     procedure ActionNewExecute(Sender: TObject);
@@ -197,7 +203,7 @@ type
     procedure ActionUndoExecute(Sender: TObject);
     procedure CheckBoxMatchCaseClick(Sender: TObject);
     procedure CloseFindPanel;
-    procedure ColourHistoryMenuClick(Sender: TObject);
+    procedure MenuItemColourHistoryClick(Sender: TObject);
     procedure dlgReplaceFind(Sender: TObject);
     procedure dlgReplaceReplace(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
@@ -211,8 +217,8 @@ type
       Shift: TShiftState);
     procedure LabeledEditSearchKeyPress(Sender: TObject; var Key: char);
     procedure MenuEditClick(Sender: TObject);
+    procedure MenuItemAboutClick(Sender: TObject);
     procedure MenuItemCloseTabsClick(Sender: TObject);
-    procedure MenuItemExitClick(Sender: TObject);
     procedure MenuItemShowClick(Sender: TObject);
     procedure MenuItemTabCloseClick(Sender: TObject);
     procedure MenuItemTabCloseOthersClick(Sender: TObject);
@@ -533,12 +539,12 @@ begin
       PopupItemReplace.Enabled:= B;
       if(B)then
       begin
-        if(Length(SelText) > 20)then
+        if(Length(SelText) > 13)then
-          S:= Format('"%s"', [Copy(SelText, 1, 17) + '...'])
+          S:= Format('"%s"', [Copy(SelText, 1, 10) + '...'])
         else
           S:= Format('"%s"', [SelText]);
         PopupItemFind.Caption:= 'Find next: ' + S;
-        PopupItemReplace.Caption:= 'Replace: ' + S;
+        PopupItemReplace.Caption:= 'Replace:   ' + S;
       end;
     end
   end
@@ -678,7 +684,10 @@ begin
   if CurrScript.SynEdit.Focused or ScriptPopup.HandleAllocated then
     CurrScript.SynEdit.CopyToClipboard
   else if Memo1.Focused then
+  begin;
+    Writeln('WOT');
     Memo1.CopyToClipboard;
+  end;
 end;
 
 procedure TForm1.ActionCutExecute(Sender: TObject);
@@ -697,6 +706,11 @@ begin
     Memo1.ClearSelection;
 end;
 
+procedure TForm1.ActionExitExecute(Sender: TObject);
+begin
+  Self.Close;
+end;
+
 procedure TForm1.ActionFindNextExecute(Sender: TObject);
 begin
   if(ScriptPopup.HandleAllocated)then
@@ -845,10 +859,10 @@ begin
     CurrScript.SynEdit.SetFocus;
 end;
 
-procedure TForm1.ColourHistoryMenuClick(Sender: TObject);
+procedure TForm1.MenuItemColourHistoryClick(Sender: TObject);
 begin
-  View_CH_Menu.Checked := not ColourHistoryForm.Visible;
+  MenuItemColourHistory.Checked := not ColourHistoryForm.Visible;
-  if View_CH_Menu.Checked then
+  if MenuItemColourHistory.Checked then
     ColourHistoryForm.Show
   else
     ColourHistoryForm.Hide;
@@ -956,11 +970,14 @@ end;
 
 procedure TForm1.FormShortCuts(var Msg: TLMKey; var Handled: Boolean);
 begin
+  SetEditActions;
   Handled := ActionList.IsShortCut(Msg);
 {  ShiftState := MsgKeyDataToShiftState(Message.KeyData);
   ShortCut := KeyToShortCut(Message.CharCode, ShiftState);}
 end;
 
+
+
 procedure TForm1.LabeledEditSearchEnter(Sender: TObject);
 begin
   SearchStart := CurrScript.SynEdit.LogicalCaretXY;
@@ -1006,18 +1023,16 @@ begin
   SetEditActions;
 end;
 
+procedure TForm1.MenuItemAboutClick(Sender: TObject);
+begin
+  AboutForm.ShowModal;
+end;
+
 procedure TForm1.MenuItemCloseTabsClick(Sender: TObject);
 begin
   Self.CloseTabs;
 end;
 
-procedure TForm1.MenuItemExitClick(Sender: TObject);
-begin
-  Self.Close;
-end;
-
-
-
 procedure TForm1.MenuItemShowClick(Sender: TObject);
 begin
   Self.Show;

Units/MMLAddon/PSInc/Wrappers/mouse.inc

@@ -21,6 +21,10 @@
     Mouse.inc for the Mufasa Macro Library
 }
 
+const
+  ps_mouse_right = 0;
+  ps_mouse_left = 1;
+  ps_mouse_middle = 2;
 procedure MoveMouse(x, y: integer);
 begin
   CurrThread.Client.MInput.SetMousePos(X, Y);
@@ -30,20 +34,30 @@ procedure GetMousePos(out x, y: integer);
 begin
    CurrThread.Client.MInput.GetMousePos(X, Y);
 end;
+function ConvIntClickType(Int : Integer) : TClickType;inline;
+begin;
+  case int of
+    ps_mouse_right : result := mouse_Right;
+    ps_mouse_left : result := mouse_left;
+    ps_mouse_middle: result := mouse_middle;
+  else
+    raise exception.CreateFMT('Unknown Clicktype (%d) passed.',[int]);
+  end;
+end;
 
-procedure HoldMouse(x, y: integer; clickType: TClickType);
+procedure HoldMouse(x, y: integer; clickType: integer);
 begin
    CurrThread.Client.MInput.SetMousePos(x, y);
-   CurrThread.Client.MInput.MouseButtonAction(x, y, clickType, mouse_Down);
+   CurrThread.Client.MInput.MouseButtonAction(x, y, ConvIntClickType(clickType), mouse_Down);
 end;
 
-procedure ReleaseMouse(x, y: integer; clickType: TClickType);
+procedure ReleaseMouse(x, y: integer; clickType: integer);
 begin
    CurrThread.Client.MInput.SetMousePos(x, y);
-   CurrThread.Client.MInput.MouseButtonAction(x, y, clickType, mouse_Up);
+   CurrThread.Client.MInput.MouseButtonAction(x, y, ConvIntClickType(clickType), mouse_Up);
 end;
 
-procedure ClickMouse(x, y: integer; clickType: TClickType);
+procedure ClickMouse(x, y: integer; clickType: integer);
 begin
-   CurrThread.Client.MInput.ClickMouse(x, y, clickType);
+   CurrThread.Client.MInput.ClickMouse(x, y, ConvIntClickType(clickType));
 end;

Units/MMLAddon/PSInc/pscompile.inc

@@ -34,7 +34,6 @@ Sender.Comp.AddTypes('TDTMPointDefArray', 'Array Of TDTMPointDef;');
 Sender.Comp.AddTypes('TDTM','record MainPoint: TDTMPointDef; SubPoints: TDTMPointDefArray; end;');
 Sender.Comp.AddTypeS('pDTM','record p: TPointArray; c, t, asz, ash: TIntegerArray; end;');
 Sender.Comp.AddTypeS('T2DExtendedArray', 'array of array of extended;');
-Sender.Comp.AddTypeS('TClickType',  '(mouse_Left, mouse_Right, mouse_Middle);');
 Sender.Comp.AddTypeS('TMousePress', '(mouse_Down, mouse_Up);');
 
 
@@ -99,11 +98,14 @@ Sender.AddFunction(@SetColorToleranceSpeed, 'procedure SetColorToleranceSpeed(ct
 Sender.AddFunction(@ColorToHSL, 'procedure ColorToHSL(c: integer; out r,g,b: extended);');
 
 {Mouse etc.}
+Sender.Comp.AddConstantN('mouse_Right','integer').SetInt(ps_mouse_right); //0
+Sender.Comp.AddConstantN('mouse_Left','integer').SetInt(ps_mouse_left);//1
+Sender.Comp.AddConstantN('mouse_Middle','integer').SetInt(ps_mouse_middle);//2
 Sender.AddFunction(@MoveMouse, 'procedure MoveMouse(x, y: integer);');
 Sender.AddFunction(@GetMousePos, 'procedure GetMousePos(out x, y: integer);');
-Sender.AddFunction(@HoldMouse, 'procedure HoldMouse(x, y: integer; clickType: TClickType);');
+Sender.AddFunction(@HoldMouse, 'procedure HoldMouse(x, y: integer; clickType: integer);');
-Sender.AddFunction(@ReleaseMouse, 'procedure ReleaseMouse(x, y: integer; clickType: TClickType);');
+Sender.AddFunction(@ReleaseMouse, 'procedure ReleaseMouse(x, y: integer; clickType: integer);');
-Sender.AddFunction(@ClickMouse, 'procedure ClickMouse(x, y: integer; clickType: TClickType);');
+Sender.AddFunction(@ClickMouse, 'procedure ClickMouse(x, y: integer; clickType: integer);');
 
 
 {Keyboard}