Changeset 65 for trunk/IDE/Forms/UFormMain.pas

Timestamp:

Jul 18, 2012, 10:57:48 PM (12 years ago)

Author:

chronos

Message:

• Modified: Updated GeneralRegistry package references.

File:

• trunk/IDE/Forms/UFormMain.pas (modified) (9 diffs)

trunk/IDE/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
-  Registry, ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas,
+  ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas,
   UProject, FileUtil, Menus, ActnList,
-  UFormTargetCode, UFormCodeTree, URegistry, UApplicationInfo;
+  UFormTargetCode, UFormCodeTree, UGeneralRegistry, UApplicationInfo;
 
 type
@@ -81 +81 @@
     MenuItem9: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
-    OpenDialog1: TOpenDialog;
+    OpenDialogProject: TOpenDialog;
     PageControlMain: TPageControl;
     PageControlRight: TPageControl;
     PageControlBottom: TPageControl;
     PopupMenu1: TPopupMenu;
-    SaveDialog1: TSaveDialog;
+    SaveDialogProject: TSaveDialog;
     Splitter1: TSplitter;
     Splitter2: TSplitter;
@@ -146 +146 @@
     procedure ProducerProcessOutput(Text: string);
   public
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Root: Integer; Key: string);
+    procedure SaveToRegistry(Root: Integer; Key: string);
     procedure OpenRecentClick(Sender: TObject);
     function GetSource(Name: string; var SourceCode: string): Boolean;
@@ -397 +397 @@
 end;
 
-procedure TFormMain.LoadFromRegistry(Root: HKEY; Key: string);
-begin
-  with TRegistryEx.Create do
+procedure TFormMain.LoadFromRegistry(Root: Integer; Key: string);
+begin
+  with TGeneralRegistry.Create(nil) do
     try
-      RootKey := Root;
+      CurrentRoot := Root;
       OpenKey(Key, True);
-      PageControlRight.Width := ReadIntegerWithDefault('RightPanelWidth', 120);
-      PageControlBottom.Height := ReadIntegerWithDefault('BottomPanelHeight', 100);
+      if ValueExists('RightPanelWidth') then
+        PageControlRight.Width := ReadInteger('RightPanelWidth')
+        else PageControlRight.Width := 150;
+      if ValueExists('BottomPanelHeight') then
+        PageControlBottom.Height := ReadInteger('BottomPanelHeight')
+        else PageControlBottom.Height := 100;
     finally
       Free;
@@ -410 +414 @@
 end;
 
-procedure TFormMain.SaveToRegistry(Root: HKEY; Key: string);
-begin
-  with TRegistryEx.Create do
+procedure TFormMain.SaveToRegistry(Root: Integer; Key: string);
+begin
+  with TGeneralRegistry.Create(nil) do
     try
-      RootKey := Root;
+      CurrentRoot := Root;
       OpenKey(Key, True);
       WriteInteger('RightPanelWidth', PageControlRight.Width);
@@ -468 +472 @@
 begin
   AProjectClose.Execute;
-  Core.SaveToRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  Core.SaveToRegistry(Integer(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
 end;
 
@@ -494 +498 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.LoadFromRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  Core.LoadFromRegistry(Integer(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
   DockInit;
   Core.ProjectTemplatesInit;
@@ -503 +507 @@
 
   WindowState := wsMaximized;
+  UpdateInterface;
 end;
 
 procedure TFormMain.AProjectOpenExecute(Sender: TObject);
 begin
-  if OpenDialog1.Execute then begin
-    Core.ProjectOpen(OpenDialog1.FileName);
+  if Core.LastOpenedFiles.Items.Count > 0 then
+    OpenDialogProject.FileName := Core.LastOpenedFiles.Items[0]
+    else OpenDialogProject.FileName := ExtractFileDir(Application.ExeName);
+  if OpenDialogProject.Execute then begin
+    Core.ProjectOpen(OpenDialogProject.FileName);
   end;
 end;
@@ -555 +563 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
+  if Core.LastOpenedFiles.Items.Count > 0 then
+    SaveDialogProject.FileName := Core.LastOpenedFiles.Items[0]
+    else SaveDialogProject.FileName := ExtractFileDir(Application.ExeName);
   if Assigned(Core.Project) then
-  if SaveDialog1.Execute then begin
-    Core.Project.SaveToFile(SaveDialog1.FileName);
+  if SaveDialogProject.Execute then begin
+    Core.Project.SaveToFile(SaveDialogProject.FileName);
     FormSourceCode.Save;
     Core.Project.Save;
     UpdateInterface;
-    Core.LastOpenedFiles.AddItem(SaveDialog1.FileName);
+    Core.LastOpenedFiles.AddItem(SaveDialogProject.FileName);
   end;
 end;