Changeset 65 for trunk/IDE/Forms

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated GeneralRegistry package references.

Location:

trunk/IDE/Forms

Files:

• UFormMain.lfm (modified) (10 diffs)
• UFormMain.pas (modified) (9 diffs)

trunk/IDE/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 695
   Caption = 'Transpascal IDE'
-  ClientHeight = 482
+  ClientHeight = 476
   ClientWidth = 695
   Font.Height = -11
@@ -20 +20 @@
     Left = 0
     Height = 5
-    Top = 477
+    Top = 471
     Width = 695
     Align = alBottom
@@ -89 +89 @@
     object ComboBoxTarget: TComboBox
       Left = 230
-      Height = 21
+      Height = 27
       Top = 2
       Width = 100
-      ItemHeight = 13
+      ItemHeight = 0
       OnChange = ComboBoxTargetChange
       Style = csDropDownList
@@ -105 +105 @@
   object Splitter1: TSplitter
     Left = 490
-    Height = 345
+    Height = 339
     Top = 26
     Width = 5
@@ -113 +113 @@
   object PageControlRight: TPageControl
     Left = 495
-    Height = 345
+    Height = 339
     Top = 26
     Width = 200
@@ -137 +137 @@
     Left = 0
     Height = 101
-    Top = 376
+    Top = 370
     Width = 695
     ActivePage = TabSheetMessages
@@ -155 +155 @@
     Left = 0
     Height = 5
-    Top = 371
+    Top = 365
     Width = 695
     Align = alBottom
@@ -162 +162 @@
   object PageControlMain: TPageControl
     Left = 0
-    Height = 345
+    Height = 339
     Top = 26
     Width = 490
@@ -667 +667 @@
       object MenuItem24: TMenuItem
         Action = AViewTargets
+        Bitmap.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000000000000000
+          000000000000000000000000000000000000000000000202022F020202FF0303
+          031F000000000000000000000000000000000000000000000000000000000000
+          000000000000000000000000000000000000000000000505053F050505FF0505
+          053F000000000000000000000000000000000000000000000000000000000000
+          00000000000000000000000000000909097F090909DF090909FF090909FF0909
+          09FF090909DF0909096F00000000000000000000000000000000000000000000
+          000000000000000000000D0D0D9F0C0C0CFF0C0C0CAF0B0B0B4F0C0C0CFF0B0B
+          0B4F0C0C0CAF0C0C0CFF0D0D0D9F000000000000000000000000000000000000
+          0000000000000F0F0F7F0F0F0FFF0E0E0E5F00000000000000000F0F0FFF0000
+          0000000000000E0E0E5F0F0F0FFF1010106F0000000000000000000000000000
+          000000000000131313DF131313AF000000000000000000000000131313FF0000
+          00000000000000000000131313AF131313DF0000000000000000000000001818
+          182F1818183F161616FF1616167F1818183F1818183F1818183F161616FF1818
+          183F1818183F1818183F1616167F161616FF1818183F1818181F1A1A1A1F1A1A
+          1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1ABF1A1A
+          1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1AFF000000001C1C
+          1C1F1C1C1C3F1D1D1DFF1D1D1D4F0000000000000000000000001D1D1DFF0000
+          000000000000000000001D1D1D4F1D1D1DFF1C1C1C3F1C1C1C1F000000000000
+          000000000000202020DF202020AF000000000000000000000000202020FF0000
+          00000000000000000000202020AF202020DF0000000000000000000000000000
+          0000000000002424247F242424FF2424245F0000000000000000242424FF0000
+          0000000000002424245F242424FF2424247F0000000000000000000000000000
+          000000000000000000002727279F272727FF282828AF2828284F272727FF2828
+          284F282828AF272727FF2727279F000000000000000000000000000000000000
+          00000000000000000000000000002A2A2A7F2A2A2ADF2B2B2BFF2B2B2BFF2B2B
+          2BFF2A2A2ADF2A2A2A7F00000000000000000000000000000000000000000000
+          000000000000000000000000000000000000000000002E2E2E3F2E2E2EFF2E2E
+          2E3F000000000000000000000000000000000000000000000000000000000000
+          000000000000000000000000000000000000000000003131312F313131FF3030
+          301F000000000000000000000000000000000000000000000000000000000000
+          0000000000000000000000000000000000000000000000000000000000000000
+          0000000000000000000000000000000000000000000000000000
+        }
       end
     end
@@ -877 +913 @@
     end
   end
-  object OpenDialog1: TOpenDialog
+  object OpenDialogProject: TOpenDialog
     DefaultExt = '.tppr'
     Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'
     left = 115
-    top = 52
+    top = 54
   end
-  object SaveDialog1: TSaveDialog
+  object SaveDialogProject: TSaveDialog
     DefaultExt = '.tppr'
     Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'

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;