Merge remote-tracking branch 'remotes/origin/dev/acaform' into simba2000

Author: ollydev

Examples/form_aca.simba

@@ -0,0 +1,59 @@
+var
+  AcaForm: TACAForm;
+
+function GetImageForACA: TImage;
+begin
+  Result := Target.GetImage();
+end;
+
+// On button click, set a custom image.
+// Clicking Update Image will still use GetImageForACA though
+procedure OnSomeButtonClick(Sender: TLazObject);
+var
+  img: TImage;
+begin
+  img := new TImage(100,100);
+  img.Fill(Random($FFFFFF));
+  for 1 to 100 do
+    img.Pixel[Random(100), Random(100)] := Random($FFFFFF);
+
+  AcaForm.Image := img;
+  // can also maniplate the imagebox with some zooming
+  AcaForm.ImageBox.Zoom := 800;
+end;
+
+begin
+  AcaForm := TACAForm.Create(@GetImageForACA);
+  AcaForm.Width := 1600;
+  AcaForm.Height := 800;
+
+  // Add custom things to user panel
+  // sorry no custom (themed) components for the time being
+  with TLazButton.Create(AcaForm) do
+  begin
+    Parent := AcaForm.UserPanel;
+    Caption := 'SomeButton';
+    AutoSize := True;
+    Align := ELazAlign.LEFT;
+    BorderSpacing.Around := 5;
+    OnClick := @OnSomeButtonClick;
+  end;
+
+  with TLazEdit.Create(AcaForm) do
+  begin
+    Parent := AcaForm.UserPanel;
+    Caption := 'SomeInput';
+    Align := ELazAlign.LEFT;
+    Width := 200;
+    Font.Color := $000000;
+    BorderSpacing.Around := 5;
+  end;
+
+  // can populate the colors too
+  AcaForm.Colors := [Colors.RED, Colors.GREEN];
+  AcaForm.ShowModal();
+
+  WriteLn('The best color was: ', AcaForm.BestColor);
+
+  AcaForm.Free();
+end;

Source/Simba.lpi

@@ -17,7 +17,7 @@
         <TextDesc Value=""/>
       </XPManifest>
       <Icon Value="0"/>
-      <Resources Count="28">
+      <Resources Count="29">
         <Resource_0 FileName="..\Examples\array.simba" Type="RCDATA" ResourceName="EXAMPLE_ARRAY"/>
         <Resource_1 FileName="..\Examples\function.simba" Type="RCDATA" ResourceName="EXAMPLE_FUNCTION"/>
         <Resource_2 FileName="..\Examples\static_method.simba" Type="RCDATA" ResourceName="EXAMPLE_STATIC_METHOD"/>
@@ -27,11 +27,11 @@
         <Resource_6 FileName="..\Examples\image_drawtext.simba" Type="RCDATA" ResourceName="EXAMPLE_IMAGE_DRAW_TEXT"/>
         <Resource_7 FileName="..\Examples\cluster_points.simba" Type="RCDATA" ResourceName="EXAMPLE_CLUSTER_POINTS"/>
         <Resource_8 FileName="..\Examples\form.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM"/>
-        <Resource_9 FileName="..\Examples\form_dragablepanel.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_DRAGABLE_PANEL"/>  
-        <Resource_10 FileName="..\Examples\form_imagebox.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_IMAGEBOX"/>     
+        <Resource_9 FileName="..\Examples\form_dragablepanel.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_DRAGABLE_PANEL"/>
+        <Resource_10 FileName="..\Examples\form_imagebox.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_IMAGEBOX"/>
         <Resource_11 FileName="..\Examples\irc.simba" Type="RCDATA" ResourceName="EXAMPLE_IRC"/>
         <Resource_12 FileName="..\Examples\asyncmouse.simba" Type="RCDATA" ResourceName="EXAMPLE_ASYNCMOUSE"/>
