From 585862bd00e5964f574a9b2ddb638090ce726bbf Mon Sep 17 00:00:00 2001 From: Andrey Sotnikov Date: Sun, 8 Sep 2024 20:49:02 +0500 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mainformunit.lfm | 228 +++++++++++++------------------------------ src/mainformunit.pas | 13 ++- 2 files changed, 74 insertions(+), 167 deletions(-) diff --git a/src/mainformunit.lfm b/src/mainformunit.lfm index 362a4cf..1b4eeac 100644 --- a/src/mainformunit.lfm +++ b/src/mainformunit.lfm @@ -1,28 +1,28 @@ object MainForm: TMainForm - Left = 312 - Height = 58 - Top = 109 - Width = 320 + Left = 767 + Height = 72 + Top = 390 + Width = 400 BorderIcons = [biSystemMenu] Caption = 'Калькулятор' - ClientHeight = 58 - ClientWidth = 320 - Constraints.MaxHeight = 58 - Constraints.MinHeight = 58 + ClientHeight = 72 + ClientWidth = 400 + Constraints.MinHeight = 72 + DesignTimePPI = 120 FormStyle = fsSystemStayOnTop OnClose = FormClose OnCreate = FormCreate OnShow = FormShow - LCLVersion = '1.6.0.4' + LCLVersion = '3.4.0.0' object QueryEdit: TEditButton - Left = 4 - Height = 23 - Top = 4 - Width = 312 + Left = 5 + Height = 28 + Top = 5 + Width = 390 Align = alTop - BorderSpacing.Around = 4 + BorderSpacing.Around = 5 ButtonHint = 'Очистить' - ButtonWidth = 23 + ButtonWidth = 29 Flat = True Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 @@ -68,15 +68,15 @@ object MainForm: TMainForm PasswordChar = #0 TabOrder = 0 end - object ResultEdit: TEdit - Left = 4 - Height = 23 - Top = 31 - Width = 312 - Align = alTop - BorderSpacing.Around = 4 + object ResultMemo: TMemo + Left = 5 + Height = 29 + Top = 38 + Width = 390 + Align = alClient + BorderSpacing.Around = 5 + ScrollBars = ssAutoVertical TabOrder = 1 - Text = '0,00' end object TrayIcon: TTrayIcon PopUpMenu = TrayPopupMenu @@ -124,159 +124,63 @@ object MainForm: TMainForm end object TrayPopupMenu: TPopupMenu Images = ImageList16px - left = 32 + Left = 40 object ShowHideMenuItem: TMenuItem Caption = 'Показать/Скрыть' - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF000000 - 0023000000330000003300000033000000330000003300000033000000330000 - 0033000000330000003300000033000000330000002CFFFFFF00FFFFFF009696 - 96C09F9F9FFF9E9E9EFF9E9E9EFF9E9F9FFF9E9E9EFF9E9E9EFF9E9F9FFF9E9E - 9EFF9D9E9FFF9D9E9FFF9D9E9EFF9F9F9FFF9E9E9EE1FFFFFF00FFFFFF009F9F - 9FFFFFFEFEFFFBFAFAFFFEFDFDFFFEFDFDFFFDFCFCFFFEFDFDFFFEFDFEFFFBFC - FDFFF9FCFFFFF9FCFFFFF9FAFCFFFFFEFEFF9F9F9FFFFFFFFF00FFFFFF009E9E - 9EFFF7F6F6FFF2F1F0FF8D8A88FF6D6B68FFF7F6F5FF8D8B89FF6C6B69FFF2F6 - F9FFE49F55FFE49F55FFEEF2F5FFF7F6F7FF9E9E9EFFFFFFFF00FFFFFF009D9E - 9EFFF4F3F2FFEDECEBFFF2F1F0FFF3F3F2FFF0F0EFFFF3F2F1FFF3F3F3FFEDF1 - F6FFEEAD66FFE4A25BFFE9EDF2FFF4F4F3FF9D9E9EFFFFFFFF00FFFFFF009E9E - 9EFFF3F2F0FFE9E8E7FF8E8C8AFF6E6C6AFFEDECEBFF8F8D8AFF6E6C6BFFE9EC - F0FFF0AC62FFF0AC62FFE5E8ECFFF2F2F1FF9E9E9EFFFFFFFF00FFFFFF009E9E - 9EFFF0EEEEFFE4E2E2FFE9E7E7FFEAE8E9FFE8E6E6FFE9E7E8FFEAE8E9FFE6E5 - E7FFE5E6EBFFE4E6EBFFE2E2E4FFF0EEEEFF9E9E9EFFFFFFFF00FFFFFF009E9F - 9FFFEEEDEDFFE0DEDDFF918E8AFF716F6BFFE5E2E2FF918F8CFF706E6CFFE4E2 - E2FF918F8CFF706E6AFFE1DFDEFFEEEDEEFF9E9F9FFFFFFFFF00FFFFFF009F9F - 9FFFEEECECFFDDD9D5FFE4DED6FFE5DFD7FFE0DDD9FFE0DEDDFFE1DFDEFFE1DD - D9FFE5DFD7FFE5DFD6FFDDD9D5FFEEEDECFF9F9F9FFFFFFFFF00FFFFFF009F9F - 9FFFEDECEAFFDAD5CEFF1F7FFFFF2266FFFFDDD8D1FF928F8CFF716F6CFFDED8 - D2FF2080FFFF2265FFFFDAD5CEFFEEECEAFF9F9F9FFFFFFFFF00FFFFFF00A0A1 - A1FFF1F0F0FFF1EFEDFFF6F1ECFFF6F2ECFFF2F1EFFFF1F1F2FFF2F2F3FFF2F1 - EFFFF6F2ECFFF6F2ECFFF1F0EDFFF1F0F0FFA0A1A1FFFFFFFF00FFFFFF00A2A3 - A5FF7C7E7FFF7B7D80FF7C7E80FF7C7E81FF7B7E81FF7B7E82FF7B7E82FF7B7E - 81FF7C7E81FF7C7E80FF7B7D80FF7C7E7FFFA2A3A5FFFFFFFF00FFFFFF00A0A3 - A7FFFFCA8BFFF9C27EFFF9C27FFFF9C280FFF9C280FFF9C280FFF9C280FFF9C2 - 80FFF9C280FFF9C27FFFF9C27EFFFFCA8BFFA0A3A7FFFFFFFF00FFFFFF009EA2 - A6FFF9D0A4FFE8A760FFE7A762FFE7A863FFE7A863FFE7A863FFE7A863FFE7A8 - 63FFE7A863FFE7A762FFE8A760FFF9D0A4FF9EA2A6FFFFFFFF00FFFFFF009FA2 - A5FFFDDBB6FFF8DAB8FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DA - B9FFF8DAB9FFF8DAB9FFF8DAB8FFFDDBB6FF9FA2A5FFFFFFFF00FFFFFF00A3A4 - A5EF9FA2A5FF9EA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1 - A5FF9DA1A5FF9DA1A5FF9EA1A5FF9FA2A5FFA3A4A5EFFFFFFF00 - } ImageIndex = 0 ShortCut = 16433 OnClick = ShowHideMenuItemClick end object ExitMenuItem: TMenuItem Caption = 'Выход' - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000120000003200000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 0033000000330000003300000033365D7B79497BA2FC68A4D9FF5C5C5CFF5C5C - 5CFF5E5B5AFF5E5A59FF5D5A5AFF5B5A5BFF5A5B5BFF5A5B5BFF5A5B5BFF5B5A - 5AFF5C5956FF576876FF4E7EA4FF4C80ACFF5082ABFF65A2D5FF5E5B5C005F5A - 5C00635859003F69A5FF756667FF706869FF6D6969FF6C6A69FF6C6A69FF6C6A - 68FF6E6762FF4C89BAFF4E85B2FF4D83AEFF5D8CB2FF629ED1FF66565D006955 - 5C0010866D0013826BFF009346FF715C62FF6A6263FF676463FF666463FF6764 - 62FF68615BFF4F8ABBFF5086B4FF4F84B1FF6895B9FF5F9BCDFF000000300000 - 003300000033008C46FF4FDDB0FF008D43FF6B585EFF655E60FF636160FF6260 - 5FFF645D57FF518DBEFF528AB7FF5187B4FF739FC2FF5D97C9FF008B4BF2008A - 47FF008845FF008441FF00DAA2FF60D9B3FF008D42FF68545AFF625B5CFF605C - 5AFF605852FF5490C2FF558CBAFF4E81ADFF7EA6C8FF5A94C4FF008A47FF63ED - D0FF00D4A0FF00D29EFF00CC9CFF00CD9CFF6FDCBDFF009346FF615457FF5C57 - 56FF5B534DFF5794C5FF588EBCFF47749BFF88AFCFFF5790C0FF008A47FF61E1 - D0FF60DDCAFF63DCC8FF00C49BFF00C69CFF82E1C8FF009447FF5C5054FF5853 - 53FF574F4AFF5A96CAFF5B8FBEFF22B9F7FF95B5D3FF548DBCFF008D4CEF008A - 47FF008844FF00853FFF00C1A0FF97E3D1FF008F43FF5A484EFF565051FF5351 - 4FFF524B45FF5B9ACDFF5C91C1FF20B7F5FF9EBCD7FF5189B8FF008F4E00008F - 4C00008E4900008B44FFA0E8DAFF009144FF55434AFF524B4DFF4F4D4EFF4F4D - 4CFF4D4641FF5E9CD2FF5C95C5FF5990C1FFA6C4DFFF4E86B5FF00904C000091 - 47001A866E0017866DFF009647FF523F45FF4F4749FF4D494AFF4C4A4AFF4C48 - 48FF4A423DFF60A0D5FF5D98C9FF5894C6FFAFCCE6FF4B83B0FF009242005276 - AF004E77AB004D7BB0FF4C3D3BFF4A4343FF484544FF484644FF484644FF4745 - 42FF433C36FF5FA1D8FF5C9ACCFF5896C9FFB8D3EBFF4980ACFF4F79AB004C7A - A7004A7BA6004A7FACFF443831FF433B37FF433D38FF433D38FF433D38FF423B - 36FF3C332CFFB9DAF5FF7FB0DAFF5495CCFFC0DAEFFF467CA8FF4B7CA6004A7C - A5004A7CA6004A7EA8B04A82AEFF4A83B0FF4A83B0FF4A83B0FF4A83B0FF4A82 - AFFF447DA9FF709CBFFFB9D5EBFFB3D1EAFFC1DBF2FF4279A5FF4A7CA5004A7C - A5004A7CA5004A7CA5004A7EA7004A7EA8004A7EA8004A7EA8004A7EA800497D - A7004579A400709BBE00B5D2EA00C3DAEF58CDE3F5FB3F75A1FF - } ImageIndex = 1 OnClick = ExitMenuItemClick end end object ImageList16px: TImageList - left = 64 + Left = 80 Bitmap = { - 4C69020000001000000010000000FFFFFF00A3A4A5EF9FA2A5FF9EA1A5FF9DA1 - A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9DA1A5FF9EA1 - A5FF9FA2A5FFA3A4A5EFFFFFFF00FFFFFF009FA2A5FFFDDBB6FFF8DAB8FFF8DA - B9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DAB9FFF8DA - B8FFFDDBB6FF9FA2A5FFFFFFFF00FFFFFF009EA2A6FFF9D0A4FFE8A760FFE7A7 - 62FFE7A863FFE7A863FFE7A863FFE7A863FFE7A863FFE7A863FFE7A762FFE8A7 - 60FFF9D0A4FF9EA2A6FFFFFFFF00FFFFFF00A0A3A7FFFFCA8BFFF9C27EFFF9C2 - 7FFFF9C280FFF9C280FFF9C280FFF9C280FFF9C280FFF9C280FFF9C27FFFF9C2 - 7EFFFFCA8BFFA0A3A7FFFFFFFF00FFFFFF00A2A3A5FF7C7E7FFF7B7D80FF7C7E - 80FF7C7E81FF7B7E81FF7B7E82FF7B7E82FF7B7E81FF7C7E81FF7C7E80FF7B7D - 80FF7C7E7FFFA2A3A5FFFFFFFF00FFFFFF00A0A1A1FFF1F0F0FFF1EFEDFFF6F1 - ECFFF6F2ECFFF2F1EFFFF1F1F2FFF2F2F3FFF2F1EFFFF6F2ECFFF6F2ECFFF1F0 - EDFFF1F0F0FFA0A1A1FFFFFFFF00FFFFFF009F9F9FFFEDECEAFFDAD5CEFF1F7F - FFFF2266FFFFDDD8D1FF928F8CFF716F6CFFDED8D2FF2080FFFF2265FFFFDAD5 - CEFFEEECEAFF9F9F9FFFFFFFFF00FFFFFF009F9F9FFFEEECECFFDDD9D5FFE4DE - D6FFE5DFD7FFE0DDD9FFE0DEDDFFE1DFDEFFE1DDD9FFE5DFD7FFE5DFD6FFDDD9 - D5FFEEEDECFF9F9F9FFFFFFFFF00FFFFFF009E9F9FFFEEEDEDFFE0DEDDFF918E - 8AFF716F6BFFE5E2E2FF918F8CFF706E6CFFE4E2E2FF918F8CFF706E6AFFE1DF - DEFFEEEDEEFF9E9F9FFFFFFFFF00FFFFFF009E9E9EFFF0EEEEFFE4E2E2FFE9E7 - E7FFEAE8E9FFE8E6E6FFE9E7E8FFEAE8E9FFE6E5E7FFE5E6EBFFE4E6EBFFE2E2 - E4FFF0EEEEFF9E9E9EFFFFFFFF00FFFFFF009E9E9EFFF3F2F0FFE9E8E7FF8E8C - 8AFF6E6C6AFFEDECEBFF8F8D8AFF6E6C6BFFE9ECF0FFF0AC62FFF0AC62FFE5E8 - ECFFF2F2F1FF9E9E9EFFFFFFFF00FFFFFF009D9E9EFFF4F3F2FFEDECEBFFF2F1 - F0FFF3F3F2FFF0F0EFFFF3F2F1FFF3F3F3FFEDF1F6FFEEAD66FFE4A25BFFE9ED - F2FFF4F4F3FF9D9E9EFFFFFFFF00FFFFFF009E9E9EFFF7F6F6FFF2F1F0FF8D8A - 88FF6D6B68FFF7F6F5FF8D8B89FF6C6B69FFF2F6F9FFE49F55FFE49F55FFEEF2 - F5FFF7F6F7FF9E9E9EFFFFFFFF00FFFFFF009F9F9FFFFFFEFEFFFBFAFAFFFEFD - FDFFFEFDFDFFFDFCFCFFFEFDFDFFFEFDFEFFFBFCFDFFF9FCFFFFF9FCFFFFF9FA - FCFFFFFEFEFF9F9F9FFFFFFFFF00FFFFFF00969696C09F9F9FFF9E9E9EFF9E9E - 9EFF9E9F9FFF9E9E9EFF9E9E9EFF9E9F9FFF9E9E9EFF9D9E9FFF9D9E9FFF9D9E - 9EFF9F9F9FFF9E9E9EE1FFFFFF00FFFFFF000000002300000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 0033000000330000002CFFFFFF004A7CA5004A7CA5004A7CA5004A7CA5004A7E - A7004A7EA8004A7EA8004A7EA8004A7EA800497DA7004579A400709BBE00B5D2 - EA00C3DAEF58CDE3F5FB3F75A1FF4B7CA6004A7CA5004A7CA6004A7EA8B04A82 - AEFF4A83B0FF4A83B0FF4A83B0FF4A83B0FF4A82AFFF447DA9FF709CBFFFB9D5 - EBFFB3D1EAFFC1DBF2FF4279A5FF4F79AB004C7AA7004A7BA6004A7FACFF4438 - 31FF433B37FF433D38FF433D38FF433D38FF423B36FF3C332CFFB9DAF5FF7FB0 - DAFF5495CCFFC0DAEFFF467CA8FF009242005276AF004E77AB004D7BB0FF4C3D - 3BFF4A4343FF484544FF484644FF484644FF474542FF433C36FF5FA1D8FF5C9A - CCFF5896C9FFB8D3EBFF4980ACFF00904C00009147001A866E0017866DFF0096 - 47FF523F45FF4F4749FF4D494AFF4C4A4AFF4C4848FF4A423DFF60A0D5FF5D98 - C9FF5894C6FFAFCCE6FF4B83B0FF008F4E00008F4C00008E4900008B44FFA0E8 - DAFF009144FF55434AFF524B4DFF4F4D4EFF4F4D4CFF4D4641FF5E9CD2FF5C95 - C5FF5990C1FFA6C4DFFF4E86B5FF008D4CEF008A47FF008844FF00853FFF00C1 - A0FF97E3D1FF008F43FF5A484EFF565051FF53514FFF524B45FF5B9ACDFF5C91 - C1FF20B7F5FF9EBCD7FF5189B8FF008A47FF61E1D0FF60DDCAFF63DCC8FF00C4 - 9BFF00C69CFF82E1C8FF009447FF5C5054FF585353FF574F4AFF5A96CAFF5B8F - BEFF22B9F7FF95B5D3FF548DBCFF008A47FF63EDD0FF00D4A0FF00D29EFF00CC - 9CFF00CD9CFF6FDCBDFF009346FF615457FF5C5756FF5B534DFF5794C5FF588E - BCFF47749BFF88AFCFFF5790C0FF008B4BF2008A47FF008845FF008441FF00DA - A2FF60D9B3FF008D42FF68545AFF625B5CFF605C5AFF605852FF5490C2FF558C - BAFF4E81ADFF7EA6C8FF5A94C4FF000000300000003300000033008C46FF4FDD - B0FF008D43FF6B585EFF655E60FF636160FF62605FFF645D57FF518DBEFF528A - B7FF5187B4FF739FC2FF5D97C9FF66565D0069555C0010866D0013826BFF0093 - 46FF715C62FF6A6263FF676463FF666463FF676462FF68615BFF4F8ABBFF5086 - B4FF4F84B1FF6895B9FF5F9BCDFF5E5B5C005F5A5C00635859003F69A5FF7566 - 67FF706869FF6D6969FF6C6A69FF6C6A69FF6C6A68FF6E6762FF4C89BAFF4E85 - B2FF4D83AEFF5D8CB2FF629ED1FF5C5C5CFF5C5C5CFF5E5B5AFF5E5A59FF5D5A - 5AFF5B5A5BFF5A5B5BFF5A5B5BFF5A5B5BFF5B5A5AFF5C5956FF576876FF4E7E - A4FF4C80ACFF5082ABFF65A2D5FF000000330000003300000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 0033365D7B79497BA2FC68A4D9FF000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000120000003200000033 + 4C7A020000001000000010000000F40400000000000078DA9D93EB4F14571887 + CF9FD0B41F9AF44B8DFDEA87B626D4440D91051696BD70DF657716965DC5E52A + A6D586822CA25205968B056C04165859B0F102DE2AB4D68A55A3065AC1A2B20A + 08725960AF836051F0D773864BA1B131759227F3CE99DFF39E9933670090138D + 364F9DD5064B830DB56F8165589639A02E835D2F3CFE117FD9DB28ED6FA14DC8 + 3267D9B7589B3077AF118E661DC69BF5183F697833F41ECBB02C7396FDFA13CD + C0DD22CC5DCFA5982879FF8149C8B0ACE02CF9D61336E4E49A90BD2F8F9E19FB + 912D90BFC47E618CDD5BCC98C09C95F91B1AE0F37AE1F3B830EB7362967782F7 + 79E0F3F1E0F969A166630C9FD7256499B3B27E757570392761EFFD1D1F9B80F5 + 4940FFA36E1C2D2DC6EE5D691878D4837579747C07848C9B6699B3DA773B9DE8 + EFEBC5C8C0038C0E3EC4D3FE3E3C1DE8C7D0E0008668CDC646071F0819B7CBB9 + C6B730DFE512F2E5258574CE548C0E0FA39CCE9F99918691953A45E8E776B961 + 59ED5B2CF0BADD426E627C1C938E0938C6C668ED10EAB1D1718C8E4D6184323C + 3C226499B3DA9FE6BD98708CA3A4B810196929743DA6506A66752A269C5E784F + EB05461D746D79DF1ABF96D6CFA779C1E17D5E4CD3DAEBF5D09E3E5A4FC3E59B + 85FB4C1246AC1A4CB8783C7F3E8DDA7FCDFF62765670CD8587919E6AA4D73330 + 171D415A6A32F8D9398CD4C508B8F9197AEFC59AF985B57CFD1AAF5EBEC4EB85 + 058185F9F9A59A8ECF2F606E1E8BBC9C17B2ABD7BFAAAAEA1ABB663D05DE50D7 + 5AEA96B060293BB4ECD3E313CAC6FFC906E64A726C6BC96DA69C5C43E8BE6612 + 94D54832ABAF924B3D93E437BB47D5F56CE695FF9E0684E5342DB94D2CDB2AC9 + 3F0BC981D6B5E4B72070DF0FC8ACF915EDBD53B8D03D898EC73C02B26C50649D + 22D26FE89CD9D4379D46E0A6CF20DAFC05445B37AD10B0D90F5B366E40BB7D06 + A6563BA22B3B71CDEE4170CE4990A30124726F0B917F7D8AC8B25B21DDBA1912 + 910821418108095E441C1400D1163F24343C0277BC13AAAA3B68BB3F85D0BCD3 + 20655242CAC5E4A3820CF261413AFD186244FA0741210E852C5402A984121202 + 49C056E8EA7BA1FDFE0E5415B7D0D2398630FA6EA4544E4829ED51124A485120 + EA1D7690F240C48824880C9341219353A490056F437C4D0FB8CA9B882BEB40D3 + 8D41C80B2E8198A51E522806391C0872C81FA4A31EC79E75D3BE22A843E4880D + 8F40548482F60A82E67817B8F20EACBB3C03CB95878838D206E6260EDD83AEFF + 2E0C4F6E83DCA806B95583FC215A5788C1854743151505A5420275D55D684AAF + 627DFB0B545EBA8F68F315C137B8EE81FC590FD26301E9AC01E9AAC1AE27BF80 + 7C178CC4682538652C345132282B6E42557205E2AFAA71B8E50F28CBAE811485 + F18BCF1F0472701B88DD0A5DDF05FA5E013046ABA1D770D0716AE85491882EBB + 8E98E29F20DF7F06B94DB7A1AEB8C136EFA72B7BB238188A7EBAA666115255F1 + D811AF83215107BD2E01DBB54A4498AF22B2F03222BEBD882FEBAE437BEC0E92 + 62B524398623EF15A4930FF2538567DECDE991A23760E7760392B6B3B31EC644 + 0D14853F23BCE0221407CFC158D98E84EA2EC46B3892A0E688411547FC936DD8 + 93B41399C664A42727232D6519233276EA213D429FFDD079C80E9C85B6F83CF4 + 966E701C2710AF51235E1D07AD5A0D8D5A03B5E61F34748C8B8B85D2B817F2DC + 4648E9BE0BCF3F851DD65EBCC37FBBD14F9B9D159A6D9D3736F6093FFF3B1CEF + 533E67BDFE06A36DF6BD } end end diff --git a/src/mainformunit.pas b/src/mainformunit.pas index b21cef2..9afa344 100644 --- a/src/mainformunit.pas +++ b/src/mainformunit.pas @@ -9,12 +9,15 @@ uses StdCtrls, ExtCtrls, Menus, Windows, fpExprPars, lazutf8; type + + { TMainForm } + TMainForm = class(TForm) ExitMenuItem: TMenuItem; ImageList16px: TImageList; + ResultMemo: TMemo; ShowHideMenuItem: TMenuItem; TrayPopupMenu: TPopupMenu; - ResultEdit: TEdit; QueryEdit: TEditButton; TrayIcon: TTrayIcon; procedure ExitMenuItemClick(Sender: TObject); @@ -55,7 +58,7 @@ var parserResult: TFPExpressionResult; begin if length(QueryEdit.Text) = 0 then begin - ResultEdit.Text := '0,00'; + ResultMemo.Text := ''; exit; end; @@ -68,10 +71,10 @@ begin parser.BuiltIns := [bcMath]; parser.Expression := UTF8StringReplace(QueryEdit.Text,',','.',[rfReplaceAll]); parserResult := parser.Evaluate; - ResultEdit.Text := formatfloat('0.00', ArgToFloat(parserResult)); + ResultMemo.Text := formatfloat('0.00', ArgToFloat(parserResult)); except on E: Exception do - ResultEdit.Text := E.Message; + ResultMemo.Text := E.Message; end; parser.Free; end; @@ -79,7 +82,7 @@ end; procedure TMainForm.QueryEditKeyPress(Sender: TObject; var Key: char); begin if Key = #13 then - QueryEdit.Text := ResultEdit.Text; + QueryEdit.Text := ResultMemo.Text; end; procedure TMainForm.ShowHideMenuItemClick(Sender: TObject);