Changeset 8 for trunk/Forms/UFormField.pas

Timestamp:

Jan 23, 2015, 12:00:37 AM (9 years ago)

Author:

chronos

Message:

• Modified: All data types have own table which is used to specify supported data types by database engines.

File:

• trunk/Forms/UFormField.pas (modified) (4 diffs)

trunk/Forms/UFormField.pas

@@ -60 +60 @@
 
 uses
-  UDataTypes;
+  UDataTypes, UCore;
 
 {$R *.lfm}
@@ -71 +71 @@
 
 procedure TFormField.FormCreate(Sender: TObject);
-var
-  I: TFieldType;
 begin
-  ComboBoxType.Items.Clear;
-  for I := Low(TFieldType) to High(TFieldType) do
-    ComboBoxType.Items.Add(FieldTypeString[I]);
 end;
 
@@ -85 +80 @@
 
 procedure TFormField.Load(Field: TField);
+var
+  I: Integer;
+  SelectedItem: TDataType;
 begin
+  if ComboBoxType.ItemIndex <> -1 then
+    SelectedItem := TDataType(ComboBoxType.Items.Objects[ComboBoxType.ItemIndex])
+    else SelectedItem := nil;
+
+  with Field.Table.Database.Engine.DataTypes do begin
+    while ComboBoxType.Items.Count > Count do
+      ComboBoxType.Items.Delete(ComboBoxType.Items.Count - 1);
+    while ComboBoxType.Items.Count < Count do
+      ComboBoxType.Items.Add('');
+    for I := 0 to Count - 1 do begin
+      ComboBoxType.Items.Strings[I] := TDataType(Items[I]).Name;
+      ComboBoxType.Items.Objects[I] := Items[I];
+    end;
+    if Assigned(SelectedItem) then
+      ComboBoxType.ItemIndex := ComboBoxType.Items.IndexOfObject(SelectedItem);
+  end;
+
   EditName.Text := Field.Name;
   EditTextAfter.Text := Field.TextAfter;
   EditTextBefore.Text := Field.TextBefore;
-  ComboBoxType.ItemIndex := Integer(Field.FieldType);
+  ComboBoxType.ItemIndex := ComboBoxType.Items.IndexOfObject(Field.DataType);
   ComboBoxTypeChange(Self);
-  if Field.FieldType = ftString then
-    EditStringDefault.Text := TFieldString(Field.TypeRelated).DefaultValue;
-  if Field.FieldType = ftDateTime then begin
-    DateEditMin.Date := TFieldDateTime(Field.TypeRelated).Min;
-    DateEditMax.Date := TFieldDateTime(Field.TypeRelated).Max;
-  end;
-  if Field.FieldType = ftInteger then begin
-    SpinEditMin.Value := TFieldInteger(Field.TypeRelated).Min;
-    SpinEditMax.Value := TFieldInteger(Field.TypeRelated).Max;
-  end;
-  if Field.FieldType = ftFloat then begin
-    FloatSpinEditMin.Value := TFieldFloat(Field.TypeRelated).Min;
-    FloatSpinEditMax.Value := TFieldFloat(Field.TypeRelated).Max;
+  case Field.DataType.FieldType of
+    ftString: begin
+      EditStringDefault.Text := TFieldString(Field.TypeRelated).DefaultValue;
+    end;
+    ftDateTime: begin
+      DateEditMin.Date := TFieldDateTime(Field.TypeRelated).Min;
+      DateEditMax.Date := TFieldDateTime(Field.TypeRelated).Max;
+    end;
+    ftInteger: begin
+      SpinEditMin.Value := TFieldInteger(Field.TypeRelated).Min;
+      SpinEditMax.Value := TFieldInteger(Field.TypeRelated).Max;
+    end;
+    ftFloat: begin
+      FloatSpinEditMin.Value := TFieldFloat(Field.TypeRelated).Min;
+      FloatSpinEditMax.Value := TFieldFloat(Field.TypeRelated).Max;
+    end;
   end;
 end;
@@ -112 +130 @@
   Field.TextBefore := EditTextBefore.Text;
   Field.TextAfter := EditTextAfter.Text;
-  Field.FieldType := TFieldType(ComboBoxType.ItemIndex);
-  if Field.FieldType = ftString then
-    TFieldString(Field.TypeRelated).DefaultValue := EditStringDefault.Text;
-  if Field.FieldType = ftDateTime then begin
-    TFieldDateTime(Field.TypeRelated).Min := DateEditMin.Date;
-    TFieldDateTime(Field.TypeRelated).Max := DateEditMax.Date;
-  end;
-  if Field.FieldType = ftInteger then begin
-    TFieldInteger(Field.TypeRelated).Min := SpinEditMin.Value;
-    TFieldInteger(Field.TypeRelated).Max := SpinEditMax.Value;
-  end;
-  if Field.FieldType = ftFloat then begin
-    TFieldFloat(Field.TypeRelated).Min := FloatSpinEditMin.Value;
-    TFieldFloat(Field.TypeRelated).Max := FloatSpinEditMax.Value;
+  Field.DataType := TDataType(ComboBoxType.Items.Objects[ComboBoxType.ItemIndex]);
+  case Field.DataType.FieldType of
+    ftString: TFieldString(Field.TypeRelated).DefaultValue := EditStringDefault.Text;
+    ftDateTime: begin
+      TFieldDateTime(Field.TypeRelated).Min := DateEditMin.Date;
+      TFieldDateTime(Field.TypeRelated).Max := DateEditMax.Date;
+    end;
+    ftInteger: begin
+      TFieldInteger(Field.TypeRelated).Min := SpinEditMin.Value;
+      TFieldInteger(Field.TypeRelated).Max := SpinEditMax.Value;
+    end;
+    ftFloat: begin
+      TFieldFloat(Field.TypeRelated).Min := FloatSpinEditMin.Value;
+      TFieldFloat(Field.TypeRelated).Max := FloatSpinEditMax.Value;
+    end;
   end;
 end;