Changeset 508

Timestamp:

Mar 29, 2018, 10:59:19 AM (6 years ago)

Author:

chronos

Message:

• Fixed: FileNew initialization.

Location:

ProjectTemplates/FileMenuProject

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UDataFile.pas (modified) (3 diffs)

ProjectTemplates/FileMenuProject/Forms/UFormMain.pas

@@ -104 +104 @@
 begin
   Core.Initialize;
-  Core.PersistentForm1.Load(Self);
+  Core.PersistentForm1.Load(Self, True);
   Core.ThemeManager1.UseTheme(Self);
   SetToolbarHints;

ProjectTemplates/FileMenuProject/UCore.pas

@@ -244 +244 @@
   FileClose;
   if FileClosed then begin
-    DataFile := TDataFile.Create;
+    DataFile := DataFileClass.Create;
     DataFile.OnModify := FileModified;
   end;
@@ -312 +312 @@
     if FileNameOption <> '' then begin
       // Open file specified as command line parameter
-      AFileNew.Execute;
+      FileNew;
       DataFile.LoadFromFile(FileNameOption);
       LastOpenedList1.AddItem(FileNameOption);
@@ -318 +318 @@
     if (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then begin
       // Open last opened file
-      AFileNew.Execute;
+      FileNew;
       DataFile.LoadFromFile(LastOpenedList1.Items[0])
     end;

ProjectTemplates/FileMenuProject/UDataFile.pas

@@ -15 +15 @@
     FFileName: string;
     FModified: Boolean;
+    FOnDestroy: TNotifyEvent;
     FOnModify: TNotifyEvent;
     procedure SetFileName(AValue: string);
@@ -24 +25 @@
     procedure SaveToFile(FileName: string); virtual;
     constructor Create; virtual;
+    destructor Destroy; override;
     property FileName: string read FFileName write SetFileName;
     property Modified: Boolean read FModified write SetModified;
     property OnModify: TNotifyEvent read FOnModify write FOnModify;
+    property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
   end;
 
@@ -81 +84 @@
 end;
 
+destructor TDataFile.Destroy;
+begin
+  if Assigned(FOnDestroy) then FOnDestroy(Self);
+  inherited Destroy;
+end;
+
 procedure TDataFile.SetFileName(AValue: string);
 begin