almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Display the dangerous document filename on the tasks widget

Browse source
This commit is contained in:
Micah Lee 2020-01-13 14:46:06 -08:00
parent 5c99796496
commit 70889646be
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dangerzone/main_window.py
View file

@ -50,6 +50,9 @@ class MainWindow(QtWidgets.QMainWindow):
# Tasks # Tasks
self.tasks_widget = TasksWidget(self.common) 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.settings_widget.start_clicked.connect(self.tasks_widget.start)
self.tasks_widget.hide() self.tasks_widget.hide()

2
dangerzone/settings_widget.py
View file

@ -10,7 +10,7 @@ class SettingsWidget(QtWidgets.QWidget):
super(SettingsWidget, self).__init__() super(SettingsWidget, self).__init__()
self.common = common self.common = common
# Dangerous document # Dangerous document label
self.dangerous_doc_label = QtWidgets.QLabel() self.dangerous_doc_label = QtWidgets.QLabel()
self.dangerous_doc_label.setAlignment(QtCore.Qt.AlignCenter) self.dangerous_doc_label.setAlignment(QtCore.Qt.AlignCenter)
self.dangerous_doc_label.setStyleSheet( self.dangerous_doc_label.setStyleSheet(

16
dangerzone/tasks_widget.py
View file

@ -1,5 +1,6 @@
import shutil import shutil
import tempfile import tempfile
import os
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from .tasks import PullImageTask, BuildContainerTask, ConvertToPixels, ConvertToPDF from .tasks import PullImageTask, BuildContainerTask, ConvertToPixels, ConvertToPDF
@ -10,6 +11,13 @@ class TasksWidget(QtWidgets.QWidget):
super(TasksWidget, self).__init__() super(TasksWidget, self).__init__()
self.common = common 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 = QtWidgets.QLabel()
self.task_label.setAlignment(QtCore.Qt.AlignCenter) self.task_label.setAlignment(QtCore.Qt.AlignCenter)
self.task_label.setStyleSheet("QLabel { font-weight: bold; font-size: 20px; }") self.task_label.setStyleSheet("QLabel { font-weight: bold; font-size: 20px; }")
@ -30,12 +38,20 @@ class TasksWidget(QtWidgets.QWidget):
# Layout # Layout
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
layout.addWidget(self.dangerous_doc_label)
layout.addSpacing(20)
layout.addWidget(self.task_label) layout.addWidget(self.task_label)
layout.addWidget(self.details_scrollarea) layout.addWidget(self.details_scrollarea)
self.setLayout(layout) self.setLayout(layout)
self.tasks = [] 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): def start(self):
if self.common.settings.get("update_container"): if self.common.settings.get("update_container"):
self.tasks += [PullImageTask, BuildContainerTask] self.tasks += [PullImageTask, BuildContainerTask]