From 222e4fc6405d3532d68ffe6b78406caa1d122ad3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Thu, 9 Jul 2020 16:29:57 +0000 Subject: [PATCH] spktoolbar: Fix not being able to control caption color of checked buttons by Appearance Editor. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7533 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../spktoolbar/SpkToolbar/spkt_Appearance.pas | 34 +- .../spktoolbar/SpkToolbar/spkt_Buttons.pas | 30 +- .../designtime/spkte_AppearanceEditor.lfm | 326 +++++------------- 3 files changed, 117 insertions(+), 273 deletions(-) diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas index ce68c0ad4..cb6642048 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas @@ -204,15 +204,15 @@ type procedure SaveToXML(Node: TSpkXMLNode); procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); - procedure GetActiveColors(IsChecked: Boolean; out AFrameColor, + procedure GetActiveColors(IsChecked: Boolean; out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, AGradientToColor: TColor; out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); - procedure GetHotTrackColors(IsChecked: Boolean; out AFrameColor, + procedure GetHotTrackColors(IsChecked: Boolean; out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, AGradientToColor: TColor; out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); - procedure GetIdleColors(IsChecked: Boolean; out AFrameColor, + procedure GetIdleColors(IsChecked: Boolean; out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, AGradientToColor: TColor; out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); @@ -926,12 +926,13 @@ begin end; procedure TSpkElementAppearance.GetActiveColors(IsChecked: Boolean; - out AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, - AGradientToColor: TColor; out AGradientKind: TBackgroundKind; - ABrightenBy: Integer = 0); + out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, + AGradientFromColor, AGradientToColor: TColor; + out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); const DELTA = -20; begin + ACaptionColor := FActiveCaptionColor; AFrameColor := FActiveFrameColor; AInnerLightColor := FActiveInnerLightColor; AInnerDarkColor := FActiveInnerDarkColor; @@ -944,24 +945,26 @@ begin if ABrightenBy <> 0 then begin + ACaptionColor := TColorTools.Brighten(ACaptionColor, ABrightenBy); AFrameColor := TColorTools.Brighten(AFrameColor, ABrightenBy); AInnerLightColor := TColorTools.Brighten(AInnerLightColor, ABrightenBy); - AInnerDarkColor := TColortools.Brighten(AInnerDarkColor, ABrightenBy); + AInnerDarkColor := TColorTools.Brighten(AInnerDarkColor, ABrightenBy); AGradientFromColor := TColorTools.Brighten(AGradientFromColor, ABrightenBy); AGradientToColor := TColorTools.Brighten(AGradientToColor, ABrightenBy); end; end; procedure TSpkElementAppearance.GetIdleColors(IsChecked: Boolean; - out AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, - AGradientToColor: TColor; out AGradientKind: TBackgroundKind; - ABrightenBy: Integer = 0); + out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, + AGradientFromColor, AGradientToColor: TColor; + out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); const DELTA = 10; begin if IsChecked then begin ABrightenBy := DELTA + ABrightenBy; + ACaptionColor := FActiveCaptionColor; AFrameColor := FActiveFrameColor; AInnerLightColor := FActiveInnerLightColor; AInnerDarkColor := FActiveInnerDarkColor; @@ -970,6 +973,7 @@ begin AGradientKind := FActiveGradientType; end else begin + ACaptionColor := FIdleCaptionColor; AFrameColor := FIdleFrameColor; AInnerLightColor := FIdleInnerLightColor; AInnerDarkColor := FIdleInnerDarkColor; @@ -980,6 +984,7 @@ begin if ABrightenBy <> 0 then begin + ACaptionColor := TColorTools.Brighten(ACaptionColor, ABrightenBy); AFrameColor := TColorTools.Brighten(AFrameColor, ABrightenBy); AInnerLightColor := TColorTools.Brighten(AInnerLightColor, ABrightenBy); AInnerDarkColor := TColorTools.Brighten(AInnerLightColor, ABrightenBy); @@ -989,14 +994,15 @@ begin end; procedure TSpkElementAppearance.GetHotTrackColors(IsChecked: Boolean; - out AFrameColor, AInnerLightColor, AInnerDarkColor, AGradientFromColor, - AGradientToColor: TColor; out AGradientKind: TBackgroundKind; - ABrightenBy: Integer = 0); + out ACaptionColor, AFrameColor, AInnerLightColor, AInnerDarkColor, + AGradientFromColor, AGradientToColor: TColor; + out AGradientKind: TBackgroundKind; ABrightenBy: Integer = 0); const DELTA = 20; begin if IsChecked then begin ABrightenBy := ABrightenBy + DELTA; + ACaptionColor := FActiveCaptionColor; AFrameColor := FActiveFrameColor; AInnerLightColor := FActiveInnerLightColor; AInnerDarkColor := FActiveInnerDarkColor; @@ -1004,6 +1010,7 @@ begin AGradientToColor := FActiveGradientToColor; AGradientKind := FActiveGradientType; end else begin + ACaptionColor := FHotTrackCaptionColor; AFrameColor := FHotTrackFrameColor; AInnerLightColor := FHotTrackInnerLightColor; AInnerDarkColor := FHotTrackInnerDarkColor; @@ -1012,6 +1019,7 @@ begin AGradientKind := FHotTrackGradientType; end; if ABrightenBy <> 0 then begin + ACaptionColor := TColorTools.Brighten(ACaptionColor, ABrightenBy); AFrameColor := TColorTools.Brighten(AFrameColor, ABrightenBy); AInnerLightColor := TColorTools.Brighten(AInnerLightColor, ABrightenBy); AInnerDarkColor := TColortools.Brighten(AInnerDarkColor, ABrightenBy); diff --git a/components/spktoolbar/SpkToolbar/spkt_Buttons.pas b/components/spktoolbar/SpkToolbar/spkt_Buttons.pas index 68baaac2d..1ac643ae9 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Buttons.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Buttons.pas @@ -1035,20 +1035,20 @@ begin if (FButtonState in [bsBtnHotTrack, bsBtnPressed]) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind, delta); end else if (FButtonState = bsDropdownHottrack) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind); end else if (FButtonState = bsDropdownPressed) then begin FAppearance.Element.GetActiveColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind); end else drawBtn := false; @@ -1078,26 +1078,26 @@ begin if FButtonState = bsBtnHottrack then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind); end else if FButtonState = bsBtnPressed then begin FAppearance.Element.GetActiveColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientkind); end else if (FButtonState in [bsDropdownHotTrack, bsDropdownPressed]) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind, delta); end else if (FButtonState = bsIdle) and Checked then begin FAppearance.Element.GetActiveColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind ); end else @@ -1535,28 +1535,28 @@ begin if (FButtonState = bsIdle) and (not FHideFrameWhenIdle) then begin FAppearance.Element.GetIdleColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind ); end else if FButtonState = bsBtnHottrack then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind ); end else if FButtonState = bsBtnPressed then begin FAppearance.Element.GetActiveColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind ); end else if (FButtonState in [bsDropdownHotTrack, bsDropdownPressed]) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind, delta ); @@ -1657,14 +1657,14 @@ begin if (FButtonState = bsIdle) and (not FHideFrameWhenIdle) then begin FAppearance.Element.GetIdleColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientkind ); end else if (FButtonState in [bsBtnHottrack, bsBtnPressed]) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind, delta ); @@ -1672,14 +1672,14 @@ begin if (FButtonState = bsDropdownHottrack) then begin FAppearance.Element.GetHotTrackColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientkind ); end else if (FButtonState = bsDropdownPressed) then begin FAppearance.Element.GetActiveColors(Checked, - frameColor, innerLightColor, innerDarkColor, + fontColor, frameColor, innerLightColor, innerDarkColor, gradientFromColor, gradientToColor, gradientKind ); end else diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm index 8dce5d7e8..ba9553693 100644 --- a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm +++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm @@ -16,18 +16,18 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow LCLVersion = '2.1.0.0' object gbPreview: TGroupBox Left = 0 - Height = 132 + Height = 133 Top = 0 Width = 552 Align = alTop AutoSize = True Caption = ' Preview ' - ClientHeight = 112 + ClientHeight = 113 ClientWidth = 548 TabOrder = 0 object tbPreview: TSpkToolbar Left = 0 - Height = 112 + Height = 113 Top = 0 Width = 548 Color = clBtnFace @@ -273,16 +273,16 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object PageControl1: TPageControl Left = 0 - Height = 382 - Top = 132 + Height = 381 + Top = 133 Width = 552 - ActivePage = TabSheet1 + ActivePage = TabSheet3 Align = alClient - TabIndex = 0 + TabIndex = 2 TabOrder = 1 object TabSheet1: TTabSheet Caption = 'Tab' - ClientHeight = 354 + ClientHeight = 353 ClientWidth = 544 object sTabRectangle: TShape AnchorSideLeft.Control = LblInactiveTabHeaderFontColor @@ -701,7 +701,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet2: TTabSheet Caption = 'Pane' - ClientHeight = 354 + ClientHeight = 353 ClientWidth = 544 ImageIndex = 1 object Label8: TLabel @@ -1189,7 +1189,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet3: TTabSheet Caption = 'Item' - ClientHeight = 354 + ClientHeight = 353 ClientWidth = 544 ImageIndex = 2 object sItemRectangle: TShape @@ -2464,173 +2464,55 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Width = 32 left = 344 Bitmap = { - 4C69010000002000000020000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000006305171FF2E506FFF2E506FFF305272FF000000060000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000062D4E6DFFC7DEF2FFC2D7EAFFC1D6E8FFC3D8E9FF2D4E6EFF0000 - 0006000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00062D4E6DFFC2D9EFFF467FB4FF447DAEFF4278A7FF3B72A1FFBACEE1FF3153 - 72FF000000060000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000063152 - 72FFBCD5EDFF4680B4FF4A81B0FF4A7EABFF4679A6FF3C709DFFAEC5D6FF2F51 - 71FF000000110000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000112F50 - 70FFB1CCE4FF457DAFFF4A7EABFF477AA6FF4476A1FF396C97FFA8BFD1FF3051 - 71FF000000160000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000162D4E - 6DFFACC5DDFF457BA9FF477AA6FF4476A1FF41729BFF386B93FFA3BCCDFF3253 - 73FF000000160000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000006305171FF305171FF0000000B2F506FFFA9C5 - DFFF447AA9FF4579A5FF4476A1FF41729BFF3E6F96FF3A6B93FF335473FF0000 - 0037000000110000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000006305171FFC2DCF1FFBDD5EAFF264868FFA2C1DDFF447B - AAFF4579A6FF4476A2FF41749DFF3E7198FF3C6D94FF375775FF0000003D0000 - 001C000000060000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000112D5072FFB9D4EDFFDAE6F2FFB5CCDFFF366590FF4478 - A6FF4476A2FF41749EFF375673FF385775FF385776FF0000003D0000001C0000 - 0006000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000165B5753FF224669FF4480B5FF3E76A7FFB2C7D8FF3763 - 8AFF3F739EFF375674FF0000004800000043000000370000001C000000060000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000006515151FFFFFFFFFFDDD6D0FF254869FF467DAEFF3C719DFFA5BC - CEFF2D4E6DFF0000003D00000022000000160000001100000006000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0006515151FFFFFFFFFFCCCAC8FFC4C2BFFFC5C0BAFF284B6DFF3E74A2FFABC2 - D4FF99B3C7FF325473FF0000000B000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000065151 - 51FFFFFFFFFFCCCAC7FFC1C0BEFFB7B6B4FFB0ADAAFFAFA9A2FF2A4E70FF376D - 99FF95B0C4FF335473FF00000011000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000006515151FFFFFF - FFFFCCCAC7FFC1C0BEFFB7B6B4FFADABA9FFA19F9DFFDBD9D6FF605B57FF3355 - 76FF345574FF0000003700000011000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000006515151FFFFFFFFFFCAC7 - C6FFBFBEBCFFB5B4B3FFACAAA8FFA19F9DFFD6D5D3FF565656FF000000480000 - 0043000000370000001C00000006000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000006515356FFFFFFFFFFEAEDF4FFDFE2 - EAFFCDD2D9FFBFC2CAFFB0B1B4FFD3D2D2FF565656FF0000003D000000220000 - 0016000000110000000600000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000006505459FFFFF4D2FFE3AA4CFFDDA13FFFD99A - 30FFD79320FFD58908FFF6C46FFF54575AFF0000003D0000001C000000060000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000004535557B0FFF2CEFFE3AB50FFDDA549FFD99F3CFFD697 - 2CFFD38D15FFF2C475FF535861FF0000003D0000001C00000006000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000D52555BFFFFE8C2FFDCA343FFD99F3CFFD6972DFFD38D - 16FFF1C371FF525862FF0000003D0000001C0000000600000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000148A7554FFFAE2BCFFD89C35FFD69529FFD38C15FFF1C1 - 6CFF535862FF0000003D0000001C000000060000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000650545CFFFFE6BAFFDB9D33FFDB9826FFEFC273FFF1BE65FF5358 - 63FF0000003D0000001C00000006000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000655595FFFFFE6B4FFDD9D31FFE09B26FF85704BFF535963FF4C4F54C30000 - 003B0000001C0000000600000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00114A5467FFFEDFACFFE49B21FF505968FF000000480000003F000000300000 - 0018000000060000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000001A66E - 0E59D78B07FF766648FF545A65FF0000003D00000022000000140000000D0000 - 0004000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000007C68B - 27B2D69526FFB9801EB70000003B0000001C0000000600000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000EE8C0 - 7FFFE7BC76FFE5AE58FF0000001D000000060000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000004BB7300B2F3DA - B2FFF1D6ABFFE7B66CFFBD7600B1000000040000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000DC77B00FFE6BC - 76FFE4B971FFDCA243FFC77D00FF0000000D0000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000014C77D00FFD494 - 27FFD39224FFD59529FFC77D00FF000000140000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000001152370A53CC86 - 0EFACC870CFFCC860EFA52370A53000000110000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000070000001E0000 - 003900000042000000390000001E000000070000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000001000000070000 - 0011000000160000001100000007000000010000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000 + 4C7A010000002000000020000000BF0300000000000078DABDD76D4C53571807 + F09A98B2CC49D204891F1C51A3B82D6314992B2A4294D23134ACA56F54966C8E + B06904A1141A9530F1832EF32559A64C1DEB0C35A0A588058B06567929600DA9 + 64527AA142C517442421A668FCE007FF3BE77AF165FBDAD3277972D3D326BF9E + E73CCFBDAD48C42CC45295119F294BF894E69681AE892213E2849C6278EECCC1 + 3D32831E6E1ABDA38F9190B32712DF81B7DD8127501C70425ED58C2D7BCF6363 + 591D3A06EF2149CDB40EE2245267977F168A6A27B20F3A90FD931D8A7D0D482D + B5A0B99F43223913F23909235F92A82C458B771299559778FBCBFD0D909BEBB0 + BEE8142E74DD82F4951FCBC88FA5B56FEA0F22B3D2F6DADE5C568B94DD2770CE + 75136BD5A670FA7C8F0B7B5A9448FADCD63F01F97E1B32F7D5BFB6D34A7EC706 + E2276B785B16A6FAF3B67B3C846BFE19C467ED84B52708796523B1E9BEADD85C + 6E419AF134528B4F42A6AFA0F62692CBC2D47F92046519DA8767717B6A0E6DDE + 097C51F82BE47BE7EDBF20D3999042DC14BD39DC367FD6F97A35562A76415EDD + 8634F379B47A46212B38827413B5CBA999453243A879386DB14AA5028D20F70F + 5667ED8282CC79AAD1827AD720680F0AFB5D29F49A8485ED1DB8813E7717FABB + 3BF0D1D662A4955B61770FE3CC650FD6BEEAB545E1BEBFBCB13DE8E9EEC4D52B + 4E382E36E292CD8A4F724A212B3E831A47DF7CAF4B58DB17ED36D49DB5602CC0 + E1BB7C3D92B5667CAE2D0FE79CBD630F78AEA3ABD38536E76534355EE06DCEEF + 834EA763D56F62955AC7DB33B3CF30717F06378702E8720FC0D1E2846F6868DE + 66D16F62A5C6003C1BC283C66D08D6A523F08714232796C3FFCB7B78DE57028D + 7E3B8BD9A6B150ADD53B30378807762582F55F21703615DCA94FE13BBE04737D + 1550E7ED6065D3589CABCD07A6DD183F9721D809C48E45A8D788DCBCEF59DA34 + 628E5468F0E2BE0BA37FAE0357F3317CC79620D45344F6CDDC26E7FE0D30D581 + 314B32C64EC7E389DB84506721B10B98DB5AC3B7C476226849C2DDDA781C2ADD + 0AB5A100DBBED6F492F73732B4F9E75AB6E647BC9C68C264ED0A280D3BE7E73A + 9DA494E45286F682863DD18691A35130FF9005CDF6C2B7E73A86F6249D0B86BF + 5DA3AE1F5DD3CAD5C4A3BD3AEE6A046AFDDF889EEE3E80472E331E36E7D1BD7F + 18417BE1DF2651EBD3DBAD0871763CBA52846B66510BE37ABF73BFF1548A3045 + F63ED96EC4B835039E2A1184338F44C4506FF8E41AF87E5B053FB9DF087E4C84 + 7C49AEEC7DB5F770F40BEFCF1F805EE96B86FF55FED7FB24E348AE27B945B8C6 + 09EB918805822579EB191E25AC338B7F0100AA5741 } end object Images_100: TImageList left = 488 Bitmap = { - 4C69010000001000000010000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000032537266325372FF3253 - 72FF365675FF3253726600000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000325372FFA7C5DBFFA4BD - D2FF8DAEC7E4365675FF00000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000002F4F6EFF9BB8D2FF346A - 95FF96B0C4FF335473FF00000000000000000000000000000000000000000000 - 0000000000000000000035577699335372FF2F4F6DFF98B9D8FF4277A6FF3B70 - 9AFF8AA8BFFF335474FF00000000000000000000000000000000000000000000 - 00000000000000000000294D6FFF92B9DCFF93B8DAFF42729DFF477DABFF3554 - 72FF355574FF2640588500000000000000000000000000000000000000000000 - 000000000000535251FFF8F8F7E8306491FF457DADFF4C82B2FF365472FF0000 - 0033000000330000001400000000000000000000000000000000000000000000 - 0000535353FFFFFFFFFFC9C7C4FFA7A19B9E30618CFF4278A5FF375775FF0000 - 0000000000000000000000000000000000000000000000000000000000005252 - 53FFDEDEDCFFC5C4C2FFB5B4B3FFABA8A5FFD5CFC8D52F5272FF314E69AD0000 - 0000000000000000000000000000000000000000000000000000515357FFFEFF - FFFFE7EBF2FFD3D7DEFFC1C3C7FFDDDCDBFF595654FF000000330000001F0000 - 0000000000000000000000000000000000000000000057595BA8FFF1CCFFE1A5 - 43FFDA992FFFD78F14FFF3C169FF545659FF0000003300000000000000000000 - 0000000000000000000000000000000000000000000054575BFFFFE7BDFFD999 - 30FFD6921FFFF1C26FFF525861FF000000330000000000000000000000000000 - 0000000000000000000000000000000000000000000051545AFFFFE2AFFFEFC2 - 73FFF2C067FF525862FF00000033000000000000000000000000000000000000 - 00000000000000000000000000000000000054575BFFFFEAAEFF51555BFF5559 - 5FFF505358B90000003300000000000000000000000000000000000000000000 - 0000000000000000000000000000555659FFFFE8A8FF54575CFF000000330000 - 0033000000220000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000B3B2B1BF545659FF00000033000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000003300000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000 + 4C7A010000001000000010000000870100000000000078DA9DD2BB4B42511C07 + 70FF88F6A02168BA9669434B18D15299F7E1F566104614053D307B2C2E414B14 + 5151645110645E10ED0D3A84698A05416098A5261441514364434D7D3B57125A + D45B5FF87186C3E7FCCE4BA190972AC6D24D0A52690C23D2D8ADF84324E70C27 + B17914C58C27F220ADF1174FE906B0EA8DA2BA6F114B3B21A8D8E1A25ECD8FDA + 55A42FA5EBC7B2EF1ADAB12DD40EAD604AF4136F2DEA2B9A0731EF4B61C19B80 + D6B286469B0B6AD602356745799D71B29065683D3E3F3F9E945D7368B0B9D134 + B1070DB1644AF55325792DC340CA592404E7C6EABAD23C0DEDB803357CF13BA3 + 6906E9740AE150108707FB70890EC42E4E63146D41654BAFBB90D5333CBE48DF + C7970C2EE369044E22B84D252118D8DCBE4BF3595E3089783BC79DA31E093B85 + F86C09DE03BD600D42CE160CCB9B48E323DCD895B89A2FC55B7010B4D12CCB66 + F7CEB601F7DB780D0E2373DC436CA76C9BEDFDEC819E3381133AD0CA187D722D + 47CE8727112CDFFEFB6DCBE4FEEBFDBD5DBFDC3B2A907FDB6F49DFDE00 } end object Images_150: TImageList @@ -2638,79 +2520,33 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Width = 24 left = 416 Bitmap = { - 4C69010000001800000018000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000003426180F240607DFF426280FF2E4D - 6A42000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000005086BB010000000258738ED28EB4D7FF8CB2D3FF8BB0D0FE7590 - ABFF2648676B0000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000426180F188B0D4FF4981B2FF487CAAFF386E9DFFABC4 - D8FF26496AE50000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000003E5E7DFF83ACD0FF487DAAFF4679A4FF376B97FFA2BC - D0FF28496AE50000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000406C9601000000001E40 - 62891B3C5C3113324E707593AFFF5F8EB7FF4578A4FF42739DFF396C95FE6686 - A0FF213B54860000000200000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000264768C5B6D1 - E7FF5F7D99F08FACC8FE4C81AFFF4377A4FF4276A0FF3E729AFF3B6589FF1B2D - 3E6F0000001805090C0200000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000284764E2B0CB - E4FFC6DAEBFF4D779DFF4275A2FF4275A0FF365571EC36536FEB293F568C0000 - 0019000000020000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000C0D0F37AEA8A3F2697E - 92FF256196FF789EBEFF6486A4FF294D6ECE0000003600000020000000140406 - 0803000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000858585010D0D0D129B9B9BFFDAD8D7FFC8C5 - C1FF687B8DFF326A9AFFB5C9D8FF5C7A94FF1B32472700000002000000010000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000D0D0D12787878FFF0EFEDFEC0BFBDFFB3B2 - B0FFBDB6ADFF415970FF3C6F99FF638098FF1A2E422B00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000F0F0E32999999FFEDEBEAFEBBBAB7FFB2B1AFFFA7A5 - A3FFB2B1B0FF5E564EB2243F5AA415293C5E0000000D00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000838A92010E0F1312989BA0FFF2F7FFFFD9E0EDFFC3CCDAFFABAFB8FFC9C7 - C6FF4A4A4AB30000002A000000180000000E0204050100000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000002030509767773FFFED68DFEDC9D35FFD89422FFD88B07FFECB85FFF3B42 - 4AD0000000180303030500000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000404651C6FFF6C5FFDA9E3BFFD89D39FFD6921EFFCAA460FF464B55B40000 - 00180C0C0D070000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000736247E1FFE5BBFFD49428FFD08811FFE6B867FF464B55B4000000240202 - 0306000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000010151B025155 - 5D9BEFD8AEFFD89420FFD6A551FFEABC6BFB39445BD100000018020303060000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000172B4F27A7A2 - 98FFF4AA2EFE8D754BFF424345A028324382000000170C0D0E07000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000AB700A65A97D - 32FF6A665FFF040C18460000001C000000110203030400000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000D09635D2D495 - 2CEA2E19003B0505041300000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000009B520047F2D3A3FFEDC3 - 81FFB57A19790000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000C27500DBEBC68AFFE4B4 - 67FFC98108FF0000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000BF7700CFD39121FFD492 - 22FFC67E05F90000000400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000400000A24A56C08A2A46B - 08A63B290A3E0000000800000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000007000000160000 - 00180000000B0000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000 + 4C7A0100000018000000180000002D0300000000000078DAAD94FB4B936114C7 + 5F77C9699BA676D10CD1302F5D84065A32319BE56C66656574F5D6C552514B96 + D39A68A298B7CAD45C6332746669E99A5A9295DD5C595133C596F543851678C1 + 922822D8B7E785FA0336DF038707CE73F89CEF7338CFA1A8591B5B9C983F1396 + A08038291F01D129628A01DB56DC63430ED6EEACCA37959D6F51AE1F4499CE68 + 969D6F854F64722A133588EEEF25BA216C2AD023F2740BD6A6ABD1FAC4049F4D + 29634CF043E31428BC6E44A4A20511395AAC49BD8486BB46F859C10F4BABA5FB + 417984259D750FD9BFDA45B8255376B11DF195B7B151AE85384B8DE0B41AF391 + 620DBC443B8BE9DE595AC34772B4EFD6C057C42B94DFCE5D7F66DE5CD08EF06C + C23EA941E889CB101D3E0BF755A11924D5956BC7B798EF2739F459F762148691 + 094467AB21963510D72028F6F864D08E8C09FF75BBCA499A9B35DAF902C7356D + 571B678EE5556159622DE4F5F771A8580BFFE8F457E43A88B827F1F99C393CB6 + 25DCA2A2221B8140E0AC52A930627A8B677D0F71F45405842997D1D56FC2FEDC + 6AB80B25BEFF34DB58AA9B66CBE5727C9B9E323FE8BD870EBD0EF76EDDC0FA3D + 9908C950E2607E1D1607885758337F8E8E0E42A55289A9897173CF9DDBD0DF6C + 47735323397588DBB545EFBD6EAF76817F481C2DC3126E6169958D83A38B739D + 4A83995FC0BB8F5378FC7204ADEDDDE87F6A80542AED2069CBE93921EEC0E270 + 2DEA0B8BCDB53B999D05F37085F9833A10A6EAA53095D962B23B1E22B1D44873 + D96C36D7DA7F19161163C0CF3E8CD48B60520763B8CA03CFB50988888AEDA4D9 + 7CBEC07636FF3E2B49F209633D18AAF683B1C4095FBA93FFB3BD592CF61C6BB9 + F316B8B362620FA8A64D6DA4279E186E8AC1F8DDD43FC11BF60DD0BA596CEBD9 + B42D5AB1D5B7B9A10E3F5A02CC15B22888C3376AFC84E167E82BBEC0C176B6FB + B035D3FEF03585102947E2C1E1BB4690D012E24E443787897D6BAC0D7C3354B3 + 723CC08D1271B91C178A41536DA72433838D987A5C80AE5CB71C8A617B24A3DE + 4F184A31DA998CFE021E98E6F76653AF072F7861A86A290C79DCDF24C461104F + 58F6DE4D69BC066D2AEF8AC8DF3E94C4780C3F819EBF85FF76CA5CA6A07F0143 + 826490 } end object LargeImages: TImageList