tvplanit: Update FlexDatastore mapping form to scale correctly in the HiDPI mode of Lazarus 1.8. Update demos datastores/bufds and datastores/flex/access.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5873 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-05-19 16:22:42 +00:00
parent 5572830dac
commit 6ceea2b711
9 changed files with 572 additions and 487 deletions

View File

@ -1,45 +1,66 @@
object Form1: TForm1 object Form1: TForm1
Left = 225 Left = 269
Height = 686 Height = 686
Top = 155 Top = 216
Width = 980 Width = 980
Caption = 'Form1' Caption = 'Form1'
ClientHeight = 686 ClientHeight = 686
ClientWidth = 980 ClientWidth = 980
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '1.7' LCLVersion = '1.9.0.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 34 Height = 34
Top = 0 Top = 0
Width = 980 Width = 980
Align = alTop Align = alTop
AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 34
ClientWidth = 980 ClientWidth = 980
TabOrder = 0 TabOrder = 0
object VpResourceCombo1: TVpResourceCombo object VpResourceCombo1: TVpResourceCombo
Left = 8 AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 4
Height = 23 Height = 23
Top = 5 Top = 6
Width = 208 Width = 208
DataStore = VpBufDSDataStore1 DataStore = VpBufDSDataStore1
Style = csDropDownList Style = csDropDownList
Borderspacing.Left = 4
Borderspacing.Top = 4
Borderspacing.Bottom = 4
end end
object BtnNewRes: TButton object BtnNewRes: TButton
Left = 222 AnchorSideLeft.Control = VpResourceCombo1
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 216
Height = 25 Height = 25
Top = 4 Top = 5
Width = 99 Width = 99
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Bottom = 4
Caption = 'New resource' Caption = 'New resource'
OnClick = BtnNewResClick OnClick = BtnNewResClick
TabOrder = 1 TabOrder = 1
end end
object BtnEditRes: TButton object BtnEditRes: TButton
Left = 328 AnchorSideLeft.Control = BtnNewRes
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 319
Height = 25 Height = 25
Top = 4 Top = 5
Width = 96 Width = 96
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Bottom = 4
Caption = 'Edit resource' Caption = 'Edit resource'
OnClick = BtnEditResClick OnClick = BtnEditResClick
TabOrder = 2 TabOrder = 2
@ -81,7 +102,6 @@ object Form1: TForm1
TimeSlotColors.Active = clWhite TimeSlotColors.Active = clWhite
TimeSlotColors.Inactive = 8454143 TimeSlotColors.Inactive = 8454143
TimeSlotColors.Holiday = 16744703 TimeSlotColors.Holiday = 16744703
TimeSlotColors.Weekday = clWhite
TimeSlotColors.Weekend = 16777088 TimeSlotColors.Weekend = 16777088
TimeSlotColors.ActiveRange.RangeBegin = h_00 TimeSlotColors.ActiveRange.RangeBegin = h_00
TimeSlotColors.ActiveRange.RangeEnd = h_00 TimeSlotColors.ActiveRange.RangeEnd = h_00
@ -156,24 +176,23 @@ object Form1: TForm1
TabOrder = 1 TabOrder = 1
KBNavigation = True KBNavigation = True
DateLabelFormat = 'mmmm yyyy' DateLabelFormat = 'mmmm yyyy'
DayHeadAttributes.Color = clBtnFace
DayHeadAttributes.Font.Height = -13 DayHeadAttributes.Font.Height = -13
DayHeadAttributes.Font.Name = 'Tahoma' DayHeadAttributes.Font.Name = 'Tahoma'
DayHeadAttributes.Color = clBtnFace
DayNameStyle = dsShort DayNameStyle = dsShort
DayNumberFont.Height = -12 DayNumberFont.Height = -12
DrawingStyle = dsFlat DrawingStyle = dsFlat
EventDayStyle = [] EventDayStyle = []
EventFont.Height = -12 EventFont.Height = -12
HeadAttributes.Color = clBtnFace HeadAttributes.Color = clBtnFace
LineColor = clGray
TimeFormat = tf12Hour
TodayAttributes.Color = clSilver
TodayAttributes.BorderPen.Color = clRed
TodayAttributes.BorderPen.Width = 3
OffDayColor = clSilver OffDayColor = clSilver
SelectedDayColor = clRed SelectedDayColor = clRed
ShowEvents = True ShowEvents = True
ShowEventTime = False ShowEventTime = False
TimeFormat = tf12Hour
TodayAttributes.Color = clSilver
TodayAttributes.BorderPen.Color = clRed
TodayAttributes.BorderPen.Width = 3
WeekStartsOn = dtSunday WeekStartsOn = dtSunday
end end
object Splitter2: TSplitter object Splitter2: TSplitter
@ -279,7 +298,7 @@ object Form1: TForm1
top = 264 top = 264
end end
object VpResourceEditDialog1: TVpResourceEditDialog object VpResourceEditDialog1: TVpResourceEditDialog
Version = 'v1.04' Version = 'v1.05'
DataStore = VpBufDSDataStore1 DataStore = VpBufDSDataStore1
Options = [] Options = []
Placement.Position = mpCenter Placement.Position = mpCenter

View File

