tvplanit: Fix compilation under non-Windows. Fix OK/Cancel button alignment under non-Windows.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5889 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-05-21 21:30:07 +00:00
parent b5d006373c
commit 5d5bc8ba94
16 changed files with 469 additions and 417 deletions

View File

@@ -1,23 +1,35 @@
object frmReportSetup: TfrmReportSetup object frmReportSetup: TfrmReportSetup
Left = 380 Left = 380
Height = 138 Height = 159
Top = 138 Top = 138
Width = 299 Width = 308
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Report Setup' Caption = 'Report Setup'
ClientHeight = 138 ClientHeight = 159
ClientWidth = 299 ClientWidth = 308
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poMainFormCenter Position = poMainFormCenter
LCLVersion = '1.6.4.0' LCLVersion = '1.6.4.0'
object Panel1: TPanel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
Left = 0
Height = 105
Top = 0
Width = 265
AutoSize = True
BevelOuter = bvNone
ClientHeight = 105
ClientWidth = 265
TabOrder = 0
object lblStartDate: TLabel object lblStartDate: TLabel
AnchorSideTop.Control = edStartDate AnchorSideTop.Control = edStartDate
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edStartDate AnchorSideRight.Control = edStartDate
Left = 42 Left = 8
Height = 15 Height = 15
Top = 12 Top = 12
Width = 54 Width = 54
@@ -32,7 +44,7 @@ object frmReportSetup: TfrmReportSetup
AnchorSideTop.Control = edEndDate AnchorSideTop.Control = edEndDate
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edEndDate AnchorSideRight.Control = edEndDate
Left = 46 Left = 12
Height = 15 Height = 15
Top = 43 Top = 43
Width = 50 Width = 50
@@ -47,7 +59,7 @@ object frmReportSetup: TfrmReportSetup
AnchorSideTop.Control = PrintFormatCombo AnchorSideTop.Control = PrintFormatCombo
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PrintFormatCombo AnchorSideRight.Control = PrintFormatCombo
Left = 55 Left = 21
Height = 15 Height = 15
Top = 74 Top = 74
Width = 41 Width = 41
@@ -58,46 +70,13 @@ object frmReportSetup: TfrmReportSetup
FocusControl = PrintFormatCombo FocusControl = PrintFormatCombo
ParentColor = False ParentColor = False
end end
object btnOK: TButton
AnchorSideTop.Control = PrintFormatCombo
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnCancel
Left = 125
Height = 25
Top = 105
Width = 75
Anchors = [akTop, akRight]
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 3
end
object btnCancel: TButton
AnchorSideTop.Control = PrintFormatCombo
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 208
Height = 25
Top = 105
Width = 83
Anchors = [akTop, akRight]
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Cancel = True
Caption = 'Cancel'
ModalResult = 2
TabOrder = 4
end
object PrintFormatCombo: TVpPrintFormatComboBox object PrintFormatCombo: TVpPrintFormatComboBox
AnchorSideLeft.Control = edStartDate AnchorSideLeft.Control = edStartDate
AnchorSideTop.Control = edEndDate AnchorSideTop.Control = edEndDate
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edStartDate AnchorSideRight.Control = edStartDate
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 104 Left = 70
Height = 23 Height = 23
Top = 70 Top = 70
Width = 187 Width = 187
@@ -106,13 +85,13 @@ object frmReportSetup: TfrmReportSetup
Borderspacing.Bottom = 12 Borderspacing.Bottom = 12
ItemHeight = 15 ItemHeight = 15
Sorted = True Sorted = True
TabOrder = 2 TabOrder = 0
end end
object edStartDate: TDateEdit object edStartDate: TDateEdit
AnchorSideTop.Control = Owner AnchorSideTop.Control = Panel1
AnchorSideRight.Control = Owner AnchorSideRight.Control = Panel1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 104 Left = 70
Height = 23 Height = 23
Top = 8 Top = 8
Width = 187 Width = 187
@@ -124,7 +103,7 @@ object frmReportSetup: TfrmReportSetup
BorderSpacing.Right = 8 BorderSpacing.Right = 8
NumGlyphs = 1 NumGlyphs = 1
MaxLength = 0 MaxLength = 0
TabOrder = 0 TabOrder = 1
end end
object edEndDate: TDateEdit object edEndDate: TDateEdit
AnchorSideLeft.Control = edStartDate AnchorSideLeft.Control = edStartDate
@@ -132,7 +111,7 @@ object frmReportSetup: TfrmReportSetup
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edStartDate AnchorSideRight.Control = edStartDate
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 104 Left = 70
Height = 23 Height = 23
Top = 39 Top = 39
Width = 187 Width = 187
@@ -143,6 +122,50 @@ object frmReportSetup: TfrmReportSetup
BorderSpacing.Top = 8 BorderSpacing.Top = 8
NumGlyphs = 1 NumGlyphs = 1
MaxLength = 0 MaxLength = 0
TabOrder = 2
end
end
object ButtonPanel: TPanel
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel1
AnchorSideRight.Side = asrBottom
Left = 0
Height = 33
Top = 105
Width = 265
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BevelOuter = bvNone
ClientHeight = 33
ClientWidth = 265
TabOrder = 1
object btnOK: TButton
Left = 91
Height = 25
Top = 0
Width = 75
Align = alRight
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 0
end
object btnCancel: TButton
Left = 174
Height = 25
Top = 0
Width = 83
Align = alRight
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Cancel = True
Caption = 'Cancel'
ModalResult = 2
TabOrder = 1 TabOrder = 1
end end
end
end end

View File

