Update and bugfixes

reckel-jm · Mar 18, 2024 · d3ac73d · d3ac73d
1 parent 7e806dd
commit d3ac73d
Show file tree

Hide file tree

Showing 19 changed files with 115 additions and 245 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -11,8 +11,8 @@ grade: stable
 architectures:
   - build-on: amd64
     build-for: amd64
-  - build-on: arm64
-    build-for: arm64
+  #- build-on: arm64
+  #  build-for: arm64
 
 plugs: # plugs for theming, font settings, cursor and to use gtk3 file chooser
   gtk-3-themes:
@@ -37,7 +37,8 @@ parts:
     - wget
     - libgtk2.0-dev
     override-build: |
-      if [ "$SNAP_ARCH" = "amd64" ] then
+      if [ "$SNAP_ARCH" = "amd64" ]
+      then
         wget -nc "https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.2/lazarus-project_3.2.0-0_amd64.deb"
         wget -nc "https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.2/fpc-laz_3.2.2-210709_amd64.deb"
         wget -nc "https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.2/fpc-src_3.2.2-210709_amd64.deb"

diff --git a/src/Cantara.lpi b/src/Cantara.lpi
@@ -362,7 +362,7 @@
         <PackageName Value="LCL"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="27">
+    <Units Count="28">
       <Unit0>
         <Filename Value="Cantara.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -524,6 +524,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit26>
+      <Unit27>
+        <Filename Value="interfaces/exporterinterfaces.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit27>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

diff --git a/src/Cantara.lpr b/src/Cantara.lpr
@@ -29,7 +29,7 @@
   markup,
   imageexport,
   loadimagethread, CantaraStandardDialogs, presentationcontroller,
-cantarafontdialog;
+cantarafontdialog, exporterinterfaces;
   {$R *.res}
 
 begin

diff --git a/src/forms/cantarafontdialog.lfm b/src/forms/cantarafontdialog.lfm
@@ -3,7 +3,7 @@ object CFontDialog: TCFontDialog
   Height = 420
   Top = 33
   Width = 547
-  Caption = 'CFontDialog'
+  Caption = 'Font Selection'
   ClientHeight = 420
   ClientWidth = 547
   OnClose = FormClose

diff --git a/src/forms/cantarafontdialog.lrj b/src/forms/cantarafontdialog.lrj
@@ -1,5 +1,5 @@
 {"version":1,"strings":[
-{"hash":149468423,"name":"tcfontdialog.caption","sourcebytes":[67,70,111,110,116,68,105,97,108,111,103],"value":"CFontDialog"},
+{"hash":82637614,"name":"tcfontdialog.caption","sourcebytes":[70,111,110,116,32,83,101,108,101,99,116,105,111,110],"value":"Font Selection"},
 {"hash":317012,"name":"tcfontdialog.fontselectiongroupbox.caption","sourcebytes":[70,111,110,116],"value":"Font"},
 {"hash":61643203,"name":"tcfontdialog.fontpropertiesgroupbox.caption","sourcebytes":[70,111,110,116,32,80,114,111,112,101,114,116,105,101,115],"value":"Font Properties"},
 {"hash":106882778,"name":"tcfontdialog.labelfontsize.caption","sourcebytes":[70,111,110,116,32,83,105,122,101,58],"value":"Font Size:"},

diff --git a/src/forms/imageexport (conflicted copy 2023-07-26 162334).lfm b/src/forms/imageexport (conflicted copy 2023-07-26 162334).lfm
diff --git a/src/forms/imageexport.lfm b/src/forms/imageexport.lfm
@@ -9,6 +9,7 @@ object FormImageExport: TFormImageExport
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
+  LCLVersion = '3.2.0.0'
   WindowState = wsMaximized
   object GroupSettings: TGroupBox
     AnchorSideLeft.Control = Owner
@@ -22,10 +23,9 @@ object FormImageExport: TFormImageExport
     Width = 408
     Anchors = [akTop, akLeft, akRight, akBottom]
     Caption = 'Settings'
-    ClientHeight = 495
-    ClientWidth = 402
+    ClientHeight = 511
+    ClientWidth = 396
     TabOrder = 0
-    OnClick = GroupSettingsClick
     object LabelFolder: TLabel
       AnchorSideLeft.Control = GroupSettings
       AnchorSideTop.Control = EditFolder

diff --git a/src/forms/imageexport.pas b/src/forms/imageexport.pas
@@ -6,13 +6,15 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  Spin, ComCtrls, Menus, Slides, PresentationCanvas;
+  Spin, ComCtrls, Menus, Slides, PresentationCanvas,
+
+  exporterinterfaces;
 
 type
 
   { TFormImageExport }
 
-  TFormImageExport = class(TForm)
+  TFormImageExport = class(TForm, ISongExporter)
     ButtonReloadPreview: TButton;
     ButtonExportAll: TButton;
     ButtonChoose: TButton;
@@ -43,18 +45,19 @@   TFormImageExport = class(TForm)
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure GroupSettingsClick(Sender: TObject);
     procedure ItemExportClick(Sender: TObject);
     procedure ItemRemoveClick(Sender: TObject);
-    procedure TimerUpdateScreenTimer(Sender: TObject);
   private
     Scale: Double;
     ShowFirstTime: Boolean;
+    FrmSongsPresentationIsRunning: Boolean;
     procedure ReadjustScale;
   public
     PresentationCanvas: TPresentationCanvasHandler;
     SlideList: TSlideList;
     procedure LoadImages;
+
+    procedure RunExporter(PresentationIsRunning: Boolean);
   end;
 
 var
@@ -152,8 +155,11 @@ procedure TFormImageExport.FormCreate(Sender: TObject);
 
 procedure TFormImageExport.FormDestroy(Sender: TObject);
 begin
-  SlideList.Destroy;
-  PresentationCanvas.Destroy;
+  if not Self.FrmSongsPresentationIsRunning then
+  begin
+    SlideList.Destroy;
+    PresentationCanvas.Destroy;
+  end;
 end;
 
 procedure TFormImageExport.FormShow(Sender: TObject);
@@ -170,11 +176,6 @@ procedure TFormImageExport.FormShow(Sender: TObject);
   end;
 end;
 
-procedure TFormImageExport.GroupSettingsClick(Sender: TObject);
-begin
-
-end;
-
 procedure TFormImageExport.ItemExportClick(Sender: TObject);
 var
   Picture: TPicture;
@@ -199,9 +200,15 @@ procedure TFormImageExport.ItemRemoveClick(Sender: TObject);
   ImageListView.Items.Delete(ImageListView.ItemIndex);
 end;
 
-procedure TFormImageExport.TimerUpdateScreenTimer(Sender: TObject);
+procedure TFormImageExport.RunExporter(PresentationIsRunning: Boolean);
 begin
+  Self.ShowOnTop;
+  Application.ProcessMessages;
+  Self.Invalidate;
+  Self.Repaint;
+  Self.LoadImages;
 
+  Self.FrmSongsPresentationIsRunning:=PresentationIsRunning;
 end;
 
 procedure TFormImageExport.ReadjustScale;