@ -1,46 +1,61 @@
object Form1: TForm1 object Form1: TForm1
Left = 344 Left = 336
Height = 686 Height = 686
Top = 169 Top = 153
Width = 980 Width = 980
Caption = 'VpFlexDatastore demo (MS Access via ODBC)' Caption = 'VpFlexDatastore demo (MS Access via ODBC)'
ClientHeight = 686 ClientHeight = 686
ClientWidth = 980 ClientWidth = 980
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
LCLVersion = '1.7' LCLVersion = '1.9.0.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 34 Height = 33
Top = 0 Top = 0
Width = 980 Width = 980
Align = alTop Align = alTop
AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 33
ClientWidth = 980 ClientWidth = 980
TabOrder = 0 TabOrder = 0
object VpResourceCombo1: TVpResourceCombo object VpResourceCombo1: TVpResourceCombo
Left = 8 AnchorSideLeft.Control = Panel1
Left = 4
Height = 23 Height = 23
Top = 5 Top = 5
Width = 208 Width = 208
DataStore = VpFlexDataStore1 DataStore = VpFlexDataStore1
Style = csDropDownList Style = csDropDownList
Borderspacing.Left = 4
Borderspacing.Top = 4
Borderspacing.Bottom = 4
end end
object BtnNewRes: TButton object BtnNewRes: TButton
Left = 222 AnchorSideLeft.Control = VpResourceCombo1
AnchorSideLeft.Side = asrBottom
Left = 216
Height = 25 Height = 25
Top = 4 Top = 4
Width = 99 Width = 99
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Bottom = 4
Caption = 'New resource' Caption = 'New resource'
OnClick = BtnNewResClick OnClick = BtnNewResClick
TabOrder = 1 TabOrder = 1
end end
object BtnEditRes: TButton object BtnEditRes: TButton
Left = 328 AnchorSideLeft.Control = BtnNewRes
AnchorSideLeft.Side = asrBottom
Left = 319
Height = 25 Height = 25
Top = 4 Top = 4
Width = 96 Width = 96
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Bottom = 4
Caption = 'Edit resource' Caption = 'Edit resource'
OnClick = BtnEditResClick OnClick = BtnEditResClick
TabOrder = 2 TabOrder = 2
@ -48,8 +63,8 @@ object Form1: TForm1
end end
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 652 Height = 653
Top = 34 Top = 33
Width = 980 Width = 980
ActivePage = TabSheet1 ActivePage = TabSheet1
Align = alClient Align = alClient
@ -58,11 +73,11 @@ object Form1: TForm1
OnChange = PageControl1Change OnChange = PageControl1Change
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'Events and tasks' Caption = 'Events and tasks'
ClientHeight = 624 ClientHeight = 625
ClientWidth = 972 ClientWidth = 972
object VpDayView1: TVpDayView object VpDayView1: TVpDayView
Left = 0 Left = 0
Height = 624 Height = 625
Top = 0 Top = 0
Width = 301 Width = 301
DataStore = VpFlexDataStore1 DataStore = VpFlexDataStore1
@ -80,7 +95,6 @@ object Form1: TForm1
TimeSlotColors.Active = clWhite TimeSlotColors.Active = clWhite
TimeSlotColors.Inactive = 8454143 TimeSlotColors.Inactive = 8454143
TimeSlotColors.Holiday = 16744703 TimeSlotColors.Holiday = 16744703
TimeSlotColors.Weekday = clWhite
TimeSlotColors.Weekend = 16777088 TimeSlotColors.Weekend = 16777088
TimeSlotColors.ActiveRange.RangeBegin = h_00 TimeSlotColors.ActiveRange.RangeBegin = h_00
TimeSlotColors.ActiveRange.RangeEnd = h_00 TimeSlotColors.ActiveRange.RangeEnd = h_00
@ -99,18 +113,18 @@ object Form1: TForm1
end end
object Panel2: TPanel object Panel2: TPanel
Left = 306 Left = 306
Height = 624 Height = 625
Top = 0 Top = 0
Width = 386 Width = 386
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'Panel2' Caption = 'Panel2'
ClientHeight = 624 ClientHeight = 625
ClientWidth = 386 ClientWidth = 386
TabOrder = 1 TabOrder = 1
object VpWeekView1: TVpWeekView object VpWeekView1: TVpWeekView
Left = 0 Left = 0
Height = 378 Height = 379
Top = 0 Top = 0
Width = 386 Width = 386
DataStore = VpFlexDataStore1 DataStore = VpFlexDataStore1
@ -138,7 +152,7 @@ object Form1: TForm1
object VpMonthView1: TVpMonthView object VpMonthView1: TVpMonthView
Left = 0 Left = 0
Height = 241 Height = 241
Top = 383 Top = 384
Width = 386 Width = 386
DataStore = VpFlexDataStore1 DataStore = VpFlexDataStore1
ControlLink = VpControlLink1 ControlLink = VpControlLink1
@ -148,29 +162,28 @@ object Form1: TForm1
TabOrder = 1 TabOrder = 1
KBNavigation = True KBNavigation = True
DateLabelFormat = 'mmmm yyyy' DateLabelFormat = 'mmmm yyyy'
DayHeadAttributes.Color = clBtnFace
DayHeadAttributes.Font.Height = -13 DayHeadAttributes.Font.Height = -13
DayHeadAttributes.Font.Name = 'Tahoma' DayHeadAttributes.Font.Name = 'Tahoma'
DayHeadAttributes.Color = clBtnFace
DayNameStyle = dsShort DayNameStyle = dsShort
DrawingStyle = dsFlat DrawingStyle = dsFlat
EventDayStyle = [] EventDayStyle = []
HeadAttributes.Color = clBtnFace HeadAttributes.Color = clBtnFace
LineColor = clGray
TimeFormat = tf12Hour
TodayAttributes.Color = clSilver
TodayAttributes.BorderPen.Color = clRed
TodayAttributes.BorderPen.Width = 3
OffDayColor = clSilver OffDayColor = clSilver
SelectedDayColor = clRed SelectedDayColor = clRed
ShowEvents = True ShowEvents = True
ShowEventTime = False ShowEventTime = False
TimeFormat = tf12Hour
TodayAttributes.Color = clSilver
TodayAttributes.BorderPen.Color = clRed
TodayAttributes.BorderPen.Width = 3
WeekStartsOn = dtMonday WeekStartsOn = dtMonday
end end
object Splitter2: TSplitter object Splitter2: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 5
Top = 378 Top = 379
Width = 386 Width = 386
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
@ -178,7 +191,7 @@ object Form1: TForm1
end end
object VpTaskList1: TVpTaskList object VpTaskList1: TVpTaskList
Left = 697 Left = 697
Height = 624 Height = 625
Top = 0 Top = 0
Width = 275 Width = 275
DataStore = VpFlexDataStore1 DataStore = VpFlexDataStore1
@ -206,13 +219,13 @@ object Form1: TForm1
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 692 Left = 692
Height = 624 Height = 625
Top = 0 Top = 0
Width = 5 Width = 5
end end
object Splitter3: TSplitter object Splitter3: TSplitter
Left = 301 Left = 301
Height = 624 Height = 625
Top = 0 Top = 0
Width = 5 Width = 5
end end

View File

