From c66cd464af0e3c57258c46b33edbf8debb9fce95 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Wed, 30 Mar 2022 18:17:35 -0300 Subject: [PATCH] [view] improvement: 'close' button added to the screenshots window --- CHANGELOG.md | 1 + bauh/view/qt/screenshots.py | 15 +++++++++++++++ bauh/view/resources/locale/ca | 1 + bauh/view/resources/locale/de | 1 + bauh/view/resources/locale/en | 1 + bauh/view/resources/locale/es | 1 + bauh/view/resources/locale/fr | 1 + bauh/view/resources/locale/it | 1 + bauh/view/resources/locale/pt | 1 + bauh/view/resources/locale/ru | 1 + bauh/view/resources/locale/tr | 1 + bauh/view/resources/style/default/default.qss | 4 ++++ 12 files changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8807b49a..83d7b5fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - UI - only displaying the "Installed" filter when installed packages are available on the table - settings: margin between components reduced [#241](https://github.com/vinifmor/bauh/issues/241) + - "close" button added to the screenshots window (some distributions hide the default "x" on the dialog frame) [#246](https://github.com/vinifmor/bauh/issues/246) ### Fixes - Arch diff --git a/bauh/view/qt/screenshots.py b/bauh/view/qt/screenshots.py index cc3b719e..5d52aaf7 100644 --- a/bauh/view/qt/screenshots.py +++ b/bauh/view/qt/screenshots.py @@ -47,7 +47,22 @@ class ScreenshotsDialog(QDialog): self.setWindowIcon(QIcon(pkg.model.get_type_icon_path())) self.setLayout(QVBoxLayout()) + self.bt_close = QPushButton(self.i18n['screenshots.bt_close']) + self.bt_close.setObjectName('close') + self.bt_close.clicked.connect(self.close) + self.bt_close.setCursor(QCursor(Qt.PointingHandCursor)) + + self.upper_buttons = QWidget() + self.upper_buttons.setObjectName('upper_buttons') + self.upper_buttons.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) + self.upper_buttons.setContentsMargins(0, 0, 0, 0) + self.upper_buttons.setLayout(QHBoxLayout()) + self.upper_buttons.layout().setAlignment(Qt.AlignRight) + self.upper_buttons.layout().addWidget(self.bt_close) + self.layout().addWidget(self.upper_buttons) + self.layout().addWidget(new_spacer()) + self.img = QLabel() self.img.setObjectName('image') self.layout().addWidget(self.img) diff --git a/bauh/view/resources/locale/ca b/bauh/view/resources/locale/ca index 59944115..53ce2f99 100644 --- a/bauh/view/resources/locale/ca +++ b/bauh/view/resources/locale/ca @@ -411,6 +411,7 @@ publisher=proveïdor publisher.verified=verificat repository=dipòsit screenshots.bt_back.label=anterior +screenshots.bt_close=Tancar screenshots.bt_next.label=següent screenshots.download.no_content=No hi ha contingut a mostrar screenshots.image.loading=Loading diff --git a/bauh/view/resources/locale/de b/bauh/view/resources/locale/de index b08ec3bf..2b414ca2 100644 --- a/bauh/view/resources/locale/de +++ b/bauh/view/resources/locale/de @@ -410,6 +410,7 @@ publisher=Herausgeber publisher.verified=Geprüft repository=Repository screenshots.bt_back.label=Zurück +screenshots.bt_close=Schließen screenshots.bt_next.label=Fortfahren screenshots.download.no_content=Kein Inhalt screenshots.download.no_response=Screenshot nicht gefunden diff --git a/bauh/view/resources/locale/en b/bauh/view/resources/locale/en index f68805bb..5c04ac3d 100644 --- a/bauh/view/resources/locale/en +++ b/bauh/view/resources/locale/en @@ -413,6 +413,7 @@ publisher.verified=verified publisher=publisher repository=repository screenshots.bt_back.label=previous +screenshots.bt_close=Close screenshots.bt_next.label=next screenshots.download.no_content=No content to display screenshots.download.no_response=Image not found diff --git a/bauh/view/resources/locale/es b/bauh/view/resources/locale/es index 73d9e6c1..87ddf223 100644 --- a/bauh/view/resources/locale/es +++ b/bauh/view/resources/locale/es @@ -413,6 +413,7 @@ publisher.verified=verificado removing=removing repository=repositorio screenshots.bt_back.label=anterior +screenshots.bt_close=Cerrar screenshots.bt_next.label=siguiente screenshots.download.no_content=No hay contenido para mostrar screenshots.download.no_response=No se encontró la imagen diff --git a/bauh/view/resources/locale/fr b/bauh/view/resources/locale/fr index 3065098f..9525573f 100644 --- a/bauh/view/resources/locale/fr +++ b/bauh/view/resources/locale/fr @@ -407,6 +407,7 @@ publisher.verified=vérifié publisher=publier repository=dépôt screenshots.bt_back.label=précédant +screenshots.bt_close=Fermer screenshots.bt_next.label=suivant screenshots.download.no_content=Rien à afficher screenshots.download.no_response=Pas d'image diff --git a/bauh/view/resources/locale/it b/bauh/view/resources/locale/it index c629bbd7..db6a75c8 100644 --- a/bauh/view/resources/locale/it +++ b/bauh/view/resources/locale/it @@ -413,6 +413,7 @@ publisher=editore publisher.verified=verificato repository=deposito screenshots.bt_back.label=precedente +screenshots.bt_close=Chiudere screenshots.bt_next.label=prossimo screenshots.download.no_content=Nessun contenuto da visualizzare screenshots.download.no_response=Immagine non trovata diff --git a/bauh/view/resources/locale/pt b/bauh/view/resources/locale/pt index aa011ea6..d48a9403 100644 --- a/bauh/view/resources/locale/pt +++ b/bauh/view/resources/locale/pt @@ -411,6 +411,7 @@ publisher.verified=verificado publisher=publicador repository=repositório screenshots.bt_back.label=anterior +screenshots.bt_close=Fechar screenshots.bt_next.label=próxima screenshots.download.no_content=Sem conteúdo para exibir screenshots.download.no_response=Imagem não encontrada diff --git a/bauh/view/resources/locale/ru b/bauh/view/resources/locale/ru index 89c13d63..b975dfc4 100644 --- a/bauh/view/resources/locale/ru +++ b/bauh/view/resources/locale/ru @@ -410,6 +410,7 @@ publisher=издатель publisher.verified=Проверенный repository=Репозиторий screenshots.bt_back.label=Предыдущий +screenshots.bt_close=закрыть screenshots.bt_next.label=Следующий screenshots.download.no_content=Нет материалов для отображени screenshots.download.no_response=Изображение не найдено diff --git a/bauh/view/resources/locale/tr b/bauh/view/resources/locale/tr index e09c5703..1dce6f53 100644 --- a/bauh/view/resources/locale/tr +++ b/bauh/view/resources/locale/tr @@ -410,6 +410,7 @@ publisher.verified=doğrula publisher=yayımcı repository=depo screenshots.bt_back.label=önceki +screenshots.bt_close=Kapatmak screenshots.bt_next.label=sonraki screenshots.download.no_content=Görüntülenecek içerik yok screenshots.download.no_response=İmaj bulunamadı diff --git a/bauh/view/resources/style/default/default.qss b/bauh/view/resources/style/default/default.qss index 0f2cb313..6c71d578 100644 --- a/bauh/view/resources/style/default/default.qss +++ b/bauh/view/resources/style/default/default.qss @@ -391,6 +391,10 @@ ScreenshotsDialog QAbstractButton[control = "true"] { min-width: 100px; } +ScreenshotsDialog QPushButton#close { + min-width: 25px; +} + SettingsWindow TabGroupQt#settings { min-width: 400px; }