From dc58a75c1545fb4a0f04ee62229eea8503837821 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 27 Apr 2019 23:12:23 +0000 Subject: [PATCH] jvlcllaz: Layout fixes for JvComboListboxDemo and JvHTCtrlsDemo for Linux. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6877 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../JvComboListBox/jvcombolistboxdemoform.lfm | 75 +++++++++++++++---- .../JvComboListBox/jvcombolistboxdemoform.pas | 1 + .../examples/JvHTControls/JvHTCtrlsDemo.lpi | 6 +- .../jvcllaz/examples/JvHTControls/unit1.lfm | 19 +++-- .../jvcllaz/examples/JvHTControls/unit1.pas | 3 + 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.lfm b/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.lfm index 248f0a7de..628309101 100644 --- a/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.lfm +++ b/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.lfm @@ -43,6 +43,7 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm ParentColor = False end object Label2: TLabel + AnchorSideTop.Control = Memo1 Left = 416 Height = 15 Top = 32 @@ -52,36 +53,48 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm ParentColor = False end object Label3: TLabel + AnchorSideTop.Control = btnCopyText + AnchorSideTop.Side = asrBottom Left = 416 Height = 15 - Top = 200 + Top = 197 Width = 58 + BorderSpacing.Top = 4 Caption = 'Draw &Type:' ParentColor = False end object Label4: TLabel + AnchorSideTop.Control = edItemHeight + AnchorSideTop.Side = asrBottom Left = 416 Height = 15 - Top = 72 + Top = 74 Width = 74 + BorderSpacing.Top = 4 Caption = 'Button &Width:' FocusControl = edButtonWidth ParentColor = False end object Label5: TLabel + AnchorSideTop.Control = cbPopupAlign + AnchorSideTop.Side = asrBottom Left = 416 Height = 15 - Top = 280 + Top = 281 Width = 51 + BorderSpacing.Top = 4 Caption = 'Col&umns:' FocusControl = edColumns ParentColor = False end object Label6: TLabel + AnchorSideTop.Control = cbDrawStyle + AnchorSideTop.Side = asrBottom Left = 416 Height = 15 - Top = 240 + Top = 239 Width = 90 + BorderSpacing.Top = 4 Caption = 'Dro&pdown Align:' FocusControl = cbPopupAlign ParentColor = False @@ -1659,36 +1672,47 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm end end object btnLoadImage: TButton + AnchorSideTop.Control = chkInsert + AnchorSideTop.Side = asrBottom Left = 416 Height = 25 - Top = 372 + Top = 365 Width = 87 + BorderSpacing.Top = 4 Caption = 'L&oad image...' OnClick = btnLoadImageClick TabOrder = 15 end object btnCopyImage: TButton + AnchorSideTop.Control = btnLoadImage + AnchorSideTop.Side = asrBottom Left = 416 Height = 25 - Top = 400 + Top = 394 Width = 87 + BorderSpacing.Top = 4 Caption = 'Cop&y Image' OnClick = btnCopyImageClick TabOrder = 16 end object btnCopyText: TButton + AnchorSideTop.Control = btnLoadText + AnchorSideTop.Side = asrBottom Left = 416 Height = 25 Top = 168 Width = 87 + BorderSpacing.Top = 4 Caption = '&Copy text' OnClick = btnCopyTextClick TabOrder = 7 end object edItemHeight: TEdit + AnchorSideTop.Control = Label2 + AnchorSideTop.Side = asrBottom Left = 416 Height = 23 - Top = 48 + Top = 47 Width = 96 TabOrder = 1 Text = '48' @@ -1696,7 +1720,7 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm object udItemHeight: TUpDown Left = 512 Height = 23 - Top = 48 + Top = 47 Width = 15 Associate = edItemHeight Max = 32767 @@ -1706,9 +1730,11 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm TabOrder = 2 end object cbDrawStyle: TComboBox + AnchorSideTop.Control = Label3 + AnchorSideTop.Side = asrBottom Left = 416 Height = 23 - Top = 216 + Top = 212 Width = 110 ItemHeight = 15 Items.Strings = ( @@ -1721,9 +1747,11 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm TabOrder = 9 end object edButtonWidth: TEdit + AnchorSideTop.Control = Label4 + AnchorSideTop.Side = asrBottom Left = 416 Height = 23 - Top = 88 + Top = 89 Width = 96 TabOrder = 3 Text = '26' @@ -1731,7 +1759,7 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm object udButtonWidth: TUpDown Left = 512 Height = 23 - Top = 88 + Top = 89 Width = 15 Associate = edButtonWidth Max = 32767 @@ -1741,24 +1769,32 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm TabOrder = 4 end object btnLoadText: TButton + AnchorSideTop.Control = chkCustomDrop + AnchorSideTop.Side = asrBottom Left = 416 Height = 25 - Top = 140 + Top = 139 Width = 87 + BorderSpacing.Top = 4 Caption = '&Load text...' OnClick = btnLoadTextClick TabOrder = 6 end object chkHotTrackCombo: TCheckBox + AnchorSideTop.Control = edColumns + AnchorSideTop.Side = asrBottom Left = 416 Height = 19 - Top = 328 + Top = 323 Width = 109 + BorderSpacing.Top = 4 Caption = 'Hot&TrackCombo' OnClick = chkHotTrackComboClick TabOrder = 13 end object edColumns: TEdit + AnchorSideTop.Control = Label5 + AnchorSideTop.Side = asrBottom Left = 416 Height = 23 Top = 296 @@ -1779,18 +1815,22 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm TabOrder = 12 end object chkInsert: TCheckBox + AnchorSideTop.Control = chkHotTrackCombo + AnchorSideTop.Side = asrBottom Left = 416 Height = 19 - Top = 344 + Top = 342 Width = 83 Caption = 'Ins&ert at top' OnClick = chkHotTrackComboClick TabOrder = 14 end object cbPopupAlign: TComboBox + AnchorSideTop.Control = Label6 + AnchorSideTop.Side = asrBottom Left = 416 Height = 23 - Top = 256 + Top = 254 Width = 110 DropDownCount = 100 ItemHeight = 15 @@ -1804,10 +1844,13 @@ object JvComboListBoxDemoFrm: TJvComboListBoxDemoFrm TabOrder = 10 end object chkCustomDrop: TCheckBox + AnchorSideTop.Control = edButtonWidth + AnchorSideTop.Side = asrBottom Left = 416 Height = 19 - Top = 120 + Top = 116 Width = 91 + BorderSpacing.Top = 4 Caption = 'Custom &Drop' TabOrder = 5 end diff --git a/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.pas b/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.pas index 76c9513b5..f6d8b7a54 100644 --- a/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.pas +++ b/components/jvcllaz/examples/JvComboListBox/jvcombolistboxdemoform.pas @@ -196,6 +196,7 @@ begin if Memo1.SelLength = 0 then Memo1.SelectAll; Memo1.CopyToClipboard; + UpdateFromClipboardText; end; procedure TJvComboListBoxDemoFrm.btnCopyImageClick(Sender: TObject); diff --git a/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi b/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi index 15be502bf..c538eef50 100644 --- a/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi +++ b/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi @@ -1,11 +1,13 @@ - + + + + - <ResourceType Value="res"/> <UseXPManifest Value="True"/> diff --git a/components/jvcllaz/examples/JvHTControls/unit1.lfm b/components/jvcllaz/examples/JvHTControls/unit1.lfm index d4f39c874..75536bf6b 100644 --- a/components/jvcllaz/examples/JvHTControls/unit1.lfm +++ b/components/jvcllaz/examples/JvHTControls/unit1.lfm @@ -109,11 +109,13 @@ object Form1: TForm1 Width = 5 end object Memo2: TMemo - Left = 160 + AnchorSideLeft.Control = Splitter2 + AnchorSideLeft.Side = asrBottom + Left = 157 Height = 90 Hint = '<b>New item content</b><br><i>Enter new item contnent</i>' Top = 8 - Width = 406 + Width = 409 Anchors = [akTop, akLeft, akRight] Lines.Strings = ( 'new item...' @@ -123,7 +125,9 @@ object Form1: TForm1 TabOrder = 2 end object Button1: TButton - Left = 160 + AnchorSideLeft.Control = Splitter2 + AnchorSideLeft.Side = asrBottom + Left = 157 Height = 25 Hint = '<b>Add item</b><br>'#13#10'<i>Add item to ListBox and ComboBox</i>' Top = 112 @@ -136,7 +140,9 @@ object Form1: TForm1 TabOrder = 3 end object JvHTComboBox1: TJvHTComboBox - Left = 160 + AnchorSideLeft.Control = Splitter2 + AnchorSideLeft.Side = asrBottom + Left = 157 Height = 24 Hint = '<b>TJvHTComboBox</b><br>'#13#10'<i>ComboBox with HT items</i>' Top = 160 @@ -164,11 +170,14 @@ object Form1: TForm1 TabOrder = 4 end object Button2: TButton - Left = 264 + AnchorSideLeft.Control = Button1 + AnchorSideLeft.Side = asrBottom + Left = 256 Height = 25 Top = 112 Width = 53 AutoSize = True + BorderSpacing.Left = 24 Caption = 'Clear' OnClick = Button2Click TabOrder = 5 diff --git a/components/jvcllaz/examples/JvHTControls/unit1.pas b/components/jvcllaz/examples/JvHTControls/unit1.pas index f77180e38..f876db085 100644 --- a/components/jvcllaz/examples/JvHTControls/unit1.pas +++ b/components/jvcllaz/examples/JvHTControls/unit1.pas @@ -112,3 +112,6 @@ end; end. + +// Text on tab 3: +//Numeric field: <b><field="Num"></b><br>Field 1: <b><font color="clRed"><field="fld1"></font></b><br><i>Field 2:</i> <b><font color="clGreen"><field="fld2"></font></b><br>And some link: <a href="url"><field="Fld1"></a><br><a href="qwe">#<field="num"></a> - <b><field="fld1"> <field="fld2"></b>