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

updater: Move "Ok" button to the right

Browse source 
Move the "Ok" button in the prompt that asks users if they want to
enable update checks to the right, to further reinforce that this is
the default action.
This commit is contained in:
Alex Pyrgiotis 2023-07-28 19:57:46 +03:00
parent bc4bba4fa1
commit d5ca6bb422
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dangerzone/gui/logic.py
View file

@ -152,19 +152,17 @@ class Dialog(QtWidgets.QDialog):
self.ok_button = QtWidgets.QPushButton(ok_text) self.ok_button = QtWidgets.QPushButton(ok_text)
self.ok_button.clicked.connect(self.clicked_ok) self.ok_button.clicked.connect(self.clicked_ok)
self.extra_button: Optional[QtWidgets.QPushButton] = None
if extra_button_text: if extra_button_text:
self.extra_button = QtWidgets.QPushButton(extra_button_text) self.extra_button = QtWidgets.QPushButton(extra_button_text)
self.extra_button.clicked.connect(self.clicked_extra) self.extra_button.clicked.connect(self.clicked_extra)
buttons_layout = QtWidgets.QHBoxLayout() self.cancel_button: Optional[QtWidgets.QPushButton] = None
buttons_layout.addStretch()
buttons_layout.addWidget(self.ok_button)
if extra_button_text:
buttons_layout.addWidget(self.extra_button)
if has_cancel: if has_cancel:
self.cancel_button = QtWidgets.QPushButton(cancel_text) self.cancel_button = QtWidgets.QPushButton(cancel_text)
self.cancel_button.clicked.connect(self.clicked_cancel) self.cancel_button.clicked.connect(self.clicked_cancel)
buttons_layout.addWidget(self.cancel_button)
buttons_layout = self.create_buttons_layout()
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
layout.addLayout(message_layout) layout.addLayout(message_layout)
@ -172,6 +170,18 @@ class Dialog(QtWidgets.QDialog):
layout.addLayout(buttons_layout) layout.addLayout(buttons_layout)
self.setLayout(layout) self.setLayout(layout)
def create_buttons_layout(self) -> QtWidgets.QHBoxLayout:
buttons_layout = QtWidgets.QHBoxLayout()
buttons_layout.addStretch()
buttons_layout.addWidget(self.ok_button)
if self.extra_button:
buttons_layout.addWidget(self.extra_button)
if self.cancel_button:
buttons_layout.addWidget(self.cancel_button)
return buttons_layout
def create_layout(self) -> QtWidgets.QBoxLayout: def create_layout(self) -> QtWidgets.QBoxLayout:
raise NotImplementedError("Dangerzone dialogs must implement this method") raise NotImplementedError("Dangerzone dialogs must implement this method")

14
dangerzone/gui/updater.py
View file

@ -11,12 +11,12 @@ from typing import Any, Optional
from packaging import version from packaging import version
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
from PySide2 import QtCore from PySide2 import QtCore, QtWidgets
else: else:
try: try:
from PySide6 import QtCore from PySide6 import QtCore, QtWidgets
except ImportError: except ImportError:
from PySide2 import QtCore from PySide2 import QtCore, QtWidgets
import markdown import markdown
import requests import requests
@ -61,6 +61,14 @@ class UpdateCheckPrompt(Alert):
self.x_pressed = True self.x_pressed = True
event.accept() event.accept()
def create_buttons_layout(self) -> QtWidgets.QHBoxLayout:
buttons_layout = QtWidgets.QHBoxLayout()
buttons_layout.addStretch()
assert self.cancel_button is not None
buttons_layout.addWidget(self.cancel_button)
buttons_layout.addWidget(self.ok_button)
return buttons_layout
class UpdateReport: class UpdateReport:
"""A report for an update check.""" """A report for an update check."""