Changeset 14

Timestamp:

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

Author:

george

Message:

• Added: Classes for base data types.

Location:

trunk

Files:

• Application/UApplicationInfo.pas (modified) (1 diff)
• Application/UDataTypes.pas (added)
• Forms/UItemAdd.pas (modified) (4 diffs)
• Forms/UItemEdit.pas (modified) (4 diffs)
• Forms/UItemView.pas (modified) (5 diffs)
• Forms/UMainForm.pas (modified) (14 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• USystem.pas (modified) (11 diffs)
• chronis.lpi (modified) (33 diffs)
• chronis.lpr (modified) (1 diff)

trunk/Application/UApplicationInfo.pas

@@ -50 +50 @@
   Name := 'ChronIS';
   Identification := 1;
-  ReleaseDate := '9.6.2011';
+  ReleaseDate := '10.6.2011';
   MajorVersion := 0;
   MinorVersion := 1;

trunk/Forms/UItemAdd.pas

@@ -36 +36 @@
 
 uses
-  UMainForm;
+  UMainForm, UDataTypes, UCore;
 
 {$R *.lfm}
@@ -61 +61 @@
 begin
   Report := TReport.Create;
-  Report.Base := MainForm.System;
+  Report.Base := Core.System;
 end;
 
@@ -77 +77 @@
 procedure TItemAddForm.BuildControls;
 var
-  NewControl: TControl;
+  NewControl: TWinControl;
   LastTop: Integer;
   I: Integer;
   Column: Integer;
   ValueType: Integer;
+  NewLabel: TLabel;
+  DataType: TDataType;
 const
   ColumnCount = 2;
@@ -97 +99 @@
     for I := 0 to Report.Columns.Count - 1 do
     if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
-      NewControl := TLabel.Create(Panel1);
+      NewLabel := TLabel.Create(Panel1);
+      NewLabel.Parent := Panel1;
+      NewLabel.Top := LastTop;
+      NewLabel.Left := Column * Width div ColumnCount + 10;
+      NewLabel.Caption := TReportColumn(Report.Columns[I]).Caption + ':';
+
+      DataType := TReportColumn(Report.Columns[I]).CustomType;
+      NewControl := DataType.CreateControl(Panel1);
+      DataType.SetDefault;
+      DataType.SetupControl(NewControl);
       NewControl.Parent := Panel1;
       NewControl.Top := LastTop;
-      NewControl.Left := Column * Width div ColumnCount + 10;
-      TLabel(NewControl).Caption := TReportColumn(Report.Columns[I]).Caption + ':';
-
-      ValueType := TReportColumn(Report.Columns[I]).TypeDef.TypeIndex;
-      if ValueType = Integer(vtInteger) then begin
-        NewControl := TSpinEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtDate) then begin
-        NewControl := TDateEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TDateEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtFloat) then begin
-        NewControl := TFloatSpinEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TFloatSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtString) then begin
-        NewControl := TEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtPassword) then begin
-        NewControl := TMaskEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TMaskEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtBoolean) then begin
-        NewControl := TCheckBox.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-      end else begin
-        NewControl := TEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end;
+      NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
+      NewControl.Width := (Width div ColumnCount) div 2 - 20;
 
       Column := (Column + 1) mod 2;

trunk/Forms/UItemEdit.pas

@@ -36 +36 @@
 
 uses
-  UMainForm;
+  UMainForm, UDataTypes, UCore;
 
 {$R *.lfm}
@@ -63 +63 @@
 begin
   Report := TReport.Create;
-  Report.Base := MainForm.System;
+  Report.Base := Core.System;
 end;
 
@@ -80 +80 @@
 var
   Values: TDbRows;
-  NewControl: TControl;
   LastTop: Integer;
   I: Integer;
   Column: Integer;
-  ValueType: Integer;
+  DataType: TDataType;
+  NewControl: TWinControl;
+  NewLabel: TLabel;
 const
   ColumnCount = 2;
@@ -100 +101 @@
     if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
 
-      NewControl := TLabel.Create(Panel1);
+      NewLabel := TLabel.Create(Panel1);
+      NewLabel.Parent := Panel1;
+      NewLabel.Top := LastTop;
+      NewLabel.Left := Column * Width div ColumnCount + 10;
+      NewLabel.Caption := TReportColumn(Report.Columns[I]).Caption + ':';
+
+      DataType := TReportColumn(Report.Columns[I]).CustomType;
+      NewControl := DataType.CreateControl(Panel1);
+      DataType.Load(TReportLine(Report[0]).Items[I]);
+      DataType.SetupControl(NewControl);
       NewControl.Parent := Panel1;
       NewControl.Top := LastTop;
