Changeset 7 for trunk/Forms/UItemEdit.pas

Timestamp:

Dec 25, 2010, 9:53:55 PM (13 years ago)

Author:

george

Message:

• Updated: USqlDatabase library.
• Added: Dependency to TemplateGenerics package.
• Modified: Rest of czech strings translated to english.

File:

• trunk/Forms/UItemEdit.pas (modified) (2 diffs)

trunk/Forms/UItemEdit.pas

@@ -78 +78 @@
   LastTop := 8;
   Column := 0;
-  ObjectInfo := MainForm.Database.Query('SELECT * FROM `Object` WHERE `Id`=' + IntToStr(MainForm.SelectedObject));
+  try
+  ObjectInfo := TDbRows.Create;
+  MainForm.Database.Query(ObjectInfo, 'SELECT * FROM `Object` WHERE `Id`=' + IntToStr(MainForm.SelectedObject));
   if ObjectInfo.Count = 1 then begin
 
     for I := Panel1.ControlCount - 1 downto 0 do
-      Panel1.Controls[I].Destroy;
+      Panel1.Controls[I].Free;
 
     // Load column names
-    Properties := MainForm.Database.Query('SELECT * FROM `Property` WHERE `Object`=' +
+    try
+    Properties := TDbRows.Create;
+    MainForm.Database.Query(Properties, 'SELECT * FROM `Property` WHERE `Object`=' +
       IntToStr(MainForm.SelectedObject));
-    Values := MainForm.Database.Query('SELECT * FROM `' + ObjectInfo[0].Values['Schema'] + '`.`' +
+    Values := TDbRows.Create;
+    MainForm.Database.Query(Values, 'SELECT * FROM `' + ObjectInfo[0].Values['Schema'] + '`.`' +
       ObjectInfo[0].Values['Table'] + '` WHERE ' + ObjectInfo[0].Values['PrimaryKey'] + ' = ' +
       IntToStr(MainForm.SelectedItem));
@@ -155 +160 @@
       Column := (Column + 1) mod 2;
       if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
-    end else ShowMessage('Položka nenalezena');
-    Values.Destroy;
-    Properties.Destroy;
-  end else ShowMessage('Objekt nenalezen');
-  ObjectInfo.Destroy;
+    end else ShowMessage(SItemNotFound);
+    finally
+      Values.Free;
+      Properties.Free;
+    end;
+  end else ShowMessage(SObjectNotFound);
+  finally
+    ObjectInfo.Free;
+  end;
 end;