Changeset 28 for trunk/Forms/UFormFields.pas

Timestamp:

Sep 10, 2022, 10:21:48 PM (20 months ago)

Author:

chronos

Message:

• Modified: Do not create all application forms at initialization phase but dynamically.

File:

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

trunk/Forms/UFormFields.pas

@@ -45 +45 @@
   end;
 
-var
-  FormFields: TFormFields;
-
 implementation
 
@@ -84 +81 @@
   if Fields.Table.DbClient.ConnectProfile.ClientType.DataTypes.Count > 0 then
     NewField.DataType := TDataType(Fields.Table.DbClient.ConnectProfile.ClientType.DataTypes[0]);
-  FormField.Load(NewField);
-  if FormField.ShowModal = mrOk then begin
-    FormField.Save(NewField);
-    Fields.Table.DbClient.Query('INSERT INTO ModelField ( Name , Caption , Model , DataType ) VALUES ( ' +
-      NewField.Name + ' , ' + NewField.TextBefore + ' , ' + TableName + ' , ' + NewField.DataType.Name + ' )');
-    ReloadList;
-  end else NewField.Free;
+  with TFormField.Create(nil) do
+  try
+    Load(NewField);
+    if ShowModal = mrOk then begin
+      Save(NewField);
+      Fields.Table.DbClient.Query('INSERT INTO ModelField ( Name , Caption , Model , DataType ) VALUES ( ' +
+        NewField.Name + ' , ' + NewField.TextBefore + ' , ' + TableName + ' , ' + NewField.DataType.Name + ' )');
+      ReloadList;
+    end else NewField.Free;
+  finally
+    Free;
+  end;
 end;
 
@@ -101 +103 @@
 begin
   if Assigned(ListView1.Selected) then begin
-    FormField.Load(TField(ListView1.Selected.Data));
-    if FormField.ShowModal = mrOk then begin
-      FormField.Save(TField(ListView1.Selected.Data));
-      Fields.Table.DbClient.Query('UPDATE ModelField SET Caption = ' + TField(ListView1.Selected.Data).TextBefore +
-        ' , DataType = ' + TField(ListView1.Selected.Data).DataType.Name +
-        ' WHERE Model = ' + Fields.Table.Name +' , Name = ' + TField(ListView1.Selected.Data).Name);
-      ReloadList;
+    with TFormField.Create(nil) do
+    try
+      Load(TField(ListView1.Selected.Data));
+      if ShowModal = mrOk then begin
+        Save(TField(ListView1.Selected.Data));
+        Fields.Table.DbClient.Query('UPDATE ModelField SET Caption = ' + TField(ListView1.Selected.Data).TextBefore +
+          ' , DataType = ' + TField(ListView1.Selected.Data).DataType.Name +
+          ' WHERE Model = ' + Fields.Table.Name +' , Name = ' + TField(ListView1.Selected.Data).Name);
+        ReloadList;
+      end;
+    finally
+      Free;
     end;
   end;
@@ -160 +167 @@
   Fields.Clear;
   DbRows := TDbRows.Create;
-  Fields.Table.DbClient.Query('SELECT * FROM ModelField WHERE Model = ' + Fields.Table.Name, DbRows);
-  for I := 0 to DbRows.Count - 1 do begin
-    NewField := Fields.AddNew(DbRows[I].Items['Name'],
-      Fields.Table.DbClient.DbManager.DataTypes.SearchByName(DbRows[I].Items['DataType']));
-    NewField.TextBefore := DbRows[I].Items['Caption'];
+  try
+    Fields.Table.DbClient.Query('SELECT * FROM ModelField WHERE Model = ' + Fields.Table.Name, DbRows);
+    for I := 0 to DbRows.Count - 1 do begin
+      NewField := Fields.AddNew(DbRows[I].Items['Name'],
+        Fields.Table.DbClient.DbManager.DataTypes.SearchByName(DbRows[I].Items['DataType']));
+      NewField.TextBefore := DbRows[I].Items['Caption'];
+    end;
+  finally
+    DbRows.Free;
   end;
-  DbRows.Free;
 
   ListView1.Items.Count := Fields.Count;