Changeset 24 for trunk

Timestamp:

Oct 21, 2011, 11:12:09 PM (13 years ago)

Author:

george

Message:

• Add: Support for storing module skeleton.

Location:

trunk

Files:

• Forms/UMainForm.lfm (modified) (8 diffs)
• Forms/UMainForm.pas (modified) (3 diffs)
• Languages (added)
• Languages/chronis.cs.po (added)
• Languages/chronis.po (added)
• UCore.lfm (modified) (1 diff)
• USystem.pas (modified) (5 diffs)

trunk/Forms/UMainForm.lfm

@@ -6 +6 @@
   ActiveControl = Panel1
   Caption = 'ChronIS'
-  ClientHeight = 427
+  ClientHeight = 422
   ClientWidth = 640
   Menu = MainMenu1
@@ -16 +16 @@
   object Panel1: TPanel
     Left = 0
-    Height = 427
+    Height = 422
     Top = 0
     Width = 184
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 427
+    ClientHeight = 422
     ClientWidth = 184
     TabOrder = 0
     object Label1: TLabel
       Left = 7
-      Height = 14
+      Height = 18
       Top = 4
-      Width = 39
+      Width = 51
       Caption = 'Groups:'
       ParentColor = False
@@ -34 +34 @@
     object TreeView1: TTreeView
       Left = 4
-      Height = 403
+      Height = 398
       Top = 19
       Width = 180
       Anchors = [akTop, akLeft, akRight, akBottom]
-      DefaultItemHeight = 16
       Images = ImageListActions
       ReadOnly = True
@@ -48 +47 @@
   object Panel2: TPanel
     Left = 189
-    Height = 427
+    Height = 422
     Top = 0
     Width = 451
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 427
+    ClientHeight = 422
     ClientWidth = 451
     TabOrder = 1
     object Label2: TLabel
       Left = 2
-      Height = 14
+      Height = 18
       Top = 4
-      Width = 43
+      Width = 54
       Caption = 'Reports:'
       ParentColor = False
@@ -66 +65 @@
     object ListView1: TListView
       Left = 2
-      Height = 371
+      Height = 366
       Top = 19
       Width = 447
@@ -86 +85 @@
       Left = 3
       Height = 25
-      Top = 398
+      Top = 393
       Width = 75
       Action = AItemAdd
@@ -95 +94 @@
       Left = 83
       Height = 25
-      Top = 398
+      Top = 393
       Width = 75
       Action = AItemDelete
@@ -104 +103 @@
   object Splitter1: TSplitter
     Left = 184
-    Height = 427
+    Height = 422
     Top = 0
     Width = 5

trunk/Forms/UMainForm.pas

@@ -383 +383 @@
         ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
     end;
+
+      if Tables.IndexOf(ModuleTable) = -1 then begin
+      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + ModuleTable + '` ( ' +
+        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
+        '`Name` VARCHAR(255) NOT NULL,' +
+        '`Author` VARCHAR(255) NOT NULL,' +
+        '`Website` VARCHAR(255) NOT NULL,' +
+        '`Version` VARCHAR(255) NOT NULL,' +
+        '`License` VARCHAR(255) NOT NULL,' +
+        '`Description` TEXT NOT NULL,' +
+        'PRIMARY KEY (`Id`)' +
+        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
+    end;
   finally
     Tables.Free;
@@ -409 +422 @@
   GroupId: Integer;
   EnumId: Integer;
+  ModuleId: Integer;
+  ModuleBaseId: Integer;
 begin
   with Core.System do begin
@@ -485 +500 @@
     AddPropertyRelationMany(ObjectPropertyGroupId, 'Properties', 'Properties', True, ObjectPropertyIdGroup);
     AddPropertyRelationMany(PropertyTypeId, 'Custom types', 'CustomTypes', True, CustomTypeIdType);
+  ModuleId := AddObject('Modules', 'Module', Core.System.Database.Database, GroupId);
+    AddPropertyNumber(ModuleId, 'Id', 'Id', False);
+    AddPropertyString(ModuleId, 'Name', 'Name', True);
+    AddPropertyString(ModuleId, 'Author', 'Author', True);
+    AddPropertyString(ModuleId, 'Website', 'Website', False);
+    AddPropertyString(ModuleId, 'Version', 'Version', True);
+    AddPropertyText(ModuleId, 'Description', 'Description', False);
+    AddPropertyString(ModuleId, 'License', 'License', False);
+
+  ModuleBaseId := AddModule('Base', 'Chronos', '', '0.1', '', 'GNU/GPL');
   end;
 end;

trunk/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 340
-  HorizontalOffset = 236
-  VerticalOffset = 74
+  HorizontalOffset = 320
+  VerticalOffset = 114
   Width = 413
   object CoolTranslator1: TCoolTranslator

trunk/USystem.pas

@@ -16 +16 @@
   PropertyTypeTable = 'Type';
   PropertyGroupTable = 'PropertyGroup';
+  ModuleTable = 'Module';
   TypeEnumeration = 'TypeEnumeration';
   TypeFile = 'TypeFile';
@@ -119 +120 @@
     function AddPropertyString(ObjectId: Integer; Name, ColumnName: string;
       Editable: Boolean; Default: string = ''; MaxLength: Integer = 255): Integer;
+    function AddPropertyText(ObjectId: Integer; Name, ColumnName: string;
+      Editable: Boolean; Default: string = ''): Integer;
     function AddPropertyRelationOne(ObjectId: Integer; Name, ColumnName: string;
       Editable: Boolean; ReferedObject: Integer): Integer;
@@ -126 +129 @@
     function AddEnumeration(Name: string): Integer;
     function AddEnumerationState(Enum: Integer; Name: string): Integer;
+    function AddModule(Name, Author, Website, Version, Description, License: string): Integer;
     procedure LoadTypes;
     constructor Create;
@@ -435 +439 @@
 end;
 
+function TChronisBase.AddPropertyText(ObjectId: Integer; Name,
+  ColumnName: string; Editable: Boolean; Default: string): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+  CustomTypeId: Integer;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Data.Clear;
+    Data.Add('Type', IntToStr(Integer(vtText)));
+    Database.Insert(CustomTypeTableName, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Data.Clear;
+    Data.Add('CustomType', IntToStr(CustomTypeId));
+    Data.Add('Default', Default);
+    Database.Insert(TypeString, Data);
+    //CustomTypeId := Database.LastInsertId;
+
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
 function TChronisBase.AddPropertyRelationOne(ObjectId: Integer; Name,
   ColumnName: string; Editable: Boolean; ReferedObject: Integer): Integer;
@@ -539 +572 @@
     Data.Add('Name', Name);
     Database.Insert(EnumerationState, Data);
+    Result := Database.LastInsertId;
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddModule(Name, Author, Website, Version, Description,
+  License: string): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+    Data.Add('Name', Name);
+    Data.Add('Author', Author);
+    Data.Add('Website', Website);
+    Data.Add('Version', Version);
+    Data.Add('Description', Description);
+    Data.Add('License', License);
+    Database.Insert(ModuleTable, Data);
     Result := Database.LastInsertId;
   finally