-      NewControl.Left := Column * Width div ColumnCount + 10;
-      TLabel(NewControl).Caption := TReportColumn(Report.Columns[I]).Caption + ':';
-
-      ValueType := TReportColumn(Report.Columns[I]).TypeDef.TypeIndex;
-      if ValueType = Integer(vtInteger) then begin
-        NewControl := TSpinEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TSpinEdit(NewControl).Value := StrToInt(TReportLine(Report[0]).Items[I]);
-        TSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtDate) then begin
-        NewControl := TDateEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TDateEdit(NewControl).Date := StrToDate(TReportLine(Report[0]).Items[I]);
-        TDateEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtFloat) then begin
-        NewControl := TFloatSpinEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TFloatSpinEdit(NewControl).Value := StrToFloat(TReportLine(Report[0]).Items[I]);
-        TFloatSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtString) then begin
-        NewControl := TEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TEdit(NewControl).Text := TReportLine(Report[0]).Items[I];
-        TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtPassword) then begin
-        NewControl := TMaskEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TMaskEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-      end else
-      if ValueType = Integer(vtBoolean) then begin
-        NewControl := TCheckBox.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TCheckBox(NewControl).Checked := Boolean(StrToInt(TReportLine(Report[0]).Items[I]));
-      end else begin
-        NewControl := TEdit.Create(Panel1);
-        NewControl.Parent := Panel1;
-        NewControl.Top := LastTop;
-        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-        TEdit(NewControl).Text := TReportLine(Report[0]).Items[I];
-      end;
+      NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
+      NewControl.Width := (Width div ColumnCount) div 2 - 20;
 
       Column := (Column + 1) mod 2;

trunk/Forms/UItemView.pas

@@ -42 +42 @@
 
 uses
-  UMainForm, UItemEdit;
+  UMainForm, UItemEdit, UDataTypes, UCore;
 
 {$R *.lfm}
@@ -57 +57 @@
 begin
   Report := TReport.Create;
-  Report.Base := MainForm.System;
+  Report.Base := Core.System;
 end;
 
@@ -93 +93 @@
   I: Integer;
   Column: Integer;
+  DataType: TDataType;
 const
   ColumnCount = 2;
@@ -107 +108 @@
 
   if Report.Count = 1 then
-  for I := 0 to Report.Columns.Count - 1 do
-  if TReportColumn(Report.Columns[I]).TypeDef.TypeIndex = Integer(vtPointer) then begin
+  for I := 0 to Report.Columns.Count - 1 do begin
+    DataType := TReportColumn(Report.Columns[I]).CustomType;
+  if DataType is TDataTypeRelationOne then begin
     TabControl1.Tabs.Add(TReportColumn(Report.Columns[I]).Caption);
   end else begin
@@ -126 +128 @@
     if Column = 0 then LastTop := LastTop + 24;
   end;
+  end;
   Panel2.Visible := TabControl1.Tabs.Count > 0;
 end;

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']);

trunk/UCore.lfm

@@ -1 +1 @@
 object Core: TCore
+  OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   OldCreateOrder = False
   Height = 346

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, UCoolTranslator;
+  Classes, SysUtils, FileUtil, UCoolTranslator, USystem, USqlDatabase;
 
 type
@@ -14 +14 @@
   TCore = class(TDataModule)
     CoolTranslator1: TCoolTranslator;
+    procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     { private declarations }
   public
-    { public declarations }
-  end; 
+    System: TChronisBase;
+  end;
 
 var
@@ -27 +29 @@
 {$R *.lfm}
 
+{ TCore }
+
+procedure TCore.DataModuleCreate(Sender: TObject);
+begin
+  System := TChronisBase.Create;
+  System.Database := TSqlDatabase.Create;
+end;
+
+procedure TCore.DataModuleDestroy(Sender: TObject);
+begin
+  System.Free;
+end;
+
 end.
 

trunk/USystem.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, SpecializedList, SpecializedDictionary, USqlDatabase,
-  Strings;
+  Strings, UDataTypes;
 
 const
@@ -21 +21 @@
   TypeRelationOne = 'TypeRelationOne';
   TypeRelationMany = 'TypeRelationMany';
-  CustomType = 'TypeCustom';
+  CustomTypeTableName = 'TypeCustom';
   Enumeration = 'Enumeration';
   EnumerationState = 'EnumerationState';
