diff --git a/src/seedsigner/controller.py b/src/seedsigner/controller.py index 1d270d2b..dab0571f 100644 --- a/src/seedsigner/controller.py +++ b/src/seedsigner/controller.py @@ -557,8 +557,8 @@ class Controller(Singleton): if frame is not None: if decoder.getPercentComplete() > 0 and decoder.isPSBT(): scan_text = str(decoder.getPercentComplete()) + "% Complete" - View.DispShowImageWithText(frame.resize((240,240)), scan_text, font=View.ANTON22, text_color=View.color, text_background=(0,0,0,225)) - time.sleep(0.1) # turn this up or down to tune performace while decoding psbt + View.DispShowImageWithText(frame.resize((240,240)), scan_text, font=View.ASSISTANT22, text_color=View.color, text_background=(0,0,0,225)) + time.sleep(0.1) # turn this up or down to tune performance while decoding psbt if camera._video_stream is None: break diff --git a/src/seedsigner/resources/fonts/Assistant-Bold.ttf b/src/seedsigner/resources/fonts/Assistant-Bold.ttf new file mode 100644 index 00000000..b231abef Binary files /dev/null and b/src/seedsigner/resources/fonts/Assistant-Bold.ttf differ diff --git a/src/seedsigner/resources/fonts/Assistant-Medium.ttf b/src/seedsigner/resources/fonts/Assistant-Medium.ttf new file mode 100644 index 00000000..83efe1ab Binary files /dev/null and b/src/seedsigner/resources/fonts/Assistant-Medium.ttf differ diff --git a/src/seedsigner/resources/fonts/Assistant-OFL.txt b/src/seedsigner/resources/fonts/Assistant-OFL.txt new file mode 100644 index 00000000..a754f0e4 --- /dev/null +++ b/src/seedsigner/resources/fonts/Assistant-OFL.txt @@ -0,0 +1,95 @@ +Copyright 2020 The Assistant Project Authors (https://github.com/hafontia/Assistant). +Copyright 2010 The Source Sans Pro Authors (https://github.com/adobe-fonts/source-sans-pro), with Reserved Font Name 'Source'. +Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/seedsigner/resources/fonts/RobotoMono-LICENSE.txt b/src/seedsigner/resources/fonts/RobotoMono-LICENSE.txt new file mode 100644 index 00000000..75b52484 --- /dev/null +++ b/src/seedsigner/resources/fonts/RobotoMono-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/seedsigner/resources/fonts/RobotoMono-Medium.ttf b/src/seedsigner/resources/fonts/RobotoMono-Medium.ttf new file mode 100644 index 00000000..8461be77 Binary files /dev/null and b/src/seedsigner/resources/fonts/RobotoMono-Medium.ttf differ diff --git a/src/seedsigner/views/io_test_view.py b/src/seedsigner/views/io_test_view.py index 7bb8c2c4..ca3a6f3a 100644 --- a/src/seedsigner/views/io_test_view.py +++ b/src/seedsigner/views/io_test_view.py @@ -78,7 +78,7 @@ class IOTestView(View): self.redraw_complete = False self.redraw = False self.draw.rectangle((0,0,View.canvas_width, View.canvas_height), outline=0, fill=0) - self.draw.text((45, 5), "Input/Output Check:", fill=View.color, font=View.ANTON18) + self.draw.text((45, 5), "Input/Output Check:", fill=View.color, font=View.ASSISTANT18) self.draw.polygon([(61, 89), (80, 46), (99, 89)], outline=View.color, fill=0) self.draw.polygon([(51, 100), (8, 119), (51, 138)], outline=View.color, fill=0) self.draw.polygon([(109, 100), (152, 119), (109, 138)], outline=View.color, fill=0) @@ -86,10 +86,10 @@ class IOTestView(View): self.draw.ellipse([(61, 99), (99, 141)], outline=View.color, fill=0) self.draw.ellipse([(198, 40), (238, 80)], outline=View.color, fill=0) self.draw.ellipse([(198, 95), (238, 135)], outline=View.color, fill=0) - self.draw.text((200, 160), "EXIT", fill=View.color, font=View.ANTON18) + self.draw.text((200, 160), "EXIT", fill=View.color, font=View.ASSISTANT18) self.draw.rectangle((30, 205, 210, 235), outline=View.color, fill="BLACK") - tw, th = self.draw.textsize(self.qr_text, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 205), self.qr_text, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(self.qr_text, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 205), self.qr_text, fill=View.color, font=View.ASSISTANT22) View.DispShowImage() self.redraw_complete = True @@ -144,8 +144,8 @@ class IOTestView(View): self.qr_text = "QR Scanned" if self.redraw == False and self.redraw_complete == True: self.draw.rectangle((30, 205, 210, 235), outline=View.color, fill=View.color) - tw, th = self.draw.textsize(self.qr_text, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 205), self.qr_text, fill="BLACK", font=View.ANTON22) + tw, th = self.draw.textsize(self.qr_text, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 205), self.qr_text, fill="BLACK", font=View.ASSISTANT22) View.DispShowImage() self.redraw = True \ No newline at end of file diff --git a/src/seedsigner/views/menu_view.py b/src/seedsigner/views/menu_view.py index 60c185be..68a60603 100644 --- a/src/seedsigner/views/menu_view.py +++ b/src/seedsigner/views/menu_view.py @@ -308,8 +308,8 @@ class MenuView(View): #Menu has changed, redraw View.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - tw, th = View.draw.textsize(t, font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 2), t, fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(t, font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 2), t, fill=View.color, font=View.ASSISTANT22) num_of_lines = len(lines) @@ -347,8 +347,8 @@ class MenuView(View): if num_of_lines >= 15: self.draw_menu_text(15, 175, lines[14], (True if selected_menu_num == 15 else False)) - tw, th = View.draw.textsize(b, font=View.ANTON18) - View.draw.text(((240 - tw) / 2, 210), b, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(b, font=View.ASSISTANT18) + View.draw.text(((240 - tw) / 2, 210), b, fill=View.color, font=View.ASSISTANT18) View.DispShowImage() # saved update menu lines and selection @@ -375,8 +375,8 @@ class MenuView(View): def draw_menu_text(self, x, y, line, selected) -> None: if selected == True: View.draw.rectangle((5, y-3, 235, y+28), outline=0, fill=View.color) - View.draw.text((x, y) , line, fill="BLACK", font=View.ANTON20) + View.draw.text((x, y) , line, fill="BLACK", font=View.ASSISTANT20BOLD) else: - View.draw.text((x, y) , line, fill=View.color, font=View.ANTON20) + View.draw.text((x, y) , line, fill=View.color, font=View.ASSISTANT20) return diff --git a/src/seedsigner/views/seed_tools_view.py b/src/seedsigner/views/seed_tools_view.py index 6e9a77e0..dd16389d 100644 --- a/src/seedsigner/views/seed_tools_view.py +++ b/src/seedsigner/views/seed_tools_view.py @@ -669,13 +669,14 @@ class SeedToolsView(View): last_word = finalseed[-1] self.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - tw, th = self.draw.textsize("The final word is :", font=View.ANTON23) - self.draw.text(((240 - tw) / 2, 60), "The final word is :", fill=View.color, font=View.ANTON23) - tw, th = self.draw.textsize(last_word, font=View.ANTON50) - self.draw.text(((240 - tw) / 2, 90), last_word, fill=View.color, font=View.ANTON50) + tw, th = self.draw.textsize("The final word is :", font=View.ASSISTANT23) + self.draw.text(((240 - tw) / 2, 60), "The final word is :", fill=View.color, font=View.ASSISTANT23) + tw, th = self.draw.textsize(last_word, font=View.ASSISTANT50) + self.draw.text(((240 - tw) / 2, 90), last_word, fill=View.color, font=View.ASSISTANT50) + + tw, th = View.draw.textsize("Right to Continue", font=View.ASSISTANT18) + View.draw.text(((240 - tw) / 2, 210), "Right to Continue", fill=View.color, font=View.ASSISTANT18) - tw, th = View.draw.textsize("Right to Continue", font=View.ANTON18) - View.draw.text(((240 - tw) / 2, 210), "Right to Continue", fill=View.color, font=View.ANTON18) View.DispShowImage() @@ -809,7 +810,7 @@ class SeedToolsView(View): def draw_dice(self, dice_selected): self.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - self.draw.text((45, 5), "Dice roll: " + str(self.roll_number) + "/99", fill=View.color, font=View.ANTON26) + self.draw.text((45, 5), "Dice roll: " + str(self.roll_number) + "/99", fill=View.color, font=View.ASSISTANT26) # when dice is selected, rect fill will be orange and ellipse will be black, ellipse outline will be the black # when dice is not selected, rect will will be black and ellipse will be orange, ellipse outline will be orange @@ -893,7 +894,7 @@ class SeedToolsView(View): self.draw.ellipse([(208, 174), (220, 186)], outline=View.color, fill=View.color) # bottom text - self.draw.text((18, 210), "Press Control Stick to Select", fill=View.color, font=View.ANTON18) + self.draw.text((18, 210), "Press Control Stick to Select", fill=View.color, font=View.ASSISTANT18) View.DispShowImage() self.dice_selected = dice_selected @@ -928,19 +929,19 @@ class SeedToolsView(View): title = "Seed Phrase (2/2)" word_index_offset = 12 # Skip ahead one page worth of words - tw, th = View.draw.textsize(title, font=View.ANTON18) - draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(title, font=View.ASSISTANT18) + draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ASSISTANT18) for i in range(0, max_range): - draw.text(word_positions[i], f"{i + 1 + word_index_offset}: " + seed_phrase[i + word_index_offset] , fill=View.color, font=View.ANTON22) + draw.text(word_positions[i], f"{i + 1 + word_index_offset}: " + seed_phrase[i + word_index_offset] , fill=View.color, font=View.ASSISTANT22) if passphrase and ((len(seed_phrase) > 12 and page_num == 2) or (len(seed_phrase) <= 12 and page_num == 1)): disp_passphrase = "Passphrase: ************" - tw, th = View.draw.textsize(disp_passphrase, font=View.ANTON18) - draw.text(((240 - tw) / 2, 185), disp_passphrase, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(disp_passphrase, font=View.ASSISTANT18) + draw.text(((240 - tw) / 2, 185), disp_passphrase, fill=View.color, font=View.ASSISTANT18) - tw, th = View.draw.textsize(bottom, font=View.ANTON18) - draw.text(((240 - tw) / 2, 212), bottom, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(bottom, font=View.ASSISTANT18) + draw.text(((240 - tw) / 2, 212), bottom, fill=View.color, font=View.ASSISTANT18) View.DispShowImage() @@ -1005,7 +1006,7 @@ class SeedToolsView(View): def seed_phrase_as_qr(self, seed_phrase): e = EncodeQR(seed_phrase=seed_phrase, qr_type=QRType.SEEDSSQR, wordlist=self.controller.settings.wordlist) image = e.nextPartImage(240, 240, 3) - View.DispShowImageWithText(image, "click to zoom, right to exit", font=View.ANTON18, text_color="BLACK", text_background="ORANGE") + View.DispShowImageWithText(image, "click to zoom, right to exit", font=View.ASSISTANT18, text_color="BLACK", text_background="ORANGE") input = self.buttons.wait_for([B.KEY_RIGHT, B.KEY_PRESS]) if input == B.KEY_RIGHT: @@ -1050,8 +1051,8 @@ class SeedToolsView(View): draw.line((mask_width, View.canvas_height - mask_height, View.canvas_width - mask_width, View.canvas_height - mask_height), fill=View.color) msg = "click to exit" - tw, th = draw.textsize(msg, font=View.ANTON18) - draw.text(((View.canvas_width - tw) / 2, View.canvas_height - th - 2), msg, fill=View.color, font=View.ANTON18) + tw, th = draw.textsize(msg, font=View.ASSISTANT18) + draw.text(((View.canvas_width - tw) / 2, View.canvas_height - th - 2), msg, fill=View.color, font=View.ASSISTANT18) def draw_block_labels(cur_block_x, cur_block_y): # Create overlay for block labels (e.g. "D-5") @@ -1090,7 +1091,7 @@ class SeedToolsView(View): ) while True: - # View.draw_text_over_image("click to exit", font=View.ANTON18, text_color="BLACK", text_background="ORANGE") + # View.draw_text_over_image("click to exit", font=View.ASSISTANT18, text_color="BLACK", text_background="ORANGE") input = self.buttons.wait_for([B.KEY_RIGHT, B.KEY_LEFT, B.KEY_UP, B.KEY_DOWN, B.KEY_PRESS]) if input == B.KEY_RIGHT: @@ -1141,7 +1142,7 @@ class SeedToolsView(View): while True: frame = self.controller.camera.read_video_stream(as_image=True) if frame is not None: - View.DispShowImageWithText(frame.resize((240,240)), "Scan Seed QR", font=View.ANTON22, text_color=View.color, text_background=(0,0,0,225)) + View.DispShowImageWithText(frame.resize((240,240)), "Scan Seed QR", font=View.ASSISTANT22, text_color=View.color, text_background=(0,0,0,225)) status = decoder.addImage(frame) if status in (DecodeQRStatus.COMPLETE, DecodeQRStatus.INVALID): diff --git a/src/seedsigner/views/settings_tools_view.py b/src/seedsigner/views/settings_tools_view.py index 9931fbf2..cf106fd8 100644 --- a/src/seedsigner/views/settings_tools_view.py +++ b/src/seedsigner/views/settings_tools_view.py @@ -89,12 +89,12 @@ class SettingsToolsView(View): line3 = "(Joystick RIGHT to EXIT)" View.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - tw, th = View.draw.textsize(line1, font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 20), line1, fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(line2, font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 55), line2, fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(line3, font=View.ANTON18) - View.draw.text(((240 - tw) / 2, 210), line3, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(line1, font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 20), line1, fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(line2, font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 55), line2, fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(line3, font=View.ASSISTANT18) + View.draw.text(((240 - tw) / 2, 210), line3, fill=View.color, font=View.ASSISTANT18) View.DispShowImage() ### @@ -178,7 +178,6 @@ class SettingsToolsView(View): keyboard_digits.set_selected_key(selected_letter="0") keyboard_digits.render_keys() render_right_panel() - View.DispShowImage() # Start the interactive update loop while True: diff --git a/src/seedsigner/views/signing_tools_view.py b/src/seedsigner/views/signing_tools_view.py index c549a972..ebdee6cf 100644 --- a/src/seedsigner/views/signing_tools_view.py +++ b/src/seedsigner/views/signing_tools_view.py @@ -28,14 +28,15 @@ class SigningToolsView(View): def display_transaction_information(self, p) -> None: self.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - tw, th = self.draw.textsize("Confirm Tx Details", font=View.ANTON25) - self.draw.text(((240 - tw) / 2, 3), "Confirm Tx Details", fill=View.color, font=View.ANTON25) + tw, th = self.draw.textsize("Confirm Tx Details", font=View.ASSISTANT25) + self.draw.text(((240 - tw) / 2, 3), "Confirm Tx Details", fill=View.color, font=View.ASSISTANT25) + in_fee_outs_str = str(len(p.psbt.inputs)) in_fee_outs_str += " inputs - fee = " if len(p.psbt.inputs) > 1 else " input - fee = " in_fee_outs_str += str(len(p.psbt.outputs)) in_fee_outs_str += " outs" if len(p.psbt.outputs) > 1 else " out" - tw, th = self.draw.textsize(in_fee_outs_str, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 40), in_fee_outs_str, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(in_fee_outs_str, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 40), in_fee_outs_str, fill=View.color, font=View.ASSISTANT22) receiving_addr_str1 = "" receiving_addr_str2 = "" @@ -48,40 +49,41 @@ class SigningToolsView(View): else: receiving_addr_str1 += "Self-Transfer" - tw, th = self.draw.textsize(receiving_addr_str1, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 75), receiving_addr_str1, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(receiving_addr_str1, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 75), receiving_addr_str1, fill=View.color, font=View.ASSISTANT22) if len(receiving_addr_str2) > 0: - tw, th = self.draw.textsize(receiving_addr_str2, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 100), receiving_addr_str2, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(receiving_addr_str2, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 100), receiving_addr_str2, fill=View.color, font=View.ASSISTANT22) + if p.spend_amount > 0: spending_str = "Spend: " + str(p.spend_amount) + " sats" - tw, th = self.draw.textsize(spending_str, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 130), spending_str, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(spending_str, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 130), spending_str, fill=View.color, font=View.ASSISTANT22) if p.change_amount > 0 and len(p.destination_addresses) == 0: change_str = "Amount: " + str(p.change_amount) + " sats" - tw, th = self.draw.textsize(change_str, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 155), change_str, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(change_str, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 155), change_str, fill=View.color, font=View.ASSISTANT22) elif p.change_amount > 0: change_str = "Change: " + str(p.change_amount) + " sats" - tw, th = self.draw.textsize(change_str, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 155), change_str, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(change_str, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 155), change_str, fill=View.color, font=View.ASSISTANT22) fee_str = "Fee: " + str(p.fee_amount) + " sats" - tw, th = self.draw.textsize(fee_str, font=View.ANTON22) - self.draw.text(((240 - tw) / 2, 180), fee_str, fill=View.color, font=View.ANTON22) + tw, th = self.draw.textsize(fee_str, font=View.ASSISTANT22) + self.draw.text(((240 - tw) / 2, 180), fee_str, fill=View.color, font=View.ASSISTANT22) - tw, th = self.draw.textsize("Left to Exit, Right to Continue", font=View.ANTON18) - self.draw.text(((240 - tw) / 2, 215), "Left to Exit, Right to Continue", fill=View.color, font=View.ANTON18) + tw, th = self.draw.textsize("Left to Exit, Right to Continue", font=View.ASSISTANT18) + self.draw.text(((240 - tw) / 2, 215), "Left to Exit, Right to Continue", fill=View.color, font=View.ASSISTANT18) View.DispShowImage() def qr_gen_status(percentage): View.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) - tw, th = View.draw.textsize("QR Generation", font=View.ANTON25) - View.draw.text(((240 - tw) / 2, 90), "QR Generation", fill=View.color, font=View.ANTON25) - tw, th = View.draw.textsize(str(round(percentage)) + "% Complete", font=View.ANTON25) - View.draw.text(((240 - tw) / 2, 125), str(round(percentage)) + "% Complete", fill=View.color, font=View.ANTON25) + tw, th = View.draw.textsize("QR Generation", font=View.ASSISTANT25) + View.draw.text(((240 - tw) / 2, 90), "QR Generation", fill=View.color, font=View.ASSISTANT25) + tw, th = View.draw.textsize(str(round(percentage)) + "% Complete", font=View.ASSISTANT25) + View.draw.text(((240 - tw) / 2, 125), str(round(percentage)) + "% Complete", fill=View.color, font=View.ASSISTANT25) View.DispShowImage() diff --git a/src/seedsigner/views/view.py b/src/seedsigner/views/view.py index 03722f87..d1770c28 100644 --- a/src/seedsigner/views/view.py +++ b/src/seedsigner/views/view.py @@ -16,26 +16,35 @@ class View: WIDTH = 240 HEIGHT = 240 - + font_path = os.path.join(pathlib.Path(__file__).parent.resolve(), "..", "resources", "fonts") # Define necessary fonts - ANTON16 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 16) - ANTON18 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 18) - ANTON20 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 20) - ANTON21 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 21) - ANTON22 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 22) - ANTON23 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 23) - ANTON25 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 25) - ANTON26 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 26) - ANTON35 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 35) - ANTON50 = ImageFont.truetype(os.path.join(font_path, "Anton.ttf"), 50) - COURIERNEW14 = ImageFont.truetype(os.path.join(font_path, "Cour.ttf"), 14) - COURIERNEW24 = ImageFont.truetype(os.path.join(font_path, "Cour.ttf"), 24) - COURIERNEW38 = ImageFont.truetype(os.path.join(font_path, "Cour.ttf"), 38) - COURIERNEW30 = ImageFont.truetype(os.path.join(font_path, "Cour.ttf"), 30) - COURIERNEW20 = ImageFont.truetype(os.path.join(font_path, "Cour.ttf"), 20) - + ASSISTANT16 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 16) + ASSISTANT18 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 18) + ASSISTANT20 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 20) + ASSISTANT21 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 21) + ASSISTANT22 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 22) + ASSISTANT23 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 23) + ASSISTANT25 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 25) + ASSISTANT26 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 26) + ASSISTANT35 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 35) + ASSISTANT50 = ImageFont.truetype(os.path.join(font_path, 'Assistant-Medium.ttf'), 50) + ASSISTANT16BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 15) + ASSISTANT18BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 17) + ASSISTANT20BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 19) + ASSISTANT21BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 20) + ASSISTANT22BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 21) + ASSISTANT23BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 22) + ASSISTANT25BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 25) + ASSISTANT26BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 26) + ASSISTANT35BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 35) + ASSISTANT50BOLD = ImageFont.truetype(os.path.join(font_path, 'Assistant-Bold.ttf'), 50) + ROBOTOMONO14 = ImageFont.truetype(os.path.join(font_path, 'RobotoMono-Medium.ttf'), 14) + ROBOTOMONO24 = ImageFont.truetype(os.path.join(font_path, 'RobotoMono-Medium.ttf'), 24) + ROBOTOMONO38 = ImageFont.truetype(os.path.join(font_path, 'RobotoMono-Medium.ttf'), 38) + ROBOTOMONO30 = ImageFont.truetype(os.path.join(font_path, 'RobotoMono-Medium.ttf'), 30) + ROBOTOMONO20 = ImageFont.truetype(os.path.join(font_path, 'RobotoMono-Medium.ttf'), 20) ROBOTOCONDENSED_BOLD_16 = ImageFont.truetype(os.path.join(font_path, "RobotoCondensed-Bold.ttf"), 16) ROBOTOCONDENSED_BOLD_18 = ImageFont.truetype(os.path.join(font_path, "RobotoCondensed-Bold.ttf"), 18) @@ -162,37 +171,37 @@ class View: View.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) if len(title) > 0: - tw, th = View.draw.textsize(title, font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(title, font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ASSISTANT22) if len(bottom) > 0: - tw, th = View.draw.textsize(bottom, font=View.ANTON18) - View.draw.text(((240 - tw) / 2, 210), bottom, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(bottom, font=View.ASSISTANT18) + View.draw.text(((240 - tw) / 2, 210), bottom, fill=View.color, font=View.ASSISTANT18) if len(lines) == 1: - tw, th = View.draw.textsize(lines[0], font=View.ANTON26) - View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ANTON26) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT26) + View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ASSISTANT26) elif len(lines) == 2: - tw, th = View.draw.textsize(lines[0], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[1], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[1], fill=View.color, font=View.ASSISTANT22) elif len(lines) == 3: - tw, th = View.draw.textsize(lines[0], font=View.ANTON26) - View.draw.text(((240 - tw) / 2, 55), lines[0], fill=View.color, font=View.ANTON26) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[2], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT26) + View.draw.text(((240 - tw) / 2, 55), lines[0], fill=View.color, font=View.ASSISTANT26) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[2], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ASSISTANT22) elif len(lines) == 4: - tw, th = View.draw.textsize(lines[0], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 55), lines[0], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[2], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[3], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 160), lines[3], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 55), lines[0], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[2], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[3], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 160), lines[3], fill=View.color, font=View.ASSISTANT22) View.DispShowImage() @@ -210,46 +219,46 @@ class View: View.draw.rectangle((0, 0, View.canvas_width, View.canvas_height), outline=0, fill=0) if len(title) > 0: - tw, th = View.draw.textsize(title, font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(title, font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 2), title, fill=View.color, font=View.ASSISTANT22) if len(bottom) > 0: - tw, th = View.draw.textsize(bottom, font=View.ANTON18) - View.draw.text(((240 - tw) / 2, 210), bottom, fill=View.color, font=View.ANTON18) + tw, th = View.draw.textsize(bottom, font=View.ASSISTANT18) + View.draw.text(((240 - tw) / 2, 210), bottom, fill=View.color, font=View.ASSISTANT18) if len(lines) == 1: - tw, th = View.draw.textsize(lines[0], font=View.ANTON26) - View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ANTON26) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT26) + View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ASSISTANT26) elif len(lines) == 2: - tw, th = View.draw.textsize(lines[0], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[1], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[0], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[1], fill=View.color, font=View.ASSISTANT22) elif len(lines) == 3: - tw, th = View.draw.textsize(lines[0], font=View.ANTON26) - View.draw.text(((240 - tw) / 2, 20), lines[0], fill=View.color, font=View.ANTON26) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[2], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT26) + View.draw.text(((240 - tw) / 2, 20), lines[0], fill=View.color, font=View.ASSISTANT26) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[2], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ASSISTANT22) elif len(lines) == 4: - tw, th = View.draw.textsize(lines[0], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 20), lines[0], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[1], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[2], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(lines[3], font=View.ANTON22) - View.draw.text(((240 - tw) / 2, 160), lines[3], fill=View.color, font=View.ANTON22) + tw, th = View.draw.textsize(lines[0], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 20), lines[0], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[1], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 90), lines[1], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[2], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 125), lines[2], fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(lines[3], font=View.ASSISTANT22) + View.draw.text(((240 - tw) / 2, 160), lines[3], fill=View.color, font=View.ASSISTANT22) - a_x_offset = 240 - View.ANTON25.getsize(a_txt)[0] - View.draw.text((a_x_offset, 39 + 0), a_txt, fill=View.color, font=View.ANTON25) + a_x_offset = 240 - View.ASSISTANT25.getsize(a_txt)[0] + View.draw.text((a_x_offset, 39 + 0), a_txt, fill=View.color, font=View.ASSISTANT25) - b_x_offset = 240 - View.ANTON25.getsize(b_txt)[0] - View.draw.text((b_x_offset , 39 + 60), b_txt, fill=View.color, font=View.ANTON25) + b_x_offset = 240 - View.ASSISTANT25.getsize(b_txt)[0] + View.draw.text((b_x_offset , 39 + 60), b_txt, fill=View.color, font=View.ASSISTANT25) - c_x_offset = 240 - View.ANTON25.getsize(c_txt)[0] - View.draw.text((c_x_offset , 39 + 120), c_txt, fill=View.color, font=View.ANTON25) + c_x_offset = 240 - View.ASSISTANT25.getsize(c_txt)[0] + View.draw.text((c_x_offset , 39 + 120), c_txt, fill=View.color, font=View.ASSISTANT25) View.DispShowImage() @@ -269,14 +278,14 @@ class View: line3 = "30 seconds before" line4 = "disconnecting power." - tw, th = View.draw.textsize(line1, font=View.ANTON22) - View.draw.text(((240-tw)/2, 45), line1, fill=View.color, font=View.ANTON22) - tw, th = View.draw.textsize(line2, font=View.ANTON20) - View.draw.text(((240-tw)/2, 100), line2, fill=View.color, font=View.ANTON20) - tw, th = View.draw.textsize(line3, font=View.ANTON20) - View.draw.text(((240-tw)/2, 130), line3, fill=View.color, font=View.ANTON20) - tw, th = View.draw.textsize(line4, font=View.ANTON20) - View.draw.text(((240-tw)/2, 160), line4, fill=View.color, font=View.ANTON20) + tw, th = View.draw.textsize(line1, font=View.ASSISTANT22) + View.draw.text(((240-tw)/2, 45), line1, fill=View.color, font=View.ASSISTANT22) + tw, th = View.draw.textsize(line2, font=View.ASSISTANT20) + View.draw.text(((240-tw)/2, 100), line2, fill=View.color, font=View.ASSISTANT20) + tw, th = View.draw.textsize(line3, font=View.ASSISTANT20) + View.draw.text(((240-tw)/2, 130), line3, fill=View.color, font=View.ASSISTANT20) + tw, th = View.draw.textsize(line4, font=View.ASSISTANT20) + View.draw.text(((240-tw)/2, 160), line4, fill=View.color, font=View.ASSISTANT20) View.DispShowImage()