almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-15 09:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fixup! Drop Ubuntu 20.04 (Focal) support

Browse source
This commit is contained in:
Alex Pyrgiotis 2025-03-10 23:36:49 +02:00
parent 606efa7ea2
commit d9a714b793
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dangerzone/gui/main_window.py
View file

@ -185,6 +185,9 @@ class MainWindow(QtWidgets.QMainWindow):
header_layout.addWidget(self.hamburger_button) header_layout.addWidget(self.hamburger_button)
header_layout.addSpacing(15) header_layout.addSpacing(15)
# Content widget, contains all the window content except waiting widget
self.content_widget = ContentWidget(self.dangerzone)
if self.dangerzone.isolation_provider.should_wait_install(): if self.dangerzone.isolation_provider.should_wait_install():
# Waiting widget replaces content widget while container runtime isn't available # Waiting widget replaces content widget while container runtime isn't available
self.waiting_widget: WaitingWidget = WaitingWidgetContainer(self.dangerzone) self.waiting_widget: WaitingWidget = WaitingWidgetContainer(self.dangerzone)
@ -194,9 +197,6 @@ class MainWindow(QtWidgets.QMainWindow):
self.waiting_widget = WaitingWidget() self.waiting_widget = WaitingWidget()
self.dangerzone.is_waiting_finished = True self.dangerzone.is_waiting_finished = True
# Content widget, contains all the window content except waiting widget
self.content_widget = ContentWidget(self.dangerzone)
# Only use the waiting widget if container runtime isn't available # Only use the waiting widget if container runtime isn't available
if self.dangerzone.is_waiting_finished: if self.dangerzone.is_waiting_finished:
self.waiting_widget.hide() self.waiting_widget.hide()
@ -874,8 +874,8 @@ class SettingsWidget(QtWidgets.QWidget):
self.safe_extension_name_layout.setSpacing(0) self.safe_extension_name_layout.setSpacing(0)
self.safe_extension_name_layout.addWidget(self.safe_extension_filename) self.safe_extension_name_layout.addWidget(self.safe_extension_filename)
self.safe_extension_name_layout.addWidget(self.safe_extension) self.safe_extension_name_layout.addWidget(self.safe_extension)
self.dot_pdf_validator = QtGui.QRegExpValidator( self.dot_pdf_validator = QtGui.QRegularExpressionValidator(
QtCore.QRegExp(r".*\.[Pp][Dd][Ff]") QtCore.QRegularExpression(r".*\.[Pp][Dd][Ff]")
) )
if platform.system() == "Linux": if platform.system() == "Linux":
illegal_chars_regex = r"[/]" illegal_chars_regex = r"[/]"
@ -883,7 +883,7 @@ class SettingsWidget(QtWidgets.QWidget):
illegal_chars_regex = r"[\\]" illegal_chars_regex = r"[\\]"
else: else:
illegal_chars_regex = r"[\"*/:<>?\\|]" illegal_chars_regex = r"[\"*/:<>?\\|]"
self.illegal_chars_regex = QtCore.QRegExp(illegal_chars_regex) self.illegal_chars_regex = QtCore.QRegularExpression(illegal_chars_regex)
self.safe_extension_layout = QtWidgets.QHBoxLayout() self.safe_extension_layout = QtWidgets.QHBoxLayout()
self.safe_extension_layout.addWidget(self.save_checkbox) 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)