From d980d5475bbda278b54f5315e0f01c4b97b8d65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Moreira?= Date: Sun, 30 Jun 2019 18:25:07 -0300 Subject: [PATCH] Small design improvements --- fpakman/resources/img/refresh.svg | 81 ++++++++++++++++---------- fpakman/resources/img/toggle_on.svg | 52 ++++++++++++----- fpakman/resources/img/update_green.svg | 71 +++++++++++++++++----- fpakman/resources/locale/en | 2 +- fpakman/resources/locale/es | 2 +- fpakman/resources/locale/pt | 2 +- fpakman/view/qt/apps_table.py | 11 ++-- fpakman/view/qt/window.py | 11 ++-- 8 files changed, 158 insertions(+), 74 deletions(-) mode change 100644 => 100755 fpakman/resources/img/refresh.svg diff --git a/fpakman/resources/img/refresh.svg b/fpakman/resources/img/refresh.svg old mode 100644 new mode 100755 index 0158d7d0..16952792 --- a/fpakman/resources/img/refresh.svg +++ b/fpakman/resources/img/refresh.svg @@ -7,22 +7,39 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="Capa_1" x="0px" y="0px" - width="45" - height="44.999996" - viewBox="0 0 44.999999 44.999995" + width="48" + height="48" + viewBox="0 0 47.999999 47.999999" xml:space="preserve" - sodipodi:docname="refresh_blue.svg" - inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml + transform="matrix(0.10547014,0,0,0.0985161,-1.6940777,0)" + style="fill:url(#linearGradient542);fill-opacity:1"> + style="fill:url(#linearGradient542);fill-opacity:1"> + style="fill:url(#linearGradient542);fill-opacity:1" /> + style="fill:url(#linearGradient542);fill-opacity:1" /> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> + transform="translate(-16.062155,-439.23)"> \ No newline at end of file diff --git a/fpakman/resources/img/toggle_on.svg b/fpakman/resources/img/toggle_on.svg index 5c341548..7d05dace 100755 --- a/fpakman/resources/img/toggle_on.svg +++ b/fpakman/resources/img/toggle_on.svg @@ -7,17 +7,41 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="45" - height="45" - viewBox="0 0 11.90625 11.90625" + width="48" + height="48" + viewBox="0 0 12.7 12.7" version="1.1" id="svg8" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="pak_update_green.svg"> + sodipodi:docname="toggle_on_3.svg"> + id="defs2"> + + + + + + @@ -58,12 +82,12 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(198.05951,-115.76041)"> + transform="translate(198.0595,-114.96666)"> + cx="-191.7095" + cy="121.31666" + r="6.3499999" /> diff --git a/fpakman/resources/img/update_green.svg b/fpakman/resources/img/update_green.svg index 85063166..d4fc7a00 100755 --- a/fpakman/resources/img/update_green.svg +++ b/fpakman/resources/img/update_green.svg @@ -5,16 +5,17 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - viewBox="0 0 45 45" + viewBox="0 0 48 48" enable-background="new 0 0 26 26" id="svg8" - sodipodi:docname="update_green.svg" + sodipodi:docname="update_green_2.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" - width="45" - height="45"> + width="48" + height="48"> @@ -28,7 +29,47 @@ + id="defs12"> + + + + + + + + + transform="matrix(1.8461538,0,0,2,0,-2)" + style="fill:url(#linearGradient311);fill-opacity:1"> + style="fill:url(#linearGradient313);fill-opacity:1" /> + style="fill:url(#linearGradient315);fill-opacity:1" /> + diff --git a/fpakman/resources/locale/en b/fpakman/resources/locale/en index 353c87e2..27d90a57 100644 --- a/fpakman/resources/locale/en +++ b/fpakman/resources/locale/en @@ -10,7 +10,7 @@ manage_window.apps_table.row.actions.uninstall.popup.body=Remove {} ? manage_window.apps_table.row.actions.downgrade=Downgrade manage_window.apps_table.row.actions.downgrade.popup.body=Do you really want to downgrade {} ? manage_window.apps_table.row.actions.install=Install -manage_window.apps_table.upgrade_toggle.tooltip=Click it to check or uncheck the update +manage_window.apps_table.upgrade_toggle.tooltip=Click here to check or uncheck the update manage_window.checkbox.only_apps=Apps window_manage.input_search.placeholder=Search window_manage.input_search.tooltip=Type and press ENTER to search for applications diff --git a/fpakman/resources/locale/es b/fpakman/resources/locale/es index 1fac6233..bf6d19c3 100644 --- a/fpakman/resources/locale/es +++ b/fpakman/resources/locale/es @@ -10,7 +10,7 @@ manage_window.apps_table.row.actions.uninstall.popup.body=¿Eliminar {}? manage_window.apps_table.row.actions.downgrade=Revertir versión manage_window.apps_table.row.actions.downgrade.popup.body=¿Realmente quieres revertir la versión actual de {}? manage_window.apps_table.row.actions.install=Instalar -manage_window.apps_table.upgrade_toggle.tooltip=Haz clic para marcar o desmarcar la actualización +manage_window.apps_table.upgrade_toggle.tooltip=Haces clic aqui para marcar o desmarcar la actualización manage_window.checkbox.only_apps=Aplicativos window_manage.input_search.placeholder=Buscar window_manage.input_search.tooltip=Escriba y oprima ENTER para buscar aplicativos diff --git a/fpakman/resources/locale/pt b/fpakman/resources/locale/pt index 776dd22c..8d30767c 100644 --- a/fpakman/resources/locale/pt +++ b/fpakman/resources/locale/pt @@ -10,7 +10,7 @@ manage_window.apps_table.row.actions.uninstall.popup.body=Remover {}? manage_window.apps_table.row.actions.downgrade=Reverter versão manage_window.apps_table.row.actions.downgrade.popup.body=Você realmente quer reverter a versão atual de {} ? manage_window.apps_table.row.actions.install=Instalar -manage_window.apps_table.upgrade_toggle.tooltip=Clique para marcar ou desmarcar a atualização +manage_window.apps_table.upgrade_toggle.tooltip=Clique aqui para marcar ou desmarcar a atualização manage_window.checkbox.only_apps=Aplicativos window_manage.input_search.placeholder=Buscar window_manage.input_search.tooltip=Digite e pressione ENTER para buscar aplicativos diff --git a/fpakman/view/qt/apps_table.py b/fpakman/view/qt/apps_table.py index b2696601..4853b384 100644 --- a/fpakman/view/qt/apps_table.py +++ b/fpakman/view/qt/apps_table.py @@ -4,7 +4,7 @@ from PyQt5.QtCore import Qt, QUrl from PyQt5.QtGui import QPixmap, QIcon, QColor, QCursor from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager from PyQt5.QtWidgets import QTableWidget, QTableView, QMenu, QAction, QTableWidgetItem, QToolButton, QWidget, \ - QHeaderView + QHeaderView, QLabel from fpakman.core import resource, util from fpakman.view.qt import dialog @@ -212,14 +212,13 @@ class AppsTable(QTableWidget): col_origin.setToolTip(tooltip) self.setItem(idx, 6, col_origin) - col_installed = QTableWidgetItem() + col_installed = QLabel() col_installed.setText(self.parent().locale_keys['yes'] if app['model']['installed'] else self.parent().locale_keys['no']) - col_installed.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled) - col_installed.setTextAlignment(Qt.AlignCenter) col_installed.setToolTip(tooltip) - col_installed.setForeground(Qt.blue if app['model']['installed'] else Qt.red) + col_installed.setAlignment(Qt.AlignCenter) + col_installed.setStyleSheet("color: {}; font-weight: bold".format('#1E90FF' if app['model']['installed'] else 'red')) - self.setItem(idx, 7, col_installed) + self.setCellWidget(idx, 7, col_installed) col_update = UpdateToggleButton(app, self.window, self.window.locale_keys, app['model']['update']) if app['model']['update'] else None self.setCellWidget(idx, 8, col_update) diff --git a/fpakman/view/qt/window.py b/fpakman/view/qt/window.py index feb0de3c..5d688feb 100755 --- a/fpakman/view/qt/window.py +++ b/fpakman/view/qt/window.py @@ -151,7 +151,7 @@ class ManageWindow(QWidget): self.toolbar_bottom = QToolBar() self.label_updates = QLabel('') - self.label_updates.setStyleSheet("color: red;") + self.label_updates.setStyleSheet("color: #FF4500; font-weight: bold") self.toolbar_bottom.addWidget(self.label_updates) spacer = QWidget() spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) @@ -284,11 +284,10 @@ class ManageWindow(QWidget): total_updates = app_updates + runtime_updates if total_updates > 0: - self.label_updates.setText('{}: {} ( {} {} | {} runtimes )'.format(self.locale_keys['manage_window.label.updates'], - total_updates, - app_updates, - self.locale_keys['manage_window.checkbox.only_apps'].lower(), - runtime_updates)) + self.label_updates.setText('{}: {}'.format(self.locale_keys['manage_window.label.updates'], total_updates)) + self.label_updates.setToolTip('{} {} | {} runtimes'.format(app_updates, + self.locale_keys['manage_window.checkbox.only_apps'].lower(), + runtime_updates)) else: self.label_updates.setText('')