From e6ab2b0ec61d67affb400c081df5665d4170de54 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Thu, 17 Oct 2019 11:43:09 -0300 Subject: [PATCH] [window] improvement: categories combo auto-adjusting size | [i18n] categories | [window] fix: uninstall refresh when there is only one app of a given type --- bauh/view/qt/window.py | 10 ++++++---- bauh/view/resources/locale/en | 6 ++++++ bauh/view/resources/locale/es | 7 +++++++ bauh/view/resources/locale/pt | 8 ++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index 7ed733a5..cafe6280 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -132,6 +132,7 @@ class ManageWindow(QWidget): self.cache_type_filter_icons = {} self.combo_filter_type = QComboBox() self.combo_filter_type.setStyleSheet('QLineEdit { height: 2px; }') + self.combo_filter_type.setSizeAdjustPolicy(QComboBox.AdjustToContents) self.combo_filter_type.setEditable(True) self.combo_filter_type.lineEdit().setReadOnly(True) self.combo_filter_type.lineEdit().setAlignment(Qt.AlignCenter) @@ -141,7 +142,8 @@ class ManageWindow(QWidget): self.any_category_filter = 'any' self.combo_categories = QComboBox() - self.combo_categories.setStyleSheet('QLineEdit { height: 2px; width: 50px; }') + self.combo_categories.setStyleSheet('QLineEdit { height: 2px; }') + self.combo_categories.setSizeAdjustPolicy(QComboBox.AdjustToContents) self.combo_categories.setEditable(True) self.combo_categories.lineEdit().setReadOnly(True) self.combo_categories.lineEdit().setAlignment(Qt.AlignCenter) @@ -393,7 +395,6 @@ class ManageWindow(QWidget): def _handle_category_filter(self, idx: int): self.category_filter = self.combo_categories.itemData(idx) - self.combo_categories.adjustSize() self.apply_filters_async() def _notify_model_data_change(self): @@ -481,7 +482,8 @@ class ManageWindow(QWidget): if self._can_notify_user(): util.notify_user('{} ({}) {}'.format(pkgv.model.name, pkgv.model.get_type(), self.i18n['uninstalled'])) - self.refresh_apps(pkg_types={pkgv.model.__class__} if len(self.pkgs) > 1 else None) + only_pkg_type = len([p for p in self.pkgs if p.model.get_type() == pkgv.model.get_type()]) >= 2 + self.refresh_apps(pkg_types={pkgv.model.__class__} if only_pkg_type else None) else: if self._can_notify_user(): util.notify_user('{}: {}'.format(pkgv.model.name, self.i18n['notification.uninstall.failed'])) @@ -498,7 +500,7 @@ class ManageWindow(QWidget): if self._can_notify_user(): util.notify_user('{} {}'.format(res['app'], self.i18n['downgraded'])) - self.refresh_apps(pkg_types={res['app'].model.__class__}) + self.refresh_apps(pkg_types={res['app'].model.__class__} if len(self.pkgs) > 1 else None) if self.tray_icon: self.tray_icon.verify_updates(notify_user=False) diff --git a/bauh/view/resources/locale/en b/bauh/view/resources/locale/en index ac508bd6..029a4b4c 100644 --- a/bauh/view/resources/locale/en +++ b/bauh/view/resources/locale/en @@ -134,6 +134,12 @@ screenshots.bt_back.label=previous instantmessaging=messaging 2dgraphics=2d graphics vectorgraphics=vector graphics +audiovideo=audio / video +webdevelopment=web development +filetransfer=file transfer +packagemanager=package manager +sportsgame=sports game +arcadegame=arcade game screenshots,download.running=downloading image screenshots.download.no_content=No content to display screenshots.download.no_response=Image not found \ No newline at end of file diff --git a/bauh/view/resources/locale/es b/bauh/view/resources/locale/es index ffe36242..dfb29385 100644 --- a/bauh/view/resources/locale/es +++ b/bauh/view/resources/locale/es @@ -174,6 +174,13 @@ vectorgraphics=gráficos vectoriales office=oficina devices=dispositivos security=seguridad +audiovideo=audio / video +amusement=diversión +webdevelopment=desarrollo web +filetransfer=transferencia de archivos +packagemanager=administrador de paquetes +sportsgame=juego de deportes +arcadegame=juego arcade screenshots.bt_next.label=próxima screenshots.bt_back.label=anterior screenshots,download.running=descargando imagen diff --git a/bauh/view/resources/locale/pt b/bauh/view/resources/locale/pt index db9fedf9..728ad2f2 100644 --- a/bauh/view/resources/locale/pt +++ b/bauh/view/resources/locale/pt @@ -176,6 +176,14 @@ vectorgraphics=gráficos vetoriais office=escritório devices=dispositivos security=segurança +audiovideo=áudio / vídeo +amusement=diversão +webdevelopment=desenvolvimento web +filetransfer=transferência de arquivos +viewer=visualizador +packagemanager=gerenciador de pacotes +sportsgame=jogo de esportes +arcadegame=jogo arcade screenshots.bt_next.label=próxima screenshots.bt_back.label=anterior screenshots,download.running=baixando imagem