@ -1,14 +1,14 @@
object ContactEditForm: TContactEditForm object ContactEditForm: TContactEditForm
Left = 479 Left = 479
Height = 739 Height = 610
Top = 22 Top = 165
Width = 480 Width = 506
HorzScrollBar.Page = 432 HorzScrollBar.Page = 432
VertScrollBar.Page = 320 VertScrollBar.Page = 320
ActiveControl = PageControl ActiveControl = PageControl
Caption = 'ContactEdit' Caption = 'ContactEdit'
ClientHeight = 739 ClientHeight = 610
ClientWidth = 480 ClientWidth = 506
Constraints.MinWidth = 480 Constraints.MinWidth = 480
OnCreate = FormCreate OnCreate = FormCreate
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
@ -17,18 +17,18 @@ object ContactEditForm: TContactEditForm
LCLVersion = '1.9.0.0' LCLVersion = '1.9.0.0'
object PageControl: TPageControl object PageControl: TPageControl
Left = 0 Left = 0
Height = 706 Height = 577
Top = 0 Top = 0
Width = 480 Width = 506
ActivePage = tabBaseData ActivePage = tabAddresses
Align = alClient Align = alClient
TabIndex = 0 TabIndex = 1
TabOrder = 0 TabOrder = 0
OnChange = PageControlChange OnChange = PageControlChange
object tabBaseData: TTabSheet object tabBaseData: TTabSheet
Caption = 'tabBaseData' Caption = 'tabBaseData'
ClientHeight = 678 ClientHeight = 545
ClientWidth = 472 ClientWidth = 498
ImageIndex = 0 ImageIndex = 0
object lblLastName: TLabel object lblLastName: TLabel
AnchorSideTop.Control = edLastName AnchorSideTop.Control = edLastName
@ -53,7 +53,7 @@ object ContactEditForm: TContactEditForm
Left = 106 Left = 106
Height = 23 Height = 23
Top = 8 Top = 8
Width = 358 Width = 384
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -86,7 +86,7 @@ object ContactEditForm: TContactEditForm
Left = 106 Left = 106
Height = 23 Height = 23
Top = 35 Top = 35
Width = 358 Width = 384
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -190,14 +190,14 @@ object ContactEditForm: TContactEditForm
end end
object tabAddresses: TTabSheet object tabAddresses: TTabSheet
Caption = 'tabAddresses' Caption = 'tabAddresses'
ClientHeight = 752 ClientHeight = 549
ClientWidth = 617 ClientWidth = 498
ImageIndex = 1 ImageIndex = 1
object gbWorkAddress: TGroupBox object gbWorkAddress: TGroupBox
Left = 8 Left = 8
Height = 408 Height = 298
Top = 8 Top = 8
Width = 601 Width = 482
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -205,8 +205,8 @@ object ContactEditForm: TContactEditForm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
Caption = 'gbWorkAddress' Caption = 'gbWorkAddress'
ClientHeight = 388 ClientHeight = 278
ClientWidth = 597 ClientWidth = 478
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
@ -214,8 +214,8 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = gbWorkAddress AnchorSideTop.Control = gbWorkAddress
AnchorSideRight.Control = gbWorkAddress AnchorSideRight.Control = gbWorkAddress
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 0 Top = 0
Width = 338 Width = 338
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -229,10 +229,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCompany AnchorSideTop.Control = edCompany
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 147 Left = 59
Height = 25 Height = 15
Top = 4 Top = 4
Width = 96 Width = 65
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -246,10 +246,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edDepartment AnchorSideTop.Control = edDepartment
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 129 Left = 48
Height = 25 Height = 15
Top = 41 Top = 31
Width = 114 Width = 76
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -265,9 +265,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 37 Top = 27
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -280,10 +280,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edPosition AnchorSideTop.Control = edPosition
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 160 Left = 68
Height = 25 Height = 15
Top = 78 Top = 58
Width = 83 Width = 56
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -299,9 +299,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 74 Top = 54
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -314,10 +314,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edAddressW AnchorSideTop.Control = edAddressW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 159 Left = 69
Height = 25 Height = 15
Top = 115 Top = 85
Width = 84 Width = 55
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -333,9 +333,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 111 Top = 81
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -348,10 +348,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCityW AnchorSideTop.Control = edCityW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 194 Left = 90
Height = 25 Height = 15
Top = 152 Top = 112
Width = 49 Width = 34
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -367,9 +367,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 148 Top = 108
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -382,10 +382,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edStateW AnchorSideTop.Control = edStateW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 184 Left = 85
Height = 25 Height = 15
Top = 189 Top = 139
Width = 59 Width = 39
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -401,9 +401,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 185 Top = 135
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -416,10 +416,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbStateW AnchorSideTop.Control = cbStateW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 128 Left = 49
Height = 25 Height = 15
Top = 226 Top = 166
Width = 119 Width = 79
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -436,9 +436,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 23 Height = 23
Top = 222 Top = 162
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -452,10 +452,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edZipCodeW AnchorSideTop.Control = edZipCodeW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 157 Left = 66
Height = 25 Height = 15
Top = 263 Top = 193
Width = 86 Width = 58
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -470,9 +470,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbStateW AnchorSideTop.Control = cbStateW
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 259 Top = 189
Width = 120 Width = 120
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -485,10 +485,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbCountryW AnchorSideTop.Control = cbCountryW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 101 Left = 28
Height = 25 Height = 15
Top = 300 Top = 220
Width = 142 Width = 96
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -505,9 +505,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 23 Height = 23
Top = 296 Top = 216
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -523,10 +523,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCountryW AnchorSideTop.Control = edCountryW
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
Left = 161 Left = 68
Height = 25 Height = 15
Top = 341 Top = 251
Width = 82 Width = 56
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -542,9 +542,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edCompany AnchorSideRight.Control = edCompany
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 337 Top = 247
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -555,9 +555,9 @@ object ContactEditForm: TContactEditForm
end end
object gbHomeAddress: TGroupBox object gbHomeAddress: TGroupBox
Left = 8 Left = 8
Height = 297 Height = 217
Top = 432 Top = 322
Width = 601 Width = 482
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -565,8 +565,8 @@ object ContactEditForm: TContactEditForm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
Caption = 'gbHomeAddress' Caption = 'gbHomeAddress'
ClientHeight = 277 ClientHeight = 197
ClientWidth = 597 ClientWidth = 478
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
@ -574,10 +574,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edAddressH AnchorSideTop.Control = edAddressH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
Left = 159 Left = 69
Height = 25 Height = 15
Top = 4 Top = 4
Width = 84 Width = 55
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -591,8 +591,8 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = gbHomeAddress AnchorSideTop.Control = gbHomeAddress
AnchorSideRight.Control = gbHomeAddress AnchorSideRight.Control = gbHomeAddress
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 0 Top = 0
Width = 338 Width = 338
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -606,10 +606,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCityH AnchorSideTop.Control = edCityH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCityH AnchorSideRight.Control = edCityH
Left = 194 Left = 90
Height = 25 Height = 15
Top = 41 Top = 31
Width = 49 Width = 34
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -625,9 +625,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 37 Top = 27
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -640,10 +640,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edStateH AnchorSideTop.Control = edStateH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edStateH AnchorSideRight.Control = edStateH
Left = 184 Left = 85
Height = 25 Height = 15
Top = 78 Top = 58
Width = 59 Width = 39
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -659,9 +659,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 74 Top = 54
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -674,10 +674,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbStateH AnchorSideTop.Control = cbStateH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbStateH AnchorSideRight.Control = cbStateH
Left = 128 Left = 49
Height = 25 Height = 15
Top = 115 Top = 85
Width = 119 Width = 79
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -694,9 +694,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 23 Height = 23
Top = 111 Top = 81
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -710,10 +710,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edZipCodeH AnchorSideTop.Control = edZipCodeH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edZipCodeH AnchorSideRight.Control = edZipCodeH
Left = 157 Left = 66
Height = 25 Height = 15
Top = 152 Top = 112
Width = 86 Width = 58
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -728,9 +728,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbStateH AnchorSideTop.Control = cbStateH
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 148 Top = 108
Width = 120 Width = 120
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -743,10 +743,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = cbCountryH AnchorSideTop.Control = cbCountryH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbCountryH AnchorSideRight.Control = cbCountryH
Left = 101 Left = 28
Height = 25 Height = 15
Top = 189 Top = 139
Width = 142 Width = 96
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -763,9 +763,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 23 Height = 23
Top = 185 Top = 135
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -781,10 +781,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCountryH AnchorSideTop.Control = edCountryH
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCountryH AnchorSideRight.Control = edCountryH
Left = 161 Left = 68
Height = 25 Height = 15
Top = 230 Top = 170
Width = 82 Width = 56
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -800,9 +800,9 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edAddressH AnchorSideRight.Control = edAddressH
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 251 Left = 132
Height = 33 Height = 23
Top = 226 Top = 166
Width = 338 Width = 338
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@ -814,22 +814,22 @@ object ContactEditForm: TContactEditForm
end end
object tabContact: TTabSheet object tabContact: TTabSheet
Caption = 'tabContact' Caption = 'tabContact'
ClientHeight = 752 ClientHeight = 545
ClientWidth = 617 ClientWidth = 498
ImageIndex = 1 ImageIndex = 1
object gbPhone: TGroupBox object gbPhone: TGroupBox
Left = 8 Left = 8
Height = 219 Height = 159
Top = 8 Top = 8
Width = 601 Width = 482
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'Phone / fax' Caption = 'Phone / fax'
ClientHeight = 199 ClientHeight = 139
ClientWidth = 597 ClientWidth = 478
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
@ -855,7 +855,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 37 Top = 27
Width = 88 Width = 88
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -875,7 +875,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 74 Top = 54
Width = 88 Width = 88
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -895,7 +895,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 111 Top = 81
Width = 88 Width = 88
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -915,9 +915,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edPhone3 AnchorSideRight.Control = edPhone3
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 100 Left = 100
Height = 33 Height = 23
Top = 111 Top = 81
Width = 489 Width = 370
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
MaxLength = 25 MaxLength = 25
@ -933,9 +933,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edPhone2 AnchorSideRight.Control = edPhone2
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 100 Left = 100
Height = 33 Height = 23
Top = 74 Top = 54
Width = 489 Width = 370
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
MaxLength = 25 MaxLength = 25
@ -951,9 +951,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edPhone1 AnchorSideRight.Control = edPhone1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 100 Left = 100
Height = 33 Height = 23
Top = 37 Top = 27
Width = 489 Width = 370
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
MaxLength = 25 MaxLength = 25
@ -969,9 +969,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = gbPhone AnchorSideRight.Control = gbPhone
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 100 Left = 100
Height = 33 Height = 23
Top = 0 Top = 0
Width = 489 Width = 370
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -988,7 +988,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 148 Top = 108
Width = 88 Width = 88
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -1008,9 +1008,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edPhone4 AnchorSideRight.Control = edPhone4
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 100 Left = 100
Height = 33 Height = 23
Top = 148 Top = 108
Width = 489 Width = 370
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
@ -1022,17 +1022,17 @@ object ContactEditForm: TContactEditForm
end end
object gbEMail: TGroupBox object gbEMail: TGroupBox
Left = 8 Left = 8
Height = 149 Height = 109
Top = 243 Top = 183
Width = 601 Width = 482
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 16 BorderSpacing.Top = 16
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'E-Mail' Caption = 'E-Mail'
ClientHeight = 129 ClientHeight = 89
ClientWidth = 597 ClientWidth = 478
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
@ -1044,9 +1044,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = gbEMail AnchorSideRight.Control = gbEMail
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 128 Left = 128
Height = 33 Height = 23
Top = 4 Top = 4
Width = 461 Width = 342
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1061,9 +1061,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edEMail1 AnchorSideRight.Control = edEMail1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 128 Left = 128
Height = 33 Height = 23
Top = 41 Top = 31
Width = 461 Width = 342
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
ParentFont = False ParentFont = False
@ -1077,9 +1077,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edEMail1 AnchorSideRight.Control = edEMail1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 128 Left = 128
Height = 33 Height = 23
Top = 78 Top = 58
Width = 461 Width = 342
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
@ -1109,7 +1109,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 41 Top = 31
Width = 116 Width = 116
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -1129,7 +1129,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 78 Top = 58
Width = 116 Width = 116
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -1144,9 +1144,9 @@ object ContactEditForm: TContactEditForm
end end
object gbWebsites: TGroupBox object gbWebsites: TGroupBox
Left = 6 Left = 6
Height = 108 Height = 78
Top = 408 Top = 308
Width = 603 Width = 484
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -1154,8 +1154,8 @@ object ContactEditForm: TContactEditForm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
Caption = 'Websites' Caption = 'Websites'
ClientHeight = 88 ClientHeight = 58
ClientWidth = 599 ClientWidth = 480
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
@ -1167,9 +1167,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = gbWebsites AnchorSideRight.Control = gbWebsites
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 157 Left = 157
Height = 33 Height = 23
Top = 0 Top = 0
Width = 434 Width = 315
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1184,9 +1184,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edWebsite1 AnchorSideRight.Control = edWebsite1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 157 Left = 157
Height = 33 Height = 23
Top = 37 Top = 27
Width = 434 Width = 315
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
@ -1216,7 +1216,7 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 23
Top = 37 Top = 27
Width = 145 Width = 145
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -1233,17 +1233,17 @@ object ContactEditForm: TContactEditForm
end end
object tabCustom: TTabSheet object tabCustom: TTabSheet
Caption = 'tabCustom' Caption = 'tabCustom'
ClientHeight = 752 ClientHeight = 545
ClientWidth = 617 ClientWidth = 498
ImageIndex = 3 ImageIndex = 3
object lblCustom1: TLabel object lblCustom1: TLabel
AnchorSideTop.Control = edCustom1 AnchorSideTop.Control = edCustom1
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCustom1 AnchorSideRight.Control = edCustom1
Left = 61 Left = 91
Height = 25 Height = 15
Top = 12 Top = 12
Width = 91 Width = 61
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1255,10 +1255,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCustom2 AnchorSideTop.Control = edCustom2
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCustom2 AnchorSideRight.Control = edCustom2
Left = 61 Left = 91
Height = 25 Height = 15
Top = 49 Top = 39
Width = 91 Width = 61
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1270,10 +1270,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCustom3 AnchorSideTop.Control = edCustom3
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCustom3 AnchorSideRight.Control = edCustom3
Left = 61 Left = 91
Height = 25 Height = 15
Top = 86 Top = 66
Width = 91 Width = 61
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1285,10 +1285,10 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Control = edCustom4 AnchorSideTop.Control = edCustom4
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCustom4 AnchorSideRight.Control = edCustom4
Left = 61 Left = 91
Height = 25 Height = 15
Top = 123 Top = 93
Width = 91 Width = 61
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1301,9 +1301,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = tabCustom AnchorSideRight.Control = tabCustom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 160 Left = 160
Height = 33 Height = 23
Top = 8 Top = 8
Width = 449 Width = 330
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@ -1318,9 +1318,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edCustom1 AnchorSideRight.Control = edCustom1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 160 Left = 160
Height = 33 Height = 23
Top = 45 Top = 35
Width = 449 Width = 330
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
MaxLength = 100 MaxLength = 100
@ -1334,9 +1334,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edCustom1 AnchorSideRight.Control = edCustom1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 160 Left = 160
Height = 33 Height = 23
Top = 82 Top = 62
Width = 449 Width = 330
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
MaxLength = 100 MaxLength = 100
@ -1350,9 +1350,9 @@ object ContactEditForm: TContactEditForm
AnchorSideRight.Control = edCustom1 AnchorSideRight.Control = edCustom1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 160 Left = 160
Height = 33 Height = 23
Top = 119 Top = 89
Width = 449 Width = 330
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
@ -1363,14 +1363,14 @@ object ContactEditForm: TContactEditForm
end end
object tabNotes: TTabSheet object tabNotes: TTabSheet
Caption = 'tabNotes' Caption = 'tabNotes'
ClientHeight = 752 ClientHeight = 549
ClientWidth = 617 ClientWidth = 498
ImageIndex = 4 ImageIndex = 4
object memoNotes: TMemo object memoNotes: TMemo
Left = 4 Left = 4
Height = 744 Height = 541
Top = 4 Top = 4
Width = 609 Width = 490
Align = alClient Align = alClient
BorderSpacing.Around = 4 BorderSpacing.Around = 4
Constraints.MinHeight = 300 Constraints.MinHeight = 300
@ -1383,20 +1383,20 @@ object ContactEditForm: TContactEditForm
object pnlBottom: TPanel object pnlBottom: TPanel
Left = 0 Left = 0
Height = 33 Height = 33
Top = 706 Top = 577
Width = 480 Width = 506
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 33 ClientHeight = 33
ClientWidth = 480 ClientWidth = 506
TabOrder = 1 TabOrder = 1
object OKBtn: TButton object OKBtn: TButton
AnchorSideTop.Control = CancelBtn AnchorSideTop.Control = CancelBtn
AnchorSideRight.Control = CancelBtn AnchorSideRight.Control = CancelBtn
AnchorSideBottom.Control = CancelBtn AnchorSideBottom.Control = CancelBtn
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 328 Left = 354
Height = 25 Height = 25
Top = 4 Top = 4
Width = 74 Width = 74
@ -1411,7 +1411,7 @@ object ContactEditForm: TContactEditForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnlBottom AnchorSideRight.Control = pnlBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 410 Left = 436
Height = 25 Height = 25
Top = 4 Top = 4
Width = 62 Width = 62

