Changeset 93 for trunk/Forms/UFormMain.pas

Timestamp:

Jul 20, 2018, 10:25:06 AM (6 years ago)

Author:

chronos

Message:

• Modified: Updated Common, CoolTranslator and TemplateGenerics packages.
• Fixed: FormMain initialization was not completed if last opened file was not found.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UFormMain.pas (modified) (6 diffs)

trunk

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

trunk/Forms/UFormMain.pas

@@ -152 +152 @@
     procedure TargetLogExecute(Lines: TStrings);
     procedure TargetStateChanged(Sender: TObject);
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Context: TRegistryContext);
+    procedure SaveToRegistry(Context: TRegistryContext);
     procedure UpdateInterface;
     procedure UpdateStatusBar;
@@ -189 +189 @@
 begin
   Core.Init;
-  LoadFromRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  LoadFromRegistry(Core.ApplicationInfo.GetRegistryContext);
   PageControlMain.TabIndex := 0;
-  if Core.OpenProjectOnStart and (Core.LastOpenedList.Items.Count > 0) then
-    ProjectOpen(Core.LastOpenedList.Items[0])
-    else AProjectNew.Execute;
-  UpdateInterface;
-  UpdateToolBarHints;
-  UpdateTargetList;
-  DockInit;
-  Core.PersistentForm1.Load(Self, wsMaximized);
+  try
+    if Core.OpenProjectOnStart and (Core.LastOpenedList.Items.Count > 0) then
+      ProjectOpen(Core.LastOpenedList.Items[0])
+      else AProjectNew.Execute;
+  finally
+    LastOpenedListChange(nil);
+    UpdateInterface;
+    UpdateToolBarHints;
+    UpdateTargetList;
+    DockInit;
+    Core.PersistentForm1.Load(Self, True);
+  end;
 end;
 
@@ -293 +297 @@
 end;
 
-procedure TFormMain.LoadFromRegistry(Root: HKEY; Key: string);
+procedure TFormMain.LoadFromRegistry(Context: TRegistryContext);
 var
   TargetName: string;
@@ -299 +303 @@
   with TRegistryEx.Create do
   try
-    RootKey := Root;
-    OpenKey(Key, True);
+    CurrentContext := Context;
     TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
     Core.CurrentTarget := Core.Targets.FindByName(TargetName);
@@ -314 +317 @@
 end;
 
-procedure TFormMain.SaveToRegistry(Root: HKEY; Key: string);
+procedure TFormMain.SaveToRegistry(Context: TRegistryContext);
 begin
   with TRegistryEx.Create do
   try
-    RootKey := Root;
-    OpenKey(Key, True);
+    CurrentContext := Context;
     WriteString('TargetName', Core.CurrentTarget.Name);
     WriteBool('OptimizationAddSubEnabled', Core.Optimizations.AddSub);
@@ -397 +399 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  SaveToRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
 end;
 

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg