tvplanit: Avoid properties of Laz 1.8 in vpflxdsed1.lfm. Improved layout of FlexDS field mapper.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5874 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-05-19 16:44:40 +00:00
parent 6ceea2b711
commit 89f0aff1e3
3 changed files with 166 additions and 58 deletions

View File

@ -8,7 +8,7 @@ object Form1: TForm1
ClientWidth = 980 ClientWidth = 980
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
LCLVersion = '1.9.0.0' LCLVersion = '1.6.4.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 33 Height = 33
@ -592,6 +592,7 @@ object Form1: TForm1
end end
object QryResources: TSQLQuery object QryResources: TSQLQuery
PacketRecords = -1 PacketRecords = -1
IndexName = 'DEFAULT_ORDER'
FieldDefs = < FieldDefs = <
item item
Name = 'ResourceID' Name = 'ResourceID'
@ -709,6 +710,7 @@ object Form1: TForm1
end end
object QryContacts: TSQLQuery object QryContacts: TSQLQuery
PacketRecords = -1 PacketRecords = -1
IndexName = 'DEFAULT_ORDER'
FieldDefs = < FieldDefs = <
item item
Name = 'RecordID' Name = 'RecordID'
@ -755,6 +757,12 @@ object Form1: TForm1
Precision = -1 Precision = -1
Size = 50 Size = 50
end end
item
Name = 'Department'
DataType = ftString
Precision = -1
Size = 50
end
item item
Name = 'Job_Position' Name = 'Job_Position'
DataType = ftString DataType = ftString
@ -762,31 +770,71 @@ object Form1: TForm1
Size = 30 Size = 30
end end
item item
Name = 'Address' Name = 'AddressType1'
DataType = ftInteger
Precision = -1
end
item
Name = 'Address1'
DataType = ftString DataType = ftString
Precision = -1 Precision = -1
Size = 100 Size = 100
end end
item item
Name = 'City' Name = 'City1'
DataType = ftString DataType = ftString
Precision = -1 Precision = -1
Size = 50 Size = 50
end end
item item
Name = 'State' Name = 'State1'
DataType = ftString DataType = ftString
Precision = -1 Precision = -1
Size = 25 Size = 25
end end
item item
Name = 'Zip' Name = 'Zip1'
DataType = ftString DataType = ftString
Precision = -1 Precision = -1
Size = 10 Size = 10
end end
item item
Name = 'Country' Name = 'Country1'
DataType = ftString
Precision = -1
Size = 25
end
item
Name = 'AddressType2'
DataType = ftInteger
Precision = -1
end
item
Name = 'Address2'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'City2'
DataType = ftString
Precision = -1
Size = 50
end
item
Name = 'State2'
DataType = ftString
Precision = -1
Size = 25
end
item
Name = 'Zip2'
DataType = ftString
Precision = -1
Size = 10
end
item
Name = 'Country2'
DataType = ftString DataType = ftString
Precision = -1 Precision = -1
Size = 25 Size = 25
@ -797,6 +845,39 @@ object Form1: TForm1
Precision = -1 Precision = -1
Size = 255 Size = 255
end end
item
Name = 'EMail1'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'EMail2'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'EMail3'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'EMailType1'
DataType = ftInteger
Precision = -1
end
item
Name = 'EMailType2'
DataType = ftInteger
Precision = -1
end
item
Name = 'EMailType3'
DataType = ftInteger
Precision = -1
end
item item
Name = 'Phone1' Name = 'Phone1'
DataType = ftString DataType = ftString
@ -853,15 +934,31 @@ object Form1: TForm1
Precision = -1 Precision = -1
end end
item item
Name = 'Category' Name = 'Website1'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'Website2'
DataType = ftString
Precision = -1
Size = 100
end
item
Name = 'WebsiteType1'
DataType = ftInteger DataType = ftInteger
Precision = -1 Precision = -1
end end
item item
Name = 'EMail' Name = 'WebsiteType2'
DataType = ftString DataType = ftInteger
Precision = -1
end
item
Name = 'Category'
DataType = ftInteger
Precision = -1 Precision = -1
Size = 100
end end
item item
Name = 'Custom1' Name = 'Custom1'
@ -957,6 +1054,7 @@ object Form1: TForm1
end end
object QryEvents: TSQLQuery object QryEvents: TSQLQuery
PacketRecords = -1 PacketRecords = -1
IndexName = 'DEFAULT_ORDER'
FieldDefs = < FieldDefs = <
item item
Name = 'RecordID' Name = 'RecordID'
@ -1088,6 +1186,7 @@ object Form1: TForm1
end end
object QryTasks: TSQLQuery object QryTasks: TSQLQuery
PacketRecords = -1 PacketRecords = -1
IndexName = 'DEFAULT_ORDER'
FieldDefs = < FieldDefs = <
item item
Name = 'RecordID' Name = 'RecordID'
@ -1174,7 +1273,7 @@ object Form1: TForm1
top = 621 top = 621
end end
object ODBCConnection1: TODBCConnection object ODBCConnection1: TODBCConnection
Connected = False Connected = True
LoginPrompt = False LoginPrompt = False
KeepConnection = True KeepConnection = True
Params.Strings = ( Params.Strings = (
@ -1187,7 +1286,7 @@ object Form1: TForm1
top = 304 top = 304
end end
object SQLTransaction1: TSQLTransaction object SQLTransaction1: TSQLTransaction
Active = False Active = True
Database = ODBCConnection1 Database = ODBCConnection1
Options = [] Options = []
left = 136 left = 136

View File

@ -1,34 +1,33 @@
object frmFieldMapper: TfrmFieldMapper object frmFieldMapper: TfrmFieldMapper
Left = 332 Left = 314
Height = 769 Height = 762
Top = 0 Top = 117
Width = 655 Width = 655
HorzScrollBar.Page = 408 HorzScrollBar.Page = 408
VertScrollBar.Page = 536 VertScrollBar.Page = 536
BorderStyle = bsToolWindow BorderStyle = bsToolWindow
Caption = 'FlexDataStore Field Mapping Designer' Caption = 'FlexDataStore Field Mapping Designer'
ClientHeight = 769 ClientHeight = 762
ClientWidth = 655 ClientWidth = 655
DesignTimePPI = 144
OnClose = FormClose OnClose = FormClose
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '1.6.4.0'
object ButtonPanel: TPanel object ButtonPanel: TPanel
Left = 0 Left = 0
Height = 45 Height = 35
Top = 724 Top = 727
Width = 655 Width = 655
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
ClientHeight = 45 ClientHeight = 35
ClientWidth = 655 ClientWidth = 655
TabOrder = 1 TabOrder = 1
object BtnOK: TButton object BtnOK: TButton
AnchorSideTop.Control = ButtonPanel AnchorSideTop.Control = ButtonPanel
AnchorSideRight.Control = BtnCancel AnchorSideRight.Control = BtnCancel
Left = 384 Left = 384
Height = 35 Height = 25
Top = 5 Top = 5
Width = 115 Width = 115
Anchors = [akTop] Anchors = [akTop]
@ -43,10 +42,10 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Control = ButtonPanel AnchorSideTop.Control = ButtonPanel
AnchorSideRight.Control = ButtonPanel AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 573 Left = 580
Height = 35 Height = 25
Top = 5 Top = 5
Width = 77 Width = 62
Anchors = [akTop] Anchors = [akTop]
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -59,7 +58,7 @@ object frmFieldMapper: TfrmFieldMapper
end end
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 724 Height = 727
Top = 0 Top = 0
Width = 655 Width = 655
ActivePage = TabSheet1 ActivePage = TabSheet1
@ -68,16 +67,16 @@ object frmFieldMapper: TfrmFieldMapper
TabOrder = 0 TabOrder = 0
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'Field Mapping Designer' Caption = 'Field Mapping Designer'
ClientHeight = 686 ClientHeight = 699
ClientWidth = 647 ClientWidth = 647
object lblFieldMappings: TLabel object lblFieldMappings: TLabel
AnchorSideLeft.Control = lblDataset AnchorSideLeft.Control = lblDataset
AnchorSideTop.Control = DatasetFieldLB AnchorSideTop.Control = DatasetFieldLB
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 8 Left = 8
Height = 25 Height = 15
Top = 424 Top = 437
Width = 126 Width = 84
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Field Mappings:' Caption = 'Field Mappings:'
ParentColor = False ParentColor = False
@ -90,8 +89,8 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideBottom.Control = TabSheet1 AnchorSideBottom.Control = TabSheet1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 8 Left = 8
Height = 225 Height = 235
Top = 453 Top = 456
Width = 459 Width = 459
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -100,7 +99,6 @@ object frmFieldMapper: TfrmFieldMapper
ItemHeight = 0 ItemHeight = 0
OnClick = FieldMappingsLBClick OnClick = FieldMappingsLBClick
OnKeyPress = FieldMappingsLBKeyPress OnKeyPress = FieldMappingsLBKeyPress
Options = [lboDrawFocusRect]
TabOrder = 0 TabOrder = 0
end end
object btnDeleteMapping: TButton object btnDeleteMapping: TButton
@ -109,7 +107,7 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 475 Left = 475
Height = 38 Height = 38
Top = 453 Top = 456
Width = 164 Width = 164
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Delete Mapping' Caption = 'Delete Mapping'
@ -125,7 +123,7 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 475 Left = 475
Height = 38 Height = 38
Top = 495 Top = 498
Width = 164 Width = 164
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -140,15 +138,15 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Control = TabSheet1 AnchorSideTop.Control = TabSheet1
AnchorSideRight.Control = TabSheet1 AnchorSideRight.Control = TabSheet1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 80 Left = 58
Height = 33 Height = 23
Top = 8 Top = 8
Width = 559 Width = 581
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
ItemHeight = 25 ItemHeight = 15
OnChange = DatasetComboChange OnChange = DatasetComboChange
TabOrder = 3 TabOrder = 3
Text = 'DatasetCombo' Text = 'DatasetCombo'
@ -158,9 +156,9 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Control = DatasetCombo AnchorSideTop.Control = DatasetCombo
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 8 Left = 8
Height = 25 Height = 15
Top = 12 Top = 12
Width = 64 Width = 42
BorderSpacing.Left = 8 BorderSpacing.Left = 8
Caption = 'Dataset:' Caption = 'Dataset:'
ParentColor = False ParentColor = False
@ -170,9 +168,9 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Control = DatasetCombo AnchorSideTop.Control = DatasetCombo
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 8 Left = 8
Height = 25 Height = 15
Top = 49 Top = 39
Width = 190 Width = 126
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Available Dataset Fields:' Caption = 'Available Dataset Fields:'
ParentColor = False ParentColor = False
@ -184,8 +182,8 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideRight.Control = btnAddMapping AnchorSideRight.Control = btnAddMapping
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 8 Left = 8
Height = 338 Height = 371
Top = 78 Top = 58
Width = 259 Width = 259
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -193,16 +191,15 @@ object frmFieldMapper: TfrmFieldMapper
ItemHeight = 0 ItemHeight = 0
OnClick = DBFieldSelected OnClick = DBFieldSelected
OnKeyPress = DatasetFieldLBKeyPress OnKeyPress = DatasetFieldLBKeyPress
Options = [lboDrawFocusRect]
TabOrder = 4 TabOrder = 4
end end
object lblVPFieldsAvail: TLabel object lblVPFieldsAvail: TLabel
AnchorSideLeft.Control = VPFieldLB AnchorSideLeft.Control = VPFieldLB
AnchorSideTop.Control = lblDBFieldsAvail AnchorSideTop.Control = lblDBFieldsAvail
Left = 379 Left = 379
Height = 25 Height = 15
Top = 49 Top = 39
Width = 225 Width = 151
Caption = 'Available Visual PlanIt Fields:' Caption = 'Available Visual PlanIt Fields:'
ParentColor = False ParentColor = False
end end
@ -212,7 +209,7 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideBottom.Control = Bevel2 AnchorSideBottom.Control = Bevel2
Left = 271 Left = 271
Height = 72 Height = 72
Top = 165 Top = 161
Width = 104 Width = 104
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = 'Add' Caption = 'Add'
@ -227,7 +224,7 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 321 Left = 321
Height = 20 Height = 20
Top = 237 Top = 233
Width = 5 Width = 5
Shape = bsSpacer Shape = bsSpacer
end end
@ -240,8 +237,8 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideBottom.Control = DatasetFieldLB AnchorSideBottom.Control = DatasetFieldLB
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 379 Left = 379
Height = 338 Height = 371
Top = 78 Top = 58
Width = 260 Width = 260
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
@ -249,7 +246,6 @@ object frmFieldMapper: TfrmFieldMapper
ItemHeight = 0 ItemHeight = 0
OnClick = VpFieldSelected OnClick = VpFieldSelected
OnKeyPress = VPFieldLBKeyPress OnKeyPress = VPFieldLBKeyPress
Options = [lboDrawFocusRect]
TabOrder = 6 TabOrder = 6
end end
object btnAddAll: TButton object btnAddAll: TButton
@ -259,7 +255,7 @@ object frmFieldMapper: TfrmFieldMapper
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 271 Left = 271
Height = 72 Height = 72
Top = 257 Top = 253
Width = 104 Width = 104
Caption = 'Add all' Caption = 'Add all'
Enabled = False Enabled = False

View File

@ -355,13 +355,26 @@ begin
h := btnAddMapping.Height; h := btnAddMapping.Height;
btnAddMapping.AutoSize := false; btnAddMapping.AutoSize := false;
btnAddMapping.Height := h; btnAddMapping.Height := w * 2 div 3; //h;
btnAddMapping.Width := w; btnAddMapping.Width := w;
btnAddAll.AutoSize := false; btnAddAll.AutoSize := false;
btnAddAll.Height := h; btnAddAll.Height := w * 2 div 3; //h;
btnAddAll.Width := w; btnAddAll.Width := w;
btnDeleteMapping.AutoSize := true;
btnClearMappings.AutoSize := true;
w := max(btnDeleteMapping.Width, btnClearMappings.Width);
h := btnDeleteMapping.Height;
btnDeleteMapping.AutoSize := false;
btnDeleteMapping.Height := h;
btnDeleteMapping.Width := w;
btnClearMappings.AutoSize := false;
btnClearMappings.Height := h;
btnClearMappings.Width := w;
AlignOKCancel(BtnOK, BtnCancel, ButtonPanel); AlignOKCancel(BtnOK, BtnCancel, ButtonPanel);
end; end;