View File

@ -543,23 +543,7 @@ begin
{----------------------------------------------------------------------------} {----------------------------------------------------------------------------}
{ Button panel } { Button panel }
{----------------------------------------------------------------------------} {----------------------------------------------------------------------------}
// The cancel button is autosized AlignOKCancel(OKBtn, CancelBtn, pnlBottom);
OKBtn.Width := CancelBtn.Width;
{$IFDEF MSWINDOWS} // button order: OK - Cancel
CancelBtn.AnchorSideRight.Control := pnlBottom;
CancelBtn.AnchorSideRight.Side := asrRight;
OKBtn.AnchorSideRight.Control := CancelBtn;
OKBtn.AnchorSideRight.Side := asrLeft;
OKBtn.TabOrder := 0;
CancelBtn.TabOrder := 1;
{$ELSE} // button order: Cancel - OK
OKBtn.AnchorSideRight.Control := pnlBottom;
OKBtn.AnchorSideRight.Side := asrRight;
CancelBtn.AnchorSideRight.Control := OKBtn;
CancelBtn.AnchorSideRight.Side := asrLeft;
CancelBtn.TabOrder := 0;
OKBtn.TabOrder := 1;
{$ENDIF}
{----------------------------------------------------------------------------} {----------------------------------------------------------------------------}
{ Page "Base data" } { Page "Base data" }

