Add improvments in Designer

.gitignore

@@ -38,6 +38,9 @@
 *.dcu
 *.lib
 
+# SVN Database
+*.svn 
+
 # Delphi autogenerated files (duplicated info)
 *.cfg
 *Resource.rc
@@ -57,3 +60,4 @@ __recovery/
 
 # Castalia statistics file
 *.stat
+

Designer/Classes/RibbonCompiler.pas

@@ -34,7 +34,9 @@   TRibbonCompiler = class
     procedure CreateDelphiProject(const Filename: String);
   {$ENDREGION 'Internal Declarations'}
   public
-    function Compile(const Document: TRibbonDocument; ResourceName: string = 'APPLICATION'; const pCreateDLL: Boolean = False): TRibbonCompileResult;
+    function Compile(const Document: TRibbonDocument; ResourceName: string = 'APPLICATION'; const pCreateDLL: Boolean = False): TRibbonCompileResult; overload;
+    function Compile(const Document: TRibbonDocument; const IncludeXML: Boolean = False; ResourceName: string = 'APPLICATION'; const pCreateDLL: Boolean = False): TRibbonCompileResult; overload;
+
 
     property OutputDllPath: String read FOutputDllPath;
     property OnMessage: TRibbonCompilerMessageEvent read FOnMessage write FOnMessage;
@@ -63,6 +65,11 @@ implementation
 { TRibbonCompiler }
 
 function TRibbonCompiler.Compile(const Document: TRibbonDocument; ResourceName: string = 'APPLICATION'; const pCreateDLL: Boolean = False): TRibbonCompileResult;
+begin
+  Result := Compile( Document, False, ResourceName, pCreateDLL);
+end;
+
+function TRibbonCompiler.Compile(const Document: TRibbonDocument; const IncludeXML: Boolean = False; ResourceName: string = 'APPLICATION'; const pCreateDLL: Boolean = False): TRibbonCompileResult;
 var
   DocDir, DprFilename: String;
   lMarkupGenerator: TMarkupGenerator;
