diff --git a/components/jvcllaz/examples/JvXPBar/MainFrm.lfm b/components/jvcllaz/examples/JvXPBar/MainFrm.lfm index 825c22562..a218d6bf6 100644 --- a/components/jvcllaz/examples/JvXPBar/MainFrm.lfm +++ b/components/jvcllaz/examples/JvXPBar/MainFrm.lfm @@ -1,43 +1,41 @@ object frmMain: TfrmMain Left = 309 - Height = 370 + Height = 464 Top = 130 Width = 500 Caption = 'JvXPBar Demo' - ClientHeight = 370 + ClientHeight = 464 ClientWidth = 500 Color = clBtnFace Constraints.MinHeight = 370 Constraints.MinWidth = 500 DefaultMonitor = dmDesktop Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' OnCreate = FormCreate Position = poDesktopCenter ShowHint = True LCLVersion = '1.7' object spltMain: TSplitter Left = 206 - Height = 347 + Height = 441 Top = 0 Width = 4 end object cntWinXPBar: TGroupBox Left = 0 - Height = 347 + Height = 441 Top = 0 Width = 206 Align = alLeft Caption = 'cntWinXPBar' - ClientHeight = 329 + ClientHeight = 421 ClientWidth = 202 Color = 14985086 ParentColor = False TabOrder = 1 object sbxWinXPBar: TScrollBox Left = 0 - Height = 329 + Height = 421 Top = 0 Width = 202 HorzScrollBar.Increment = 13 @@ -45,17 +43,17 @@ object frmMain: TfrmMain HorzScrollBar.Smooth = True HorzScrollBar.Tracking = True VertScrollBar.Increment = 26 - VertScrollBar.Page = 261 + VertScrollBar.Page = 263 VertScrollBar.Smooth = True VertScrollBar.Tracking = True Align = alClient BorderStyle = bsNone - ClientHeight = 329 + ClientHeight = 421 ClientWidth = 202 TabOrder = 0 object JvXPContainer1: TGroupBox Left = 0 - Height = 261 + Height = 263 Top = 0 Width = 202 Align = alTop @@ -102,11 +100,7 @@ object frmMain: TfrmMain end> RollImages = ilWhiteButtons Font.Color = 17877 - Font.Height = -13 - Font.Name = 'MS Shell Dlg 2' HeaderFont.Color = clWindowText - HeaderFont.Height = -13 - HeaderFont.Name = 'MS Shell Dlg 2' HeaderFont.Style = [fsBold] HotTrackColor = 4227327 OwnerDraw = False @@ -154,11 +148,7 @@ object frmMain: TfrmMain end> RollImages = ilRedButtons Font.Color = 1573351 - Font.Height = -13 - Font.Name = 'MS Shell Dlg 2' HeaderFont.Color = 1573351 - HeaderFont.Height = -13 - HeaderFont.Name = 'MS Shell Dlg 2' HeaderFont.Style = [fsBold] HotTrackColor = clMaroon OwnerDraw = False @@ -196,11 +186,7 @@ object frmMain: TfrmMain end> RollImages = ilWhiteButtons Font.Color = clWindowText - Font.Height = -13 - Font.Name = 'MS Shell Dlg 2' HeaderFont.Color = clWhite - HeaderFont.Height = -13 - HeaderFont.Name = 'MS Shell Dlg 2' HeaderFont.Style = [fsBold] HotTrackColor = clNone OwnerDraw = False @@ -233,15 +219,14 @@ object frmMain: TfrmMain end> RollImages = ilMSN2 Font.Color = 8650752 - Font.Height = -11 HeaderFont.Color = 8650752 - HeaderFont.Height = -11 HeaderFont.Style = [fsBold] OwnerDraw = False RollStep = 5 ShowItemFrame = False RoundedItemFrame = 0 Align = alTop + ParentFont = False end object dxWinXPBar1: TJvXPBar Left = 0 @@ -269,9 +254,7 @@ object frmMain: TfrmMain end> RollImages = ilFB Font.Color = 8650752 - Font.Height = -11 HeaderFont.Color = 8650752 - HeaderFont.Height = -11 HeaderFont.Style = [fsBold] HeaderRounded = False OwnerDraw = False @@ -279,31 +262,30 @@ object frmMain: TfrmMain ShowItemFrame = True RoundedItemFrame = 0 Align = alTop + ParentFont = False end end end end object cntDetails: TGroupBox Left = 210 - Height = 347 + Height = 441 Top = 0 Width = 290 Align = alClient Caption = 'cntDetails' - ClientHeight = 329 + ClientHeight = 421 ClientWidth = 286 Color = clInfoBk ParentColor = False TabOrder = 2 object lbWelcome: TLabel Left = 8 - Height = 13 + Height = 15 Top = 16 - Width = 230 + Width = 232 Caption = 'Welcome to the JVCL XP Controls Demo...' Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Shell Dlg 2' Font.Style = [fsBold] ParentColor = False ParentFont = False @@ -348,7 +330,7 @@ object frmMain: TfrmMain Left = 24 Height = 19 Top = 152 - Width = 61 + Width = 66 Caption = 'Grouped' OnClick = chkGroupedClick TabOrder = 4 @@ -357,7 +339,7 @@ object frmMain: TfrmMain object StatusBar1: TStatusBar Left = 0 Height = 23 - Top = 347 + Top = 441 Width = 500 Panels = < item @@ -366,8 +348,8 @@ object frmMain: TfrmMain SimplePanel = False end object imlWinXPBar: TImageList - left = 288 - top = 280 + left = 128 + top = 296 Bitmap = { 4C69190000001000000010000000000000000000000000000000000000006858 50FF685850FF605848FF605848FF584840FF584840FF584840FF004050FF0000 @@ -1174,8 +1156,8 @@ object frmMain: TfrmMain end object aclWinXPBar: TActionList Images = imlWinXPBar - left = 220 - top = 280 + left = 40 + top = 296 object acConnectRemoteServer: TAction Category = 'Connect' Caption = 'Remote-Server' @@ -1262,8 +1244,8 @@ object frmMain: TfrmMain BkColor = clFuchsia Height = 19 Width = 19 - left = 332 - top = 198 + left = 430 + top = 152 Bitmap = { 4C69020000001300000013000000F800F800F800F800F800F800F800F800F800 F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800 @@ -1360,8 +1342,8 @@ object frmMain: TfrmMain end object ilWhiteButtons: TImageList BkColor = clFuchsia - left = 232 - top = 198 + left = 430 + top = 200 Bitmap = { 4C69040000001000000010000000F800F800F800F800F800F800F800F800F800 F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800 @@ -1496,8 +1478,8 @@ object frmMain: TfrmMain end object ilRedButtons: TImageList BkColor = clFuchsia - left = 264 - top = 198 + left = 430 + top = 296 Bitmap = { 4C69020000001000000010000000F800F800F800F800F800F800F800F800F800 F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800 @@ -1568,8 +1550,8 @@ object frmMain: TfrmMain end object ilBlackButtons: TImageList BkColor = clFuchsia - left = 296 - top = 198 + left = 430 + top = 248 Bitmap = { 4C69060000001000000010000000F800F800F800F800F800F800F800F800F800 F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800F800 @@ -1769,8 +1751,8 @@ object frmMain: TfrmMain object ilMSN: TImageList Height = 15 Width = 15 - left = 392 - top = 198 + left = 328 + top = 248 Bitmap = { 4C69020000000F0000000F00000000000000000000000000000000000000E098 78FFE0A080FFE0A088FFE0A088FFE09880FFE09070FFD88868FF000000000000 @@ -1834,8 +1816,8 @@ object frmMain: TfrmMain object ilMSN2: TImageList Height = 15 Width = 15 - left = 434 - top = 198 + left = 328 + top = 296 Bitmap = { 4C69020000000F0000000F00000000000000B06858FFB06858FFB06858FFB068 58FFB06858FFB06858FFB06858FFB06858FFB06858FFB06858FFB06858FFB068 @@ -1900,8 +1882,8 @@ object frmMain: TfrmMain BkColor = clFuchsia Height = 15 Width = 15 - left = 364 - top = 198 + left = 328 + top = 200 Bitmap = { 4C69020000000F0000000F000000F800F800F800F800F800F800F800F800F0C8 A8FFE8B898FFE8B898FFE8B898FFE8B898FFE8B898FFF0C0A8FFF800F800F800 diff --git a/components/jvcllaz/examples/JvXPBar/MainFrm.pas b/components/jvcllaz/examples/JvXPBar/MainFrm.pas index e7ab47f66..def94682b 100644 --- a/components/jvcllaz/examples/JvXPBar/MainFrm.pas +++ b/components/jvcllaz/examples/JvXPBar/MainFrm.pas @@ -12,8 +12,8 @@ uses ; resourcestring - SClickEvent = - ' You clicked on the action "%s"...'; + SClickEventAc = ' You clicked on the action "%s"...'; + SClickEventXP = ' You clicked on the JvXPBarItem "%s"...'; type TProcControl = procedure (Control:TControl) of object; @@ -96,9 +96,9 @@ begin if Sender is TJvXPBarItem then with TJvXPBarItem(Sender) do if Assigned(Action) then - StatusBar1.Panels[0].Text := Format(SClickEvent, [Name]) + StatusBar1.Panels[0].Text := Format(SClickEventAc, [Action.Name]) else - Statusbar1.Panels[0].Text := Caption; + Statusbar1.Panels[0].Text := Format(SClickEventXP, [Caption]); end; procedure TfrmMain.btnCollapseAllClick(Sender: TObject); @@ -106,7 +106,6 @@ begin IterateControls(DoCollapseAll); end; - procedure TfrmMain.btnExpandAllClick(Sender: TObject); begin IterateControls(DoExpandAll); diff --git a/components/jvcllaz/packages/JvCoreLaz.lpk b/components/jvcllaz/packages/JvCoreLaz.lpk index 43dd69410..ebf908770 100644 --- a/components/jvcllaz/packages/JvCoreLaz.lpk +++ b/components/jvcllaz/packages/JvCoreLaz.lpk @@ -1,27 +1,28 @@ - + - + - + + - + - - + + - - - - - - + + + + + - - + + @@ -62,7 +63,7 @@ - + diff --git a/components/jvcllaz/packages/JvNavigationPaneLaz.lpk b/components/jvcllaz/packages/JvNavigationPaneLaz.lpk index 099c1a6f1..61262e30e 100644 --- a/components/jvcllaz/packages/JvNavigationPaneLaz.lpk +++ b/components/jvcllaz/packages/JvNavigationPaneLaz.lpk @@ -1,28 +1,30 @@ - + - + - + + + - + - - + + - - - - - - + + + + + - - + + @@ -31,9 +33,9 @@ + - @@ -47,7 +49,7 @@ - + diff --git a/components/jvcllaz/packages/JvXPBarLaz.lpk b/components/jvcllaz/packages/JvXPBarLaz.lpk index 4fd2288e2..adcc76ce9 100644 --- a/components/jvcllaz/packages/JvXPBarLaz.lpk +++ b/components/jvcllaz/packages/JvXPBarLaz.lpk @@ -22,8 +22,8 @@ - - + + diff --git a/components/jvcllaz/packages/jvhtcontrolslaz.lpk b/components/jvcllaz/packages/jvhtcontrolslaz.lpk index e6d131c3a..1f13fbb7b 100644 --- a/components/jvcllaz/packages/jvhtcontrolslaz.lpk +++ b/components/jvcllaz/packages/jvhtcontrolslaz.lpk @@ -4,6 +4,7 @@ + @@ -12,6 +13,9 @@ + + + diff --git a/components/jvcllaz/packages/jvvalidatorlaz.lpk b/components/jvcllaz/packages/jvvalidatorlaz.lpk index 862d71841..548816e3f 100644 --- a/components/jvcllaz/packages/jvvalidatorlaz.lpk +++ b/components/jvcllaz/packages/jvvalidatorlaz.lpk @@ -4,6 +4,7 @@ + @@ -13,6 +14,9 @@ + + + diff --git a/components/jvcllaz/run/JvXPBar.pas b/components/jvcllaz/run/JvXPBar.pas index e2ef6c340..557a935fb 100644 --- a/components/jvcllaz/run/JvXPBar.pas +++ b/components/jvcllaz/run/JvXPBar.pas @@ -1438,14 +1438,14 @@ begin FFont := TFont.Create; FFont.Color := $00840000; - FFont.Size := 8; + FFont.Size := 0; //8; FFont.OnChange := @FontChange; FHeaderHeight := 28; FHeaderRounded := True; FGradientWidth := 0; FHeaderFont := TFont.Create; FHeaderFont.Color := $00840000; - FHeaderFont.Size := 8; + FHeaderFont.Size := 0; //8; FHeaderFont.Style := [fsBold]; FHeaderFont.OnChange := @FontChange;