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

Switch save widgets order

Browse source 
Move the 'safe_extension' widget to the top of the settings and the save
location widget to the bottom.
This commit is contained in:
deeplow 2022-11-16 10:45:43 +00:00
parent a88f8cc44b
commit 994e70c17a
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 45 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
dangerzone/gui/main_window.py
View file

@ -303,21 +303,10 @@ class SettingsWidget(QtWidgets.QWidget):
self.docs_selected_label.setProperty("class", "docs-selection") # type: ignore [arg-type] self.docs_selected_label.setProperty("class", "docs-selection") # type: ignore [arg-type]
# Save safe version # Save safe version
self.save_checkbox = QtWidgets.QCheckBox("Save safe PDF to") self.save_checkbox = QtWidgets.QCheckBox()
self.save_checkbox.clicked.connect(self.update_ui) self.save_checkbox.clicked.connect(self.update_ui)
self.output_dir = None self.output_dir = None
# Save safe to...
self.save_location = QtWidgets.QLineEdit()
self.save_location.setReadOnly(True)
self.save_browse_button = QtWidgets.QPushButton("Choose...")
self.save_browse_button.clicked.connect(self.select_output_directory)
self.save_location_layout = QtWidgets.QHBoxLayout()
self.save_location_layout.addWidget(self.save_checkbox)
self.save_location_layout.addWidget(self.save_location)
self.save_location_layout.addWidget(self.save_browse_button)
self.save_location_layout.addStretch()
# Save safe as... [filename]-safe.pdf # Save safe as... [filename]-safe.pdf
self.safe_extension_label = QtWidgets.QLabel("Save as") self.safe_extension_label = QtWidgets.QLabel("Save as")
self.safe_extension_filename = QtWidgets.QLabel("document") self.safe_extension_filename = QtWidgets.QLabel("document")
@ -339,13 +328,45 @@ class SettingsWidget(QtWidgets.QWidget):
dot_pdf_regex = QtCore.QRegExp(r".*\.[Pp][Dd][Ff]") dot_pdf_regex = QtCore.QRegExp(r".*\.[Pp][Dd][Ff]")
self.safe_extension.setValidator(QtGui.QRegExpValidator(dot_pdf_regex)) self.safe_extension.setValidator(QtGui.QRegExpValidator(dot_pdf_regex))
self.safe_extension_layout = QtWidgets.QHBoxLayout() self.safe_extension_layout = QtWidgets.QHBoxLayout()
self.safe_extension_layout.setContentsMargins(20, 0, 0, 0) self.safe_extension_layout.addWidget(self.save_checkbox)
self.safe_extension_layout.addWidget(self.safe_extension_label) self.safe_extension_layout.addWidget(self.safe_extension_label)
self.safe_extension_layout.addLayout(self.safe_extension_name_layout) self.safe_extension_layout.addLayout(self.safe_extension_name_layout)
self.safe_extension_layout.addWidget(self.safe_extension_invalid) self.safe_extension_layout.addWidget(self.safe_extension_invalid)
self.safe_extension_layout.addStretch() self.safe_extension_layout.addStretch()
# Save safe to...
self.save_label = QLabelClickable("Save safe PDFs to")
self.save_location = QtWidgets.QLineEdit()
self.save_location.setReadOnly(True)
self.save_browse_button = QtWidgets.QPushButton("Choose...")
self.save_browse_button.clicked.connect(self.select_output_directory)
self.save_location_layout = QtWidgets.QHBoxLayout()
self.save_location_layout.setContentsMargins(20, 0, 0, 0)
self.save_location_layout.addWidget(self.save_label)
self.save_location_layout.addWidget(self.save_location)
self.save_location_layout.addWidget(self.save_browse_button)
self.save_location_layout.addStretch()
# 'Save PDF to' group box
save_group_box_innner_layout = QtWidgets.QVBoxLayout()
save_group_box = QtWidgets.QGroupBox()
save_group_box.setLayout(save_group_box_innner_layout)
save_group_box_layout = QtWidgets.QHBoxLayout()
save_group_box_layout.setContentsMargins(20, 0, 0, 0)
save_group_box_layout.addWidget(save_group_box)
self.radio_move_untrusted = QtWidgets.QRadioButton(
"Move unsafe PDFs to 'unsafe' subdirectory"
)
self.radio_move_untrusted.setChecked(True)
save_group_box_innner_layout.addWidget(self.radio_move_untrusted)
self.radio_save_to = QtWidgets.QRadioButton()
self.save_label.clicked.connect(
lambda: self.radio_save_to.setChecked(True)
) # select the radio button when label is clicked
self.radio_save_to.setMinimumHeight(30) # make the QTextEdit fully visible
self.radio_save_to.setLayout(self.save_location_layout)
save_group_box_innner_layout.addWidget(self.radio_save_to)
# Open safe document # Open safe document
if platform.system() in ["Darwin", "Windows"]: if platform.system() in ["Darwin", "Windows"]:
self.open_checkbox = QtWidgets.QCheckBox( self.open_checkbox = QtWidgets.QCheckBox(
@ -393,8 +414,8 @@ class SettingsWidget(QtWidgets.QWidget):
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
layout.addSpacing(20) layout.addSpacing(20)
layout.addWidget(self.docs_selected_label) layout.addWidget(self.docs_selected_label)
layout.addLayout(self.save_location_layout)
layout.addLayout(self.safe_extension_layout) layout.addLayout(self.safe_extension_layout)
layout.addLayout(save_group_box_layout)
layout.addLayout(open_layout) layout.addLayout(open_layout)
layout.addLayout(ocr_layout) layout.addLayout(ocr_layout)
layout.addSpacing(20) layout.addSpacing(20)
@ -690,3 +711,12 @@ class DocumentWidget(QtWidgets.QWidget):
# Open # Open
if self.dangerzone.settings.get("open"): if self.dangerzone.settings.get("open"):
self.dangerzone.open_pdf_viewer(self.document.output_filename) self.dangerzone.open_pdf_viewer(self.document.output_filename)
class QLabelClickable(QtWidgets.QLabel):
"""QLabel with a 'clicked' event"""
clicked = QtCore.Signal()
def mouseReleaseEvent(self, ev: QtGui.QMouseEvent) -> None:
self.clicked.emit()