Changeset 18 for trunk/Forms

Timestamp:

Jun 13, 2011, 2:41:33 PM (13 years ago)

Author:

george

Message:

• Fixed: Do not show RelationMany items in Add and Edit form.

Location:

trunk/Forms

Files:

• UItemAdd.pas (modified) (1 diff)
• UItemEdit.pas (modified) (2 diffs)
• USettingForm.lfm (modified) (1 diff)
• USettingForm.lrt (modified) (1 diff)

trunk/Forms/UItemAdd.pas

@@ -129 +129 @@
 
       DataType := TReportColumn(Report.Columns[I]).CustomType;
-      NewControl := DataType.CreateControl(Panel1);
-      DataType.SetDefault;
-      DataType.SetupControl(NewControl);
-      NewControl.Parent := Panel1;
-      NewControl.Top := LastTop;
-      NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-      NewControl.Width := (Width div ColumnCount) div 2 - 20;
-      ControlList.Add(NewControl);
+      if not (DataType is TDataTypeRelationMany) then begin
+        NewControl := DataType.CreateControl(Panel1);
+        DataType.SetDefault;
+        DataType.SetupControl(NewControl);
+        NewControl.Parent := Panel1;
+        NewControl.Top := LastTop;
+        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
+        NewControl.Width := (Width div ColumnCount) div 2 - 20;
+        ControlList.Add(NewControl);
 
-      Column := (Column + 1) mod 2;
-      if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
+        Column := (Column + 1) mod 2;
+        if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
+      end;
     end else ControlList.Add(nil);
 end;

trunk/Forms/UItemEdit.pas

@@ -123 +123 @@
   if Report.Count = 1 then
     for I := 0 to Report.Columns.Count - 1 do
-    if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
+    if (TReportColumn(Report.Columns[I]).ColumnName <> 'Id') then begin
 
       NewLabel := TLabel.Create(Panel1);
@@ -132 +132 @@
 
       DataType := TReportColumn(Report.Columns[I]).CustomType;
-      NewControl := DataType.CreateControl(Panel1);
-      DataType.Load(TReportLine(Report[0]).Items[I]);
-      DataType.SetupControl(NewControl);
-      NewControl.Parent := Panel1;
-      NewControl.Top := LastTop;
-      NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-      NewControl.Width := (Width div ColumnCount) div 2 - 20;
-      ControlList.Add(NewControl);
+      if not (DataType is TDataTypeRelationMany) then begin
+        NewControl := DataType.CreateControl(Panel1);
+        DataType.Load(TReportLine(Report[0]).Items[I]);
+        DataType.SetupControl(NewControl);
+        NewControl.Parent := Panel1;
+        NewControl.Top := LastTop;
+        NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
+        NewControl.Width := (Width div ColumnCount) div 2 - 20;
+        ControlList.Add(NewControl);
 
-      Column := (Column + 1) mod 2;
-      if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
+        Column := (Column + 1) mod 2;
+        if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
+      end;
    end else ControlList.Add(nil);
 end;

trunk/Forms/USettingForm.lfm

@@ -60 +60 @@
     ItemHeight = 13
     TabOrder = 3
-    Text = 'ComboBoxLanguage'
   end
 end

trunk/Forms/USettingForm.lrt

@@ -4 +4 @@
 TSETTINGFORM.BUTTONCANCEL.CAPTION=Cancel
 TSETTINGFORM.LABEL2.CAPTION=Language:
-TSETTINGFORM.COMBOBOXLANGUAGE.TEXT=ComboBoxLanguage