@@ -28,7 +28,7 @@ interface
uses uses
SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
StdCtrls, ComCtrls, EditBtn, StdCtrls, ComCtrls, EditBtn, ExtCtrls,
VpBaseDS, VpPrtFmtCBox; VpBaseDS, VpPrtFmtCBox;
@@ -48,6 +48,8 @@ type
lblFormat: TLabel; lblFormat: TLabel;
edStartDate: TDateEdit; edStartDate: TDateEdit;
edEndDate: TDateEdit; edEndDate: TDateEdit;
Panel1: TPanel;
ButtonPanel: TPanel;
PrintFormatCombo: TVpPrintFormatComboBox; PrintFormatCombo: TVpPrintFormatComboBox;
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
@@ -127,6 +129,8 @@ var
begin begin
AutoSize := false; AutoSize := false;
AlignOKCancel(btnOK, btnCancel, ButtonPanel);
(*
btnOK.AutoSize := true; btnOK.AutoSize := true;
btnCancel.AutoSize := true; btnCancel.AutoSize := true;
w := Max(btnOK.Width, btnCancel.Width); w := Max(btnOK.Width, btnCancel.Width);
@@ -155,6 +159,7 @@ begin
btnCancel.TabOrder := PrintFormatCombo.TabOrder; btnCancel.TabOrder := PrintFormatCombo.TabOrder;
btnOK.TabOrder := PrintFormatCombo.TabOrder + 1; btnOK.TabOrder := PrintFormatCombo.TabOrder + 1;
{$ENDIF} {$ENDIF}
*)
cnv := TControlCanvas.Create; cnv := TControlCanvas.Create;
try try

View File

@@ -1,47 +1,61 @@
object frmAbout: TfrmAbout object frmAbout: TfrmAbout
Left = 282 Left = 368
Height = 313 Height = 339
Top = 205 Top = 312
Width = 582 Width = 634
HorzScrollBar.Page = 470 HorzScrollBar.Page = 470
VertScrollBar.Page = 311 VertScrollBar.Page = 311
AutoSize = True AutoSize = True
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'About Visual PlanIt' Caption = 'About Visual PlanIt'
ClientHeight = 313 ClientHeight = 339
ClientWidth = 582 ClientWidth = 634
OnActivate = FormActivate OnActivate = FormActivate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.7' LCLVersion = '1.6.4.0'
object ButtonPanel: TPanel object ButtonPanel: TPanel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 50 Height = 55
Top = 265 Top = 272
Width = 582 Width = 634
Align = alTop Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 50 ClientHeight = 55
ClientWidth = 582 ClientWidth = 634
TabOrder = 0 TabOrder = 0
object Bevel3: TBevel object Bevel3: TBevel
Left = 4 Left = 4
Height = 8 Height = 8
Top = 0 Top = 0
Width = 574 Width = 626
Align = alTop Align = alTop
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4
Shape = bsTopLine BorderSpacing.Bottom = 7
Shape = bsBottomLine
end end
object OKButton: TButton object OKButton: TButton
AnchorSideTop.Control = ButtonPanel AnchorSideTop.Control = CopyrightLabel
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 496 AnchorSideRight.Control = ButtonPanel
Height = 25 AnchorSideRight.Side = asrBottom
Top = 13 Left = 576
Width = 75 Height = 33
Top = 14
Width = 50
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Top = 8
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
BorderSpacing.InnerBorder = 4
Cancel = True Cancel = True
Caption = 'OK' Caption = 'OK'
Default = True Default = True
@@ -49,13 +63,17 @@ object frmAbout: TfrmAbout
TabOrder = 0 TabOrder = 0
end end
object CopyrightLabel: TLabel object CopyrightLabel: TLabel
AnchorSideTop.Control = ButtonPanel AnchorSideLeft.Control = ButtonPanel
AnchorSideTop.Side = asrCenter AnchorSideTop.Control = Bevel3
Left = 8 AnchorSideTop.Side = asrBottom
Left = 4
Height = 30 Height = 30
Top = 10 Top = 15
Width = 483 Width = 539
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Bottom = 8
Caption = '(C) Copyright 2001, TurboPower Software Company.'#13#10'All rights reserved.' Caption = '(C) Copyright 2001, TurboPower Software Company.'#13#10'All rights reserved.'
ParentColor = False ParentColor = False
WordWrap = True WordWrap = True
@@ -63,29 +81,30 @@ object frmAbout: TfrmAbout
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 257 Height = 264
Top = 0 Top = 0
Width = 582 Width = 634
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 257 ClientHeight = 264
ClientWidth = 582 ClientWidth = 634
TabOrder = 1 TabOrder = 1
object ImagePanel: TPanel object ImagePanel: TPanel
Left = 4 Left = 4
Height = 249 Height = 252
Top = 4 Top = 8
Width = 139 Width = 139
Align = alLeft Align = alLeft
BorderSpacing.Top = 4
BorderSpacing.Around = 4 BorderSpacing.Around = 4
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 249 ClientHeight = 252
ClientWidth = 139 ClientWidth = 139
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 249 Height = 252
Top = 0 Top = 0
Width = 139 Width = 139
Align = alClient Align = alClient
@@ -1215,26 +1234,31 @@ object frmAbout: TfrmAbout
E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117 E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117
E117E117E117E117E117E1FF9139 E117E117E117E117E117E1FF9139
} }
Proportional = True
Stretch = True
end end
end end
object TextPanel: TPanel object TextPanel: TPanel
Left = 151 Left = 151
Height = 249 Height = 256
Top = 8 Top = 8
Width = 431 Width = 483
Align = alClient Align = alClient
AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 249 ClientHeight = 256
ClientWidth = 431 ClientWidth = 483
TabOrder = 1 TabOrder = 1
object ProgramName: TLabel object ProgramName: TLabel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = TextPanel
Left = 0 Left = 0
Height = 16 Height = 16
Top = 0 Top = 0
Width = 431 Width = 80
Align = alTop BorderSpacing.Right = 8
Caption = 'Visual PlanIt' Caption = 'Visual PlanIt'
Font.Height = -13 Font.Height = -13
Font.Name = 'Default' Font.Name = 'Default'
@@ -1243,23 +1267,32 @@ object frmAbout: TfrmAbout
ParentFont = False ParentFont = False
end end
object Label1: TLabel object Label1: TLabel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = ProgramName
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = lblLazPortLink
AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 30 Height = 30
Top = 24 Top = 28
Width = 431 Width = 410
Align = alTop Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 12
Caption = 'Visual PlanIt was released under the Mozilla 1.1 license in January, 2003. The project is hosted on SourceForge at' Caption = 'Visual PlanIt was released under the Mozilla 1.1 license in January, 2003. The project is hosted on SourceForge at'
ParentColor = False ParentColor = False
WordWrap = True WordWrap = True
end end
object lblTurboLink: TLabel object lblTurboLink: TLabel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
Cursor = crHandPoint Cursor = crHandPoint
Left = 0 Left = 12
Height = 15 Height = 15
Top = 54 Top = 58
Width = 431 Width = 222
Align = alTop BorderSpacing.Left = 12
BorderSpacing.Right = 8
Caption = 'http://sourceforge.net/projects/tpvplanit/' Caption = 'http://sourceforge.net/projects/tpvplanit/'
Font.Color = clBlue Font.Color = clBlue
ParentColor = False ParentColor = False
@@ -1269,24 +1302,30 @@ object frmAbout: TfrmAbout
OnMouseLeave = lblLinkMouseLeave OnMouseLeave = lblLinkMouseLeave
end end
object Label4: TLabel object Label4: TLabel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = lblTurboLink
AnchorSideTop.Side = asrBottom
Left = 0 Left = 0
Height = 15 Height = 15
Top = 77 Top = 85
Width = 431 Width = 150
Align = alTop BorderSpacing.Top = 12
BorderSpacing.Top = 8 BorderSpacing.Right = 8
Caption = 'The Lazarus port is hosted at' Caption = 'The Lazarus port is hosted at'
ParentColor = False ParentColor = False
WordWrap = True WordWrap = True
end end
object lblLazPortLink: TLabel object lblLazPortLink: TLabel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = Label4
AnchorSideTop.Side = asrBottom
Cursor = crHandPoint Cursor = crHandPoint
Left = 0 Left = 12
Height = 15 Height = 15
Top = 92 Top = 100
Width = 414 Width = 398
Align = alTop BorderSpacing.Left = 12
BorderSpacing.Right = 17 BorderSpacing.Right = 8
Caption = 'http://sourceforge.net/p/lazarus-ccr/svn/HEAD/tree/components/tvplanit/' Caption = 'http://sourceforge.net/p/lazarus-ccr/svn/HEAD/tree/components/tvplanit/'
Font.Color = clBlue Font.Color = clBlue
ParentColor = False ParentColor = False
@@ -1296,24 +1335,28 @@ object frmAbout: TfrmAbout
OnMouseLeave = lblLinkMouseLeave OnMouseLeave = lblLinkMouseLeave
end end
object SupportPanel: TPanel object SupportPanel: TPanel
AnchorSideLeft.Control = TextPanel
AnchorSideTop.Control = lblLazPortLink
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = lblLazPortLink
AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 133 Height = 133
Top = 115 Top = 123
Width = 421 Width = 410
Align = alTop Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 10
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 133 ClientHeight = 133
ClientWidth = 421 ClientWidth = 410
TabOrder = 0 TabOrder = 0
object GeneralNewsgroupsLabel: TLabel object GeneralNewsgroupsLabel: TLabel
Left = 6 Left = 6
Height = 15 Height = 15
Top = 6 Top = 6
Width = 409 Width = 398
Align = alTop Align = alTop
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@@ -1326,7 +1369,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 25 Top = 25
Width = 397 Width = 386
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@@ -1339,7 +1382,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 40 Top = 40
Width = 397 Width = 386
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Right = 4 BorderSpacing.Right = 4
@@ -1355,7 +1398,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 59 Top = 59
Width = 397 Width = 386
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@@ -1368,7 +1411,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 74 Top = 74
Width = 397 Width = 386
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Right = 4 BorderSpacing.Right = 4
@@ -1384,7 +1427,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 93 Top = 93
Width = 397 Width = 386
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@@ -1397,7 +1440,7 @@ object frmAbout: TfrmAbout
Left = 18 Left = 18
Height = 15 Height = 15
Top = 108 Top = 108
Width = 401 Width = 390
Align = alTop Align = alTop
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8

