Changeset 41 for trunk/Forms

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.

Location:

trunk/Forms

Files:

• UItemAdd.lfm (modified) (1 diff)
• UItemAdd.pas (modified) (3 diffs)
• UItemList.pas (modified) (3 diffs)
• ULoginForm.lfm (modified) (1 diff)
• UMainForm.pas (modified) (8 diffs)

trunk/Forms/UItemAdd.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnKeyPress = FormKeyPress
   OnShow = FormShow
   LCLVersion = '0.9.31'

trunk/Forms/UItemAdd.pas

@@ -23 +23 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormKeyPress(Sender: TObject; var Key: char);
     procedure FormShow(Sender: TObject);
   private
@@ -100 +101 @@
 end;
 
+procedure TItemAddForm.FormKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #27 then Close;
+end;
+
 procedure TItemAddForm.FormShow(Sender: TObject);
 begin
@@ -124 +130 @@
     Panel1.Controls[I].Free;
 
-  //Report.Load(SelectedObject, SelectedObject.PrimaryKey + ' = ' +
-  //  IntToStr(SelectedItemId));
+  Report.Load(SelectedObject, SelectedObject.PrimaryKey + ' = ' +
+    IntToStr(SelectedItemId));
 
   // Load column names

trunk/Forms/UItemList.pas

@@ -42 +42 @@
   private
     Report: TReport;
-    procedure LoadItemList;
   public
     SelectedObject: TChronisObject;
     SelectedItem: Integer;
+    procedure Reload;
   end;
 
@@ -60 +60 @@
 { TItemListForm }
 
-procedure TItemListForm.LoadItemList;
+procedure TItemListForm.Reload;
 var
   NewColumn: TListColumn;
@@ -110 +110 @@
 procedure TItemListForm.FormShow(Sender: TObject);
 begin
-  LoadItemList;
+  Reload;
 end;
 

trunk/Forms/ULoginForm.lfm

@@ -1 +1 @@
 object LoginForm: TLoginForm
-  Left = 312
+  Left = 288
   Height = 177
-  Top = 186
+  Top = 243
   Width = 451
   BorderIcons = [biSystemMenu]

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.