From 5e5e918dd5be90f04213f764827c83d6af1aebab Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 16 Mar 2022 16:48:51 +0000 Subject: [PATCH] LazBarcodes: In demo, move PDF417 to new node "Stacked". git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8211 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/lazbarcodes/demo/main.lfm | 61 ++++++++++++++++------------ components/lazbarcodes/demo/main.pas | 16 ++++---- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/components/lazbarcodes/demo/main.lfm b/components/lazbarcodes/demo/main.lfm index 55180a8d8..9ccfead27 100644 --- a/components/lazbarcodes/demo/main.lfm +++ b/components/lazbarcodes/demo/main.lfm @@ -7,6 +7,7 @@ object MainForm: TMainForm ClientHeight = 484 ClientWidth = 811 OnCreate = FormCreate + LCLVersion = '2.3.0.0' object BarcodesTree: TTreeView Left = 6 Height = 472 @@ -56,6 +57,7 @@ object MainForm: TMainForm Top = 4 Width = 21 Caption = 'Text' + ParentColor = False end object edText: TEdit AnchorSideLeft.Control = lblText @@ -80,12 +82,12 @@ object MainForm: TMainForm Left = 0 Height = 173 Top = 35 - Width = 191 + Width = 189 AutoSize = True BorderSpacing.Top = 12 Caption = 'Geometry' ClientHeight = 153 - ClientWidth = 187 + ClientWidth = 185 TabOrder = 1 object lblScale: TLabel AnchorSideLeft.Control = gbGeometry @@ -98,6 +100,7 @@ object MainForm: TMainForm BorderSpacing.Left = 16 Caption = 'Scale' Enabled = False + ParentColor = False end object seScale: TSpinEdit AnchorSideLeft.Control = seWhiteSpaceWidth @@ -108,7 +111,7 @@ object MainForm: TMainForm Left = 105 Height = 23 Top = 46 - Width = 76 + Width = 74 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 8 @@ -126,7 +129,7 @@ object MainForm: TMainForm Left = 105 Height = 23 Top = 72 - Width = 76 + Width = 74 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 3 @@ -147,6 +150,7 @@ object MainForm: TMainForm BorderSpacing.Left = 16 Caption = 'Margin' Enabled = False + ParentColor = False end object lblWhiteSpaceWidth: TLabel AnchorSideLeft.Control = gbGeometry @@ -159,6 +163,7 @@ object MainForm: TMainForm BorderSpacing.Left = 16 Caption = 'White space' Enabled = False + ParentColor = False end object seWhiteSpaceWidth: TSpinEdit AnchorSideLeft.Control = seSymbolHeight @@ -169,7 +174,7 @@ object MainForm: TMainForm Left = 105 Height = 23 Top = 98 - Width = 76 + Width = 74 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 3 @@ -190,6 +195,7 @@ object MainForm: TMainForm BorderSpacing.Left = 16 Caption = 'Symbol height' Enabled = False + ParentColor = False end object seSymbolHeight: TSpinEdit AnchorSideLeft.Control = lblSymbolHeight @@ -201,7 +207,7 @@ object MainForm: TMainForm Left = 105 Height = 23 Top = 124 - Width = 76 + Width = 74 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 12 @@ -219,7 +225,7 @@ object MainForm: TMainForm Left = 16 Height = 19 Top = 19 - Width = 165 + Width = 163 BorderSpacing.Left = 16 BorderSpacing.Right = 6 Caption = 'Recommended symbol size' @@ -234,7 +240,7 @@ object MainForm: TMainForm Left = 16 Height = 19 Top = 0 - Width = 68 + Width = 66 BorderSpacing.Left = 16 Caption = 'Auto size' OnChange = cbAutoSizeChange @@ -245,15 +251,15 @@ object MainForm: TMainForm AnchorSideLeft.Control = gbGeometry AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = gbGeometry - Left = 207 + Left = 205 Height = 74 Top = 35 - Width = 215 + Width = 213 AutoSize = True BorderSpacing.Left = 16 Caption = 'Show...' ClientHeight = 54 - ClientWidth = 211 + ClientWidth = 209 TabOrder = 2 object cbHumanReadableText: TCheckBox AnchorSideLeft.Control = gbShow @@ -261,7 +267,7 @@ object MainForm: TMainForm Left = 16 Height = 19 Top = 0 - Width = 133 + Width = 131 BorderSpacing.Left = 16 Caption = 'Human-readable text' Checked = True @@ -278,7 +284,7 @@ object MainForm: TMainForm Left = 16 Height = 23 Top = 25 - Width = 189 + Width = 187 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 16 BorderSpacing.Top = 6 @@ -301,7 +307,7 @@ object MainForm: TMainForm AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbHumanReadableText AnchorSideTop.Side = asrCenter - Left = 155 + Left = 153 Height = 25 Top = -3 Width = 50 @@ -319,16 +325,16 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbShow AnchorSideRight.Side = asrBottom - Left = 207 + Left = 205 Height = 68 Top = 121 - Width = 215 + Width = 213 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 12 Caption = 'Checksum' ClientHeight = 48 - ClientWidth = 211 + ClientWidth = 209 TabOrder = 6 object cbAddChecksum: TCheckBox AnchorSideLeft.Control = gbChecksum @@ -336,7 +342,7 @@ object MainForm: TMainForm Left = 16 Height = 19 Top = 0 - Width = 99 + Width = 97 BorderSpacing.Left = 16 Caption = 'Add checksum' Checked = True @@ -351,7 +357,7 @@ object MainForm: TMainForm Left = 16 Height = 19 Top = 23 - Width = 115 + Width = 113 BorderSpacing.Top = 4 BorderSpacing.Bottom = 6 Caption = 'Display checksum' @@ -368,13 +374,13 @@ object MainForm: TMainForm Left = 0 Height = 109 Top = 224 - Width = 191 + Width = 189 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 16 Caption = 'Colors' ClientHeight = 89 - ClientWidth = 187 + ClientWidth = 185 TabOrder = 3 object clbBackground: TColorButton AnchorSideLeft.Control = gbColors @@ -430,9 +436,7 @@ object MainForm: TMainForm end end object btnSaveToFile: TBitBtn - AnchorSideLeft.Control = btnCopyToClipboard AnchorSideTop.Control = gbColors - AnchorSideRight.Control = btnCopyToClipboard AnchorSideRight.Side = asrBottom Left = 205 Height = 25 @@ -446,14 +450,16 @@ object MainForm: TMainForm TabOrder = 4 end object btnCopyToClipboard: TBitBtn - AnchorSideLeft.Control = gbChecksum + AnchorSideLeft.Control = btnSaveToFile AnchorSideTop.Control = btnSaveToFile AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = btnSaveToFile AnchorSideRight.Side = asrBottom Left = 205 Height = 25 Top = 264 Width = 128 + Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 Caption = 'Copy to clipboard' @@ -478,7 +484,7 @@ object MainForm: TMainForm AnchorSideLeft.Control = gbShow AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = gbGeometry - Left = 438 + Left = 434 Height = 293 Top = 35 Width = 152 @@ -531,8 +537,8 @@ object MainForm: TMainForm ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 104 - ClientWidth = 152 + ClientHeight = 84 + ClientWidth = 148 ItemIndex = 0 Items.Strings = ( 'mod-10' @@ -573,6 +579,7 @@ object MainForm: TMainForm Caption = 'lblError' Font.Color = clRed Font.Style = [fsBold] + ParentColor = False ParentFont = False Visible = False WordWrap = True diff --git a/components/lazbarcodes/demo/main.pas b/components/lazbarcodes/demo/main.pas index dc0b9fc71..33d5fc893 100644 --- a/components/lazbarcodes/demo/main.pas +++ b/components/lazbarcodes/demo/main.pas @@ -344,7 +344,7 @@ begin try Items.Clear; - node := Items.AddChild(nil, '1-dimensional barcodes'); + node := Items.AddChild(nil, '1-DIMENSIONAL'); child := Items.AddChildObject(node, 'Code 11', PChar('TBarcodeC11')); child := Items.AddChildObject(node, 'Code 128 and related', PChar('TBarcodeC128')); Items.AddChildObject(child, 'Code-128', Pointer(PtrInt(bctCode128))); @@ -398,17 +398,19 @@ begin Items.AddChildObject(child, 'PostNet', Pointer(PtrInt(bctPostNet))); Items.AddChildObject(child, 'Royal Mail RM4SCC', Pointer(PtrInt(bctRM4SCC))); - node := Items.AddChild(nil, '2-dimensional barcodes'); + node := Items.AddChild(nil, 'STACKED'); + child := Items.AddChildObject(node, 'PDF417 variants', PChar('TBarcodePDF417')); + Items.AddChildObject(child, 'PDF417', Pointer(PtrInt(bctPDF417))); + Items.AddChildObject(child, 'Compact PDF417', Pointer(PtrInt(bctPDF417trunc))); + Items.AddChildObject(child, 'MicroPDF417 (ISO 24728)', Pointer(PtrInt(bctMicroPDF417))); + + node := Items.AddChild(nil, '2-DIMENSIONAL'); child := Items.AddChildObject(node, 'QR Code', PChar('TBarcodeQR')); child := Items.AddChildObject(node, 'Micro QR', PChar('TBarcodeMicroQR')); child := Items.AddChildObject(node, 'Aztec', PChar('TBarcodeAztec')); child := Items.AddChildObject(node, 'Aztec Rune', PChar('TBarcodeAztecRune')); child := Items.AddChildObject(node, 'Data Matrix', PChar('TBarcodeDataMatrix')); - child := Items.AddChildObject(node, 'PDF417 variants', PChar('TBarcodePDF417')); - Items.AddChildObject(child, 'PDF417', Pointer(PtrInt(bctPDF417))); - Items.AddChildObject(child, 'Compact PDF417', Pointer(PtrInt(bctPDF417trunc))); - Items.AddChildObject(child, 'MicroPDF417 (ISO 24728)', Pointer(PtrInt(bctMicroPDF417))); - + FullExpand; finally Items.EndUpdate;