View File

@@ -1392,15 +1392,11 @@ object ContactEditForm: TContactEditForm
ClientWidth = 506 ClientWidth = 506
TabOrder = 1 TabOrder = 1
object OKBtn: TButton object OKBtn: TButton
AnchorSideTop.Control = pnlBottom
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = CancelBtn
AnchorSideBottom.Side = asrBottom
Left = 354 Left = 354
Height = 25 Height = 25
Top = 4 Top = 4
Width = 74 Width = 74
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
@@ -1410,15 +1406,11 @@ object ContactEditForm: TContactEditForm
TabOrder = 0 TabOrder = 0
end end
object CancelBtn: TButton object CancelBtn: TButton
AnchorSideTop.Control = pnlBottom
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnlBottom
AnchorSideRight.Side = asrBottom
Left = 436 Left = 436
Height = 25 Height = 25
Top = 4 Top = 4
Width = 62 Width = 62
Anchors = [akTop, akRight] Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8

View File

@@ -147,8 +147,6 @@ type
procedure OKBtnClick(Sender: TObject); procedure OKBtnClick(Sender: TObject);
procedure PageControlChange(Sender: TObject); procedure PageControlChange(Sender: TObject);
private private
FBtnHeight: Integer;
FEditHeight: Integer;
procedure DisplayCurrentCountry(AddressType: TVpAddressType); procedure DisplayCurrentCountry(AddressType: TVpAddressType);
procedure PositionControls; procedure PositionControls;
procedure SetCaptions; procedure SetCaptions;
@@ -206,8 +204,6 @@ procedure TContactEditForm.FormCreate(Sender: TObject);
begin begin
ReturnCode := rtAbandon; ReturnCode := rtAbandon;
SetCaptions; SetCaptions;
FBtnHeight := ScaleY(OKBtn.Height, DesignTimeDPI);
FEditHeight := ScaleY(edCompany.Height, DesigntimeDPI);
end; end;
procedure TContactEditForm.SetCaptions; procedure TContactEditForm.SetCaptions;
@@ -524,7 +520,7 @@ begin
vdist := ScaleY(vdist, DesignTimeDPI); vdist := ScaleY(vdist, DesignTimeDPI);
hBorder := ScaleX(hBorder, DesignTimeDPI); hBorder := ScaleX(hBorder, DesignTimeDPI);
vBorder := ScaleY(vBorder, DesignTimeDPI); vBorder := ScaleY(vBorder, DesignTimeDPI);
edBirthdate.ButtonWidth := FEditHeight; edBirthdate.ButtonWidth := edBirthdate.Height;
comboArrowWidth := GetSystemMetrics(SM_CXVSCROLL); comboArrowWidth := GetSystemMetrics(SM_CXVSCROLL);
for i := 0 to ComponentCount-1 do for i := 0 to ComponentCount-1 do

