Changeset 4 for trunk/Forms/UFormFields.pas

Timestamp:

Jan 18, 2015, 11:29:26 PM (9 years ago)

Author:

chronos

Message:

• Moved: Field and value data type declaration moved to separate unit.
• Modified: Fields edit form is now modal and made need changes need to be accepted.
• Added: 32x32 icons to actions.
• Fixed: If fileds count or type changed then table values are updated.

File:

• trunk/Forms/UFormFields.pas (modified) (10 diffs)

trunk/Forms/UFormFields.pas

@@ -15 +15 @@
   TFormFields = class(TForm)
     AAdd: TAction;
+    AOk: TAction;
+    ACancel: TAction;
     ActionList1: TActionList;
     AModify: TAction;
@@ -27 +29 @@
     ToolButton2: TToolButton;
     ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
     procedure AAddExecute(Sender: TObject);
+    procedure ACancelExecute(Sender: TObject);
     procedure AModifyExecute(Sender: TObject);
+    procedure AOkExecute(Sender: TObject);
     procedure ARemoveExecute(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -37 +43 @@
     { private declarations }
   public
-    Table: TTable;
+    Fields: TFields;
+    TableName: string;
     procedure UpdateInterface;
     procedure ReloadList;
@@ -48 +55 @@
 
 uses
-  UFormField;
+  UFormField, UDataTypes;
 
 {$R *.lfm}
@@ -56 +63 @@
 procedure TFormFields.FormShow(Sender: TObject);
 begin
+  Caption := 'Table fields - ' + TableName;
   UpdateInterface;
   ReloadList;
@@ -69 +77 @@
   if FormField.ShowModal = mrOk then begin
     FormField.Save(NewField);
-    Table.Fields.Add(NewField);
+    Fields.Add(NewField);
     ReloadList;
   end else NewField.Free;
+end;
+
+procedure TFormFields.ACancelExecute(Sender: TObject);
+begin
+  Close;
 end;
 
@@ -85 +98 @@
 end;
 
+procedure TFormFields.AOkExecute(Sender: TObject);
+begin
+  ModalResult := mrOk;
+end;
+
 procedure TFormFields.ARemoveExecute(Sender: TObject);
 begin
   if Assigned(ListView1.Selected) then begin
-    Table.Fields.Remove(ListView1.Selected.Data);
+    Fields.Remove(ListView1.Selected.Data);
     ReloadList;
     UpdateInterface;
@@ -96 +114 @@
 procedure TFormFields.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Table.Fields.Count) then
-  with TField(Table.Fields[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < Fields.Count) then
+  with TField(Fields[Item.Index]) do begin
     Item.Caption := Name;
     Item.SubItems.Add(FieldTypeString[FieldType]);
@@ -103 +121 @@
     Item.SubItems.Add(TextBefore);
     Item.SubItems.Add(TextAfter);
-    Item.Data := Table.Fields[Item.Index];
+    Item.Data := Fields[Item.Index];
   end;
 end;
@@ -121 +139 @@
 procedure TFormFields.ReloadList;
 begin
-  ListView1.Items.Count := Table.Fields.Count;
+  ListView1.Items.Count := Fields.Count;
   ListView1.Repaint;
 end;