From fcde4a4c8436b0dc736053e47ee67678168be2ee Mon Sep 17 00:00:00 2001 From: chren Date: Wed, 5 Oct 2016 19:52:28 +0200 Subject: [PATCH] added header icon to bootloader mockups --- bootloader/ui-mockup/boot_unsigned.py | 8 ++++++-- bootloader/ui-mockup/install_fail.py | 8 ++++++-- bootloader/ui-mockup/install_fw.py | 8 ++++++-- bootloader/ui-mockup/install_fw_really.py | 8 ++++++-- bootloader/ui-mockup/install_ok.py | 8 ++++++-- bootloader/ui-mockup/install_progress.py | 8 ++++++-- bootloader/ui-mockup/install_u_fw.py | 16 ++++++++++------ 7 files changed, 46 insertions(+), 18 deletions(-) diff --git a/bootloader/ui-mockup/boot_unsigned.py b/bootloader/ui-mockup/boot_unsigned.py index 8a0f9891..5ce594a0 100755 --- a/bootloader/ui-mockup/boot_unsigned.py +++ b/bootloader/ui-mockup/boot_unsigned.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button CANCEL_BUTTON = { @@ -27,7 +27,11 @@ ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(32, 23, 'Unsigned firmware!', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Unsigned firmware!', ui.BOLD, ui.WHITE, ui.ORANGE) # content ui.display.text(10, 60, 'Check your fingeprint', ui.NORMAL, ui.WHITE, ui.BLACK) diff --git a/bootloader/ui-mockup/install_fail.py b/bootloader/ui-mockup/install_fail.py index f1e34d8e..87fc1c0b 100755 --- a/bootloader/ui-mockup/install_fail.py +++ b/bootloader/ui-mockup/install_fail.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button DEFAULT_BUTTON = { @@ -27,7 +27,11 @@ ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(10, 23, 'Install failed', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Install failed', ui.BOLD, ui.WHITE, ui.ORANGE) # content ui.display.text(10, 53, 'Some error happend', ui.NORMAL, ui.WHITE, ui.BLACK) diff --git a/bootloader/ui-mockup/install_fw.py b/bootloader/ui-mockup/install_fw.py index da1a3258..193f9a11 100755 --- a/bootloader/ui-mockup/install_fw.py +++ b/bootloader/ui-mockup/install_fw.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button CONFIRM_BUTTON = { @@ -35,7 +35,11 @@ ui.display.backlight(255) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(10, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.ORANGE) # content ui.display.text(10, 53, 'Monero v.1.1', ui.NORMAL, ui.WHITE, ui.BLACK) diff --git a/bootloader/ui-mockup/install_fw_really.py b/bootloader/ui-mockup/install_fw_really.py index 4e35abab..89fc0d46 100755 --- a/bootloader/ui-mockup/install_fw_really.py +++ b/bootloader/ui-mockup/install_fw_really.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button CONFIRM_BUTTON = { @@ -23,7 +23,11 @@ ui.display.backlight(255) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(10, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.ORANGE) # content ui.display.text(10, 53, 'Warning!', ui.BOLD, ui.WHITE, ui.BLACK) diff --git a/bootloader/ui-mockup/install_ok.py b/bootloader/ui-mockup/install_ok.py index 01b23a87..9e8b6138 100755 --- a/bootloader/ui-mockup/install_ok.py +++ b/bootloader/ui-mockup/install_ok.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button DEFAULT_BUTTON = { @@ -23,7 +23,11 @@ ui.display.backlight(255) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(10, 23, 'Install done', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Install done', ui.BOLD, ui.WHITE, ui.ORANGE) # content # content diff --git a/bootloader/ui-mockup/install_progress.py b/bootloader/ui-mockup/install_progress.py index 975205b1..5455a605 100755 --- a/bootloader/ui-mockup/install_progress.py +++ b/bootloader/ui-mockup/install_progress.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res ui.display.backlight(255) @@ -10,7 +10,11 @@ ui.display.backlight(255) # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) -ui.display.text(10, 23, 'Installing firmware', ui.BOLD, ui.WHITE, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Installing firmware', ui.BOLD, ui.WHITE, ui.ORANGE) ui.display.text_center(120, 192 + 32, "In progress ...", 1, ui.WHITE, ui.BLACK) diff --git a/bootloader/ui-mockup/install_u_fw.py b/bootloader/ui-mockup/install_u_fw.py index dc46d9f5..509471eb 100755 --- a/bootloader/ui-mockup/install_u_fw.py +++ b/bootloader/ui-mockup/install_u_fw.py @@ -2,7 +2,7 @@ import sys sys.path.append('../../src') -from trezor import ui +from trezor import ui, res from trezor.ui import button CONFIRM_BUTTON = { @@ -33,13 +33,17 @@ CANCEL_BUTTON_ACTIVE = { ui.display.backlight(255) # background frame -# ui.display.bar(0, 10, 240, 240 - 50, ui.LIGHT_RED) -# ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) +ui.display.bar(0, 10, 240, 240 - 58, ui.LIGHT_RED) +ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header -ui.display.bar(0, 0, 240, 32, ui.LIGHT_RED, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.LIGHT_RED) -ui.display.text(10, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.LIGHT_RED) +ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) +ui.display.bar(0, 10, 240, 22, ui.ORANGE) + +image = res.load('./res/bootloader.toig') +ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) + +ui.display.text(35, 23, 'Install new firmware', ui.BOLD, ui.WHITE, ui.ORANGE) # content ui.display.text(10, 60, 'Unsigned firmware!', ui.NORMAL, ui.WHITE, ui.BLACK)