From 27ba6399cb14ab8a3b6df0e88c945ba0aeed0a6e Mon Sep 17 00:00:00 2001 From: maxim Date: Sat, 6 Aug 2011 17:21:11 +0000 Subject: [PATCH] Examples, DBEditMask: removed absolute paths (based on patch by Samuel Herzog, bug #18569). While at this, also removed .lrs file reference git-svn-id: trunk@31901 - --- .gitattributes | 1 + examples/dbeditmask/Unit1.lfm | 22 +++++++++++++++++----- examples/dbeditmask/Unit1.pas | 5 ++--- examples/dbeditmask/project1.lpi | 23 +++++++++++++---------- examples/dbeditmask/project1.res | Bin 0 -> 855 bytes 5 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 examples/dbeditmask/project1.res diff --git a/.gitattributes b/.gitattributes index 6a52a03a21..c692b26eec 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3315,6 +3315,7 @@ examples/dbeditmask/Unit1.lfm svneol=native#text/plain examples/dbeditmask/Unit1.pas svneol=native#text/plain examples/dbeditmask/project1.lpi svneol=native#text/plain examples/dbeditmask/project1.lpr svneol=native#text/plain +examples/dbeditmask/project1.res -text examples/designerbaseclass/README.txt svneol=native#text/plain examples/designerbaseclass/customcomponentclass.pas svneol=native#text/plain examples/designerbaseclass/designbaseclassdemopkg.lpk svneol=native#text/plain diff --git a/examples/dbeditmask/Unit1.lfm b/examples/dbeditmask/Unit1.lfm index 6e692a595b..7b8e6fc5eb 100644 --- a/examples/dbeditmask/Unit1.lfm +++ b/examples/dbeditmask/Unit1.lfm @@ -12,7 +12,7 @@ object Form1: TForm1 Font.Name = 'MS Sans Serif' OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '0.9.29' + LCLVersion = '0.9.31' object Label3: TLabel Left = 8 Height = 14 @@ -26,16 +26,23 @@ object Form1: TForm1 Height = 273 Top = 112 Width = 497 + Color = clWindow Columns = < item + Title.Caption = 'ADATE' + Title.PrefixOption = poNone Width = 180 FieldName = 'ADATE' end item + Title.Caption = 'ASTR' + Title.PrefixOption = poNone Width = 100 FieldName = 'ASTR' end item + Title.Caption = 'AINT' + Title.PrefixOption = poNone Width = 100 FieldName = 'AINT' end> @@ -50,9 +57,16 @@ object Form1: TForm1 Top = 392 Width = 497 BevelOuter = bvNone + ChildSizing.EnlargeHorizontal = crsScaleChilds + ChildSizing.EnlargeVertical = crsScaleChilds + ChildSizing.ShrinkHorizontal = crsScaleChilds + ChildSizing.ShrinkVertical = crsScaleChilds + ChildSizing.Layout = cclLeftToRightThenTopToBottom + ChildSizing.ControlsPerLine = 100 ClientHeight = 42 ClientWidth = 497 DataSource = DataSource1 + Options = [] TabOrder = 1 end object DBEdit1: TDBEdit @@ -64,7 +78,7 @@ object Form1: TForm1 DataSource = DataSource1 CharCase = ecNormal EditMask = '!99/99/00;1;_' - MaxLength = 0 + MaxLength = 8 TabOrder = 2 end object ShowLongDateCheckBox: TCheckBox @@ -85,7 +99,7 @@ object Form1: TForm1 DataSource = DataSource1 CharCase = ecNormal EditMask = '!99;1;_' - MaxLength = 0 + MaxLength = 2 TabOrder = 4 end object Label1: TLabel @@ -102,11 +116,9 @@ object Form1: TForm1 top = 288 end object Dbf1: TDbf - FilePath = 'D:\repositories\lazarus\examples\dbeditmask\' IndexDefs = <> TableName = 'test.db' TableLevel = 4 - Active = True FilterOptions = [] left = 312 top = 288 diff --git a/examples/dbeditmask/Unit1.pas b/examples/dbeditmask/Unit1.pas index 4a10226aa9..53aede008d 100644 --- a/examples/dbeditmask/Unit1.pas +++ b/examples/dbeditmask/Unit1.pas @@ -44,6 +44,8 @@ var implementation +{$R *.lfm} + uses strutils; @@ -114,7 +116,4 @@ begin DateField.DisplayFormat := ''; end; -initialization - {$i unit1.lrs} - end. diff --git a/examples/dbeditmask/project1.lpi b/examples/dbeditmask/project1.lpi index 5eadbbbd6e..cc12d3de04 100644 --- a/examples/dbeditmask/project1.lpi +++ b/examples/dbeditmask/project1.lpi @@ -1,22 +1,20 @@ + - - - - - - - + + + + @@ -32,7 +30,7 @@ - + @@ -59,15 +57,20 @@ - + - + + + + + + diff --git a/examples/dbeditmask/project1.res b/examples/dbeditmask/project1.res new file mode 100644 index 0000000000000000000000000000000000000000..e66ecf85feb5a99d4bc85c4973bd1bb2e918b668 GIT binary patch literal 855 zcma)4OKaOe5O(RUP{^%0E_*CkiWA4QL2@vm1=9yPq%A$JS0j7rzPhvPM87^ANq#6L zlnPeN&dkny-#0TFjYf>l<70oweDb|{xsRVx&WkQ~a&k;5t{;qMTL`F}E%_un;|#2H zm9p!Sf4loQe#aR`VJo4Xg_1Xb{CfWSRUr_;taQVufW?xhV6RYazz7^0C4)m($FX$g zN}$QM6V8mVss@bThux?YJJecMV55r76F}Kn3(5y40nvp;kQ)_2#uNz7Th6R7WZXF8 zg>AmlCA$r-N-}o#PnW{Nd(L9xDeYd_i*ufLT`NEtl#j%G-lj3(y;f4R4mJp~4Ft%F zeBj!>_h1RJY}zX;D(LTVv6H5AKf`VaWe5MuUa{