View File

@@ -1,15 +1,15 @@
object frmEditElement: TfrmEditElement object frmEditElement: TfrmEditElement
Left = 288 Left = 288
Height = 516 Height = 465
Top = 321 Top = 321
Width = 661 Width = 608
HorzScrollBar.Page = 378 HorzScrollBar.Page = 378
VertScrollBar.Page = 444 VertScrollBar.Page = 444
AutoSize = True AutoSize = True
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Edit Element' Caption = 'Edit Element'
ClientHeight = 516 ClientHeight = 465
ClientWidth = 661 ClientWidth = 608
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
@@ -18,7 +18,7 @@ object frmEditElement: TfrmEditElement
Left = 12 Left = 12
Height = 144 Height = 144
Top = 196 Top = 196
Width = 637 Width = 584
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
@@ -26,7 +26,7 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Right = 12 BorderSpacing.Right = 12
Caption = ' Visual ' Caption = ' Visual '
ClientHeight = 124 ClientHeight = 124
ClientWidth = 633 ClientWidth = 580
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 3 TabOrder = 3
@@ -361,7 +361,7 @@ object frmEditElement: TfrmEditElement
Left = 12 Left = 12
Height = 54 Height = 54
Top = 352 Top = 352
Width = 637 Width = 584
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
@@ -370,7 +370,7 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = ' Caption ' Caption = ' Caption '
ClientHeight = 34 ClientHeight = 34
ClientWidth = 633 ClientWidth = 580
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 4 TabOrder = 4
@@ -393,7 +393,7 @@ object frmEditElement: TfrmEditElement
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = gbCaption AnchorSideRight.Control = gbCaption
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 566 Left = 513
Height = 25 Height = 25
Top = 1 Top = 1
Width = 59 Width = 59
@@ -413,7 +413,7 @@ object frmEditElement: TfrmEditElement
Left = 43 Left = 43
Height = 23 Height = 23
Top = 2 Top = 2
Width = 519 Width = 466
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 2 BorderSpacing.Top = 2
@@ -428,7 +428,7 @@ object frmEditElement: TfrmEditElement
Left = 12 Left = 12
Height = 23 Height = 23
Top = 8 Top = 8
Width = 637 Width = 584
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
@@ -437,7 +437,7 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 637 ClientWidth = 584
TabOrder = 0 TabOrder = 0
object lblName: TLabel object lblName: TLabel
AnchorSideTop.Control = edName AnchorSideTop.Control = edName
@@ -455,7 +455,7 @@ object frmEditElement: TfrmEditElement
Left = 42 Left = 42
Height = 23 Height = 23
Top = 0 Top = 0
Width = 595 Width = 542
Align = alRight Align = alRight
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
@@ -466,7 +466,7 @@ object frmEditElement: TfrmEditElement
Left = 12 Left = 12
Height = 51 Height = 51
Top = 133 Top = 133
Width = 639 Width = 586
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
@@ -474,7 +474,7 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Right = 10 BorderSpacing.Right = 10
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 51 ClientHeight = 51
ClientWidth = 639 ClientWidth = 586
TabOrder = 2 TabOrder = 2
object gbDayOffset: TGroupBox object gbDayOffset: TGroupBox
AnchorSideTop.Control = Panel2 AnchorSideTop.Control = Panel2
@@ -533,7 +533,7 @@ object frmEditElement: TfrmEditElement
Left = 108 Left = 108
Height = 51 Height = 51
Top = 0 Top = 0
Width = 531 Width = 478
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
@@ -548,7 +548,7 @@ object frmEditElement: TfrmEditElement
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 4 ChildSizing.ControlsPerLine = 4
ClientHeight = 31 ClientHeight = 31
ClientWidth = 527 ClientWidth = 474
Columns = 4 Columns = 4
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
@@ -565,7 +565,7 @@ object frmEditElement: TfrmEditElement
Left = 0 Left = 0
Height = 25 Height = 25
Top = 414 Top = 414
Width = 649 Width = 596
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Top = 8 BorderSpacing.Top = 8
@@ -573,7 +573,7 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 25 ClientHeight = 25
ClientWidth = 649 ClientWidth = 596
TabOrder = 5 TabOrder = 5
object btnShape: TButton object btnShape: TButton
AnchorSideLeft.Control = ButtonPanel AnchorSideLeft.Control = ButtonPanel
@@ -589,12 +589,11 @@ object frmEditElement: TfrmEditElement
TabOrder = 0 TabOrder = 0
end end
object btnOk: TButton object btnOk: TButton
AnchorSideRight.Control = btnCancel Left = 459
Left = 512
Height = 25 Height = 25
Top = 0 Top = 0
Width = 71 Width = 71
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Right = 4 BorderSpacing.Right = 4
Caption = 'OK' Caption = 'OK'
Default = True Default = True
@@ -602,13 +601,11 @@ object frmEditElement: TfrmEditElement
TabOrder = 1 TabOrder = 1
end end
object btnCancel: TButton object btnCancel: TButton
AnchorSideRight.Control = ButtonPanel Left = 534
AnchorSideRight.Side = asrBottom
Left = 587
Height = 25 Height = 25
Top = 0 Top = 0
Width = 62 Width = 62
Anchors = [akTop, akRight] Align = alRight
AutoSize = True AutoSize = True
Cancel = True Cancel = True
Caption = 'Cancel' Caption = 'Cancel'
@@ -620,7 +617,7 @@ object frmEditElement: TfrmEditElement
Left = 12 Left = 12
Height = 78 Height = 78
Top = 43 Top = 43
Width = 639 Width = 586
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
@@ -628,13 +625,13 @@ object frmEditElement: TfrmEditElement
BorderSpacing.Right = 10 BorderSpacing.Right = 10
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 78 ClientHeight = 78
ClientWidth = 639 ClientWidth = 586
TabOrder = 1 TabOrder = 1
object rgItemType: TRadioGroup object rgItemType: TRadioGroup
Left = 0 Left = 0
Height = 78 Height = 78
Top = 0 Top = 0
Width = 639 Width = 586
Align = alClient Align = alClient
AutoFill = True AutoFill = True
BorderSpacing.InnerBorder = 4 BorderSpacing.InnerBorder = 4
@@ -648,7 +645,7 @@ object frmEditElement: TfrmEditElement
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 4 ChildSizing.ControlsPerLine = 4
ClientHeight = 58 ClientHeight = 58
ClientWidth = 635 ClientWidth = 582
Columns = 4 Columns = 4
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
@@ -671,7 +668,7 @@ object frmEditElement: TfrmEditElement
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
MinFontSize = 0 MinFontSize = 0
MaxFontSize = 0 MaxFontSize = 0
left = 272 left = 536
top = 424 top = 304
end end
end end

