tvplanit: In contact editor, replace font Ms Sans Serif by system's default font, and some cosmetic changes.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4692 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-08 13:54:27 +00:00
parent a574813335
commit 462c767aad
2 changed files with 64 additions and 57 deletions

View File

@ -1,22 +1,25 @@
object ContactEditForm: TContactEditForm
Left = 311
Height = 321
Height = 320
Top = 245
Width = 433
HorzScrollBar.Page = 432
VertScrollBar.Page = 320
ActiveControl = tsContacts
Caption = 'ContactEdit'
ClientHeight = 321
ClientHeight = 320
ClientWidth = 433
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Name = 'Default'
OnCreate = FormCreate
OnKeyDown = FormKeyDown
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.7'
object tsContacts: TPageControl
Height = 280
Left = 0
Height = 279
Top = 0
Width = 433
ActivePage = tabMain
Align = alClient
@ -25,7 +28,7 @@ object ContactEditForm: TContactEditForm
OnChange = tsContactsChange
object tabMain: TTabSheet
Caption = '&Main'
ClientHeight = 254
ClientHeight = 252
ClientWidth = 425
object NameLbl: TLabel
Left = 8
@ -116,11 +119,12 @@ object ContactEditForm: TContactEditForm
ParentColor = False
end
object CompanyLbl: TLabel
Left = 91
Height = 14
Left = 8
Height = 16
Top = 175
Width = 46
Width = 127
Alignment = taRightJustify
AutoSize = False
Caption = 'Company'
FocusControl = CompanyEdit
ParentColor = False
@ -138,7 +142,7 @@ object ContactEditForm: TContactEditForm
end
object NameEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 4
Width = 247
MaxLength = 100
@ -147,7 +151,7 @@ object ContactEditForm: TContactEditForm
end
object AddressEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 52
Width = 247
MaxLength = 100
@ -156,7 +160,7 @@ object ContactEditForm: TContactEditForm
end
object CityEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 76
Width = 247
MaxLength = 50
@ -165,7 +169,7 @@ object ContactEditForm: TContactEditForm
end
object StateEdit: TEdit
Left = 168
Height = 21
Height = 22
Top = 100
Width = 247
MaxLength = 25
@ -174,7 +178,7 @@ object ContactEditForm: TContactEditForm
end
object ZipCodeEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 124
Width = 121
MaxLength = 10
@ -183,7 +187,7 @@ object ContactEditForm: TContactEditForm
end
object PositionEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 197
Width = 121
MaxLength = 50
@ -192,7 +196,7 @@ object ContactEditForm: TContactEditForm
end
object TitleEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 29
Width = 121
MaxLength = 50
@ -201,7 +205,7 @@ object ContactEditForm: TContactEditForm
end
object CompanyEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 173
Width = 121
MaxLength = 50
@ -210,28 +214,26 @@ object ContactEditForm: TContactEditForm
end
object cboxCategory: TComboBox
Left = 136
Height = 21
Height = 22
Top = 224
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
ItemHeight = 14
MaxLength = 65535
TabOrder = 11
end
object cboxState: TComboBox
Left = 136
Height = 21
Height = 22
Top = 100
Width = 249
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
ItemHeight = 14
MaxLength = 65535
TabOrder = 4
Visible = False
end
object edtCountry: TEdit
Left = 152
Height = 21
Height = 22
Top = 148
Width = 249
TabOrder = 8
@ -241,67 +243,68 @@ object ContactEditForm: TContactEditForm
Height = 21
Top = 148
Width = 249
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
Font.Height = -11
Font.Name = 'MS Sans Serif'
ItemHeight = 13
MaxLength = 65535
OnChange = cboxCountryChange
ParentFont = False
TabOrder = 7
end
end
object tabContact: TTabSheet
Caption = 'Con&tact'
ClientHeight = 280
ClientWidth = 433
ClientHeight = 252
ClientWidth = 425
ImageIndex = 1
object EMailLbl: TLabel
Left = 91
Height = 14
Top = 136
Top = 133
Width = 38
Caption = 'EMailLbl'
FocusControl = EMailEdit
ParentColor = False
end
object cboxPhoneLbl1: TComboBox
Left = 8
Height = 21
Height = 22
Top = 8
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 14
MaxLength = 65535
TabOrder = 0
end
object cboxPhoneLbl2: TComboBox
Left = 8
Height = 21
Height = 22
Top = 32
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 14
MaxLength = 65535
TabOrder = 2
end
object cboxPhoneLbl3: TComboBox
Left = 8
Height = 21
Height = 22
Top = 56
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 14
MaxLength = 65535
TabOrder = 4
end
object cboxPhoneLbl4: TComboBox
Left = 8
Height = 21
Height = 22
Top = 80
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 14
MaxLength = 65535
TabOrder = 6
end
object Phone4Edit: TEdit
Left = 136
Height = 21
Height = 22
Top = 80
Width = 121
MaxLength = 25
@ -310,7 +313,7 @@ object ContactEditForm: TContactEditForm
end
object Phone3Edit: TEdit
Left = 136
Height = 21
Height = 22
Top = 56
Width = 121
MaxLength = 25
@ -319,7 +322,7 @@ object ContactEditForm: TContactEditForm
end
object Phone2Edit: TEdit
Left = 136
Height = 21
Height = 22
Top = 32
Width = 121
MaxLength = 25
@ -328,7 +331,7 @@ object ContactEditForm: TContactEditForm
end
object Phone1Edit: TEdit
Left = 136
Height = 21
Height = 22
Top = 8
Width = 121
MaxLength = 25
@ -337,16 +340,16 @@ object ContactEditForm: TContactEditForm
end
object cboxPhoneLbl5: TComboBox
Left = 8
Height = 21
Height = 22
Top = 104
Width = 121
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 14
MaxLength = 65535
TabOrder = 8
end
object Phone5Edit: TEdit
Left = 136
Height = 21
Height = 22
Top = 104
Width = 121
MaxLength = 25
@ -355,7 +358,7 @@ object ContactEditForm: TContactEditForm
end
object EMailEdit: TEdit
Left = 136
Height = 21
Height = 22
Top = 128
Width = 121
TabOrder = 10
@ -363,8 +366,8 @@ object ContactEditForm: TContactEditForm
end
object tabCustom: TTabSheet
Caption = 'C&ustom'
ClientHeight = 280
ClientWidth = 433
ClientHeight = 252
ClientWidth = 425
ImageIndex = 2
object CustomLbl1: TLabel
Left = 8
@ -400,7 +403,7 @@ object ContactEditForm: TContactEditForm
end
object Custom1Edit: TEdit
Left = 80
Height = 21
Height = 22
Top = 8
Width = 121
MaxLength = 100
@ -409,7 +412,7 @@ object ContactEditForm: TContactEditForm
end
object Custom2Edit: TEdit
Left = 80
Height = 21
Height = 22
Top = 32
Width = 121
MaxLength = 100
@ -418,7 +421,7 @@ object ContactEditForm: TContactEditForm
end
object Custom3Edit: TEdit
Left = 80
Height = 21
Height = 22
Top = 56
Width = 121
MaxLength = 100
@ -427,7 +430,7 @@ object ContactEditForm: TContactEditForm
end
object Custom4Edit: TEdit
Left = 80
Height = 21
Height = 22
Top = 80
Width = 121
MaxLength = 100
@ -437,12 +440,12 @@ object ContactEditForm: TContactEditForm
end
object tabNotes: TTabSheet
Caption = '&Notes'
ClientHeight = 280
ClientWidth = 433
ClientHeight = 252
ClientWidth = 425
ImageIndex = 3
object NoteEdit: TMemo
Left = 8
Height = 234
Height = 238
Top = 8
Width = 409
Anchors = [akTop, akLeft, akRight, akBottom]
@ -453,8 +456,9 @@ object ContactEditForm: TContactEditForm
end
end
object pnlBottom: TPanel
Left = 0
Height = 41
Top = 280
Top = 279
Width = 433
Align = alBottom
BevelOuter = bvNone
@ -462,7 +466,7 @@ object ContactEditForm: TContactEditForm
ClientWidth = 433
TabOrder = 1
object OKBtn: TButton
Left = 278
Left = 272
Height = 25
Top = 9
Width = 75
@ -474,7 +478,7 @@ object ContactEditForm: TContactEditForm
TabStop = False
end
object CancelBtn: TButton
Left = 357
Left = 351
Height = 25
Top = 9
Width = 75

View File

@ -381,7 +381,7 @@ const
MinFormWidth = 265;
FormHeightOffset = 103;
MinFormHeight = 250;
TopField = 4;
TopField = 8;
type
TLabelArray = array[0..9] of TLabel;
@ -394,6 +394,7 @@ var
j : Integer;
OldFont : TFont;
FieldTop : Integer;
delta : Integer;
begin
{ Note: The resizing algorithm is dependent upon the labels having their
@ -451,6 +452,7 @@ begin
WidestField := 0;
OldFont := TFont.Create;
try
OldFont.Assign(Canvas.Font);
Canvas.Font.Assign (cboxCountry.Font);
try
for j := 0 to cboxState.Items.Count - 1 do begin
@ -484,11 +486,12 @@ begin
end;
{ Vertically arrange the fields. }
delta := (Labels[0].FocusControl.Height - labels[0].Height) div 2;
FieldTop := TopField;
for i := Low(Labels) to High(Labels) do
if Labels[i].Visible then begin
Labels[i].FocusControl.Top := FieldTop;
Labels[i].Top := FieldTop + 2;
Labels[i].Top := FieldTop + delta;
inc(FieldTop, FieldVertSep);
end;