From c406c95cec9e5e93ee0411cbf7b8987c0825569b Mon Sep 17 00:00:00 2001 From: deeplow Date: Fri, 23 Dec 2022 11:53:02 +0000 Subject: [PATCH] GUI: Add version to header bar Fixes #219 --- dangerzone/gui/main_window.py | 7 ++++++- share/dangerzone.css | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index ef33a0b..7c14054 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -14,7 +14,7 @@ from PySide2 import QtCore, QtGui, QtWidgets from .. import container, errors from ..container import convert from ..document import SAFE_EXTENSION, Document -from ..util import get_resource_path, get_subprocess_startupinfo +from ..util import get_resource_path, get_subprocess_startupinfo, get_version from .logic import Alert, DangerzoneGui log = logging.getLogger(__name__) @@ -44,11 +44,16 @@ class MainWindow(QtWidgets.QMainWindow): header_label = QtWidgets.QLabel("dangerzone") header_label.setFont(self.dangerzone.fixed_font) header_label.setStyleSheet("QLabel { font-weight: bold; font-size: 50px; }") + header_version_label = QtWidgets.QLabel(get_version()) + header_version_label.setProperty("class", "version") # type: ignore [arg-type] + header_version_label.setAlignment(QtCore.Qt.AlignBottom) + header_layout = QtWidgets.QHBoxLayout() header_layout.addStretch() header_layout.addWidget(logo) header_layout.addSpacing(10) header_layout.addWidget(header_label) + header_layout.addWidget(header_version_label) header_layout.addStretch() # Waiting widget, replaces content widget while container runtime isn't available diff --git a/share/dangerzone.css b/share/dangerzone.css index 3684a7c..36b8c8b 100644 --- a/share/dangerzone.css +++ b/share/dangerzone.css @@ -22,3 +22,8 @@ QLabel[style="safe_extension_filename"] { QLabel.docs-selection { font-size: 18px; } + +QLabel.version { + font-size: 20px; + padding-bottom: 5px; /* align with 'dangerzone' font */ +}