@@ -45 +45 @@
   TReportColumn = class
     Caption: string;
-    TypeDef: TChronisType;
+    //TypeDef: TChronisType;
+    CustomType: TDataType;
     ColumnName: string;
   end;
@@ -80 +81 @@
     Id: Integer;
     DbType: string;
-    DbTable: string;
     TypeIndex: Integer;
-    Parent: TChronisType;
   end;
 
@@ -178 +177 @@
       NewColumn.Caption := 'Id';
       NewColumn.ColumnName := 'Id';
-      NewColumn.TypeDef := Base.Types.FindByTypeIndex(Integer(vtInteger));
+      NewColumn.CustomType := TDataTypeNumber.Create;
+
       for I := 0 to Properties.Count - 1 do
-      if Properties[I].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
+      if Properties[I].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
         NewColumn := TReportColumn.Create;
         Columns.Add(NewColumn);
         NewColumn.Caption := Properties[I].Values['Name'];
         NewColumn.ColumnName := Properties[I].Values['ColumnName'];;
-        NewColumn.TypeDef := Base.Types.FindById(StrToInt(Properties[I].Values['Type']));
-        if not Assigned(NewColumn.TypeDef) then
-          raise Exception.Create(Format(SUnsupportedType, [Properties[I].Values['Type']]));
+        NewColumn.CustomType := GetDataType(StrToInt(Properties[I].Values['CustomType']));
       end;
 
@@ -204 +202 @@
         NewItem.Id := StrToInt(Values[I].Values[Obj.PrimaryKey]);
         for C := 0 to Properties.Count - 1 do
-        if Properties[C].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
+        if Properties[C].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
           NewItem.Items.Add(Values[I].Values[Properties[C].Values['ColumnName']]);
         end;
@@ -225 +223 @@
     Data.Add('Name', Name);
     Data.Add('DbType', DataType);
-    Data.Add('TypeIndex', IntToStr(Integer(TypeIndex)));
+    Data.Add('Id', IntToStr(Integer(TypeIndex)));
     Database.Insert(PropertyTypeTable, Data);
     Result := Database.LastInsertId;
@@ -291 +289 @@
     Data.Clear;
     Data.Add('Type', IntToStr(Integer(vtInteger)));
-    Database.Insert(CustomType, Data);
+    Database.Insert(CustomTypeTableName, Data);
     CustomTypeId := Database.LastInsertId;
 
@@ -322 +320 @@
     Data.Clear;
     Data.Add('Type', IntToStr(Integer(vtString)));
-    Database.Insert(CustomType, Data);
+    Database.Insert(CustomTypeTableName, Data);
     CustomTypeId := Database.LastInsertId;
 
@@ -330 +328 @@
     Data.Add('Default', Default);
     Database.Insert(TypeString, Data);
-    CustomTypeId := Database.LastInsertId;
+    //CustomTypeId := Database.LastInsertId;
 
     Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
@@ -405 +403 @@
       with DbRows[I] do begin
         Id := StrToInt(Values['Id']);
-        TypeIndex := StrToInt(Values['TypeIndex']);
         DbType := Values['DbType'];
         //Parent := StrToInt(Values['Parent']);

trunk/chronis.lpi

@@ -97 +97 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="37">
+    <Units Count="40">
       <Unit0>
         <Filename Value="chronis.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="chronis"/>
-        <EditorIndex Value="12"/>
         <WindowIndex Value="0"/>
         <TopLine Value="14"/>
         <CursorPos X="1" Y="33"/>
         <UsageCount Value="274"/>
-        <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -117 +115 @@
         <TopLine Value="330"/>
         <CursorPos X="1" Y="347"/>
-        <UsageCount Value="45"/>
+        <UsageCount Value="44"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit1>
@@ -129 +127 @@
         <TopLine Value="118"/>
         <CursorPos X="25" Y="144"/>
-        <UsageCount Value="99"/>
+        <UsageCount Value="98"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit2>
@@ -141 +139 @@
         <TopLine Value="1"/>
         <CursorPos X="24" Y="14"/>
-        <UsageCount Value="99"/>
+        <UsageCount Value="98"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit3>
@@ -148 +146 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UPersistentForm"/>
-        <EditorIndex Value="14"/>
         <WindowIndex Value="0"/>
         <TopLine Value="55"/>
         <CursorPos X="3" Y="84"/>
         <UsageCount Value="264"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit4>
