From a32110bedcba28f542208cbe09406ba961f91091 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Tue, 6 Oct 2020 19:34:58 +0000 Subject: [PATCH] replace xterm by uxterm for unicode support (#1614) --- home.admin/BlitzTUI/CHANGELOG.md | 3 +++ home.admin/BlitzTUI/blitztui/main.py | 8 ++++---- home.admin/BlitzTUI/blitztui/version.py | 2 +- home.admin/config.scripts/blitz.touchscreen.sh | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/home.admin/BlitzTUI/CHANGELOG.md b/home.admin/BlitzTUI/CHANGELOG.md index 7729e193..24b67390 100644 --- a/home.admin/BlitzTUI/CHANGELOG.md +++ b/home.admin/BlitzTUI/CHANGELOG.md @@ -4,6 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.49.0] - 2020-10-03 +### Add +- xterm is replaced by uxterm, so that unicode chars are correctly displayed ## [0.48.1] - 2020-05-30 ### Add diff --git a/home.admin/BlitzTUI/blitztui/main.py b/home.admin/BlitzTUI/blitztui/main.py index 60a13609..70493268 100644 --- a/home.admin/BlitzTUI/blitztui/main.py +++ b/home.admin/BlitzTUI/blitztui/main.py @@ -137,7 +137,7 @@ class AppWindow(QMainWindow): self.file_watcher.signal.connect(self.update_watched_attr) self.file_watcher.start() - # finally start 00infoBlitz.sh in dedicated xterm frame + # finally start 00infoBlitz.sh in dedicated uxterm frame self.start_info_lcd() self.show() @@ -154,7 +154,7 @@ class AppWindow(QMainWindow): process.readyReadStandardOutput.connect( lambda: log.info(str(process.readAllStandardOutput().data().decode('utf-8')))) - process.start('xterm', ['-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), + process.start('uxterm', ['-fa', 'Terminus', '-fs', '9', '-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), '+sb', '-hold', '-e', 'bash -c \"/home/admin/00infoLCD.sh --pause {}\"'.format(pause)]) def check_config(self): @@ -521,7 +521,7 @@ class AppWindow(QMainWindow): return process = QProcess(self) - process.start('xterm', ['-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), + process.start('uxterm', ['-fa', 'Terminus', '-fs', '9', '-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), '+sb', '-hold', '-e', 'bash -c \"sudo /home/admin/XXshutdown.sh\"']) def b4_restart(self): @@ -531,7 +531,7 @@ class AppWindow(QMainWindow): return process = QProcess(self) - process.start('xterm', ['-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), + process.start('uxterm', ['-fa', 'Terminus', '-fs', '9', '-fn', 'fixed', '-into', str(int(self.ui.widget.winId())), '+sb', '-hold', '-e', 'bash -c \"sudo /home/admin/XXshutdown.sh reboot\"']) def create_new_invoice(self, memo="Pay to RaspiBlitz", amt=0): diff --git a/home.admin/BlitzTUI/blitztui/version.py b/home.admin/BlitzTUI/blitztui/version.py index 4f73fdab..444ce0a9 100644 --- a/home.admin/BlitzTUI/blitztui/version.py +++ b/home.admin/BlitzTUI/blitztui/version.py @@ -4,5 +4,5 @@ # 3) we can import it into your module module """ -__version_info__ = ('0', '48', '1') +__version_info__ = ('0', '49', '0') __version__ = '.'.join(__version_info__) diff --git a/home.admin/config.scripts/blitz.touchscreen.sh b/home.admin/config.scripts/blitz.touchscreen.sh index 936b14e7..25572675 100755 --- a/home.admin/config.scripts/blitz.touchscreen.sh +++ b/home.admin/config.scripts/blitz.touchscreen.sh @@ -27,6 +27,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "making sure system dependencies are installed" sudo apt-get update >/dev/null sudo apt-get install -y unclutter xterm python3-pyqt5 >/dev/null + sudo apt-get install -y xfonts-terminus >/dev/null # check if python3 env exists - if not install it if [ ! -d /home/admin/python3-env-lnd ]; then