Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Final v0.8.5 changes] ANYKEYS on image entropy; sync submodules; final "v0.8.5" splash #675

Merged
merged 4 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions l10n/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: seedsigner 0.8.5-rc1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2025-01-19 10:20-0600\n"
"POT-Creation-Date: 2025-01-28 13:28-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -221,6 +221,11 @@ msgstr ""
msgid "Classified Info!"
msgstr ""

#: src/seedsigner/gui/screens/screen.py src/seedsigner/views/scan_views.py
#: src/seedsigner/views/view.py
msgid "Error"
msgstr ""

#: src/seedsigner/gui/screens/screen.py
msgid "Restarting"
msgstr ""
Expand Down Expand Up @@ -506,7 +511,7 @@ msgid "Home"
msgstr ""

#: src/seedsigner/gui/screens/tools_screens.py
msgid "click joystick"
msgid "click a button"
msgstr ""

#. A prompt to the user to either accept or reshoot the image
Expand Down Expand Up @@ -943,23 +948,6 @@ msgstr ""
msgid "Wrong QR Type"
msgstr ""

#: src/seedsigner/views/scan_views.py src/seedsigner/views/view.py
msgid "Error"
msgstr ""

#: src/seedsigner/views/scan_views.py
msgid "Unknown QR Type"
msgstr ""

#: src/seedsigner/views/scan_views.py
msgid "QRCode is invalid or is a data format not yet supported."
msgstr ""

#: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
#: src/seedsigner/views/view.py
msgid "Done"
msgstr ""

#: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
msgid "Scan PSBT"
msgstr ""
Expand Down Expand Up @@ -992,6 +980,19 @@ msgstr ""
msgid "Expected an address QR"
msgstr ""

#: src/seedsigner/views/scan_views.py
msgid "Unknown QR Type"
msgstr ""

#: src/seedsigner/views/scan_views.py
msgid "QRCode is invalid or is a data format not yet supported."
msgstr ""

#: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
#: src/seedsigner/views/view.py
msgid "Done"
msgstr ""

#. This is on the opening splash screen, displayed above the HRF logo
#: src/seedsigner/views/screensaver.py
msgid "With support from:"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ description = "Build an offline, airgapped Bitcoin signing device for less than
name = "seedsigner"
readme = "README.md"
requires-python = ">=3.10"
version = "0.8.5-rc1"
version = "0.8.5"

[project.urls]
"Bug Tracker" = "https://github.com/SeedSigner/seedsigner/issues"
Expand Down
2 changes: 1 addition & 1 deletion seedsigner-screenshots
2 changes: 1 addition & 1 deletion src/seedsigner/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Controller(Singleton):
rather than at the top in order avoid circular imports.
"""

VERSION = "0.8.5-rc1"
VERSION = "0.8.5"

# Declare class member vars with type hints to enable richer IDE support throughout
# the code.
Expand Down
9 changes: 5 additions & 4 deletions src/seedsigner/gui/screens/tools_screens.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def _run(self):
time.sleep(0.01)
continue

# Check for joystick click to take final entropy image
if self.hw_inputs.check_for_low(HardwareButtonsConstants.KEY_PRESS):
# Check for ANYCLICK to take final entropy image
if self.hw_inputs.check_for_low(keys=HardwareButtonsConstants.KEYS__ANYCLICK):
# Have to manually update last input time since we're not in a wait_for loop
self.hw_inputs.update_last_input_time()
self.camera.stop_video_stream_mode()
Expand Down Expand Up @@ -77,7 +77,7 @@ def _run(self):
int(self.renderer.canvas_width/2),
self.renderer.canvas_height - GUIConstants.EDGE_PADDING
),
text="< " + _("back") + " | " + _("click joystick"), # TODO: Render with UI elements instead of text
text="< " + _("back") + " | " + _("click a button"), # TODO: Render with UI elements instead of text
fill=GUIConstants.BODY_FONT_COLOR,
font=instructions_font,
stroke_width=4,
Expand Down Expand Up @@ -123,7 +123,8 @@ def _run(self):
)
self.renderer.show_image()

input = self.hw_inputs.wait_for([HardwareButtonsConstants.KEY_LEFT, HardwareButtonsConstants.KEY_RIGHT])
# LEFT = reshoot, RIGHT / ANYCLICK = accept
input = self.hw_inputs.wait_for([HardwareButtonsConstants.KEY_LEFT, HardwareButtonsConstants.KEY_RIGHT] + HardwareButtonsConstants.KEYS__ANYCLICK)
if input == HardwareButtonsConstants.KEY_LEFT:
return RET_CODE__BACK_BUTTON

Expand Down