Changeset 9 for trunk/Forms/UMainForm.pas

Timestamp:

Dec 26, 2010, 8:12:59 PM (14 years ago)

Author:

george

Message:

• Modified: Non-visual functions moved to USystem unit.
• Modified: Loading of object, properties and values rebuilded to general structures.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UMainForm.pas (modified) (14 diffs)

trunk

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc

trunk/Forms/UMainForm.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
+  Registry, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
   StdCtrls, ActnList, Menus, ExtCtrls, USqlDatabase, DOM, XMLRead, XMLWrite,
-  UPersistentForm, UTreeState, SpecializedList;
+  UPersistentForm, UTreeState, SpecializedList, URegistry, USystem;
 
 const
@@ -14 +14 @@
 
 type
-  TDbValueType = (vtNone, vtInteger, vtString, vtText, vtDateTime, vtFloat, vtImage, vtBoolean,
-  vtIPv4, vtMAC, vtIPv6, vtFile, vtGPS, vtEnumeration, vtHyperlink, vtPassword,
-  vtReference, vtDate, vtTime, vtColor);
-
-  { TReportLine }
-
-  TReportLine = class
-    Id: Integer;
-    Items: TListString;
-    constructor Create;
-    destructor Destroy; override;
-  end;
-
   { TMainForm }
 
@@ -96 +83 @@
     OriginalWindowState: TWindowState;
     ScreenBounds: TRect;
+    RegistryKey: string;
+    RegistryRootKey: HKEY;
     procedure LoadConfiguration;
+    procedure LoadFromRegistry;
+    procedure SaveToRegistry;
   public
-    SelectedObject: Integer;
+    SelectedObjectId: Integer;
+    SelectedObject: TChronisObject;
     SelectedItem: Integer;
     PersistentForm: TPersistentForm;
-    Database: TSQLDatabase;
     TreeState: TTreeState;
-    Report: TListObject;
+    System: TChronisBase;
+    Report: TReport;
     procedure LoadTree;
     procedure LoadItemList;
@@ -121 +113 @@
 uses
   UItemView, UItemEdit, UItemAdd;
-
-{ TReportLine }
-
-constructor TReportLine.Create;
-begin
-  Items := TListString.Create;
-end;
-
-destructor TReportLine.Destroy;
-begin
-  Items.Free;
-  inherited Destroy;
-end;
 
 {$R *.lfm}
@@ -157 +136 @@
         with ChildNodes[I3] do begin
           if NodeName = 'hostname' then
-            Database.HostName := TextContent;
+            System.Database.HostName := TextContent;
           if NodeName = 'schema' then
-            Database.Database := TextContent;
+            System.Database.Database := TextContent;
           if NodeName = 'username' then
-            Database.UserName := TextContent;
+            System.Database.UserName := TextContent;
           if NodeName = 'password' then
-            Database.Password := TextContent;
+            System.Database.Password := TextContent;
         end;
       end;
@@ -172 +151 @@
 end;
 
+procedure TMainForm.LoadFromRegistry;
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := RegistryRootKey;
+    OpenKey(RegistryKey, True);
+    Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
+  finally
+    Free;
+  end;
+end;
+
+procedure TMainForm.SaveToRegistry;
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := RegistryRootKey;
+    OpenKey(RegistryKey, True);
+    WriteInteger('GroupTreeWidth', Panel1.Width);
+  finally
+    Free;
+  end;
+end;
+
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  Database := TSqlDatabase.Create;
+  System := TChronisBase.Create;
+  System.Database := TSqlDatabase.Create;
   LoadConfiguration;
-  Database.Connect;
+  System.Database.Connect;
   TreeState := TTreeState.Create;
+  Report := TReport.Create;
+  Report.Base := System;
+  SelectedObject := TChronisObject.Create;
+  SelectedObject.Base := System;
+  RegistryRootKey := HKEY_CURRENT_USER;
+  RegistryKey := '\Software\Chronosoft\Chronis';
   PersistentForm := TPersistentForm.Create;
-  Report := TListObject.Create;
+  PersistentForm.RegistryKey := RegistryKey;
 end;
 
@@ -186 +196 @@
   Report.Free;
   TreeState.Free;
-  Database.Free;
   PersistentForm.Free;
+  System.Free;
 end;
 
@@ -193 +203 @@
 begin
   PersistentForm.Save(Self);
+  SaveToRegistry;
 end;
 
