Changeset 41 for trunk/Forms/UMainForm.pas

Timestamp:

Mar 9, 2012, 9:40:05 AM (13 years ago)

Author:

chronos

Message:

• Fixed: Memory leak in TReportColumn.
• Modified: Main item list is created once on application start instead on every tree item mouse doubleclick.

File:

• trunk/Forms/UMainForm.pas (modified) (8 diffs)

trunk/Forms/UMainForm.pas

@@ -86 +86 @@
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
+    procedure InitDock;
   public
-    MainPanelForm: TForm;
+    MainPanelForm: TItemListForm;
     PersistentForm: TPersistentForm;
     TreeState: TTreeState;
@@ -93 +94 @@
     procedure UpdateInterface;
     procedure LoadTree;
-    procedure SetMainPanelForm(Form: TForm);
   end;
 
@@ -146 +146 @@
 end;
 
+procedure TMainForm.InitDock;
+begin
+  MainPanelForm := TItemListForm.Create(Self);
+  MainPanelForm.ManualDock(PanelData, nil, alClient);
+  MainPanelForm.Align := alClient;
+end;
+
 procedure TMainForm.UpdateInterface;
 begin
@@ -154 +161 @@
     Caption := MainPanelForm.Caption + ' - ' + ApplicationInfo.Name
     else Caption :=  ApplicationInfo.Name;
+  Application.Title := Caption;
   if Assigned(Core.System.Client) then
   with Core.System.Client do
@@ -170 +178 @@
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
+  FreeAndNil(MainPanelForm);
   FreeAndNil(Report);
   FreeAndNil(TreeState);
@@ -306 +315 @@
   PersistentForm.Load(Self);
   LoadFromRegistry;
+  InitDock;
   AConnect.Execute;
 end;
@@ -341 +351 @@
 
 procedure TMainForm.TreeView1DblClick(Sender: TObject);
-var
-  NewItemListForm: TItemListForm;
 begin
   if Assigned(TreeView1.Selected) then begin
-    NewItemListForm := TItemListForm.Create(Self);
-    NewItemListForm.SelectedObject.Load(Integer(TreeView1.Selected.Data));
-    NewItemListForm.Caption := NewItemListForm.SelectedObject.Name;
-    SetMainPanelForm(NewItemListForm);
+    MainPanelForm.SelectedObject.Load(Integer(TreeView1.Selected.Data));
+    MainPanelForm.Caption := MainPanelForm.SelectedObject.Name;
+    MainPanelForm.Show;
+    MainPanelForm.Reload;
+    UpdateInterface;
   end;
 end;
@@ -407 +416 @@
 end;
 
-procedure TMainForm.SetMainPanelForm(Form: TForm);
-begin
-  MainPanelForm.Free;
-  MainPanelForm := Form;
-  MainPanelForm.ManualDock(PanelData, nil, alClient);
-  MainPanelForm.Align := alClient;
-  MainPanelForm.Show;
-  UpdateInterface;
-end;
-
 end.