-        <Resource_13 FileName="..\Examples\mouse_path.simba" Type="RCDATA" ResourceName="MOUSE_PATH"/>           
+        <Resource_13 FileName="..\Examples\mouse_path.simba" Type="RCDATA" ResourceName="MOUSE_PATH"/>
         <Resource_14 FileName="..\Examples\randomleft.simba" Type="RCDATA" ResourceName="EXAMPLE_RANDOM_LEFT"/>
         <Resource_15 FileName="..\Examples\method-property.simba" Type="RCDATA" ResourceName="EXAMPLE_METHOD_PROPERTY"/>
         <Resource_16 FileName="..\Examples\method-property-index.simba" Type="RCDATA" ResourceName="EXAMPLE_METHOD_PROPERTY_INDEX"/>
@@ -46,6 +46,7 @@
         <Resource_25 FileName="..\Images\arrow_right.png" Type="RCDATA" ResourceName="ARROW_RIGHT"/>
         <Resource_26 FileName="..\Images\arrow_right_150.png" Type="RCDATA" ResourceName="ARROW_RIGHT_150"/>
         <Resource_27 FileName="..\Images\arrow_right_200.png" Type="RCDATA" ResourceName="ARROW_RIGHT_200"/>
+        <Resource_28 FileName="..\Examples\form_aca.simba" Type="RCDATA" ResourceName="EXAMPLE_FORM_ACA"/>
       </Resources>
     </General>
     <VersionInfo>

Source/ide/simba.form_main.lfm

@@ -1,12 +1,12 @@
 object SimbaMainForm: TSimbaMainForm
   Left = -1136
-  Height = 646
+  Height = 861
   Top = 461
-  Width = 1218
+  Width = 1624
   Caption = 'Simba'
-  ClientHeight = 646
-  ClientWidth = 1218
-  DesignTimePPI = 144
+  ClientHeight = 861
+  ClientWidth = 1624
+  DesignTimePPI = 192
   Position = poScreenCenter
   LCLVersion = '4.0.0.4'
   OnClose = FormClose
@@ -119,13 +119,13 @@ object SimbaMainForm: TSimbaMainForm
     }
     Visible = True
     OnClick = TrayIconClick
-    Left = 228
-    Top = 60
+    Left = 304
+    Top = 80
   end
   object TrayPopup: TPopupMenu
     Images = Images
-    Left = 228
-    Top = 156
+    Left = 304
+    Top = 208
     object TrayPopupExit: TMenuItem
       Caption = 'Close Simba'
       ImageIndex = 4
@@ -136,8 +136,8 @@ object SimbaMainForm: TSimbaMainForm
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
     OnPopup = MenuFileClick
-    Left = 456
-    Top = 156
+    Left = 608
+    Top = 208
     object MenuItemNew: TMenuItem
       Caption = '&New'
       ImageIndex = 5
@@ -220,8 +220,8 @@ object SimbaMainForm: TSimbaMainForm
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
     OnPopup = MenuEditClick
-    Left = 768
-    Top = 156
+    Left = 1024
+    Top = 208
     object MenuItemUndo: TMenuItem
       Caption = 'Undo'
       ImageIndex = 32
@@ -293,8 +293,8 @@ object SimbaMainForm: TSimbaMainForm
   object MainMenuScript: TPopupMenu
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
-    Left = 612
-    Top = 156
+    Left = 816
+    Top = 208
     object MenuItemCompile: TMenuItem
       Caption = 'Compile'
       Hint = 'Compile Script'
@@ -337,8 +337,8 @@ object SimbaMainForm: TSimbaMainForm
   object MainMenuTools: TPopupMenu
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
-    Left = 768
-    Top = 60
+    Left = 1024
+    Top = 80
     object MenuItemSettings: TMenuItem
       Caption = 'Settings'
       ImageIndex = 34
@@ -396,8 +396,8 @@ object SimbaMainForm: TSimbaMainForm
   object MainMenuView: TPopupMenu
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
-    Left = 456
-    Top = 60
+    Left = 608
+    Top = 80
     object MenuItemTrayIcon: TMenuItem
       AutoCheck = True
       Caption = 'Tray Icon'
@@ -463,8 +463,8 @@ object SimbaMainForm: TSimbaMainForm
   object MainMenuHelp: TPopupMenu
     Images = Images
     OnMeasureItem = MainMenuMeasureItem