View File

@ -1,41 +1,57 @@
object frmFieldMapper: TfrmFieldMapper object frmFieldMapper: TfrmFieldMapper
Left = 281 Left = 332
Height = 533 Height = 769
Top = 112 Top = 0
Width = 409 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 = 533 ClientHeight = 769
ClientWidth = 409 ClientWidth = 655
DesignTimePPI = 144
OnClose = FormClose OnClose = FormClose
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.7' LCLVersion = '1.9.0.0'
object Panel1: TPanel object ButtonPanel: TPanel
Left = 0 Left = 0
Height = 45 Height = 45
Top = 488 Top = 724
Width = 409 Width = 655
Align = alBottom Align = alBottom
AutoSize = True
ClientHeight = 45 ClientHeight = 45
ClientWidth = 409 ClientWidth = 655
TabOrder = 1 TabOrder = 1
object BtnOK: TButton object BtnOK: TButton
Left = 240 AnchorSideTop.Control = ButtonPanel
Height = 25 AnchorSideRight.Control = BtnCancel
Top = 8 Left = 384
Width = 75 Height = 35
Top = 5
Width = 115
Anchors = [akTop]
BorderSpacing.Top = 4
BorderSpacing.Right = 4
BorderSpacing.Bottom = 4
Caption = 'OK' Caption = 'OK'
ModalResult = 1 ModalResult = 1
TabOrder = 0 TabOrder = 0
end end
object BtnCancel: TButton object BtnCancel: TButton
Left = 320 AnchorSideTop.Control = ButtonPanel
Height = 25 AnchorSideRight.Control = ButtonPanel
Top = 8 AnchorSideRight.Side = asrBottom
Width = 75 Left = 573
Height = 35
Top = 5
Width = 77
Anchors = [akTop]
AutoSize = True
BorderSpacing.Top = 4
BorderSpacing.Right = 4
BorderSpacing.Bottom = 4
Caption = 'Cancel' Caption = 'Cancel'
ModalResult = 2 ModalResult = 2
TabOrder = 1 TabOrder = 1
@ -43,130 +59,208 @@ object frmFieldMapper: TfrmFieldMapper
end end
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 488 Height = 724
Top = 0 Top = 0
Width = 409 Width = 655
ActivePage = TabSheet1 ActivePage = TabSheet1
Align = alClient Align = alClient
TabIndex = 0 TabIndex = 0
TabOrder = 0 TabOrder = 0
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'Field Mapping Designer' Caption = 'Field Mapping Designer'
ClientHeight = 460 ClientHeight = 686
ClientWidth = 401 ClientWidth = 647
object Bevel1: TBevel
Left = 5
Height = 315
Top = 4
Width = 390
end
object lblDBFieldsAvail: TLabel
Left = 11
Height = 15
Top = 36
Width = 126
Caption = 'Available Dataset Fields:'
ParentColor = False
end
object lblFieldMappings: TLabel object lblFieldMappings: TLabel
Left = 35 AnchorSideLeft.Control = lblDataset
Height = 15 AnchorSideTop.Control = DatasetFieldLB
Top = 329 AnchorSideTop.Side = asrBottom
Width = 84 Left = 8
Height = 25
Top = 424
Width = 126
BorderSpacing.Top = 8
Caption = 'Field Mappings:' Caption = 'Field Mappings:'
ParentColor = False ParentColor = False
end end
object lblVPFieldsAvail: TLabel
Left = 242
Height = 15
Top = 36
Width = 151
Caption = 'Available Visual PlanIt Fields:'
ParentColor = False
end
object lblDataset: TLabel
Left = 11
Height = 15
Top = 13
Width = 42
Caption = 'Dataset:'
ParentColor = False
end
object DatasetFieldLB: TListBox
Left = 11
Height = 255
Top = 56
Width = 145
ItemHeight = 0
OnClick = DBFieldSelected
OnKeyPress = DatasetFieldLBKeyPress
TabOrder = 1
end
object VPFieldLB: TListBox
Left = 243
Height = 255
Top = 56
Width = 145
ItemHeight = 0
OnClick = VpFieldSelected
OnKeyPress = VPFieldLBKeyPress
TabOrder = 3
end
object FieldMappingsLB: TListBox object FieldMappingsLB: TListBox
Left = 35 AnchorSideLeft.Control = lblFieldMappings
Height = 100 AnchorSideTop.Control = lblFieldMappings
Top = 349 AnchorSideTop.Side = asrBottom
Width = 217 AnchorSideRight.Control = btnDeleteMapping
AnchorSideBottom.Control = TabSheet1
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 225
Top = 453
Width = 459
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 4
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
ItemHeight = 0 ItemHeight = 0
OnClick = FieldMappingsLBClick OnClick = FieldMappingsLBClick
OnKeyPress = FieldMappingsLBKeyPress OnKeyPress = FieldMappingsLBKeyPress
TabOrder = 4 Options = [lboDrawFocusRect]
TabOrder = 0
end end
object btnDeleteMapping: TButton object btnDeleteMapping: TButton
Left = 259 AnchorSideTop.Control = FieldMappingsLB
Height = 25 AnchorSideRight.Control = VPFieldLB
Top = 349 AnchorSideRight.Side = asrBottom
Width = 109 Left = 475
Height = 38
Top = 453
Width = 164
Anchors = [akTop, akRight]
Caption = 'Delete Mapping' Caption = 'Delete Mapping'
Enabled = False Enabled = False
OnClick = btnDeleteMappingClick OnClick = btnDeleteMappingClick
TabOrder = 5 TabOrder = 1
end
object DatasetCombo: TComboBox
Left = 64
Height = 23
Top = 10
Width = 145
ItemHeight = 15
OnChange = DatasetComboChange
TabOrder = 0
Text = 'DatasetCombo'
end
object btnAddMapping: TBitBtn
Left = 166
Height = 48
Top = 128
Width = 69
Caption = 'Add'
Enabled = False
OnClick = btnAddMappingClick
TabOrder = 2
end end
object btnClearMappings: TButton object btnClearMappings: TButton
Left = 259 AnchorSideLeft.Control = btnDeleteMapping
Height = 25 AnchorSideTop.Control = btnDeleteMapping
Top = 381 AnchorSideTop.Side = asrBottom
Width = 109 AnchorSideRight.Control = btnDeleteMapping
AnchorSideRight.Side = asrBottom
Left = 475
Height = 38
Top = 495
Width = 164
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4
Caption = 'Clear All ' Caption = 'Clear All '
Enabled = False Enabled = False
OnClick = btnClearMappingsClick OnClick = btnClearMappingsClick
TabOrder = 2
end
object DatasetCombo: TComboBox
AnchorSideLeft.Control = lblDataset
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TabSheet1
AnchorSideRight.Control = TabSheet1
AnchorSideRight.Side = asrBottom
Left = 80
Height = 33
Top = 8
Width = 559
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 8
ItemHeight = 25
OnChange = DatasetComboChange
TabOrder = 3
Text = 'DatasetCombo'
end
object lblDataset: TLabel
AnchorSideLeft.Control = TabSheet1
AnchorSideTop.Control = DatasetCombo
AnchorSideTop.Side = asrCenter
Left = 8
Height = 25
Top = 12
Width = 64
BorderSpacing.Left = 8
Caption = 'Dataset:'
ParentColor = False
end
object lblDBFieldsAvail: TLabel
AnchorSideLeft.Control = lblDataset
AnchorSideTop.Control = DatasetCombo
AnchorSideTop.Side = asrBottom
Left = 8
Height = 25
Top = 49
Width = 190
BorderSpacing.Top = 8
Caption = 'Available Dataset Fields:'
ParentColor = False
end
object DatasetFieldLB: TListBox
AnchorSideLeft.Control = lblDataset
AnchorSideTop.Control = lblDBFieldsAvail
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnAddMapping
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 338
Top = 78
Width = 259
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 4
BorderSpacing.Right = 4
ItemHeight = 0
OnClick = DBFieldSelected
OnKeyPress = DatasetFieldLBKeyPress
Options = [lboDrawFocusRect]
TabOrder = 4
end
object lblVPFieldsAvail: TLabel
AnchorSideLeft.Control = VPFieldLB
AnchorSideTop.Control = lblDBFieldsAvail
Left = 379
Height = 25
Top = 49
Width = 225
Caption = 'Available Visual PlanIt Fields:'
ParentColor = False
end
object btnAddMapping: TBitBtn
AnchorSideLeft.Control = TabSheet1
AnchorSideLeft.Side = asrCenter
AnchorSideBottom.Control = Bevel2
Left = 271
Height = 72
Top = 165
Width = 104
Anchors = [akLeft, akBottom]
Caption = 'Add'
Enabled = False
OnClick = btnAddMappingClick
TabOrder = 5
end
object Bevel2: TBevel
AnchorSideLeft.Control = TabSheet1
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = DatasetFieldLB
AnchorSideTop.Side = asrCenter
Left = 321
Height = 20
Top = 237
Width = 5
Shape = bsSpacer
end
object VPFieldLB: TListBox
AnchorSideLeft.Control = btnAddMapping
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = DatasetFieldLB
AnchorSideRight.Control = TabSheet1
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = DatasetFieldLB
AnchorSideBottom.Side = asrBottom
Left = 379
Height = 338
Top = 78
Width = 260
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 4
BorderSpacing.Right = 8
ItemHeight = 0
OnClick = VpFieldSelected
OnKeyPress = VPFieldLBKeyPress
Options = [lboDrawFocusRect]
TabOrder = 6 TabOrder = 6
end end
object btnAddAll: TButton object btnAddAll: TButton
Left = 166 AnchorSideLeft.Control = TabSheet1
Height = 48 AnchorSideLeft.Side = asrCenter
Top = 184 AnchorSideTop.Control = Bevel2
Width = 69 AnchorSideTop.Side = asrBottom
Left = 271
Height = 72
Top = 257
Width = 104
Caption = 'Add all' Caption = 'Add all'
Enabled = False Enabled = False
OnClick = btnAddAllClick OnClick = btnAddAllClick