@@ -160 +156 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="USqlDatabase"/>
-        <EditorIndex Value="11"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="209"/>
-        <CursorPos X="1" Y="221"/>
+        <EditorIndex Value="9"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="410"/>
+        <CursorPos X="1" Y="424"/>
         <UsageCount Value="264"/>
         <Loaded Value="True"/>
@@ -172 +168 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="URegistry"/>
-        <EditorIndex Value="13"/>
         <WindowIndex Value="0"/>
         <TopLine Value="19"/>
         <CursorPos X="1" Y="31"/>
         <UsageCount Value="264"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit6>
@@ -188 +182 @@
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="15" Y="1"/>
+        <TopLine Value="99"/>
+        <CursorPos X="42" Y="112"/>
         <UsageCount Value="327"/>
         <Loaded Value="True"/>
@@ -201 +195 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UItemEdit"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="129"/>
-        <CursorPos X="34" Y="133"/>
+        <TopLine Value="93"/>
+        <CursorPos X="1" Y="111"/>
         <UsageCount Value="318"/>
         <Loaded Value="True"/>
@@ -217 +212 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ULoginForm"/>
-        <EditorIndex Value="16"/>
+        <EditorIndex Value="11"/>
         <WindowIndex Value="0"/>
         <TopLine Value="14"/>
@@ -233 +228 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="613"/>
-        <CursorPos X="1" Y="625"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="405"/>
+        <CursorPos X="22" Y="412"/>
         <UsageCount Value="317"/>
         <Loaded Value="True"/>
@@ -255 +250 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UItemAdd"/>
-        <EditorIndex Value="15"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="85"/>
-        <CursorPos X="70" Y="105"/>
+        <EditorIndex Value="10"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="73"/>
+        <CursorPos X="17" Y="85"/>
         <UsageCount Value="313"/>
         <Loaded Value="True"/>
@@ -269 +264 @@
         <TopLine Value="963"/>
         <CursorPos X="3" Y="974"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit13>
@@ -277 +272 @@
         <TopLine Value="43"/>
         <CursorPos X="1" Y="60"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
@@ -284 +279 @@
         <TopLine Value="68"/>
         <CursorPos X="1" Y="85"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit15>
       <Unit16>
@@ -292 +287 @@
         <TopLine Value="593"/>
         <CursorPos X="15" Y="606"/>
-        <UsageCount Value="3"/>
+        <UsageCount Value="2"/>
       </Unit16>
       <Unit17>
@@ -299 +294 @@
         <TopLine Value="2104"/>
         <CursorPos X="3" Y="2109"/>
-        <UsageCount Value="3"/>
+        <UsageCount Value="2"/>
       </Unit17>
       <Unit18>
@@ -307 +302 @@
         <TopLine Value="1"/>
         <CursorPos X="6" Y="1"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="13"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit18>
@@ -315 +310 @@
         <TopLine Value="1"/>
         <CursorPos X="3" Y="21"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="13"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit19>
@@ -322 +317 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="USystem"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="185"/>
-        <CursorPos X="33" Y="176"/>
-        <UsageCount Value="83"/>
+        <EditorIndex Value="6"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="169"/>
+        <CursorPos X="1" Y="181"/>
+        <UsageCount Value="95"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -337 +331 @@
         <TopLine Value="912"/>
         <CursorPos X="14" Y="929"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit21>
       <Unit22>
@@ -344 +338 @@
         <TopLine Value="1"/>
         <CursorPos X="15" Y="18"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit22>
       <Unit23>
@@ -351 +345 @@
         <TopLine Value="1"/>
         <CursorPos X="11" Y="30"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit23>
@@ -360 +354 @@
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="UCore"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="3"/>
-        <CursorPos X="32" Y="17"/>
-        <UsageCount Value="67"/>
+        <EditorIndex Value="5"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="70" Y="8"/>
+        <UsageCount Value="79"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -375 +369 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="USettingForm"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
         <TopLine Value="40"/>
         <CursorPos X="45" Y="15"/>
-        <UsageCount Value="66"/>
+        <UsageCount Value="78"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -388 +382 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UApplicationInfo"/>
-        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="37"/>
-        <CursorPos X="48" Y="56"/>
-        <UsageCount Value="66"/>
-        <Loaded Value="True"/>
+        <CursorPos X="21" Y="52"/>
+        <UsageCount Value="78"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit26>
@@ -402 +394 @@
         <TopLine Value="97"/>
         <CursorPos X="26" Y="109"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit27>
       <Unit28>
