From 47feb0431617b2e3aabbd530227d727c682798cf Mon Sep 17 00:00:00 2001 From: James Carr Date: Thu, 5 Aug 2021 10:01:23 +0100 Subject: [PATCH 1/2] Remove max_size usage with displayio.Group Remove max_glyphs usage with Display_Text Label --- PyPortal_Google_Calendar/authenticator.py | 6 +++--- PyPortal_Google_Calendar/code.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PyPortal_Google_Calendar/authenticator.py b/PyPortal_Google_Calendar/authenticator.py index 6abaed18c..bcc027ce4 100755 --- a/PyPortal_Google_Calendar/authenticator.py +++ b/PyPortal_Google_Calendar/authenticator.py @@ -53,16 +53,16 @@ font_small.load_glyphs(glyphs) font_large.load_glyphs(glyphs) -group_verification = displayio.Group(max_size=25) +group_verification = displayio.Group() label_overview_text = Label( font_large, x=0, y=45, text="To authorize this device with Google:" ) group_verification.append(label_overview_text) -label_verification_url = Label(font_small, x=0, y=100, line_spacing=1, max_glyphs=90) +label_verification_url = Label(font_small, x=0, y=100, line_spacing=1) group_verification.append(label_verification_url) -label_user_code = Label(font_small, x=0, y=150, max_glyphs=50) +label_user_code = Label(font_small, x=0, y=150) group_verification.append(label_user_code) label_qr_code = Label(font_small, x=0, y=190, text="Or scan the QR code:") diff --git a/PyPortal_Google_Calendar/code.py b/PyPortal_Google_Calendar/code.py index 163f36542..46ff1b785 100644 --- a/PyPortal_Google_Calendar/code.py +++ b/PyPortal_Google_Calendar/code.py @@ -231,7 +231,7 @@ def display_calendar_events(resp_events): pyportal.splash.append(line_header) font_h1 = bitmap_font.load_font("fonts/Arial-18.pcf") -label_header = label.Label(font_h1, x=10, y=30, color=0x000000, max_glyphs=30) +label_header = label.Label(font_h1, x=10, y=30, color=0x000000) pyportal.splash.append(label_header) # Set up calendar event fonts From 17c9575a9265b06a70b223d20fd3cc3144a2b8a3 Mon Sep 17 00:00:00 2001 From: James Carr Date: Thu, 5 Aug 2021 10:05:20 +0100 Subject: [PATCH 2/2] Remove unnecessary execute bits --- PyPortal_Google_Calendar/authenticator.py | 0 PyPortal_Google_Calendar/fonts/Arial-18.pcf | Bin 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 PyPortal_Google_Calendar/authenticator.py mode change 100755 => 100644 PyPortal_Google_Calendar/fonts/Arial-18.pcf diff --git a/PyPortal_Google_Calendar/authenticator.py b/PyPortal_Google_Calendar/authenticator.py old mode 100755 new mode 100644 diff --git a/PyPortal_Google_Calendar/fonts/Arial-18.pcf b/PyPortal_Google_Calendar/fonts/Arial-18.pcf old mode 100755 new mode 100644