View File

@ -55,13 +55,13 @@ type
{ TfrmFieldMapper } { TfrmFieldMapper }
TfrmFieldMapper = class(TForm) TfrmFieldMapper = class(TForm)
Bevel2: TBevel;
BtnCancel: TButton; BtnCancel: TButton;
btnAddAll: TButton; btnAddAll: TButton;
Panel1: TPanel; ButtonPanel: TPanel;
BtnOK: TButton; BtnOK: TButton;
PageControl1: TPageControl; PageControl1: TPageControl;
TabSheet1: TTabSheet; TabSheet1: TTabSheet;
Bevel1: TBevel;
lblDBFieldsAvail: TLabel; lblDBFieldsAvail: TLabel;
lblFieldMappings: TLabel; lblFieldMappings: TLabel;
lblVPFieldsAvail: TLabel; lblVPFieldsAvail: TLabel;
@ -123,6 +123,7 @@ implementation
{$ENDIF} {$ENDIF}
uses uses
math,
vpConst, VpMisc; vpConst, VpMisc;
(* (*
{$IFDEF RUNTIMETEST} {$IFDEF RUNTIMETEST}
@ -346,37 +347,22 @@ end;
procedure TfrmFieldMapper.PositionControls; procedure TfrmFieldMapper.PositionControls;
var var
DELTA: Integer = 8; w, h: Integer;
w: Integer;
begin begin
DELTA := ScaleX(DELTA, DesignTimeDPI); btnAddMapping.AutoSize := true;
btnAddAll.AutoSize := true;
w := Max(btnAddMapping.Width, btnAddAll.Width);
h := btnAddMapping.Height;
DataSetCombo.Left := lblDataset.Left + GetLabelWidth(lblDataset) + DELTA; btnAddMapping.AutoSize := false;
btnAddMapping.Height := h;
btnAddMapping.Width := w;
btnDeleteMapping.Width := GetButtonWidth(btnDeleteMapping); btnAddAll.AutoSize := false;
w := FieldMappingsLB.Width + DELTA + btnDeleteMapping.Width; btnAddAll.Height := h;
if w > ClientWidth then begin btnAddAll.Width := w;
ClientWidth := w;
DatasetFieldLB.Width := (ClientWidth - DatasetFieldLB.Left *2 - btnAddMapping.Width - 2*DELTA) div 2; AlignOKCancel(BtnOK, BtnCancel, ButtonPanel);
VPFieldLB.Width := DatasetFieldLB.Width;
DatasetFieldLB.Left := (w - DatasetFieldLB.Width - 2*DELTA - btnAddMapping.Width - VPFieldLB.Width) div 2;
FieldMappingsLB.Left := DatasetFieldLB.Left;
lblFieldMappings.Left := FieldMappingsLB.Left;
btnDeleteMapping.Left := ClientWidth - DatasetFieldLB.Left - btnDeleteMapping.Width;
btnClearMappings.Left := btnDeleteMapping.Left;
{$IFDEF MSWINDOWS}
BtnCancel.Left := w - DatasetFieldLB.Width - BtnCancel.Width;
BtnOK.Left := BtnCancel.Left - DELTA - BtnOK.Width;
BtnOK.TabOrder := 0;
BtnCancel.TabOrder := 1;
{$ELSE}
BtnOK.Left := w - DatasetFieldLB.Width - BtnOK.Width;
BtnCancel.Left := BtnOK.Left - DELTA - BtnCancel.Width;
BtnCancel.TabOrder := 0;
BtnOK.TabOrder := 1;
{$ENDIF}
end;
lblVPFieldsAvail.Left := RightOf(VPFieldLB) - GetLabelWidth(lblVPFieldsAvail);
end; end;
procedure TfrmFieldMapper.DatasetComboChange(Sender: TObject); procedure TfrmFieldMapper.DatasetComboChange(Sender: TObject);

View File

@ -113,6 +113,10 @@ procedure DrawBevelRect(const Canvas: TCanvas; R: TRect;
Shadow, Highlight: TColor); Shadow, Highlight: TColor);
{ Draws a bevel in the specified TRect, using the specified colors } { Draws a bevel in the specified TRect, using the specified colors }
procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
{ Aligns the OK and Cancel buttons to the right of the panel. In Windows the
order is OK-Cancel, in Linux etc it is Cancel-OK }
function PointInRect(Point: TPoint; Rect: TRect): Boolean; function PointInRect(Point: TPoint; Rect: TRect): Boolean;
{ Determines if the specified point resides inside the specified TRect } { Determines if the specified point resides inside the specified TRect }
@ -182,6 +186,7 @@ procedure Unused(const A1, A2, A3); overload;
implementation implementation
uses uses
Math,
{$IFDEF LCL} {$IFDEF LCL}
DateUtils, StrUtils, DateUtils, StrUtils,
{$ENDIF} {$ENDIF}
@ -431,6 +436,40 @@ begin
end; end;
{=====} {=====}
procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
var
w, h: Integer;
begin
OKButton.AutoSize := true;
CancelButton.AutoSize := true;
w := Max(OKButton.Width, CancelButton.Width);
h := OKButton.Height;
OKButton.AutoSize := false;
OKButton.Width := w;
OKButton.Height := h;
CancelButton.AutoSize := false;
CancelButton.Width := w;
CancelButton.Height := h;
{$IFDEF MSWINDOWS} // button order: OK - Cancel
CancelButton.AnchorSideRight.Control := APanel;
CancelButton.Anchors := [akTop, akRight];
OKButton.AnchorSideRight.Control := CancelButton;
OKButton.Anchors := [akTop, akRight];
OKButton.TabOrder := 0;
CancelButton.TabOrder := 1;
{$ELSE} // button order: Cancel - OK
OKButton.AnchorSideRight.Control := APanel;
OKButton.Anchors := [akTop, akRight];
CancelButton.AnchorSideRight.Control := OKButton;
CancelButton.Anchors := [akTop, akRight];
CancelButton.TabOrder := 0;
OKButton.TabOrder := 1;
{$ENDIF}
end;
function PointInRect(Point: TPoint; Rect: TRect): Boolean; function PointInRect(Point: TPoint; Rect: TRect): Boolean;
begin begin
result := (Point.X >= Rect.Left) and (Point.X <= Rect.Right) result := (Point.X >= Rect.Left) and (Point.X <= Rect.Right)

View File

@ -1,12 +1,12 @@
object TaskEditForm: TTaskEditForm object TaskEditForm: TTaskEditForm
Left = 284 Left = 284
Height = 433 Height = 430
Top = 231 Top = 231
Width = 547 Width = 547
HorzScrollBar.Page = 545 HorzScrollBar.Page = 545
VertScrollBar.Page = 339 VertScrollBar.Page = 339
Caption = 'TaskEditForm' Caption = 'TaskEditForm'
ClientHeight = 433 ClientHeight = 430
ClientWidth = 547 ClientWidth = 547
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
@ -15,7 +15,7 @@ object TaskEditForm: TTaskEditForm
object ButtonPanel: TPanel object ButtonPanel: TPanel
Left = 0 Left = 0
Height = 33 Height = 33
Top = 400 Top = 397
Width = 547 Width = 547
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
@ -75,7 +75,7 @@ object TaskEditForm: TTaskEditForm
end end
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 400 Height = 397
Top = 0 Top = 0
Width = 547 Width = 547
TabStop = False TabStop = False
@ -85,7 +85,7 @@ object TaskEditForm: TTaskEditForm
TabOrder = 0 TabOrder = 0
object tabTask: TTabSheet object tabTask: TTabSheet
Caption = 'Task' Caption = 'Task'
ClientHeight = 372 ClientHeight = 369
ClientWidth = 539 ClientWidth = 539
object DueDateLbl: TLabel object DueDateLbl: TLabel
AnchorSideTop.Control = DueDateEdit AnchorSideTop.Control = DueDateEdit
@ -314,7 +314,7 @@ object TaskEditForm: TTaskEditForm
AnchorSideBottom.Control = tabTask AnchorSideBottom.Control = tabTask
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 4 Left = 4
Height = 258 Height = 255
Top = 110 Top = 110
Width = 531 Width = 531
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@ -342,42 +342,6 @@ object TaskEditForm: TTaskEditForm
DateOrder = doNone DateOrder = doNone
ButtonWidth = 23 ButtonWidth = 23
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
}
NumGlyphs = 1 NumGlyphs = 1
MaxLength = 0 MaxLength = 0
TabOrder = 1 TabOrder = 1

