AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #8682 from accumulator/about_version

Browse Source 
qml: remove APK version, add Qt and PyQt version strings to About page
This commit is contained in:
ThomasV
2023-11-10 15:04:53 +01:00
committed by GitHub
parent 3967323842 42f323ac8d
commit 4252c30210
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
electrum/gui/qml/components/About.qml
View File

@@ -39,13 +39,6 @@ Pane {
Label { Label {
text: BUILD.electrum_version text: BUILD.electrum_version
} }
Label {
text: qsTr('APK Version')
Layout.alignment: Qt.AlignRight
}
Label {
text: BUILD.apk_version
}
Label { Label {
text: qsTr('Protocol version') text: qsTr('Protocol version')
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
@@ -53,6 +46,20 @@ Pane {
Label { Label {
text: BUILD.protocol_version text: BUILD.protocol_version
} }
Label {
text: qsTr('Qt Version')
Layout.alignment: Qt.AlignRight
}
Label {
text: BUILD.qt_version
}
Label {
text: qsTr('PyQt Version')
Layout.alignment: Qt.AlignRight
}
Label {
text: BUILD.pyqt_version
}
Label { Label {
text: qsTr('License') text: qsTr('License')
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight

7
electrum/gui/qml/qeapp.py
View File

@@ -7,7 +7,7 @@ import html
import threading import threading
from typing import TYPE_CHECKING, Set from typing import TYPE_CHECKING, Set
from PyQt6.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject, from PyQt6.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject, QT_VERSION_STR, PYQT_VERSION_STR,
qInstallMessageHandler, QTimer, QSortFilterProxyModel) qInstallMessageHandler, QTimer, QSortFilterProxyModel)
from PyQt6.QtGui import QGuiApplication, QFontDatabase, QScreen from PyQt6.QtGui import QGuiApplication, QFontDatabase, QScreen
from PyQt6.QtQml import qmlRegisterType, qmlRegisterUncreatableType, QQmlApplicationEngine from PyQt6.QtQml import qmlRegisterType, qmlRegisterUncreatableType, QQmlApplicationEngine
@@ -411,8 +411,9 @@ class ElectrumQmlApplication(QGuiApplication):
self.context.setContextProperty('QRIP', self.qr_ip_h) self.context.setContextProperty('QRIP', self.qr_ip_h)
self.context.setContextProperty('BUILD', { self.context.setContextProperty('BUILD', {
'electrum_version': version.ELECTRUM_VERSION, 'electrum_version': version.ELECTRUM_VERSION,
'apk_version': version.APK_VERSION, 'protocol_version': version.PROTOCOL_VERSION,
'protocol_version': version.PROTOCOL_VERSION 'qt_version': QT_VERSION_STR,
'pyqt_version': PYQT_VERSION_STR
}) })
self.plugins.load_plugin('trustedcoin') self.plugins.load_plugin('trustedcoin')