Changeset 14 for trunk/Forms/UMainForm.pas

Timestamp:

Jun 10, 2011, 2:16:52 PM (13 years ago)

Author:

george

Message:

• Added: Classes for base data types.

File:

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

trunk/Forms/UMainForm.pas

@@ -104 +104 @@
     PersistentForm: TPersistentForm;
     TreeState: TTreeState;
-    System: TChronisBase;
     Report: TReport;
     procedure LoadTree;
@@ -138 +137 @@
     OpenKey(RegistryKey, True);
     Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
-    System.Database.Database := ReadStringWithDefault('DatabaseSchema', 'chronis');
-    System.Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
-    System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
-    System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
+    Core.System.Database.Database := ReadStringWithDefault('DatabaseSchema', 'chronis');
+    Core.System.Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
+    Core.System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
+    Core.System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
     with Core.CoolTranslator1 do
       Language := Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''));
@@ -156 +155 @@
     OpenKey(RegistryKey, True);
     WriteInteger('GroupTreeWidth', Panel1.Width);
-    WriteString('DatabaseSchema', System.Database.Database);
-    WriteString('DatabaseHostName', System.Database.Hostname);
-    WriteString('DatabaseUserName', System.Database.UserName);
-    WriteString('DatabasePassword', System.Database.Password);
+    WriteString('DatabaseSchema', Core.System.Database.Database);
+    WriteString('DatabaseHostName', Core.System.Database.Hostname);
+    WriteString('DatabaseUserName', Core.System.Database.UserName);
+    WriteString('DatabasePassword', Core.System.Database.Password);
     with Core.CoolTranslator1 do
       WriteString('LanguageCode', Language.Code);
@@ -177 +176 @@
   I: Integer;
 begin
-  with System do
+  with Core.System do
   try
     DbRows := TDbRows.Create;
@@ -245 +244 @@
       '`Name` varchar(255) NOT NULL,' +
       '`DbType` varchar(255) NOT NULL,' +
-      '`TypeIndex` int(11) NOT NULL,' +
       'PRIMARY KEY (`Id`)' +
       ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
@@ -326 +324 @@
     end;
 
-    if Tables.IndexOf(CustomType) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + CustomType + '` ( ' +
+    if Tables.IndexOf(CustomTypeTableName) = -1 then begin
+      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + CustomTypeTableName + '` ( ' +
         '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
         '`Type` int NOT NULL,' +
@@ -373 +371 @@
   EnumId: Integer;
 begin
-  with System do begin
+  with Core.System do begin
   TypeNumber := AddType('Number', 'INT', vtInteger);
   TypeString := AddType('String', 'VARCHAR(255)', vtString);
@@ -407 +405 @@
   GroupId := AddObjectGroup('System');
 
-  ObjectId := AddObject('Object groups', 'ObjectGroup', System.Database.Database, GroupId);
+  ObjectId := AddObject('Object groups', 'ObjectGroup', Core.System.Database.Database, GroupId);
     AddPropertyString(ObjectId, 'Name', 'Name');
-  ObjectId := AddObject('Objects', 'Object', System.Database.Database, GroupId);
+  ObjectId := AddObject('Objects', 'Object', Core.System.Database.Database, GroupId);
     AddPropertyString(ObjectId, 'Name', 'Name');
     AddPropertyNumber(ObjectId, 'Group', 'Group');
@@ -416 +414 @@
     AddPropertyString(ObjectId, 'Primary key', 'PrimaryKey');
     AddPropertyNumber(ObjectId, 'Sequence', 'Sequence');
-  ObjectId := AddObject('Property types', 'Type', System.Database.Database, GroupId);
+  ObjectId := AddObject('Property types', 'Type', Core.System.Database.Database, GroupId);
     AddPropertyString(ObjectId, 'Name', 'Name');
     AddPropertyString(ObjectId, 'Type', 'DbType');
-    AddPropertyNumber(ObjectId, 'Type index', 'TypeIndex');
     AddPropertyNumber(ObjectId, 'Parent', 'Parent');
-  ObjectId := AddObject('Property groups', 'PropertyGroup', System.Database.Database, GroupId);
-  ObjectId := AddObject('Properties', 'Property', System.Database.Database, GroupId);
+  ObjectId := AddObject('Property groups', 'PropertyGroup', Core.System.Database.Database, GroupId);
+  ObjectId := AddObject('Properties', 'Property', Core.System.Database.Database, GroupId);
     AddPropertyString(ObjectId, 'Name', 'Name');
     AddPropertyNumber(ObjectId, 'Object', 'Object');
-    AddPropertyNumber(ObjectId, 'PropertyGroup', 'PropertyGroup');
-    AddPropertyNumber(ObjectId, 'Type', 'Type');
+    AddPropertyNumber(ObjectId, 'Property group', 'PropertyGroup');
+    AddPropertyNumber(ObjectId, 'Custom type', 'CustomType');
     AddProperty(ObjectId, 'Editable', 'Editable', TypeBoolean);
-    AddPropertyString(ObjectId, 'ColumnName', 'ColumnName');
+    AddPropertyString(ObjectId, 'Column name', 'ColumnName');
   end;
 end;
@@ -434 +431 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  System := TChronisBase.Create;
-  System.Database := TSqlDatabase.Create;
   TreeState := TTreeState.Create;
   Report := TReport.Create;
-  Report.Base := System;
+  Report.Base := Core.System;
   SelectedObject := TChronisObject.Create;
-  SelectedObject.Base := System;
+  SelectedObject.Base := Core.System;
   RegistryRootKey := HKEY_CURRENT_USER;
   RegistryKey := '\Software\' + ApplicationInfo.CompanyName + '\' +
@@ -453 +448 @@
   TreeState.Free;
   PersistentForm.Free;
-  System.Free;
 end;
 
@@ -564 +558 @@
   PersistentForm.Load(Self);
   LoadFromRegistry;
-  System.Database.Connect;
+  Core.System.Database.Connect;
   InitStructure;
-  System.LoadTypes;
+  Core.System.LoadTypes;
   LoadTree;
 end;
@@ -645 +639 @@
     try
       DbRows := TDbRows.Create;
-      System.Database.Query(DbRows, 'SELECT * FROM `' + ObjectGroupTable + '`');
+      Core.System.Database.Query(DbRows, 'SELECT * FROM `' + ObjectGroupTable + '`');
       for I := 0 to DbRows.Count - 1 do begin
         NewNode := AddChild(TopItem, DbRows[I].Values['Name']);
@@ -653 +647 @@
         try
           ObjectDbRows := TDbRows.Create;
-          System.Database.Query(ObjectDbRows, 'SELECT * FROM `' + ObjectTable + '` WHERE `Group`=' + DbRows[I].Values['Id']);
+          Core.System.Database.Query(ObjectDbRows, 'SELECT * FROM `' + ObjectTable + '` WHERE `Group`=' + DbRows[I].Values['Id']);
           for O := 0 to ObjectDbRows.Count - 1 do begin
             NewObjectNode := AddChild(NewNode, ObjectDbRows[O].Values['Name']);