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:24:43 +02:00
parent 47bc5cdb4a
commit 606efa7ea2
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dangerzone/gui/main_window.py
View file

@ -619,13 +619,6 @@ class ContentWidget(QtWidgets.QWidget):
self.dangerzone = dangerzone self.dangerzone = dangerzone
self.conversion_started = False self.conversion_started = False
self.warning_label = None
if platform.system() == "Linux":
# Add the warning message only for ubuntu focal
os_release_path = Path("/etc/os-release")
if os_release_path.exists():
os_release = os_release_path.read_text()
# Doc selection widget # Doc selection widget
self.doc_selection_widget = DocSelectionWidget(self.dangerzone) self.doc_selection_widget = DocSelectionWidget(self.dangerzone)
self.doc_selection_widget.documents_selected.connect(self.documents_selected) self.doc_selection_widget.documents_selected.connect(self.documents_selected)
@ -651,8 +644,6 @@ class ContentWidget(QtWidgets.QWidget):
# Layout # Layout
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
if self.warning_label:
layout.addWidget(self.warning_label) # Add warning at the top
layout.addWidget(self.settings_widget, stretch=1) layout.addWidget(self.settings_widget, stretch=1)
layout.addWidget(self.documents_list, stretch=1) layout.addWidget(self.documents_list, stretch=1)
layout.addWidget(self.doc_selection_wrapper, stretch=1) layout.addWidget(self.doc_selection_wrapper, stretch=1)

2
dev_scripts/env.py
View file

@ -97,7 +97,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends dh-python make build-essential \ && apt-get install -y --no-install-recommends dh-python make build-essential \
git {qt_deps} pipx python3 python3-pip python3-venv dpkg-dev debhelper python3-setuptools \ git {qt_deps} pipx python3 python3-pip python3-venv dpkg-dev debhelper python3-setuptools \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pix install poetry RUN pipx install poetry
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends mupdf thunar \ && apt-get install -y --no-install-recommends mupdf thunar \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*