View File

@@ -16,7 +16,7 @@ object frmEditFormat: TfrmEditFormat
LCLVersion = '1.6.4.0' LCLVersion = '1.6.4.0'
object Panel1: TPanel object Panel1: TPanel
Left = 8 Left = 8
Height = 157 Height = 158
Top = 8 Top = 8
Width = 331 Width = 331
Align = alClient Align = alClient
@@ -25,7 +25,7 @@ object frmEditFormat: TfrmEditFormat
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 157 ClientHeight = 158
ClientWidth = 331 ClientWidth = 331
TabOrder = 0 TabOrder = 0
object LblName: TLabel object LblName: TLabel
@@ -167,24 +167,21 @@ object frmEditFormat: TfrmEditFormat
end end
object ButtonPanel: TPanel object ButtonPanel: TPanel
Left = 0 Left = 0
Height = 34 Height = 33
Top = 165 Top = 166
Width = 347 Width = 347
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 33
ClientWidth = 347 ClientWidth = 347
TabOrder = 1 TabOrder = 1
object btnOk: TButton object btnOk: TButton
AnchorSideTop.Control = ButtonPanel
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = btnCancel
Left = 231 Left = 231
Height = 25 Height = 25
Top = 5 Top = 4
Width = 42 Width = 42
Anchors = [akTop, akRight] Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4
@@ -195,15 +192,11 @@ object frmEditFormat: TfrmEditFormat
TabOrder = 0 TabOrder = 0
end end
object btnCancel: TButton object btnCancel: TButton
AnchorSideTop.Control = ButtonPanel
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom
Left = 277 Left = 277
Height = 25 Height = 25
Top = 5 Top = 4
Width = 62 Width = 62
Anchors = [akTop, akRight] Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8

View File