@@ -409 +401 @@
         <TopLine Value="16"/>
         <CursorPos X="14" Y="58"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit28>
       <Unit29>
@@ -416 +408 @@
         <TopLine Value="87"/>
         <CursorPos X="6" Y="103"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit29>
       <Unit30>
@@ -423 +415 @@
         <TopLine Value="372"/>
         <CursorPos X="7" Y="384"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit30>
       <Unit31>
@@ -430 +422 @@
         <TopLine Value="82"/>
         <CursorPos X="40" Y="94"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit31>
       <Unit32>
@@ -438 +430 @@
         <TopLine Value="301"/>
         <CursorPos X="3" Y="305"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit32>
       <Unit33>
         <Filename Value="H:/Lazarus/0.9.31_2.5.1/lcl/dialogs.pp"/>
         <UnitName Value="Dialogs"/>
-        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="487"/>
         <CursorPos X="44" Y="500"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="28"/>
       </Unit33>
       <Unit34>
         <Filename Value="H:/Lazarus/0.9.31_2.5.1/lcl/controls.pp"/>
         <UnitName Value="Controls"/>
-        <EditorIndex Value="5"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="44"/>
-        <CursorPos X="3" Y="56"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1661"/>
+        <CursorPos X="24" Y="1673"/>
+        <UsageCount Value="28"/>
       </Unit34>
       <Unit35>
         <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericDictionary.inc"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="24" Y="11"/>
-        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="50"/>
+        <CursorPos X="1" Y="63"/>
+        <UsageCount Value="10"/>
       </Unit35>
       <Unit36>
         <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="8"/>
         <WindowIndex Value="0"/>
         <TopLine Value="120"/>
-        <CursorPos X="1" Y="132"/>
-        <UsageCount Value="11"/>
+        <CursorPos X="1" Y="134"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit36>
+      <Unit37>
+        <Filename Value="Application/UDataTypes.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UDataTypes"/>
+        <EditorIndex Value="7"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="233"/>
+        <CursorPos X="1" Y="247"/>
+        <UsageCount Value="32"/>
+        <Loaded Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit37>
+      <Unit38>
+        <Filename Value="H:/Lazarus/0.9.31_2.5.1/lcl/stdctrls.pp"/>
+        <UnitName Value="StdCtrls"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1446"/>
+        <CursorPos X="26" Y="1458"/>
+        <UsageCount Value="9"/>
+      </Unit38>
+      <Unit39>
+        <Filename Value="H:/Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/rtl/win32/system.pp"/>
+        <UnitName Value="System"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="4"/>
+        <CursorPos X="1" Y="16"/>
+        <UsageCount Value="14"/>
+        <Loaded Value="True"/>
+      </Unit39>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="101" Column="25" TopLine="92"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="133" Column="1" TopLine="120"/>
       </Position1>
       <Position2>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="274" Column="34" TopLine="274"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="134" Column="1" TopLine="120"/>
       </Position2>
       <Position3>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="102" Column="27" TopLine="100"/>
+        <Filename Value="Forms/UItemEdit.pas"/>
+        <Caret Line="112" Column="1" TopLine="93"/>
       </Position3>
       <Position4>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="291" Column="24" TopLine="277"/>
+        <Filename Value="Forms/UItemEdit.pas"/>
+        <Caret Line="111" Column="1" TopLine="93"/>
       </Position4>
       <Position5>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="389" Column="15" TopLine="375"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="131" Column="1" TopLine="120"/>
       </Position5>
       <Position6>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="316" Column="3" TopLine="318"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="133" Column="1" TopLine="120"/>
       </Position6>
       <Position7>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="31" Column="41" TopLine="20"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="134" Column="1" TopLine="120"/>
       </Position7>
       <Position8>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="290" Column="50" TopLine="278"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="131" Column="1" TopLine="120"/>
       </Position8>
       <Position9>
-        <Filename Value="Forms/UItemEdit.pas"/>
-        <Caret Line="141" Column="40" TopLine="134"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="133" Column="1" TopLine="120"/>
       </Position9>
       <Position10>
-        <Filename Value="Forms/UItemEdit.pas"/>
-        <Caret Line="133" Column="34" TopLine="129"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="134" Column="1" TopLine="120"/>
       </Position10>
       <Position11>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="374" Column="49" TopLine="357"/>
+        <Filename Value="Application/UDataTypes.pas"/>
+        <Caret Line="268" Column="27" TopLine="256"/>
       </Position11>
       <Position12>
