diff --git a/dangerzone/main_window.py b/dangerzone/main_window.py index 33dd583..8ca2100 100644 --- a/dangerzone/main_window.py +++ b/dangerzone/main_window.py @@ -50,6 +50,9 @@ class MainWindow(QtWidgets.QMainWindow): # Tasks self.tasks_widget = TasksWidget(self.common) + self.doc_selection_widget.document_selected.connect( + self.tasks_widget.document_selected + ) self.settings_widget.start_clicked.connect(self.tasks_widget.start) self.tasks_widget.hide() diff --git a/dangerzone/settings_widget.py b/dangerzone/settings_widget.py index 346e12a..a4f7700 100644 --- a/dangerzone/settings_widget.py +++ b/dangerzone/settings_widget.py @@ -10,7 +10,7 @@ class SettingsWidget(QtWidgets.QWidget): super(SettingsWidget, self).__init__() self.common = common - # Dangerous document + # Dangerous document label self.dangerous_doc_label = QtWidgets.QLabel() self.dangerous_doc_label.setAlignment(QtCore.Qt.AlignCenter) self.dangerous_doc_label.setStyleSheet( diff --git a/dangerzone/tasks_widget.py b/dangerzone/tasks_widget.py index b852f08..a46d02c 100644 --- a/dangerzone/tasks_widget.py +++ b/dangerzone/tasks_widget.py @@ -1,5 +1,6 @@ import shutil import tempfile +import os from PyQt5 import QtCore, QtGui, QtWidgets from .tasks import PullImageTask, BuildContainerTask, ConvertToPixels, ConvertToPDF @@ -10,6 +11,13 @@ class TasksWidget(QtWidgets.QWidget): super(TasksWidget, self).__init__() self.common = common + # Dangerous document label + self.dangerous_doc_label = QtWidgets.QLabel() + self.dangerous_doc_label.setAlignment(QtCore.Qt.AlignCenter) + self.dangerous_doc_label.setStyleSheet( + "QLabel { font-size: 16px; font-weight: bold; color: #572606; }" + ) + self.task_label = QtWidgets.QLabel() self.task_label.setAlignment(QtCore.Qt.AlignCenter) self.task_label.setStyleSheet("QLabel { font-weight: bold; font-size: 20px; }") @@ -30,12 +38,20 @@ class TasksWidget(QtWidgets.QWidget): # Layout layout = QtWidgets.QVBoxLayout() + layout.addWidget(self.dangerous_doc_label) + layout.addSpacing(20) layout.addWidget(self.task_label) layout.addWidget(self.details_scrollarea) self.setLayout(layout) self.tasks = [] + def document_selected(self): + # Update the danger doc label + self.dangerous_doc_label.setText( + f"Dangerous: {os.path.basename(self.common.document_filename)}" + ) + def start(self): if self.common.settings.get("update_container"): self.tasks += [PullImageTask, BuildContainerTask]