@@ -1,69 +1,36 @@
object frmEditShape: TfrmEditShape object frmEditShape: TfrmEditShape
Left = 663 Left = 663
Height = 270 Height = 267
Top = 242 Top = 242
Width = 444 Width = 446
HorzScrollBar.Page = 362 HorzScrollBar.Page = 362
VertScrollBar.Page = 313 VertScrollBar.Page = 313
AutoSize = True AutoSize = True
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Edit Shape' Caption = 'Edit Shape'
ClientHeight = 270 ClientHeight = 267
ClientWidth = 444 ClientWidth = 446
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
ShowHint = True ShowHint = True
LCLVersion = '1.6.0.4' LCLVersion = '1.6.4.0'
object btnOk: TButton
AnchorSideRight.Control = btnCancel
AnchorSideBottom.Control = gbPen
AnchorSideBottom.Side = asrBottom
Left = 301
Height = 35
Top = 222
Width = 50
Anchors = [akRight, akBottom]
AutoSize = True
BorderSpacing.Left = 8
Caption = 'OK'
Default = True
OnClick = btnOkClick
TabOrder = 3
end
object btnCancel: TButton
AnchorSideRight.Control = gbBrush
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = gbPen
AnchorSideBottom.Side = asrBottom
Left = 359
Height = 35
Top = 222
Width = 77
Anchors = [akRight, akBottom]
AutoSize = True
BorderSpacing.Left = 8
Cancel = True
Caption = 'Cancel'
OnClick = btnCancelClick
TabOrder = 4
end
object gbBrush: TGroupBox object gbBrush: TGroupBox
AnchorSideLeft.Control = gbPen AnchorSideLeft.Control = gbPen
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = gbPen AnchorSideTop.Control = gbPen
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 233 Left = 216
Height = 97 Height = 82
Top = 80 Top = 80
Width = 203 Width = 188
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
BorderSpacing.Right = 12 BorderSpacing.Right = 12
Caption = ' Brush ' Caption = ' Brush '
ClientHeight = 67 ClientHeight = 62
ClientWidth = 199 ClientWidth = 184
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
@@ -71,10 +38,10 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = cbBrushStyle AnchorSideTop.Control = cbBrushStyle
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbBrushStyle AnchorSideRight.Control = cbBrushStyle
Left = 13 Left = 12
Height = 25 Height = 15
Top = 32 Top = 32
Width = 42 Width = 28
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -89,9 +56,9 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cbBrushColor AnchorSideRight.Control = cbBrushColor
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 63 Left = 48
Height = 21 Height = 21
Top = 34 Top = 29
Width = 128 Width = 128
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 8
@@ -108,9 +75,9 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbBrushColor AnchorSideRight.Control = cbBrushColor
Left = 8 Left = 8
Height = 25 Height = 15
Top = 1 Top = 6
Width = 47 Width = 32
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -123,7 +90,7 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = gbBrush AnchorSideTop.Control = gbBrush
AnchorSideRight.Control = gbBrush AnchorSideRight.Control = gbBrush
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 63 Left = 48
Height = 22 Height = 22
Top = 2 Top = 2
Width = 128 Width = 128
@@ -142,16 +109,16 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = gbShapes AnchorSideTop.Control = gbShapes
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 12 Left = 12
Height = 177 Height = 147
Top = 80 Top = 80
Width = 209 Width = 192
AutoSize = True AutoSize = True
BorderSpacing.Left = 12 BorderSpacing.Left = 12
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Bottom = 12 BorderSpacing.Bottom = 12
Caption = ' Pen ' Caption = ' Pen '
ClientHeight = 147 ClientHeight = 127
ClientWidth = 205 ClientWidth = 188
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
@@ -159,10 +126,10 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = cbPenStyle AnchorSideTop.Control = cbPenStyle
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbPenStyle AnchorSideRight.Control = cbPenStyle
Left = 18 Left = 15
Height = 25 Height = 15
Top = 30 Top = 35
Width = 42 Width = 28
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -177,9 +144,9 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edPenWidth AnchorSideRight.Control = edPenWidth
Left = 8 Left = 8
Height = 25 Height = 15
Top = 65 Top = 65
Width = 52 Width = 35
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -193,9 +160,9 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbPenMode AnchorSideRight.Control = cbPenMode
Left = 9 Left = 9
Height = 25 Height = 15
Top = 106 Top = 96
Width = 51 Width = 34
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -210,7 +177,7 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cbPenColor AnchorSideRight.Control = cbPenColor
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 51
Height = 21 Height = 21
Top = 32 Top = 32
Width = 129 Width = 129
@@ -230,14 +197,14 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cbPenColor AnchorSideRight.Control = cbPenColor
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 51
Height = 33 Height = 23
Top = 102 Top = 92
Width = 129 Width = 129
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BorderSpacing.Bottom = 12 BorderSpacing.Bottom = 12
ItemHeight = 25 ItemHeight = 15
ParentFont = False ParentFont = False
TabOrder = 4 TabOrder = 4
end end
@@ -246,8 +213,8 @@ object frmEditShape: TfrmEditShape
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = edPenWidth AnchorSideTop.Control = edPenWidth
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 121 Left = 104
Height = 33 Height = 23
Top = 61 Top = 61
Width = 12 Width = 12
Associate = edPenWidth Associate = edPenWidth
@@ -260,8 +227,8 @@ object frmEditShape: TfrmEditShape
AnchorSideLeft.Control = cbPenStyle AnchorSideLeft.Control = cbPenStyle
AnchorSideTop.Control = cbPenStyle AnchorSideTop.Control = cbPenStyle
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 68 Left = 51
Height = 33 Height = 23
Top = 61 Top = 61
Width = 53 Width = 53
Alignment = taRightJustify Alignment = taRightJustify
@@ -275,7 +242,7 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = gbPen AnchorSideTop.Control = gbPen
AnchorSideRight.Control = gbPen AnchorSideRight.Control = gbPen
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 51
Height = 22 Height = 22
Top = 2 Top = 2
Width = 129 Width = 129
@@ -292,10 +259,10 @@ object frmEditShape: TfrmEditShape
AnchorSideTop.Control = cbPenColor AnchorSideTop.Control = cbPenColor
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbPenColor AnchorSideRight.Control = cbPenColor
Left = 17 Left = 14
Height = 25 Height = 15
Top = 1 Top = 6
Width = 43 Width = 29
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
@@ -313,7 +280,7 @@ object frmEditShape: TfrmEditShape
Left = 12 Left = 12
Height = 64 Height = 64
Top = 8 Top = 8
Width = 424 Width = 392
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 12 BorderSpacing.Left = 12
BorderSpacing.Top = 8 BorderSpacing.Top = 8
@@ -324,71 +291,113 @@ object frmEditShape: TfrmEditShape
ChildSizing.ShrinkHorizontal = crsHomogenousChildResize ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 8 ChildSizing.ControlsPerLine = 8
ClientHeight = 34 ClientHeight = 44
ClientWidth = 420 ClientWidth = 388
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object SpeedButton1: TSpeedButton object SpeedButton1: TSpeedButton
Left = 8 Left = 8
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
Down = True Down = True
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton2: TSpeedButton object SpeedButton2: TSpeedButton
Left = 60 Left = 56
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton3: TSpeedButton object SpeedButton3: TSpeedButton
Left = 112 Left = 104
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton4: TSpeedButton object SpeedButton4: TSpeedButton
Left = 164 Left = 152
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton5: TSpeedButton object SpeedButton5: TSpeedButton
Left = 216 Left = 200
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton6: TSpeedButton object SpeedButton6: TSpeedButton
Left = 268 Left = 248
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton7: TSpeedButton object SpeedButton7: TSpeedButton
Left = 320 Left = 296
Height = 26 Height = 36
Top = 0 Top = 0
Width = 44 Width = 40
GroupIndex = 1 GroupIndex = 1
end end
object SpeedButton8: TSpeedButton object SpeedButton8: TSpeedButton
Left = 372 Left = 344
Height = 26 Height = 36
Top = 0 Top = 0
Width = 40 Width = 36
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
GroupIndex = 1 GroupIndex = 1
end end
end end
object ButtonPanel: TPanel
AnchorSideRight.Control = gbBrush
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = gbPen
AnchorSideBottom.Side = asrBottom
Left = 232
Height = 25
Top = 202
Width = 172
Anchors = [akLeft, akRight, akBottom]
AutoSize = True
BevelOuter = bvNone
ClientHeight = 25
ClientWidth = 172
TabOrder = 3
object btnOk: TButton
Left = 60
Height = 25
Top = 0
Width = 42
Align = alRight
AutoSize = True
BorderSpacing.Left = 8
Caption = 'OK'
Default = True
OnClick = btnOkClick
TabOrder = 0
end
object btnCancel: TButton
Left = 110
Height = 25
Top = 0
Width = 62
Align = alRight
AutoSize = True
BorderSpacing.Left = 8
Cancel = True
Caption = 'Cancel'
OnClick = btnCancelClick
TabOrder = 1
end
end
end end

