From cb1ac69e7746e451378c4f04bd5c518c17ae58dd Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Tue, 13 Aug 2019 18:30:43 -0300 Subject: [PATCH] refactoring info popup --- bauh/resources/locale/en | 1 - bauh/resources/locale/es | 1 - bauh/resources/locale/pt | 1 - bauh/view/qt/info.py | 16 ++++++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bauh/resources/locale/en b/bauh/resources/locale/en index 77a9b3b4..3b2288d1 100644 --- a/bauh/resources/locale/en +++ b/bauh/resources/locale/en @@ -68,7 +68,6 @@ not_installed=not installed downgraded=downgraded others=others internet.required=Internet connection is required -license.unset=unset updates=updates version.installed=installed version version.latest=latest version diff --git a/bauh/resources/locale/es b/bauh/resources/locale/es index 9db8852e..c58552b3 100644 --- a/bauh/resources/locale/es +++ b/bauh/resources/locale/es @@ -70,7 +70,6 @@ not_installed=no instalado downgraded=versión revertida others=otros internet.required=Se requiere conexión a internet -license.unset=No está definida updates=actualizaciones version.installed=versión instalada version.latest=versión más reciente diff --git a/bauh/resources/locale/pt b/bauh/resources/locale/pt index 5ad98fbb..a12aeca7 100644 --- a/bauh/resources/locale/pt +++ b/bauh/resources/locale/pt @@ -70,7 +70,6 @@ not_installed=não instalado downgraded=versão revertida others=outros internet.required=É necessário estar conectado a Internet -license.unset=Não definida updates=atualizações version.installed=versão instalada version.latest=versão mais recente diff --git a/bauh/view/qt/info.py b/bauh/view/qt/info.py index b34dff8a..ecc78784 100644 --- a/bauh/view/qt/info.py +++ b/bauh/view/qt/info.py @@ -34,14 +34,18 @@ class InfoDialog(QDialog): for attr in sorted(app.keys()): if attr not in IGNORED_ATTRS and app[attr]: - val = app[attr] + i18n_key = app['__app__'].model.get_type() + '.info.' + attr.lower() + val = app[attr].strip() + + i18n_val = locale_keys.get('{}.{}'.format(i18n_key, val.lower())) + + if i18n_val: + val = i18n_val + text = QLineEdit() text.setToolTip(val) - if attr == 'license' and val.strip() == 'unset': - val = locale_keys['license.unset'] - - if attr == 'description': + if len(val) > 40: val = util.strip_html(val) val = val[0:40] + '...' @@ -50,7 +54,7 @@ class InfoDialog(QDialog): text.setStyleSheet("width: 400px") text.setReadOnly(True) - label = QLabel("{}: ".format(locale_keys.get(app['__app__'].model.get_type() + '.info.' + attr, attr)).capitalize()) + label = QLabel("{}: ".format(locale_keys.get(i18n_key, attr)).capitalize()) label.setStyleSheet("font-weight: bold") gbox_info_layout.addRow(label, text)