-        <Filename Value="Common/USqlDatabase.pas"/>
-        <Caret Line="221" Column="1" TopLine="209"/>
+        <Filename Value="Application/UDataTypes.pas"/>
+        <Caret Line="270" Column="1" TopLine="256"/>
       </Position12>
       <Position13>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="388" Column="16" TopLine="375"/>
+        <Filename Value="Forms/UItemEdit.pas"/>
+        <Caret Line="112" Column="1" TopLine="93"/>
       </Position13>
       <Position14>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="104" Column="53" TopLine="92"/>
+        <Filename Value="Forms/UItemEdit.pas"/>
+        <Caret Line="111" Column="1" TopLine="93"/>
       </Position14>
       <Position15>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="309" Column="69" TopLine="308"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="131" Column="1" TopLine="120"/>
       </Position15>
       <Position16>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="102" Column="27" TopLine="91"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="133" Column="1" TopLine="120"/>
       </Position16>
       <Position17>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="412" Column="50" TopLine="396"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="134" Column="1" TopLine="120"/>
       </Position17>
       <Position18>
-        <Filename Value="Common/USqlDatabase.pas"/>
-        <Caret Line="221" Column="1" TopLine="209"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="131" Column="1" TopLine="120"/>
       </Position18>
       <Position19>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="322" Column="1" TopLine="312"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="133" Column="1" TopLine="120"/>
       </Position19>
       <Position20>
-        <Filename Value="Common/USqlDatabase.pas"/>
-        <Caret Line="221" Column="1" TopLine="209"/>
+        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
+        <Caret Line="134" Column="1" TopLine="120"/>
       </Position20>
       <Position21>
-        <Filename Value="USystem.pas"/>
-        <Caret Line="300" Column="27" TopLine="300"/>
+        <Filename Value="Application/UDataTypes.pas"/>
+        <Caret Line="251" Column="39" TopLine="233"/>
       </Position21>
       <Position22>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="353" Column="34" TopLine="337"/>
+        <Filename Value="Application/UDataTypes.pas"/>
+        <Caret Line="246" Column="1" TopLine="233"/>
       </Position22>
       <Position23>
-        <Filename Value="Common/USqlDatabase.pas"/>
-        <Caret Line="221" Column="1" TopLine="209"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="323" Column="31" TopLine="309"/>
       </Position23>
       <Position24>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="353" Column="39" TopLine="337"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="325" Column="1" TopLine="309"/>
       </Position24>
       <Position25>
-        <Filename Value="Common/USqlDatabase.pas"/>
-        <Caret Line="221" Column="1" TopLine="209"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="326" Column="1" TopLine="309"/>
       </Position25>
       <Position26>
         <Filename Value="USystem.pas"/>
-        <Caret Line="334" Column="20" TopLine="319"/>
+        <Caret Line="327" Column="1" TopLine="309"/>
       </Position26>
       <Position27>
         <Filename Value="USystem.pas"/>
-        <Caret Line="409" Column="37" TopLine="391"/>
+        <Caret Line="328" Column="1" TopLine="309"/>
       </Position27>
       <Position28>
-        <Filename Value="H:/PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
-        <Caret Line="132" Column="1" TopLine="120"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="330" Column="7" TopLine="312"/>
       </Position28>
       <Position29>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="684" Column="1" TopLine="672"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="325" Column="1" TopLine="312"/>
       </Position29>
       <Position30>
-        <Filename Value="Forms/UMainForm.pas"/>
-        <Caret Line="625" Column="1" TopLine="613"/>
+        <Filename Value="USystem.pas"/>
+        <Caret Line="181" Column="1" TopLine="169"/>
       </Position30>
     </JumpHistory>
@@ -649 +665 @@
   </CompilerOptions>
   <Debugging>
+    <Watches Count="1">
+      <Item1>
+        <Expression Value="self.customtype"/>
+      </Item1>
+    </Watches>
     <Exceptions Count="3">
       <Item1>

trunk/chronis.lpr

@@ -10 +10 @@
   Forms, UPersistentForm, URegistry, USqlDatabase, UTreeState, SysUtils,
   UItemView, UItemEdit, ULoginForm, UMainForm, UItemAdd, TemplateGenerics,
-  CoolTranslator, USystem, UCore, UApplicationInfo, USettingForm
+  CoolTranslator, USystem, UCore, UApplicationInfo, USettingForm, UDataTypes
   { you can add units after this };