@@ -71,6 +78,7 @@ function TRibbonCompiler.Compile(const Document: TRibbonDocument; ResourceName:
   lRcFilePath: string;
   lRcFileParam: string;
   lNameParam: string;
+  lXML: string;
 begin
   try
     if (Document.Filename = '') or (not TFile.Exists(Document.Filename)) then
@@ -97,9 +105,23 @@ function TRibbonCompiler.Compile(const Document: TRibbonDocument; ResourceName:
     lNameParam := Format('"/name:%s"', [ResourceName]);
 
     // Run ribbon compiler UICC.exe to convert the markup XML to a header, a resource and a bml file.
-    if not Execute(TSettings.Instance.RibbonCompilerPath, DocDir, ['"/W0"', Document.Filename.QuotedString('"'), lBmlFileParam, lHeaderFileParam, lRcFileParam, lNameParam]) then
+    if not Execute(TSettings.Instance.RibbonCompilerPath, DocDir, ['"/W0"', Document.Filename.QuotedString('"'), lBmlFileParam,
+                                                                   lHeaderFileParam, lRcFileParam, lNameParam]) then
       Exit(crRibbonCompilerError);
 
+    // LC2L Informatique 2021-04-19 Add the possibility to include the XML file into the ressources file
+    if IncludeXML then begin
+      var RcFile := TStringList.Create;
+      try
+        RcFile.LoadFromFile(lRcFilePath);
+        RcFile.Add('');
+        RcFile.Add(Format('APPLICATION_RIBBON_XML    RCDATA    "%s"', [Document.Filename.Replace('\', '\\')]));
+        RcFile.SaveToFile(lRcFilePath);
+      finally
+        RcFile.Free;
+      end;
+    end;
+
     // Run the resource compiler, so that we can include the file into a .pas file
     if not Execute(TSettings.Instance.ResourceCompilerPath, DocDir, [lRcFilePath.QuotedString('"')]) then
       Exit(crResourceCompilerError);
@@ -312,7 +334,7 @@ class procedure TRibbonCompiler.HandleCommandLine;
         if not ParamStr(2).IsEmpty then
           lSuccess := lRibbonCompiler.Compile(lRibbonDocument, ParamStr(2)) = crOk
         else
-          lSuccess := lRibbonCompiler.Compile(lRibbonDocument) = crOk;
+          lSuccess := lRibbonCompiler.Compile(lRibbonDocument, '') = crOk;
 
         if lSuccess then
           ExitCode := 0;

Designer/DMShared.dfm

@@ -1,12 +1,12 @@
 object DataModuleShared: TDataModuleShared
   OldCreateOrder = False
-  Height = 150
-  Width = 215
+  Height = 351
+  Width = 555
   object ImageListAppModes: TImageList
     Left = 48
     Top = 16
     Bitmap = {
-      494C010103000800300010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010103000800040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -145,4 +145,17 @@ object DataModuleShared: TDataModuleShared
       FFFFFFFFFFFF0000FFFFFFFFFFFF000000000000000000000000000000000000
       000000000000}
   end
+  object JvAppIniFileStorage: TJvAppIniFileStorage
+    StorageOptions.BooleanStringTrueValues = 'TRUE, YES, Y'
+    StorageOptions.BooleanStringFalseValues = 'FALSE, NO, N'
+    AutoFlush = True
+    Location = flCustom
+    SubStorages = <>
+    Left = 260
+    Top = 160
+  end
+  object JvComputerInfoEx: TJvComputerInfoEx
+    Left = 400
+    Top = 44
+  end
 end

Designer/DMShared.pas

@@ -3,22 +3,34 @@
 interface
 
 uses
-  SysUtils, Classes, ImgList, Controls;
+  SysUtils, Classes, ImgList, Controls, JvComputerInfoEx, JvComponentBase, JvAppStorage, JvAppIniStorage, System.ImageList;
 
 type
   TDataModuleShared = class(TDataModule)
     ImageListAppModes: TImageList;
+    JvAppIniFileStorage: TJvAppIniFileStorage;
+    JvComputerInfoEx: TJvComputerInfoEx;
   private
     { Private declarations }
   public
-    { Public declarations }
+    constructor Create(AOwner : TComponent); override;
   end;
 
 var
   DataModuleShared: TDataModuleShared;
 
 implementation
+uses
+  Vcl.Forms;
 
 {$R *.dfm}
 
+constructor TDataModuleShared.Create(AOwner : TComponent);
+begin
+  inherited Create(AOwner);
+  var IniFilePath := IncludeTrailingPathDelimiter(JvComputerInfoEx.Folders.AppData) + ChangeFileExt(ExtractFileName(Application.ExeName), '');
+  ForceDirectories(IniFilePath);
+  JvAppIniFileStorage.FileName := IncludeTrailingPathDelimiter(IniFilePath) + ChangeFileExt(ExtractFileName(Application.ExeName), '.ini');
+end;
+
 end.

Designer/FEditImage.dfm

@@ -228,7 +228,7 @@ object FormEditImage: TFormEditImage
     Left = 24
     Top = 20
     Bitmap = {
-      494C0101020008002C0010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000800040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -374,4 +374,13 @@ object FormEditImage: TFormEditImage
     Left = 148
     Top = 61
   end
+  object JvFormStorage: TJvFormStorage
+    AppStorage = DataModuleShared.JvAppIniFileStorage
+    AppStoragePath = '%FORM_NAME%'
+    StoredProps.Strings = (
+      'OpenDialog.InitialDir')
+    StoredValues = <>
+    Left = 392
+    Top = 76
+  end
 end

Designer/FEditImage.pas

@@ -18,7 +18,7 @@ interface
   ImgList,
   RibbonMarkup,
   UIRibbonCommands,
-  FImageList;
+  FImageList, System.ImageList, JvComponentBase, JvFormPlacement, DmShared;
 
 type
   TFormEditImage = class(TForm)
@@ -40,6 +40,7 @@   TFormEditImage = class(TForm)
     ButtonOk: TButton;
     ButtonCancel: TButton;
     OpenDialog: TOpenDialog;
+    JvFormStorage: TJvFormStorage;
     procedure PaintBoxPaint(Sender: TObject);
     procedure EditImageFileChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);

Designer/FImageList.dfm

@@ -12,7 +12,7 @@ object FrameImageList: TFrameImageList
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 64
+    ButtonWidth = 78
     Caption = 'ToolBarSmallImages'
     Images = ImageListToolbars
     List = True
@@ -37,7 +37,7 @@ object FrameImageList: TFrameImageList
       Action = ActionDeleteAllImages
     end
     object ButtonEditSmallImage: TToolButton
-      Left = 135
+      Left = 227
       Top = 0
       Action = ActionEditImage
     end
@@ -80,7 +80,7 @@ object FrameImageList: TFrameImageList
     Left = 32
     Top = 68
     Bitmap = {
-      494C0101030008003C0010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
+      494C010103000800040010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000004590ABC07A612FF07A612FF07A612FF07A612FF04590ABC0000

Designer/FImageList.pas

@@ -20,7 +20,7 @@ interface
   CommCtrl,
   ToolWin,
   RibbonMarkup,
-  UIRibbonCommands;
+  UIRibbonCommands, JvComponentBase, JvFormPlacement, System.ImageList;
 
 type
   TImageFlag = (ifLarge, ifHighContrast);
@@ -80,7 +80,8 @@ implementation
   IOUtils,
   Math,
   FMain,
-  FEditImage;
+  FEditImage,
+  DMShared;
 
 { TFrameImageList }
 

Designer/FMain.dfm

@@ -31,9 +31,9 @@ object FormMain: TFormMain
     Left = 0
     Top = 0
     Width = 955
-    Height = 24
     AutoSize = True
-    ButtonWidth = 65
+    ButtonHeight = 30
+    ButtonWidth = 71
     Caption = 'ToolBar'
     EdgeBorders = [ebBottom]
     Images = Images
@@ -45,29 +45,31 @@ object FormMain: TFormMain
       Top = 0
       Action = ActionOpen
       AutoSize = True
+      DropdownMenu = PopupMenuButtonOpen
+      Style = tbsDropDown
     end
     object ButtonSave: TToolButton
-      Left = 57
+      Left = 78
       Top = 0
       Action = ActionSave
       AutoSize = True
     end
     object ToolButton1: TToolButton
-      Left = 112
+      Left = 133
       Top = 0
       Width = 8
       Caption = 'ToolButton1'
       ImageIndex = 4
       Style = tbsSeparator
     end
     object ButtonBuild: TToolButton
-      Left = 120
+      Left = 141
       Top = 0
       Action = ActionBuild
       AutoSize = True
     end
     object ButtonPreview: TToolButton
-      Left = 173
+      Left = 194
       Top = 0
       Action = ActionPreview
       AutoSize = True
@@ -86,9 +88,9 @@ object FormMain: TFormMain
   end
   object PageControl: TPageControl
     Left = 0
-    Top = 24
+    Top = 32
     Width = 955
-    Height = 418
+    Height = 410
     ActivePage = TabSheetCommands
     Align = alClient
     TabOrder = 2
@@ -231,6 +233,12 @@ object FormMain: TFormMain
       ShortCut = 16455
       OnExecute = ActionGenerateResourceIDsExecute
     end
+    object ActionOpenLastUsedFileAtStartup: TAction
+      Category = 'File'
+      Caption = 'Open last used file at startup'
+      Hint = 'Open last used file at startup'
+      OnExecute = ActionOpenLastUsedFileAtStartupExecute
+    end
   end
   object ApplicationEvents: TApplicationEvents
     OnException = ApplicationEventsException
@@ -673,6 +681,16 @@ object FormMain: TFormMain
       object MenuOpen: TMenuItem
         Action = ActionOpen
       end
+      object MenuRecents: TMenuItem
+        Caption = 'Recents'
+        Enabled = False
+      end
+      object N5: TMenuItem
+        Caption = '-'
+      end
+      object Openlastusedfileatstartup1: TMenuItem
+        Action = ActionOpenLastUsedFileAtStartup
+      end
       object N1: TMenuItem
         Caption = '-'
       end
@@ -736,4 +754,33 @@ object FormMain: TFormMain
     Left = 368
     Top = 480
   end
+  object JvFormStorage: TJvFormStorage
+    AppStorage = DataModuleShared.JvAppIniFileStorage
+    AppStoragePath = '%FORM_NAME%\'
+    BeforeSavePlacement = JvFormStorageBeforeSavePlacement
+    OnRestorePlacement = JvFormStorageRestorePlacement
+    StoredProps.Strings = (
+      'OpenDialog.InitialDir'
+      'ActionOpenLastUsedFileAtStartup.Checked')
+    StoredValues = <>
+    Left = 332
+    Top = 280
+  end
+  object JvMRUManager: TJvMRUManager
+    Duplicates = dupIgnore
+    Capacity = 8
+    IniStorage = JvFormStorage
+    RecentMenu = MenuRecents
+    OnClick = JvMRUManagerClick
+    OnAfterUpdate = JvMRUManagerAfterUpdate
+    Left = 472
+    Top = 300
+  end
+  object PopupMenuButtonOpen: TPopupMenu
+    Left = 52
+    Top = 64
+    object tesst1: TMenuItem
+      Caption = 'tesst'
+    end
+  end
 end