From 1dbb373b6922af2231318d5fc9c1fd93f82a3a38 Mon Sep 17 00:00:00 2001 From: jesus Date: Fri, 20 Apr 2012 17:25:47 +0000 Subject: [PATCH] LazReport, lift up to preview window improving layout and functionality, from Julio Jimenez B. git-svn-id: trunk@36938 - --- components/lazreport/source/lr_view.lfm | 890 ++++++++++++++---------- components/lazreport/source/lr_view.pas | 103 ++- 2 files changed, 574 insertions(+), 419 deletions(-) diff --git a/components/lazreport/source/lr_view.lfm b/components/lazreport/source/lr_view.lfm index d0cb9e5fbf..f69441d022 100644 --- a/components/lazreport/source/lr_view.lfm +++ b/components/lazreport/source/lr_view.lfm @@ -1,16 +1,16 @@ object frPreviewForm: TfrPreviewForm - Left = 268 - Height = 374 - Top = 103 - Width = 412 + Left = 295 + Height = 518 + Top = 158 + Width = 524 HorzScrollBar.Page = 411 HorzScrollBar.Range = 269 VertScrollBar.Page = 373 VertScrollBar.Range = 199 ActiveControl = PanTop Caption = 'Preview' - ClientHeight = 374 - ClientWidth = 412 + ClientHeight = 518 + ClientWidth = 524 Font.Color = clBlack KeyPreview = True OnActivate = FormActivate @@ -22,44 +22,39 @@ object frPreviewForm: TfrPreviewForm OnMouseDown = FormMouseDown OnResize = FormResize ShowHint = True - LCLVersion = '0.9.29' + LCLVersion = '1.1' WindowState = wsMaximized object PanTop: TPanel Left = 0 Height = 28 Top = 0 - Width = 412 + Width = 524 Align = alTop BevelOuter = bvNone ClientHeight = 28 - ClientWidth = 412 + ClientWidth = 524 FullRepaint = False TabOrder = 0 - object Bevel2: TBevel - Left = 0 - Height = 2 - Top = 0 - Width = 412 - Align = alTop - end object Panel1: TPanel Left = 0 - Height = 26 - Top = 2 - Width = 412 - Align = alClient + Height = 30 + Top = 0 + Width = 524 + Align = alTop + BevelInner = bvSpace BevelOuter = bvNone - ClientHeight = 26 - ClientWidth = 412 + ClientHeight = 30 + ClientWidth = 524 FullRepaint = False TabOrder = 0 object ZoomBtn: TBitBtn Tag = 200 - Left = 117 - Height = 26 - Top = 0 - Width = 78 + Left = 165 + Height = 28 + Top = 1 + Width = 72 Align = alLeft + AutoSize = True BorderSpacing.InnerBorder = 2 Caption = '200%' Glyph.Data = { @@ -102,295 +97,200 @@ object frPreviewForm: TfrPreviewForm Margin = 3 NumGlyphs = 0 OnClick = ZoomBtnClick - TabOrder = 0 + TabOrder = 4 end object LoadBtn: TBitBtn Tag = 201 - Left = 0 - Height = 26 - Top = 0 - Width = 26 + Left = 1 + Height = 28 + Top = 1 + Width = 30 Align = alLeft + AutoSize = True BorderSpacing.InnerBorder = 2 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF0000000000000000000000000000000000000000000000FF0000 - 00FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1 - A1FF00A1A1FF000000FF00000000000000000000000000000000000000FF00F9 - F9FF000000FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1 - A1FF00A1A1FF00A1A1FF000000FF000000000000000000000000000000FFF9F9 - F9FF00F9F9FF000000FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1 - A1FF00A1A1FF00A1A1FF00A1A1FF000000FF0000000000000000000000FF00F9 - F9FFF9F9F9FF00F9F9FF000000FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1 - A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF000000FF00000000000000FFF9F9 - F9FF00F9F9FFF9F9F9FF00F9F9FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00F9 - F9FFF9F9F9FF00F9F9FFF9F9F9FF00F9F9FFF9F9F9FF00F9F9FFF9F9F9FF00F9 - F9FF000000FF0000000000000000000000000000000000000000000000FFF9F9 - F9FF00F9F9FFF9F9F9FF00F9F9FFF9F9F9FF00F9F9FFF9F9F9FF00F9F9FFF9F9 - F9FF000000FF0000000000000000000000000000000000000000000000FF00F9 - F9FFF9F9F9FF00F9F9FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF0000000000000000000000000000000000000000000000000000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00000000000000000000000000FF00000000000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 + 20000000000000040000640000006400000000000000000000002C86D8702D88 + D8A62D87D8EA2D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88 + D8F72D88D8F72D87D8F72D88D8F12C86D893FFFFFF00FFFFFF00338ED9E6DCF0 + FAF0A7DDF4FD9EDBF4FF96DAF3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2 + F1FF6CD0F1FF69CFF1FFC2EAF8FE338ED9F0FFFFFF00FFFFFF003594DAF7EFFA + FEFFA1E9F9FF91E5F8FF81E1F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0 + F2FF2ECDF1FF26CBF0FFCAF2FBFF3594DAF7FFFFFF00FFFFFF00369ADAF8F2FA + FDFFB3EDFAFFA4E9F9FF95E6F8FF85E2F7FF81E1F7FF7AE0F7FF6FDDF6FF62DA + F5FF54D6F3FF47D3F2FFE8F9FDFF3594DAFFFFFFFF00FFFFFF0036A1DAF9F6FC + FEFFC8F2FCFFB9EFFBFFACECFAFF8CE4F8FF8AE3F8FF82E1F7FF79DFF7FF6DDD + F6FF61DAF5FF57D7F4FFE7F8FDFF3594DAFFFFFFFF00FFFFFF0037A6DAFAFEFF + FFFFF8FDFFFFF6FDFFFFF5FCFFFFDEDBD1FFADCAC5FFA6C5C0FFA4C3BDFF9EBD + B6FF97BAB3FF92B8B2FFE1CBB7FF3594DAFFC38452FFBB7742B035ABDAFAE8F6 + FBFF7EC5EAFF5BAEE3FF51A8E1FF61ADDFFFEDF6F7FFEDF5F6FFE7EFF3FFE5EC + EEFFE5EBEDFFE5EBEDFFF8F3EFFF3594DAFFF0E2D8FFC58A5DFD36AADAF2F1FA + FDFF94DEF5FF93DCF4FF81D5F2FFC0A997FF91C1E4FF3594DAFF3594DAFF3594 + DAFF3594DAFF3594DAFF3594DAFF3594DAFFF0E2D8FFC48654FF35AFDAF0F7FC + FEFF8EE4F8FF91DEF5FF9FE0F5FFE3B18CFFFAF6F1FFEAC9AEFFFFFFFFFFE8C7 + ACFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1E5DBFFC68655FF36B3DAF8FDFE + FEFFFEFFFFFFFEFEFFFFFDFEFFFFE5B48FFFFAF6F2FFE9C6AAFFE9C6ACFFE8C7 + ACFFE8C7ACFFE9C9B0FFE8C8B0FFE8CCB5FFF2E7DEFFC88A59FF34B4D9D05EC2 + E1FA60C3E2FA60C3E2FA60C3E2FAE7B794FFFBF7F4FFE9C3A6FFFFFFFFFFE8C7 + ACFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00E9BA98FFFBF7F4FFE9C3A6FFE9C3A6FFE9C3 + A6FFE9C3A6FFE9C3A6FFE9C3A6FFE9C3A6FFFBF7F4FFCE9364FFFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00EBBD9BFFFBF7F4FFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBF7F4FFD1976AFFFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00ECBF9EFFFBF7F4FF9CD5A5FF98D3A1FF8BCB + 93FF82C689FF7EC384FF7AC180FF76BE7CFFFBF7F4FFD49B6FFFFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00EEC1A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7 + F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00EFC2A37EEFC1A2E3EDC09FFFEBBE9DFFE7B7 + 93FFE4B28CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACA } GlyphShowMode = gsmAlways NumGlyphs = 0 OnClick = LoadBtnClick - TabOrder = 1 + TabOrder = 0 end object SaveBtn: TBitBtn Tag = 202 - Left = 26 - Height = 26 - Top = 0 - Width = 31 + Left = 31 + Height = 28 + Top = 1 + Width = 30 Align = alLeft + AutoSize = True BorderSpacing.InnerBorder = 2 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF0000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF0000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF0000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF00A1 - A1FF00A1A1FF00A1A1FF00A1A1FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF00A1A1FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF00A1A1FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF00A1A1FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FF00000000000000000000 - 00FF00A1A1FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF00000000000000FF00000000000000000000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 + 2000000000000004000064000000640000000000000000000000BA6A368FB969 + 35B5B86935EEB76835FFB56835FFB46734FFB26634FFB06533FFAE6433FFAC63 + 32FFAA6232FFA96132FFA86031FFA76031FEA66031F1A86131C4BA6A35DEEBC6 + ADFFEAC5ADFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB + F8FFFEFBF8FFFEFBF8FFFEFBF8FFC89A7CFFC79879FFA76031EDBA6B37FEEDCA + B3FFE0A27AFFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0 + 88FF62C088FF62C088FFFDF9F6FFCA8D65FFC99B7CFFA76031FEBB6C38FFEECC + B6FFE1A27AFFFEFAF7FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDC + C2FFBFDCC2FFBFDCC2FFFDF9F6FFCD9068FFCC9E81FFA86132FFBB6B38FFEFCE + B8FFE1A279FFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0 + 88FF62C088FF62C088FFFDF9F6FFCF936AFFCEA384FFAA6132FFBA6A36FFEFD0 + BBFFE2A27AFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB + F8FFFEFBF8FFFEFBF8FFFEFBF8FFD3966DFFD2A78AFFAB6232FFBB6A36FFF0D2 + BEFFE2A37AFFE2A37AFFE1A37AFFE2A37BFFE1A37BFFE0A178FFDE9F77FFDD9F + 76FFDC9D74FFD99B72FFD89971FFD69970FFD5AB8EFFAD6333FFBB6A36FFF2D5 + C2FFE3A37AFFE3A37AFFE2A37BFFE2A37BFFE2A47BFFE1A279FFE0A178FFDEA0 + 77FFDE9E75FFDC9D74FFDA9B73FFD99B73FFDAB095FFAF6433FFBB6A36FFF2D8 + C5FFE3A47BFFE3A37AFFE3A47AFFE2A47BFFE2A37BFFE1A37BFFE1A279FFDFA0 + 77FFDE9F76FFDD9E74FFDB9C72FFDC9D74FFDDB59AFFB16534FFBB6B36FFF4D9 + C7FFE6A67DFFC88C64FFC98D65FFC98E67FFCB926CFFCB926DFFCA9069FFC88C + 65FFC88C64FFC88C64FFC88C64FFDA9C74FFE1BA9FFFB36634FFBB6B36FEF4DC + C9FFE7A77DFFF9ECE1FFF9ECE1FFF9EDE3FFFCF4EEFFFDFAF7FFFDF7F3FFFAED + E5FFF7E7DBFFF7E5D9FFF6E5D8FFDEA077FFE4BEA4FFB46734FFBC6B36FAF5DD + CCFFE7A87EFFFAF0E8FFFAF0E8FFC98D66FFFAF0E9FFFDF8F3FFFEFAF8FFFCF4 + EFFFF9E9DFFFF7E7DBFFF7E5D9FFE0A278FFE7C2A9FFB66835FFBC6B36F0F6DF + D0FFE8A87EFFFCF6F1FFFCF6F1FFC88C64FFFAF1E9FFFBF4EEFFFDFAF7FFFDF9 + F6FFFAF0E8FFF8E8DDFFF7E6DBFFE1A37AFFEFD5C3FFB76935FEBC6B36D8F6DF + D1FFE9AA80FFFEFAF6FFFDFAF6FFC88C64FFFBF3EEFFFBF1EAFFFCF6F2FFFEFB + F8FFFCF6F1FFF9ECE2FFF8E7DBFFEED0BAFFECD0BDFFBB703EF8BC6B369BF6E0 + D1FFF7E0D1FFFEFBF8FFFEFBF7FFFDF9F6FFFCF5F0FFFAF0EAFFFBF2EDFFFDF9 + F6FFFDFAF7FFFBF1EBFFF8E9DFFEECD0BDFBC9895EECB5693563BC6B3671BC6B + 3690BC6B36CCBC6B36EEBC6B36FABB6B36FEBB6B36FFBB6A36FFBB6A36FFBC6C + 39FFBD6E3BFFBB6D3AFFBB6B38EFBB703ECBB6693554FFFFFF00 } GlyphShowMode = gsmAlways NumGlyphs = 0 OnClick = SaveBtnClick - TabOrder = 2 + TabOrder = 1 end object PrintBtn: TBitBtn Tag = 203 - Left = 87 - Height = 26 - Top = 0 + Left = 86 + Height = 28 + Top = 1 Width = 28 Align = alLeft BorderSpacing.InnerBorder = 2 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000000000000000000000000000000000 - 00FF000000000000000000000000000000000000000000000000000000000000 - 000000000000000000FF00000000000000FF0000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF00000000000000FF00000000000000FF0000 - 0000000000000000000000000000000000000000000000F9F9FF00F9F9FF00F9 - F9FF0000000000000000000000FF000000FF000000FF00000000000000FF0000 - 00000000000000000000000000000000000000000000A1A1A1FFA1A1A1FFA1A1 - A1FF0000000000000000000000FF00000000000000FF00000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF0000000000000000000000FF000000FF0000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000FF00000000000000FF00000000000000FF000000000000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF00000000000000FF00000000000000FF000000FF000000000000 - 0000000000FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9 - F9FFF9F9F9FF000000FF00000000000000FF00000000000000FF000000000000 - 000000000000000000FFF9F9F9FF000000FF000000FF000000FF000000FF0000 - 00FFF9F9F9FF000000FF000000FF000000FF000000FF00000000000000000000 - 000000000000000000FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9 - F9FFF9F9F9FFF9F9F9FF000000FF000000000000000000000000000000000000 - 00000000000000000000000000FFF9F9F9FF000000FF000000FF000000FF0000 - 00FF000000FFF9F9F9FF000000FF000000000000000000000000000000000000 - 00000000000000000000000000FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9 - F9FFF9F9F9FFF9F9F9FFF9F9F9FF000000FF0000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF0000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00C89561FDCA9865FFCA9765FFCA9765FFCA9765FFCA9764FFC997 + 64FFC99764FFCA9865FFC89461FDFFFFFF00FFFFFF00FFFFFF00636363995D5D + 5DD2585858FFC79561FFF9F7F6FFF9F1ECFFF9F1EBFFF8F0E9FFF7EDE6FFF4EA + E1FFF2E8DEFFFAF8F6FFC79461FF242424FF232323D12323237A6A6A6AFDA7A7 + A7FFB5B5B5FF818181FFAFACAAFFC5C0BDFFC5C0BDFFC5C0BDFFC5C0BDFFC5C0 + BDFFC5C0BDFFADAAA8FF2C2C2CFFB5B5B5FF9B9B9BFF232323FF707070FFB5B5 + B5FFB5B5B5FF959595FF818181FF818181FF797979FF6E6E6EFF616161FF5252 + 52FF434343FF424242FF6E6E6EFFB5B5B5FFB5B5B5FF252525FF757575FFBBBB + BBFFBBBBBBFF8D8D8DFFD4D4D4FFB9B9B9FFB9B9B9FFB9B9B9FFB9B9B9FFB9B9 + B9FFB9B9B9FFD3D3D3FF838383FFBBBBBBFFBBBBBBFF2A2A2AFF7A7A7AFFD7D7 + D7FFD7D7D7FF979797FFD8D8D8FFBFBFBFFFBFBFBFFFBFBFBFFFBFBFBFFFBFBF + BFFFBFBFBFFFD7D7D7FF8E8E8EFFD7D7D7FFD7D7D7FF3F3F3FFF7E7E7EFFF9F9 + F9FFF9F9F9FFABABABFFDFDFDFFFCBCBCBFFCBCBCBFFCBCBCBFFCBCBCBFFCBCB + CBFFCBCBCBFFDFDFDFFFA3A3A3FFF9F9F9FFF9F9F9FF616161FF818181F9FCFC + FCFFFCFCFCFFCBCBCBFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2 + F2FFF2F2F2FFF2F2F2FFC6C6C6FFFCFCFCFFFCFCFCFF707070FE818181D2D2D2 + D2FFE8E8E8FF7D7D7DFF7D7D7DFF7D7D7DFF7D7D7DFF7D7D7DFF7D7D7DFF7D7D + 7DFF7D7D7DFF7D7D7DFF7D7D7DFFE8E8E8FFC4C4C4FF565656DC818181459A9A + 9AFFCCCCCCFFC78B4EFFF9F4EDFFFEE8D8FFFEE8D7FFFDE5D3FFFCE4D1FFFAE0 + C7FFF9DDC3FFFAF4EDFFC7854AFFC3C3C3FF747474FF47474745FFFFFF008181 + 8163818181F3C5894CFFF9F4EFFFFEE7D7FFFDE7D5FFFCE6D2FFFBE1CCFFF8DC + C2FFF6DABDFFFAF4EFFFC48348FF595959F353535363FFFFFF00FFFFFF00FFFF + FF0081818109C5894BF9F9F4F0FFFCE6D3FFFDE7D3FFFBE3CDFFFAE0C8FFF5D6 + BBFFF3D4B5FFF8F4F0FFC38246F960606009FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C6894BF7F9F5F1FFFCE3CFFFFCE4CFFFFAE1CAFFF9DDC4FFF4E9 + DFFFF7F2ECFFF5EFE9FFC27E45FBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C6894CF6F9F5F1FFFCE3CDFFFBE3CDFFF9E0C8FFF8DCC2FFFDFB + F8FFFCE6CDFFE2B684FFBF7942A6FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C48649FAF7F2ECFFF8F4EEFFF8F3EDFFF8F3EDFFF8F2ECFFF2E6 + D7FFE2B27DFFDA9163F6B46B3E07FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C17D4460C88B4DBBC88C4FFEC88C4FFFC88D4FF7C98C4FF7C589 + 4CFEC4763B94FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 } GlyphShowMode = gsmAlways NumGlyphs = 0 OnClick = PrintBtnClick - TabOrder = 3 - end - object FindBtn: TBitBtn - Tag = 204 - Left = 197 - Height = 26 - Top = 0 - Width = 35 - Align = alLeft - BorderSpacing.InnerBorder = 2 - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000000000000000000000000000000000 - 0000000000FF000000FF000000FF000000FF000000FF00000000000000FFF9F9 - F9FF000000FF000000FF000000FF000000000000000000000000000000000000 - 0000000000FFF9F9F9FF000000FF000000FF000000FF00000000000000FFF9F9 - F9FF000000FF000000FF000000FF000000000000000000000000000000000000 - 0000000000FFF9F9F9FF000000FF000000FF000000FF00000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF00000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF00000000000000FF0000 - 00FFF9F9F9FF000000FF000000FF000000FF000000FF000000FF000000FFF9F9 - F9FF000000FF000000FF000000FF000000FF000000FF00000000000000FF0000 - 00FFF9F9F9FF000000FF000000FF000000FF00000000000000FF000000FFF9F9 - F9FF000000FF000000FF000000FF000000FF000000FF00000000000000FF0000 - 00FFF9F9F9FF000000FF000000FF000000FF00000000000000FF000000FFF9F9 - F9FF000000FF000000FF000000FF000000FF000000FF00000000000000000000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF0000000000000000000000000000 - 0000000000FFF9F9F9FF000000FF000000FF000000FF00000000000000FFF9F9 - F9FF000000FF000000FF000000FF000000000000000000000000000000000000 - 0000000000FF000000FF000000FF000000FF000000FF00000000000000FF0000 - 00FF000000FF000000FF000000FF000000000000000000000000000000000000 - 000000000000000000FF000000FF000000FF0000000000000000000000000000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 000000000000000000FFF9F9F9FF000000FF0000000000000000000000000000 - 00FFF9F9F9FF000000FF00000000000000000000000000000000000000000000 - 000000000000000000FF000000FF000000FF0000000000000000000000000000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 - } - GlyphShowMode = gsmAlways - NumGlyphs = 0 - OnClick = FindBtnClick - TabOrder = 4 - end - object HelpBtn: TBitBtn - Left = 232 - Height = 26 - Top = 0 - Width = 37 - Align = alLeft - BorderSpacing.InnerBorder = 2 - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF0000000000000000000000000000 - 0000A10000FFA10000FFA10000FF000000000000000000000000000000FF0000 - 00000000000000000000000000FF000000FF0000000000000000000000000000 - 0000A10000FFA10000FFA10000FF000000000000000000000000000000FF0000 - 00FF00000000000000FF000000FF000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000000000000000000000000000000000 - 0000A10000FFA10000FFA1A1A1FF000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000 - 0000A10000FFA10000FFA1A1A1FF000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF00000000000000000000 - 000000000000A10000FFA10000FF000000000000000000000000000000FF0000 - 00FF000000FF000000FF000000FF000000FF0000000000000000000000000000 - 00000000000000000000A10000FFA10000FFA1A1A1FF00000000000000FF0000 - 00FF000000FF000000FF000000FF0000000000000000A1A1A1FFA10000FFA100 - 00FF0000000000000000A1A1A1FFA10000FFA10000FFA1A1A1FF000000FF0000 - 00FF000000FF000000FF000000000000000000000000A10000FFA10000FFA1A1 - A1FF000000000000000000000000A10000FFA10000FFA10000FF000000FF0000 - 00FF000000FF00000000000000000000000000000000A10000FFA10000FFA1A1 - A1FF000000000000000000000000A10000FFA10000FFA10000FF000000FF0000 - 00FF000000000000000000000000000000000000000000000000A10000FFA100 - 00FF0000000000000000A1A1A1FFA10000FFA10000FFA1A1A1FF000000FF0000 - 000000000000000000000000000000000000000000000000000000000000A100 - 00FFA10000FFA10000FFA10000FFA10000FFA1A1A1FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 - } - GlyphShowMode = gsmAlways - NumGlyphs = 0 - OnClick = HelpBtnClick - TabOrder = 5 + TabOrder = 2 end object ExitBtn: TBitBtn Tag = 205 - Left = 57 - Height = 26 - Top = 0 + Left = 495 + Height = 28 + Top = 1 Width = 28 - Align = alLeft + Align = alRight BorderSpacing.InnerBorder = 2 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FFF9F9F9FF00000000000000000000 - 000000000000000000FFF9F9F9FF000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000FF000000FF000000FFF9F9F9FF0000000000000000000000000000 - 00000000000000000000000000FFF9F9F9FF0000000000000000000000000000 - 0000000000FF000000FF000000FFF9F9F9FF0000000000000000000000000000 - 000000000000000000FFF9F9F9FF000000000000000000000000000000000000 - 000000000000000000FF000000FF000000FFF9F9F9FF00000000000000000000 - 0000000000FF000000FFF9F9F9FF000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FFF9F9F9FF000000000000 - 00FF000000FFF9F9F9FF00000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF000000FF000000FF0000 - 00FFF9F9F9FF0000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000FF000000FF000000FFF9F9 - F9FF000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF000000FF000000FF000000FF0000 - 00FFF9F9F9FF0000000000000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FFF9F9F9FF000000000000 - 00FFF9F9F9FF0000000000000000000000000000000000000000000000000000 - 0000000000FF000000FF000000FF000000FFF9F9F9FF00000000000000000000 - 0000000000FF000000FFF9F9F9FF000000000000000000000000000000000000 - 00FF000000FF000000FF000000FFF9F9F9FF0000000000000000000000000000 - 000000000000000000FF000000FFF9F9F9FF0000000000000000000000000000 - 00FF000000FFF9F9F9FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FFF9F9F9FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D63 + 9B1619609839145D9562105A92880D5890A4135C92FC0C578FED999999FF7171 + 71FF545454FF515151FF4F4F4FFF4C4C4CFF4A4A4AFF474747FF454545FF2567 + 9DFF3274A8FF3D7CAFFF4784B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFF + FF00585858FFA2A2A2FFA2A2A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6F + A5FF78ABD2FF78ABD3FF73A7D1FF69A0CDFF407FAEFF0F5991EAFFFFFF00FFFF + FF005C5C5CFFA1A1A1FFA1A1A1FFA2A2A2FFA3A3A3FFA3A3A3FFA4A4A4FF3674 + AAFF7DAFD4FF5B9AC9FF5495C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFF + FF00606060FFA0A0A0FFA0A0A0FFA1A1A1FFA2A2A2FFA2A2A2FFA3A3A3FF3D79 + B0FF82B3D7FF629FCCFF5A9AC9FF5E9BCAFF4381AFFF196098EAFFFFFF00FFFF + FF00646464FF9F9F9FFF9F9F9FFFA0A0A0FFA1A1A1FFA1A1A1FFA2A2A2FF457E + B4FF88B7D9FF67A3CFFF619ECCFF639FCCFF4583B1FF1F649CEAFFFFFF00FFFF + FF00686868FF9E9E9EFF9F9F9FFF9F9F9FFFA0A0A0FFA0A0A0FFA1A1A1FF4C84 + BAFF8DBBDBFF6EA8D1FF66A6D1FF5FB4DFFF4785B1FF2569A1EAFFFFFF00FFFF + FF006C6C6CFF9D9D9DFF9E9E9EFF9E9E9EFF9F9F9FFF9F9F9FFFA0A0A0FF5489 + BFFF94BFDDFF75ADD4FF63B8E1FF4BD4FFFF428BB8FF2C6EA6EAFFFFFF00FFFF + FF00707070FF9C9C9CFF9D9D9DFF9D9D9DFF9E9E9EFF9F9F9FFF9F9F9FFF5A8E + C4FF98C3E0FF7CB3D7FF74AFD6FF5EC4EDFF4B88B3FF3473ABEAFFFFFF00FFFF + FF00737373FF9B9B9BFF9C9C9CFF9C9C9CFF9D9D9DFF9E9E9EFF9E9E9EFF6092 + C9FF9EC7E2FF83B8DAFF7DB4D7FF7EB3D7FF4F89B4FF3B79B1EAFFFFFF00FFFF + FF00777777FF9A9A9AFF9B9B9BFF9B9B9BFF9C9C9CFF9D9D9DFF9D9D9DFF6696 + CCFFA2CBE3FF89BDDCFF83B9DAFF84B9DAFF518BB5FF437EB6EAFFFFFF00FFFF + FF007A7A7AFF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9C9C9CFF9C9C9CFF6C9A + D0FFA7CEE5FF8FC1DFFF89BDDCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFF + FF007D7D7DFF999999FF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9D + D3FFAAD1E7FFABD1E7FF98C7E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFF + FF00808080FF7E7E7EFF7C7C7CFF7A7A7AFF777777FF757575FF727272FF719E + D4FF6F9ED6FF87B2DCFFABD3E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00709ED6DB6D9CD4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF006D9CD4896A9AD2FB6697CFEE } GlyphShowMode = gsmAlways NumGlyphs = 0 @@ -398,54 +298,350 @@ object frPreviewForm: TfrPreviewForm TabOrder = 6 end object frTBSeparator1: TPanel - Left = 85 - Height = 26 - Top = 0 - Width = 2 + Left = 61 + Height = 28 + Top = 1 + Width = 25 Align = alLeft - BevelOuter = bvLowered + BevelOuter = bvNone FullRepaint = False TabOrder = 7 end object frTBSeparator2: TPanel - Left = 115 - Height = 26 - Top = 0 - Width = 2 + Left = 114 + Height = 28 + Top = 1 + Width = 25 Align = alLeft - BevelOuter = bvLowered + BevelOuter = bvNone FullRepaint = False TabOrder = 8 end object frTBSeparator3: TPanel - Left = 195 - Height = 26 - Top = 0 - Width = 2 + Left = 263 + Height = 28 + Top = 1 + Width = 25 Align = alLeft - BevelOuter = bvLowered + BevelOuter = bvNone FullRepaint = False TabOrder = 9 end + object PgUp: TSpeedButton + Left = 308 + Height = 28 + Top = 1 + Width = 20 + Align = alLeft + AutoSize = True + Flat = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00B030 + 119BB43312FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00B43913A0C45F + 31FFB73913FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00BD4A16A2C96B37FFDA95 + 62FFB94014FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C45C19A9D0773DFFDD9F6EFFDC9B + 69FFBD4715FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00CB702A04CD6E27ACD68548FFE1A97CFFDB9866FFDEA1 + 71FFC05217FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00D68041B3DC955FFFE5B38BFFE0A477FFDC9A67FFE1A6 + 7AFFC65C19FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00D98950E2E09D6BFFE8B895FFE3AB81FFDFA172FFE3AD + 83FFC9651BFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00D98D53A4E0A071FFE9BB99FFE5AF86FFE6B2 + 8DFFCF722AFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DB905A9EE3A475FFE9BB99FFE8B9 + 95FFD47C3AFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DD95608EE5A67AFFEABD + 9AFFD9874AFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DF996587E197 + 62FEDD9059FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E19B + 6B87E19965F4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + NumGlyphs = 0 + OnClick = PgUpClick + end + object PgDown: TSpeedButton + Left = 431 + Height = 28 + Top = 1 + Width = 20 + Align = alLeft + AutoSize = True + Flat = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00C04E16FFB741149BFFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00C45918FFCC713BFFB94515A0FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00C9621AFFDFA375FFCF743CFFBD4A16A2FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00CD6E23FFE1A87EFFE0A679FFD0773DFFBD5017A9FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00D27735FFE4AF87FFDFA172FFE1A97CFFD07A3FFFC053 + 18ACB7451504FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00D68443FFE7B590FFE0A374FFE0A477FFE2AB81FFD37F + 43FFC65919B3FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00DB8E53FFEABB99FFE3AA80FFE3AB81FFE4B18AFFD688 + 4BFFC6621AE2FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00E19762FFECC1A1FFE8B792FFE9BB99FFDD9761FFCD72 + 2CA4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00E2A06EFFEEC7A8FFEDC2A3FFE3A475FFD684479EFFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00E6A779FFEFC8ADFFE8B087FFDD95608EFFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00EAAB80FFE8A97CFEE2A27487FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00E8AB80F4E8A97E87FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + NumGlyphs = 0 + OnClick = PgDownClick + end + object LbPanel: TPanel + Left = 328 + Height = 28 + Top = 1 + Width = 103 + Align = alLeft + BevelInner = bvLowered + BevelOuter = bvNone + Font.Color = clBlack + Font.Height = -11 + FullRepaint = False + ParentFont = False + TabOrder = 10 + end + object BtPgFirst: TSpeedButton + Left = 288 + Height = 28 + Top = 1 + Width = 20 + Align = alLeft + AutoSize = True + Flat = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C8621AFFC65C19FFC45518FFC05217BFFFFFFF00FFFFFF00FFFF + FF00FFFFFF00B233129BB63912FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00CD6B1EFFE1A87BFFD8915EFFC65918BFFFFFFF00FFFFFF00FFFF + FF00B63E14A0C66433FFB73C13FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00CF742CFFE3AC83FFDB9765FFC8621ABFFFFFFF00FFFFFF00BD4A + 16A2CA6B38FFDA9763FFBB4114FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D27B39FFE5B18AFFDE9D6DFFCD6B1EBFFFFFFF00C45A19A9D077 + 3DFFDD9F6EFFDC9B6AFFBD4A16FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D88445FFE8B691FFE1A477FFCF742CC0CB691EACD38144FFE0A7 + 7AFFDA9763FFDE9F70FFC05217FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D98B52FFE9BB98FFE6B38EFFD27B39ECDE9E6DFFE4AE86FFDFA1 + 71FFDB9762FFDFA376FFC65918FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00DF925CFFEBC09EFFE9BB98FFD68443F8E1A273FFE6B38EFFE1A7 + 79FFDD9C6BFFE1A87EFFC8621AFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E19B65FFEDC4A5FFE8B48FFFD98B52BFD48041A4DD9764FFE6B5 + 90FFE2A97EFFE4AD85FFCD6B1EFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E2A070FFEFC8ABFFEAB996FFDF925CBFFFFFFF00D684479EDF9A + 66FFE7B58FFFE6B28DFFCF742CFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E6A677FFF0CBB0FFECBE9DFFE19B65BFFFFFFF00FFFFFF00D685 + 4A8EDF9D69FFE7B490FFD27B39FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E8AB80FFF2CEB4FFEEC1A2FFE2A070BFFFFFFF00FFFFFF00FFFF + FF00D8894C87D9894AFED88445FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00EAAB80FFEAAB80FFE8A97EFFE6A677BFFFFFFF00FFFFFF00FFFF + FF00FFFFFF00D98D5387D98950F4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + NumGlyphs = 0 + OnClick = BtPgFirstClick + end + object BtPgLast: TSpeedButton + Left = 451 + Height = 28 + Top = 1 + Width = 20 + Align = alLeft + AutoSize = True + Flat = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00C8621AFFC055189BFFFFFF00FFFFFF00FFFFFF00FFFFFF00BB41 + 14BFB93E14FFB73A13FFB63912FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00CD6B1EFFD38142FFC45919A0FFFFFF00FFFFFF00FFFFFF00BD4A + 16BFD2804EFFD8945EFFB73C13FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00CF742CFFE3AC83FFD38144FFC65C19A2FFFFFF00FFFFFF00C052 + 17BFD48553FFDA9763FFBB4114FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D27B39FFE5B18AFFE4AE86FFD68546FFC6601AA9FFFFFF00C659 + 18BFD68B57FFDC9B6AFFBD4A16FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D88445FFE8B691FFE3A97FFFE4B189FFD6874BFFC8631AACC862 + 1AC0D9925EFFDE9F70FFC05217FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00D98B52FFE9BB98FFE3AA7FFFE3AB82FFE5B28BFFDD9966FFCD6B + 1EECDFA374FFDFA376FFC65918FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00DF925CFFEBC09EFFE6B087FFE6B189FFE8B792FFDF9D6EFFCF72 + 2AF8E2AB81FFE1A87EFFC8621AFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E19B65FFEDC4A5FFEABA97FFEABE9EFFDF9D69FFD17B39A4D27B + 39BFE0A273FFE4AD85FFCD6B1EFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E2A070FFEFC8ABFFEEC3A6FFE5A67AFFD8894E9EFFFFFF00D884 + 45BFE3A87BFFE6B28DFFCF742CFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E6A677FFEFC8ADFFE8B088FFDF97628EFFFFFF00FFFFFF00D98B + 52BFE4AE84FFE8B794FFD27B39FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E8AB80FFE8A77BFEE2A27287FFFFFF00FFFFFF00FFFFFF00DF92 + 5CBFE7B38BFFEABC9AFFD88445FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00E8AB80F4E8A97E87FFFFFF00FFFFFF00FFFFFF00FFFFFF00E19B + 65BFDF9560FFDD9059FFD98B52FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + NumGlyphs = 0 + OnClick = BtPgLastClick + end + object BtZoomOut: TBitBtn + Left = 139 + Height = 28 + Top = 1 + Width = 26 + Align = alLeft + AutoSize = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00145D9503105A921AFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF0022669E061B629AAD22679DFF115B9387FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003272 + AA062B6DA5AD558DBCFF89B5DDFF185F97FFFFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00447FB7063C79 + B1AD6497C5FF9DC1E4FF6699C7FF1F659DEBFFFFFF00FFFFFF00FFFFFF00FFFF + FF00DDB28F02D9AE8A97D6A985E3D3A57FFDD0A07BFDCD9C76E4A2938ADE75A2 + CCFFABCBE8FF76A4CEFF3070A8EB286BA327FFFFFF00FFFFFF00FFFFFF00E4BD + 9B02E1B896C0E8C9AEFFF5E1CDFFF7E5D3FFF7E5D1FFF3DDC8FFDFBA9CFFC7A8 + 91FF86AED5FF417DB5EB3977AF27FFFFFF00FFFFFF00FFFFFF00FFFFFF00E8C3 + A297EDD0B7FFF8E8D9FFF5DEC8FFF3D8BDFFF3D6BBFFF4DBC2FFF7E4D2FFDFBB + 9DFF9D9492F74B84BC27FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00ECC8 + A8E3F7E7D7FFF6E1CCFFF4DBC2FFF4DAC0FFF3D8BDFF7371F3FF5654F7FF4845 + F4FF3A35F1FF2E26EEFF231AECFF1C11EAF7FFFFFF00FFFFFF00FFFFFF00F0CE + AEFDF9ECDFFFF5DFC8FFF5DDC6FFF4DCC3FFF4DAC1FF6D6FFCFF95A7F2FF91A1 + F0FF8D9BEDFF8793EBFF828CE8FF231AECFFFFFFFF00FFFFFF00FFFFFF00F4D3 + B4FDF9EDE1FFF6E1CCFFF5DFC9FFF5DEC7FFF4DCC4FF7E80F9FF6D6FFCFF6263 + FAFF5654F7FF4845F4FF3A35F1FF2E26EEEEFFFFFF00FFFFFF00FFFFFF00F7D7 + B9E3F9EBDEFFF7E7D6FFF6E1CCFFF5E0CAFFF5DEC8FFF5DDC5FFF6E1CBFFF5E2 + D0FFDBB08CE3FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FADB + BD97F8E2CCFFFAEEE3FFF7E7D6FFF6E2CEFFF6E1CBFFF6E3D0FFF9EADDFFECCF + B5FFDFB69397FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FCDE + C002FADBBEC0F9E2CDFFFAECDEFFF9EEE2FFF9EDE2FFF8E9DAFFF0D5BDFFE7C0 + 9FC0E3BC9A02FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FCDEC102FADCBF97F9D9BBE3F6D6B8FDF4D3B4FDF1CFAFE3EECBAB97EBC6 + A602FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + OnClick = BtZoomOutClick + TabOrder = 3 + end + object BtZoomIn: TBitBtn + Left = 237 + Height = 28 + Top = 1 + Width = 26 + Align = alLeft + AutoSize = True + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00145D9503105A921AFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF0022669E061B629AAD22679DFF115B9387FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003272 + AA062B6DA5AD558DBCFF89B5DDFF185F97FFFFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00447FB7063C79 + B1AD6497C5FF9DC1E4FF6699C7FF1F659DEBFFFFFF00FFFFFF00FFFFFF00FFFF + FF00DDB28F02D9AE8A97D6A985E3D3A57FFDD0A07BFDCD9C76E4A2938ADE75A2 + CCFFABCBE8FF76A4CEFF3070A8EB286BA327FFFFFF00FFFFFF00FFFFFF00E4BD + 9B02E1B896C0E8C9AEFFF5E1CDFFF7E5D3FFF7E5D1FFF3DDC8FFDFBA9CFF3D7F + 3EFF2C7331FF2A6E3AFD3977AF27FFFFFF00FFFFFF00FFFFFF00FFFFFF00E8C3 + A297EDD0B7FFF8E8D9FFF5DEC8FFF3D8BDFFF3D6BBFFF4DBC2FFF7E4D2FF3986 + 40FF54A970FF2E7533FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00ECC8 + A8E3F7E7D7FFF6E1CCFFF4DBC2FFF4DAC0FFF3D8BDFF61A862FF489A50FF51A0 + 62FF60B27EFF449353FF2F7835FF2A702FF7FFFFFF00FFFFFF00FFFFFF00F0CE + AEFDF9ECDFFFF5DFC8FFF5DDC6FFF4DCC3FFF4DAC1FF56AD5FFF79C49CFF73BF + 94FF6CBA8CFF65B684FF5EB07BFF317B37FFFFFFFF00FFFFFF00FFFFFF00F4D3 + B4FDF9EDE1FFF6E1CCFFF5DFC9FFF5DEC7FFF4DCC4FF69BB6EFF58B061FF64B5 + 78FF78C39AFF58A769FF3F8E46FF398640EEFFFFFF00FFFFFF00FFFFFF00F7D7 + B9E3F9EBDEFFF7E7D6FFF6E1CCFFF5E0CAFFF5DEC8FFF5DDC5FFF6E1CBFF59B3 + 63FF82CAA7FF4EA256FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FADB + BD97F8E2CCFFFAEEE3FFF7E7D6FFF6E2CEFFF6E1CBFFF6E3D0FFF9EADDFF69BD + 70FF5BB565FF56AD5FF7FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FCDE + C002FADBBEC0F9E2CDFFFAECDEFFF9EEE2FFF9EDE2FFF8E9DAFFF0D5BDFFE7C0 + 9FC0E3BC9A02FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FCDEC102FADCBF97F9D9BBE3F6D6B8FDF4D3B4FDF1CFAFE3EECBAB97EBC6 + A602FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } + OnClick = BtZoomInClick + TabOrder = 5 + end end end object PreviewPanel: TPanel Left = 0 - Height = 346 + Height = 490 Top = 28 - Width = 412 + Width = 524 Align = alClient BevelInner = bvLowered BevelOuter = bvNone - ClientHeight = 346 - ClientWidth = 412 + ClientHeight = 490 + ClientWidth = 524 FullRepaint = False TabOrder = 1 object ScrollBox1: TScrollBox Left = 1 - Height = 325 + Height = 469 Top = 1 - Width = 391 + Width = 503 + HorzScrollBar.Page = 503 + VertScrollBar.Page = 469 Align = alClient BorderStyle = bsNone TabOrder = 0 @@ -453,20 +649,20 @@ object frPreviewForm: TfrPreviewForm object BPanel: TPanel Left = 1 Height = 19 - Top = 326 - Width = 410 + Top = 470 + Width = 522 Align = alBottom BevelOuter = bvNone ClientHeight = 19 - ClientWidth = 410 + ClientWidth = 522 FullRepaint = False TabOrder = 1 object HScrollBar: TScrollBar - Left = 76 - Height = 15 - Top = 0 - Width = 318 - Align = alClient + Left = 2 + Height = 16 + Top = 3 + Width = 504 + Align = alBottom BorderSpacing.Left = 2 BorderSpacing.Right = 16 LargeChange = 200 @@ -477,98 +673,24 @@ object frPreviewForm: TfrPreviewForm TabOrder = 0 OnChange = HScrollBarChange end - object LbPanel: TPanel - Left = 0 - Height = 19 - Top = 0 - Width = 74 - Align = alLeft - BevelOuter = bvLowered - FullRepaint = False - TabOrder = 1 - end end object RPanel: TPanel - Left = 392 - Height = 325 + Left = 504 + Height = 469 Top = 1 Width = 19 Align = alRight BevelOuter = bvNone - ClientHeight = 325 + ClientHeight = 469 ClientWidth = 19 FullRepaint = False TabOrder = 2 - object PgUp: TSpeedButton - Left = 0 - Height = 19 - Top = 287 - Width = 19 - Align = alBottom - Color = clBtnFace - Glyph.Data = { - 76020000424D760200000000000036000000280000000C0000000C0000000100 - 2000000000004002000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000FF000000FF0000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00FF000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000FF000000FF0000 - 00FF000000FF000000FF00000000000000000000000000000000000000000000 - 00000000000000000000000000FF000000FF000000FF00000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00FF000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 - } - NumGlyphs = 0 - OnClick = PgUpClick - end - object PgDown: TSpeedButton - Left = 0 - Height = 19 - Top = 306 - Width = 19 - Align = alBottom - Color = clBtnFace - Glyph.Data = { - 76020000424D760200000000000036000000280000000C0000000C0000000100 - 2000000000004002000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF0000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00FF000000FF0000000000000000000000000000000000000000000000000000 - 000000000000000000FF000000FF000000FF000000FF000000FF000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000FF0000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000FF0000 - 00FF000000FF0000000000000000000000000000000000000000000000000000 - 000000000000000000FF000000FF000000FF000000FF000000FF000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000 - } - NumGlyphs = 0 - OnClick = PgDownClick - end object VScrollBar: TScrollBar - Left = 4 - Height = 287 + Left = 3 + Height = 469 Top = 0 - Width = 15 - Align = alClient + Width = 16 + Align = alRight Kind = sbVertical LargeChange = 200 Max = 32000 diff --git a/components/lazreport/source/lr_view.pas b/components/lazreport/source/lr_view.pas index 38ad394468..0718156a74 100644 --- a/components/lazreport/source/lr_view.pas +++ b/components/lazreport/source/lr_view.pas @@ -93,11 +93,15 @@ type { TfrPreviewForm } TfrPreviewForm = class(TForm) + BtZoomOut: TBitBtn; + BtZoomIn: TBitBtn; frTBSeparator1: TPanel; frTBSeparator2: TPanel; frTBSeparator3: TPanel; LbPanel: TPanel; PanTop: TPanel; + PgDown: TSpeedButton; + PgUp: TSpeedButton; ProcMenu: TPopupMenu; N2001: TMenuItem; N1501: TMenuItem; @@ -111,7 +115,6 @@ type N3: TMenuItem; OpenDialog: TOpenDialog; SaveDialog: TSaveDialog; - Bevel2: TBevel; N4: TMenuItem; N5: TMenuItem; N6: TMenuItem; @@ -119,8 +122,8 @@ type PreviewPanel: TPanel; ScrollBox1: TScrollBox; RPanel: TPanel; - PgUp: TSpeedButton; - PgDown: TSpeedButton; + BtPgFirst: TSpeedButton; + BtPgLast: TSpeedButton; VScrollBar: TScrollBar; BPanel: TPanel; HScrollBar: TScrollBar; @@ -129,10 +132,12 @@ type LoadBtn: TBitBtn; SaveBtn: TBitBtn; PrintBtn: TBitBtn; - FindBtn: TBitBtn; - HelpBtn: TBitBtn; ExitBtn: TBitBtn; + procedure BtZoomInClick(Sender: TObject); + procedure BtZoomOutClick(Sender: TObject); procedure FormResize(Sender: TObject); + procedure BtPgFirstClick(Sender: TObject); + procedure BtPgLastClick(Sender: TObject); procedure VScrollBarChange(Sender: TObject); procedure HScrollBarChange(Sender: TObject); procedure PgUpClick(Sender: TObject); @@ -518,21 +523,9 @@ begin LoadBtn.Hint := sPreviewFormOpen; SaveBtn.Hint := sPreviewFormSave; PrintBtn.Hint := sPreviewFormPrint; - FindBtn.Hint := sPreviewFormFind; - HelpBtn.Hint := sPreviewFormHelp; ExitBtn.Hint := sPreviewFormClose; - - // adjust scrollbars widths - - W := PgUp.Glyph.Width + 2; - VScrollbar.Width := W; - PgUp.Width := W; - PgDown. Width := W; - PgUp.Height := PgUp.Glyph.Height + 2; - PgDown.Height := PgDown.Glyph.Height + 2; - - BPanel.Height := RPanel.Width; - HScrollbar.Height := W; + + // TODO: ADD hints to new buttons end; procedure TfrPreviewForm.FormDestroy(Sender: TObject); @@ -569,12 +562,9 @@ begin LoadBtn.Visible := pbLoad in TfrReport(Doc).PreviewButtons; SaveBtn.Visible := pbSave in TfrReport(Doc).PreviewButtons; PrintBtn.Visible := pbPrint in TfrReport(Doc).PreviewButtons; - FindBtn.Visible := pbFind in TfrReport(Doc).PreviewButtons; - HelpBtn.Visible := pbHelp in TfrReport(Doc).PreviewButtons; ExitBtn.Visible := pbExit in TfrReport(Doc).PreviewButtons; if not ZoomBtn.Visible then frTBSeparator1.Hide; - frTBSeparator3.Visible := FindBtn.Visible or HelpBtn.Visible; end; PrintBtn.Enabled := Printer.Printers.Count > 0; @@ -850,10 +840,11 @@ begin Inc(y, maxdy + 10); Inc(i, nx); end; - - VScrollBar.Height := RPanel.Height - PgUp.height - PgDown.height; - if RPanel.Visible then - HScrollbar.Width := BPanel.Width - HScrollbar.Left - RPanel.Width; + + // REMOVE: scrolls size hacks + //VScrollBar.Height := RPanel.Height - PgUp.height - PgDown.height; + //if RPanel.Visible then + // HScrollbar.Width := BPanel.Width - HScrollbar.Left - RPanel.Width; if maxx < 0 then maxx := 0 else Inc(maxx, 10); if maxy < 0 then maxy := 0 else Inc(maxy, 10); @@ -869,6 +860,56 @@ begin PaintAllowed := True; end; +procedure TfrPreviewForm.BtZoomOutClick(Sender: TObject); +begin + if EMFPages = nil then Exit; + ofx := 0; + if LastScale > 0.1 then + begin + mode := mdNone; + per := (LastScale - 0.1); + HScrollBar.Position := 0; + FormResize(nil); + LastScale := per; + LastScaleMode := mode; + PBox.Repaint; + end; +end; + +procedure TfrPreviewForm.BtZoomInClick(Sender: TObject); +begin + if EMFPages = nil then Exit; + ofx := 0; + if LastScale < 100 then + begin + mode := mdNone; + per := (LastScale + 0.1); + HScrollBar.Position := 0; + FormResize(nil); + LastScale := per; + LastScaleMode := mode; + PBox.Repaint; + end; +end; + +procedure TfrPreviewForm.BtPgFirstClick(Sender: TObject); +begin + if EMFPages = nil then Exit; + if CurPage > 1 then + CurPage := 1; + ShowPageNum; + SetToCurPage; +end; + +procedure TfrPreviewForm.BtPgLastClick(Sender: TObject); +begin + if EMFPages = nil then Exit; + if CurPage < TfrEMFPages(EMFPages).Count then + CurPage := TfrEMFPages(EMFPages).Count; + ShowPageNum; + SetToCurPage; +end; + procedure TfrPreviewForm.SetToCurPage; begin if EMFPages = nil then Exit; @@ -1009,6 +1050,7 @@ end; procedure TfrPreviewForm.PgUpClick(Sender: TObject); begin + if EMFPages = nil then Exit; if CurPage > 1 then Dec(CurPage); ShowPageNum; SetToCurPage; @@ -1274,25 +1316,16 @@ begin RedrawAll; end; -//type THackBtn = class(TBitBtn); - procedure TfrPreviewForm.HelpBtnClick(Sender: TObject); begin Screen.Cursor := crHelp; SetCapture(Handle); -//** THackBtn(HelpBtn).FMouseInControl := False; - HelpBtn.Invalidate; end; procedure TfrPreviewForm.FormMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin -// HelpBtn.Down := False; Screen.Cursor := crDefault; -(* c := frControlAtPos(Self, Point(X, Y)); - if (c <> nil) and (c <> HelpBtn) then - Application.HelpCommand(HELP_CONTEXTPOPUP, c.Tag); -*) end; end.