mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2024-11-19 09:50:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace xterm by uxterm for unicode support (#1614)

Browse Source
This commit is contained in:
Holger Nahrstaedt 2020-10-06 19:34:58 +00:00 committed by GitHub
parent a18d68d98b
commit a32110bedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
home.admin/BlitzTUI/CHANGELOG.md
View File

@ -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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [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 ## [0.48.1] - 2020-05-30
### Add ### Add

8
home.admin/BlitzTUI/blitztui/main.py
View File

@ -137,7 +137,7 @@ class AppWindow(QMainWindow):
self.file_watcher.signal.connect(self.update_watched_attr) self.file_watcher.signal.connect(self.update_watched_attr)
self.file_watcher.start() 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.start_info_lcd()
self.show() self.show()
@ -154,7 +154,7 @@ class AppWindow(QMainWindow):
process.readyReadStandardOutput.connect( process.readyReadStandardOutput.connect(
lambda: log.info(str(process.readAllStandardOutput().data().decode('utf-8')))) 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)]) '+sb', '-hold', '-e', 'bash -c \"/home/admin/00infoLCD.sh --pause {}\"'.format(pause)])
def check_config(self): def check_config(self):
@ -521,7 +521,7 @@ class AppWindow(QMainWindow):
return return
process = QProcess(self) 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\"']) '+sb', '-hold', '-e', 'bash -c \"sudo /home/admin/XXshutdown.sh\"'])
def b4_restart(self): def b4_restart(self):
@ -531,7 +531,7 @@ class AppWindow(QMainWindow):
return return
process = QProcess(self) 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\"']) '+sb', '-hold', '-e', 'bash -c \"sudo /home/admin/XXshutdown.sh reboot\"'])
def create_new_invoice(self, memo="Pay to RaspiBlitz", amt=0): def create_new_invoice(self, memo="Pay to RaspiBlitz", amt=0):

2
home.admin/BlitzTUI/blitztui/version.py
View File

@ -4,5 +4,5 @@
# 3) we can import it into your module module # 3) we can import it into your module module
""" """
__version_info__ = ('0', '48', '1') __version_info__ = ('0', '49', '0')
__version__ = '.'.join(__version_info__) __version__ = '.'.join(__version_info__)

1
home.admin/config.scripts/blitz.touchscreen.sh
View File

@ -27,6 +27,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "making sure system dependencies are installed" echo "making sure system dependencies are installed"
sudo apt-get update >/dev/null sudo apt-get update >/dev/null
sudo apt-get install -y unclutter xterm python3-pyqt5 >/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 # check if python3 env exists - if not install it
if [ ! -d /home/admin/python3-env-lnd ]; then if [ ! -d /home/admin/python3-env-lnd ]; then