View File

@@ -63,6 +63,7 @@ type
lblPenColor: TLabel; lblPenColor: TLabel;
lblPenWidth: TLabel; lblPenWidth: TLabel;
lblPenMode: TLabel; lblPenMode: TLabel;
ButtonPanel: TPanel;
SpeedButton1: TSpeedButton; SpeedButton1: TSpeedButton;
SpeedButton2: TSpeedButton; SpeedButton2: TSpeedButton;
SpeedButton3: TSpeedButton; SpeedButton3: TSpeedButton;
@@ -404,6 +405,10 @@ begin
udPenWidth.Width := udPenWidth.Height div 2 + 1; udPenWidth.Width := udPenWidth.Height div 2 + 1;
// Autosize OK and Cancel buttons and put them in the right order
AlignOKCancel(btnOK, btnCancel, ButtonPanel);
(*
// Autosize OK and Cancel buttons and put them in the right order // Autosize OK and Cancel buttons and put them in the right order
btnOK.AutoSize := true; btnOK.AutoSize := true;
btnCancel.AutoSize := true; btnCancel.AutoSize := true;
@@ -429,12 +434,12 @@ begin
{$ELSE} // button order: Cancel - OK {$ELSE} // button order: Cancel - OK
btnOK.AnchorSideRight.Control := gbBrush; btnOK.AnchorSideRight.Control := gbBrush;
btnOK.Anchors := [akTop, akRight]; btnOK.Anchors := [akTop, akRight];
btnCancel.AnchorSideRight.Control := OKbtn; btnCancel.AnchorSideRight.Control := btnOK;
btnCancel.Anchors := [akBottom, akRight]; btnCancel.Anchors := [akBottom, akRight];
btnCancel.TabOrder := cbBrushStyle.TabOrder + 1; btnCancel.TabOrder := cbBrushStyle.TabOrder + 1;
btnOK.TabOrder := btnOK.TabOrder + 1; btnOK.TabOrder := btnOK.TabOrder + 1;
wbtn := btnCancel.Width + btnOK.Width + btnOK.BorderSpacing.Left; wbtn := btnCancel.Width + btnOK.Width + btnOK.BorderSpacing.Left;
{$ENDIF} {$ENDIF} *)
// A workaround for the combobox height issue at higher dpi values: // A workaround for the combobox height issue at higher dpi values:
// Create a combobox at runtime, it has the correct height, and apply its // Create a combobox at runtime, it has the correct height, and apply its
@@ -472,6 +477,7 @@ begin
CbBrushStyle.Width := w; CbBrushStyle.Width := w;
gbPen.AutoSize := true; gbPen.AutoSize := true;
gbBrush.AutoSize := true; gbBrush.AutoSize := true;
wbtn := btnOK.Width + btnCancel.Width + btnOK.BorderSpacing.Left;;
if gbBrush.Width < wbtn then begin if gbBrush.Width < wbtn then begin
gbBrush.AutoSize := false; gbBrush.AutoSize := false;
gbBrush.Width := wbtn; gbBrush.Width := wbtn;

View File

@@ -40,13 +40,11 @@ object DlgEventEdit: TDlgEventEdit
ParentFont = False ParentFont = False
end end
object OKBtn: TButton object OKBtn: TButton
AnchorSideTop.Side = asrCenter Left = 577
AnchorSideRight.Control = CancelBtn
Left = 571
Height = 25 Height = 25
Top = 6 Top = 6
Width = 66 Width = 66
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
@@ -56,15 +54,13 @@ object DlgEventEdit: TDlgEventEdit
TabOrder = 0 TabOrder = 0
end end
object CancelBtn: TButton object CancelBtn: TButton
AnchorSideRight.Control = ButtonPanel Left = 649
AnchorSideRight.Side = asrBottom
Left = 643
Height = 25 Height = 25
Top = 6 Top = 6
Width = 71 Width = 71
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 12 BorderSpacing.Right = 6
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Cancel = True Cancel = True
Caption = '&Cancel' Caption = '&Cancel'

View File

@@ -24,13 +24,12 @@ object frmFieldMapper: TfrmFieldMapper
ClientWidth = 655 ClientWidth = 655
TabOrder = 1 TabOrder = 1
object BtnOK: TButton object BtnOK: TButton
AnchorSideTop.Control = ButtonPanel Left = 542
AnchorSideRight.Control = BtnCancel
Left = 384
Height = 25 Height = 25
Top = 5 Top = 5
Width = 115 Width = 42
Anchors = [akTop] Align = alRight
AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
@@ -39,14 +38,11 @@ object frmFieldMapper: TfrmFieldMapper
TabOrder = 0 TabOrder = 0
end end
object BtnCancel: TButton object BtnCancel: TButton
AnchorSideTop.Control = ButtonPanel Left = 588
AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom
Left = 580
Height = 25 Height = 25
Top = 5 Top = 5
Width = 62 Width = 62
Anchors = [akTop] Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4

View File