View File

@ -208,11 +208,10 @@ begin
DescriptionEdit.Height := FEditHeight; DescriptionEdit.Height := FEditHeight;
DueDateEdit.Height := FEditHeight; DueDateEdit.Height := FEditHeight;
DueDateEdit.ButtonWidth := FEditHeight; DueDateEdit.ButtonWidth := DueDateEdit.Height;
CbCategory.Height := FEditHeight; CbCategory.Height := FEditHeight;
CbPriority.Height := FEditHeight; CbPriority.Height := FEditHeight;
OKBtn.Width := CancelBtn.Width;
ResourceNameLbl.Font.Size := ScaleY(ResourceNameLbl.Font.Size, DesignTimeDPI); ResourceNameLbl.Font.Size := ScaleY(ResourceNameLbl.Font.Size, DesignTimeDPI);
DueDateEdit.Left := DueDateLbl.Left + GetLabelWidth(DueDateLbl) + HDist; DueDateEdit.Left := DueDateLbl.Left + GetLabelWidth(DueDateLbl) + HDist;
@ -254,21 +253,8 @@ begin
CbPriority.Left := CbComplete.Left; CbPriority.Left := CbComplete.Left;
LblPriority.Left := CbPriority.Left - HDist - GetLabelWidth(LblPriority); LblPriority.Left := CbPriority.Left - HDist - GetLabelWidth(LblPriority);
{$IFDEF MSWINDOWS} AlignOKCancel(OKBtn, CancelBtn, ButtonPanel);
CancelBtn.AnchorSideRight.Control := ButtonPanel;
CancelBtn.AnchorSideRight.Side := asrRight;
OKBtn.AnchorSideRight.Control := CancelBtn;
OKBtn.AnchorSideRight.Side := asrLeft;
OKBtn.TabOrder := 0;
CancelBtn.TabOrder := 1;
{$ELSE}
OKBtn.AnchorSideRight.Control := ButtonPanel;
OKBtn.AnchorSideRight.Side := asrRight;
CancelBtn.AnchorSideRight.Control := OKBtn;
CancelBtn.AnchorSideRight.Side := asrLeft;
CancelBtn.TabOrder := 0;
OKBtn.TabOrder := 1;
{$ENDIF}
AutoSize := true; AutoSize := true;
end; end;
{=====} {=====}