-    Left = 612
-    Top = 60
+    Left = 816
+    Top = 80
     object MenuItemAbout: TMenuItem
       Caption = 'About'
       ImageIndex = 40
@@ -488,14 +488,14 @@ object SimbaMainForm: TSimbaMainForm
   object RecentFilesPopup: TPopupMenu
     OnMeasureItem = MainMenuMeasureItem
     OnPopup = RecentFilesPopupPopup
-    Left = 228
-    Top = 264
+    Left = 304
+    Top = 352
   end
   object Images: TImageList
     ShareImages = True
     OnGetWidthForPPI = ImagesGetWidthForPPI
-    Left = 72
-    Top = 60
+    Left = 96
+    Top = 80
     Bitmap = {
       4C7A420000001000000010000000ED3900000000000078DAED9D075814D7D7C6
       C71A1335B16B2CD81B9A184B8C2DB144638D511135F6164B346AD468D4A888D8
@@ -2889,8 +2889,8 @@ object SimbaMainForm: TSimbaMainForm
   end
   object MainMenuSearch: TPopupMenu
     Images = Images
-    Left = 456
-    Top = 264
+    Left = 608
+    Top = 352
     object MenuItemFind: TMenuItem
       Caption = 'Find'
       ImageIndex = 28

Source/ide/simba.form_main.pas

@@ -12,7 +12,7 @@ interface
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls,
   Menus, ImgList, AnchorDockPanel, LMessages,
-  simba.base, simba.settings, simba.ide_mouselogger;
+  simba.base, simba.settings, simba.ide_mouselogger, simba.image;
 
 const
   IMG_NONE = -1;
@@ -251,7 +251,7 @@   TSimbaMainForm = class(TForm)
     // Handle main menu shortcuts if editor is focused
     procedure DoApplicationKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure DoTabLoaded(Sender: TObject);
-    function DoGetWindowForACA: TWindowHandle;
+    function DoGetWindowForACA: TSimbaImage;
 
     procedure SetCustomFontSize(Value: Integer);
     procedure SetLayoutLocked(Value: Boolean);
@@ -291,8 +291,7 @@ implementation
   simba.aca, simba.dtmeditor, simba.env, simba.ide_dockinghelpers, simba.nativeinterface,
   simba.ide_simpleformatter, simba.component_theme,
   simba.threading, simba.ide_editor, simba.vartype_string, simba.misc,
-  simba.target,
-  simba.vartype_windowhandle;
+  simba.target;
 
 procedure TSimbaMainForm.HandleException(Sender: TObject; E: Exception);
 
@@ -748,7 +747,11 @@ procedure TSimbaMainForm.MenuItemDocumentationClick(Sender: TObject);
 
 procedure TSimbaMainForm.MenuItemACAClick(Sender: TObject);
 begin
-  ShowACA(@DoGetWindowForACA);
+  with TSimbaACA.Create(@DoGetWindowForACA) do
+  begin
+    FreeOnClose := True;
+    Show();
+  end;
 end;
 
 procedure TSimbaMainForm.DoMenuItemRunClick(Sender: TObject);
@@ -1047,12 +1050,9 @@ procedure TSimbaMainForm.DoTabLoaded(Sender: TObject);
     AddRecentFile(TSimbaScriptTab(Sender).ScriptFileName);
 end;
 
-function TSimbaMainForm.DoGetWindowForACA: TWindowHandle;
+function TSimbaMainForm.DoGetWindowForACA: TSimbaImage;
 begin
-  if (SimbaMainToolBar.WindowSelection = 0) or (not SimbaMainToolBar.WindowSelection.IsValid) then
-    Result := GetDesktopWindow
-  else
-    Result := SimbaMainToolBar.WindowSelection;
+  Result := TSimbaImage.CreateFromWindow(SimbaMainToolBar.WindowSelectionOrDesktop);
 end;
 
 procedure TSimbaMainForm.MenuEditClick(Sender: TObject);

Source/ide/simba.ide_maintoolbar.pas

@@ -41,6 +41,8 @@   TSimbaMainToolBar = class(TComponent)
 
     FAreaSelection: TBox;
 
+    function GetWindowSelectionOrDesktop: TWindowHandle;
+
     procedure SetStates(ScriptState: ESimbaScriptState);
 
     procedure DoTabScriptStateChange(Sender: TObject);
@@ -74,6 +76,7 @@   TSimbaMainToolBar = class(TComponent)
     property ButtonPackage: TSimbaButton read FButtonPackage;
 
     property WindowSelection: TWindowHandle read FWindowSelection;
+    property WindowSelectionOrDesktop: TWindowHandle read GetWindowSelectionOrDesktop;
     property ProcessSelection: TProcessID read FProcessSelection;
     property AreaSelection: TBox read FAreaSelection;
 
@@ -92,6 +95,13 @@ implementation
   simba.ide_colorpicker, simba.ide_windowselector, simba.ide_areaselector,
   simba.vartype_windowhandle, simba.vartype_box;
 
+function TSimbaMainToolBar.GetWindowSelectionOrDesktop: TWindowHandle;
+begin
+  Result := WindowSelection;
+  if (Result = 0) or (not Result.IsValid()) then
+    Result := GetDesktopWindow()
+end;
+
 procedure TSimbaMainToolBar.SetStates(ScriptState: ESimbaScriptState);
 
   procedure UpdateButtons(RunEnabled, PauseEnabed, CompileEnabled, StopEnabled: Boolean; StopImageIndex: Integer);

Source/script/imports/simba.import_imagebox.pas

@@ -5,7 +5,7 @@
 interface
 
 uses
-  Classes, SysUtils, Controls, Graphics,
+  Classes, SysUtils, Controls, ExtCtrls, Graphics,
   simba.base, simba.script, simba.script_objectutil;
 
 procedure ImportSimbaImageBox(Script: TSimbaScript);
@@ -24,6 +24,7 @@ implementation
 
 type
   PComponent = ^TComponent;
+  PPanel = ^TPanel;
   PBitmap = ^TBitmap;
   PSimbaImageBox = ^TSimbaImageBox;
   PSimbaImageBoxCanvas = ^TSimbaImageBoxCanvas;
@@ -239,6 +240,11 @@ procedure _LapeImageBox_OnImgKeyUp_Read(const Params: PParamArray; const Result:
   TImageBoxKeyEvent(Result^) := PSimbaImageBox(Params^[0])^.OnImgKeyUp;
 end;
 
+procedure _LapeImageBox_UserPanel_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
+begin
+  PPanel(Result)^ := PSimbaImageBox(Params^[0])^.UserPanel;
+end;
+
 procedure _LapeImageBox_OnImgKeyUp_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
 begin
   PSimbaImageBox(Params^[0])^.OnImgKeyUp := TImageBoxKeyEvent(Params^[1]^);
@@ -459,6 +465,7 @@ procedure ImportSimbaImageBox(Script: TSimbaScript);
     addProperty('TImageBox', 'OnImgKeyDown', 'TImageBoxKeyEvent', @_LapeImageBox_OnImgKeyDown_Read, @_LapeImageBox_OnImgKeyDown_Write);
     addProperty('TImageBox', 'OnImgKeyUp', 'TImageBoxKeyEvent', @_LapeImageBox_OnImgKeyUp_Read, @_LapeImageBox_OnImgKeyUp_Write);
 
+    addProperty('TImageBox', 'UserPanel', 'TLazPanel', @_LapeImageBox_UserPanel_Read);
     addProperty('TImageBox', 'ShowScrollBars', 'Boolean', @_LapeImageBox_ShowScrollBars_Read, @_LapeImageBox_ShowScrollBars_Write);
     addProperty('TImageBox', 'ShowStatusBar', 'Boolean', @_LapeImageBox_ShowStatusBar_Read, @_LapeImageBox_ShowStatusBar_Write);
     addProperty('TImageBox', 'AllowMoving', 'Boolean', @_LapeImageBox_AllowMoving_Read, @_LapeImageBox_AllowMoving_Write);