@@ -436,6 +436,8 @@ procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
var var
w, h: Integer; w, h: Integer;
begin begin
APanel.AutoSize := true;
OKButton.AutoSize := true; OKButton.AutoSize := true;
CancelButton.AutoSize := true; CancelButton.AutoSize := true;
w := Max(OKButton.Width, CancelButton.Width); w := Max(OKButton.Width, CancelButton.Width);
@@ -444,23 +446,33 @@ begin
OKButton.AutoSize := false; OKButton.AutoSize := false;
OKButton.Width := w; OKButton.Width := w;
OKButton.Height := h; OKButton.Height := h;
OKButton.Align := alRight;
CancelButton.AutoSize := false; CancelButton.AutoSize := false;
CancelButton.Width := w; CancelButton.Width := w;
CancelButton.Height := h; CancelButton.Height := h;
CancelButton.Align := alRight;
{$IFDEF MSWINDOWS} // button order: OK - Cancel {$IFDEF MSWINDOWS} // button order: OK - Cancel
CancelButton.Left := APanel.Width;
OKButton.Left := 0;
{
CancelButton.AnchorSideRight.Control := APanel; CancelButton.AnchorSideRight.Control := APanel;
CancelButton.Anchors := [akTop, akRight]; CancelButton.Anchors := [akTop, akRight];
OKButton.AnchorSideRight.Control := CancelButton; OKButton.AnchorSideRight.Control := CancelButton;
OKButton.Anchors := [akTop, akRight]; OKButton.Anchors := [akTop, akRight];
}
OKButton.TabOrder := 0; OKButton.TabOrder := 0;
CancelButton.TabOrder := 1; CancelButton.TabOrder := 1;
{$ELSE} // button order: Cancel - OK {$ELSE} // button order: Cancel - OK
OKButton.Left := APanel.Width;
CancelButton.Left := 0;
{
OKButton.AnchorSideRight.Control := APanel; OKButton.AnchorSideRight.Control := APanel;
OKButton.Anchors := [akTop, akRight]; OKButton.Anchors := [akTop, akRight];
CancelButton.AnchorSideRight.Control := OKButton; CancelButton.AnchorSideRight.Control := OKButton;
CancelButton.Anchors := [akTop, akRight]; CancelButton.Anchors := [akTop, akRight];
}
CancelButton.TabOrder := 0; CancelButton.TabOrder := 0;
OKButton.TabOrder := 1; OKButton.TabOrder := 1;
{$ENDIF} {$ENDIF}

View File

@@ -25,14 +25,11 @@ object ResEditForm: TResEditForm
ClientWidth = 466 ClientWidth = 466
TabOrder = 1 TabOrder = 1
object OKBtn: TButton object OKBtn: TButton
AnchorSideTop.Control = pnlBottom
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = CancelBtn
Left = 313 Left = 313
Height = 25 Height = 25
Top = 4 Top = 4
Width = 66 Width = 66
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
@@ -43,15 +40,11 @@ object ResEditForm: TResEditForm
TabStop = False TabStop = False
end end
object CancelBtn: TButton object CancelBtn: TButton
AnchorSideTop.Control = pnlBottom
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnlBottom
AnchorSideRight.Side = asrBottom
Left = 383 Left = 383
Height = 25 Height = 25
Top = 4 Top = 4
Width = 75 Width = 75
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4

View File

@@ -9,7 +9,7 @@ object frmSelectResource: TfrmSelectResource
ClientHeight = 162 ClientHeight = 162
ClientWidth = 274 ClientWidth = 274
Position = poDesktopCenter Position = poDesktopCenter
LCLVersion = '1.7' LCLVersion = '1.6.4.0'
object Bevel1: TBevel object Bevel1: TBevel
Left = 8 Left = 8
Height = 105 Height = 105
@@ -26,7 +26,7 @@ object frmSelectResource: TfrmSelectResource
end end
object VpResourceCombo1: TVpResourceCombo object VpResourceCombo1: TVpResourceCombo
Left = 16 Left = 16
Height = 21 Height = 23
Top = 40 Top = 40
Width = 232 Width = 232
Style = csDropDownList Style = csDropDownList
@@ -70,7 +70,7 @@ object frmSelectResource: TfrmSelectResource
TabOrder = 2 TabOrder = 2
end end
object VpResourceEditDialog1: TVpResourceEditDialog object VpResourceEditDialog1: TVpResourceEditDialog
Version = 'v1.03' Version = 'v1.05'
Options = [] Options = []
Placement.Position = mpCenter Placement.Position = mpCenter
Placement.Top = 10 Placement.Top = 10

View File

@@ -40,14 +40,12 @@ object TaskEditForm: TTaskEditForm
ParentFont = False ParentFont = False
end end
object OKBtn: TButton object OKBtn: TButton
AnchorSideTop.Control = ButtonPanel Left = 435
AnchorSideTop.Side = asrCenter
AnchorSideBottom.Side = asrBottom
Left = 376
Height = 25 Height = 25
Top = 4 Top = 4
Width = 86 Width = 42
Anchors = [akTop, akRight] Align = alRight
AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
@@ -57,14 +55,11 @@ object TaskEditForm: TTaskEditForm
TabOrder = 0 TabOrder = 0
end end
object CancelBtn: TButton object CancelBtn: TButton
AnchorSideTop.Control = ButtonPanel Left = 481
AnchorSideTop.Side = asrCenter
AnchorSideRight.Side = asrBottom
Left = 479
Height = 25 Height = 25
Top = 4 Top = 4
Width = 62 Width = 62
Anchors = [akTop, akRight] Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Right = 4 BorderSpacing.Right = 4

View File

@@ -79,6 +79,8 @@ object FrmSoundDialog: TFrmSoundDialog
Height = 25 Height = 25
Top = 4 Top = 4
Width = 29 Width = 29
BorderSpacing.Top = 4
BorderSpacing.Bottom = 4
Glyph.Data = { Glyph.Data = {
DE010000424DDE01000000000000760000002800000024000000120000000100 DE010000424DDE01000000000000760000002800000024000000120000000100
0400000000006801000000000000000000001000000010000000000000000000 0400000000006801000000000000000000001000000010000000000000000000
@@ -101,14 +103,11 @@ object FrmSoundDialog: TFrmSoundDialog
OnClick = PlayButtonClick OnClick = PlayButtonClick
end end
object OkBtn: TButton object OkBtn: TButton
AnchorSideTop.Control = ButtonPanel
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = CancelBtn
Left = 361 Left = 361
Height = 25 Height = 25
Top = 4 Top = 4
Width = 75 Width = 75
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
@@ -119,14 +118,11 @@ object FrmSoundDialog: TFrmSoundDialog
TabOrder = 0 TabOrder = 0
end end
object CancelBtn: TButton object CancelBtn: TButton
AnchorSideTop.Control = ButtonPanel
AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom
Left = 440 Left = 440
Height = 25 Height = 25
Top = 4 Top = 4
Width = 75 Width = 75
Anchors = [akTop, akRight] Align = alRight
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4