@@ -208 +219 @@
 begin
   if Assigned(TreeView1.Selected) then begin
-    SelectedObject := 9;
+    SelectedObjectId := 9;
     SelectedItem := Integer(TreeView1.Selected.Data);
     ItemEditForm.Show;
@@ -222 +233 @@
 begin
   if Assigned(TreeView1.Selected) then begin
-    SelectedObject := 8;
+    SelectedObjectId := 8;
     SelectedItem := Integer(TreeView1.Selected.Data);
     ItemEditForm.Show;
@@ -274 +285 @@
   PersistentForm.Load(Self);
   LoadTree;
+  LoadFromRegistry;
 end;
 
@@ -351 +363 @@
     try
       DbRows := TDbRows.Create;
-      Database.Query(DbRows, 'SELECT * FROM `ObjectGroup`');
+      System.Database.Query(DbRows, 'SELECT * FROM `ObjectGroup`');
       for I := 0 to DbRows.Count - 1 do begin
         NewNode := AddChild(TopItem, DbRows[I].Values['Name']);
@@ -359 +371 @@
         try
           ObjectDbRows := TDbRows.Create;
-          Database.Query(ObjectDbRows, 'SELECT * FROM `Object` WHERE `Group`=' + DbRows[I].Values['Id']);
+          System.Database.Query(ObjectDbRows, 'SELECT * FROM `Object` WHERE `Group`=' + DbRows[I].Values['Id']);
           for O := 0 to ObjectDbRows.Count - 1 do begin
             NewObjectNode := AddChild(NewNode, ObjectDbRows[O].Values['Name']);
@@ -380 +392 @@
 procedure TMainForm.LoadItemList;
 var
-  DbRows: TDbRows;
-  Properties: TDbRows;
-  Values: TDbRows;
+  NewColumn: TListColumn;
   I: Integer;
-  C: Integer;
-  NewItem: TReportLine;
-  NewColumn: TListColumn;
-begin
-  SelectedObject := 0;
+begin
+  SelectedObjectId := 0;
   if Assigned(TreeView1.Selected) then
   with ListView1 do begin
     Visible := True;
-    Report.Clear;
-    try
-    DbRows := TDbRows.Create;
-    Database.Query(DbRows, 'SELECT * FROM `Object` WHERE `Id`=' + IntToStr(Integer(TreeView1.Selected.Data)));
-    if DbRows.Count = 1 then begin
-      SelectedObject := StrToInt(DbRows[0].Values['Id']);
-
-      // Load column names
-      try
-        Properties := TDbRows.Create;
-        Database.Query(Properties, 'SELECT * FROM `Property` WHERE `Object`=' +
-          DbRows[0].Values['Id']);
-        Columns.Clear;
-        NewColumn := Columns.Add;
-        NewColumn.Caption := 'Id';
-        for I := 0 to Properties.Count - 1 do begin
-          NewColumn := Columns.Add;
-          NewColumn.Caption := Properties[I].Values['Name'];
-        end;
-
-        ListView1Resize(Self);
-
-        // Load items
-        Values := TDbRows.Create;
-        Database.Query(Values, 'SELECT * FROM `' + DbRows[0].Values['Schema'] + '`.`' +
-          DbRows[0].Values['Table'] + '`');
-        for I := 0 to Values.Count - 1 do begin
-          NewItem := TReportLine.Create;
-          NewItem.Items.Add(Values[I].Values[DbRows[0].Values['PrimaryKey']]);
-          NewItem.Id := StrToInt(Values[I].Values[DbRows[0].Values['PrimaryKey']]);
-          for C := 0 to Properties.Count - 1 do begin
-            NewItem.Items.Add(Values[I].Values[Properties[C].Values['ColumnName']]);
-          end;
-          Report.Add(NewItem);
-        end;
-        Items.Count := Values.Count;
-        Refresh;
-      finally
-        Properties.Free;
-        Values.Free;
-      end;
+    SelectedObject.Load(Integer(TreeView1.Selected.Data));
+    Report.Load(SelectedObject);
+
+    Columns.Clear;
+    for I := 0 to Report.Columns.Count - 1 do begin
+      NewColumn := Columns.Add;
+      NewColumn.Caption := TReportColumn(Report.Columns[I]).Caption;
     end;
-    finally
-      DbRows.Free;
-    end;
-  end;
+    Items.Count := Report.Count;
+    Refresh;
+  end;
+  ListView1Resize(Self);
 end;
 

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc