From d1793d3ef4c18e1b6847a0eb4342d46bd0f4ceac Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Wed, 28 Aug 2019 16:49:50 -0300 Subject: [PATCH] changing toolbar button styles --- bauh/resources/img/new_refresh.svg | 129 +++++++++++++++++++++++++++++ bauh/resources/locale/en | 2 + bauh/resources/locale/es | 2 + bauh/resources/locale/pt | 2 + bauh/view/qt/apps_table.py | 2 +- bauh/view/qt/window.py | 28 ++++--- 6 files changed, 153 insertions(+), 12 deletions(-) create mode 100755 bauh/resources/img/new_refresh.svg diff --git a/bauh/resources/img/new_refresh.svg b/bauh/resources/img/new_refresh.svg new file mode 100755 index 00000000..c82e9923 --- /dev/null +++ b/bauh/resources/img/new_refresh.svg @@ -0,0 +1,129 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bauh/resources/locale/en b/bauh/resources/locale/en index 1c9637ff..24d380e5 100644 --- a/bauh/resources/locale/en +++ b/bauh/resources/locale/en @@ -26,7 +26,9 @@ manage_window.status.searching=Searching manage_window.status.installing=Installing manage_window.status.refreshing_app=Refreshing manage_window.status.running_app=Running {} +manage_window.bt.refresh.text=Refresh manage_window.bt.refresh.tooltip=Reload the data about installed applications +manage_window.bt.upgrade.text=Upgrade manage_window.bt.upgrade.tooltip=Upgrade all checked applications manage_window.checkbox.show_details=Show details popup.root.title=Requires root privileges diff --git a/bauh/resources/locale/es b/bauh/resources/locale/es index 79799719..36e3f9ee 100644 --- a/bauh/resources/locale/es +++ b/bauh/resources/locale/es @@ -28,7 +28,9 @@ manage_window.status.searching=Buscando manage_window.status.installing=Instalando manage_window.status.refreshing_app=Actualizando manage_window.status.running_app=Ejecutando {} +manage_window.bt.refresh.text=Recargar manage_window.bt.refresh.tooltip=Recarga los datos sobre los aplicativos instalados +manage_window.bt.upgrade.text=Actualizar manage_window.bt.upgrade.tooltip=Actualiza todos los aplicativos marcados manage_window.checkbox.show_details=Mostrar detalles popup.root.title=Requiere privilegios de root diff --git a/bauh/resources/locale/pt b/bauh/resources/locale/pt index 84582685..ae3d239a 100644 --- a/bauh/resources/locale/pt +++ b/bauh/resources/locale/pt @@ -28,7 +28,9 @@ manage_window.status.searching=Buscando manage_window.status.installing=Instalando manage_window.status.refreshing_app=Atualizando manage_window.status.running_app=Iniciando {} +manage_window.bt.refresh.text=Recarregar manage_window.bt.refresh.tooltip=Recarrega os dados sobre os aplicativos instalados +manage_window.bt.upgrade.text=Atualizar manage_window.bt.upgrade.tooltip=Atualiza todos os aplicativos marcados manage_window.checkbox.show_details=Mostrar detalhes popup.root.title=Requer privilégios de root diff --git a/bauh/view/qt/apps_table.py b/bauh/view/qt/apps_table.py index 3b0611e2..47827cfb 100644 --- a/bauh/view/qt/apps_table.py +++ b/bauh/view/qt/apps_table.py @@ -59,7 +59,7 @@ class UpdateToggleButton(QWidget): self.bt.clicked.connect(self.change_state) self.bt.setIcon(QIcon(resource.get_path('img/app_update.svg'))) - self.bt.setStyleSheet('QToolButton { background: #4EC306 } ' + + self.bt.setStyleSheet('QToolButton { background: #20A435 } ' + 'QToolButton:checked { background: gray }') layout.addWidget(self.bt) diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index 5cdfa51d..fcc3220f 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -5,7 +5,7 @@ from typing import List, Set from PyQt5.QtCore import QEvent, Qt, QSize, pyqtSignal from PyQt5.QtGui import QIcon, QWindowStateChangeEvent, QPixmap from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QCheckBox, QHeaderView, QToolButton, QToolBar, \ - QLabel, QPlainTextEdit, QLineEdit, QProgressBar, QHBoxLayout + QLabel, QPlainTextEdit, QLineEdit, QProgressBar, QHBoxLayout, QPushButton from bauh_api.abstract.controller import ApplicationManager from bauh_api.abstract.model import Application from bauh_api.abstract.view import MessageType @@ -89,6 +89,7 @@ class ManageWindow(QWidget): self.layout.addWidget(self.toolbar_top) toolbar = QToolBar() + toolbar.setStyleSheet('QToolBar {spacing: 3px;}') self.checkbox_updates = QCheckBox() self.checkbox_updates.setText(self.locale_keys['updates'].capitalize()) @@ -107,16 +108,19 @@ class ManageWindow(QWidget): toolbar.addWidget(new_spacer()) - self.bt_refresh = QToolButton() + self.bt_refresh = QPushButton() self.bt_refresh.setToolTip(locale_keys['manage_window.bt.refresh.tooltip']) - self.bt_refresh.setIcon(QIcon(resource.get_path('img/refresh.svg'))) + self.bt_refresh.setIcon(QIcon(resource.get_path('img/new_refresh.svg'))) + self.bt_refresh.setText(self.locale_keys['manage_window.bt.refresh.text']) + self.bt_refresh.setStyleSheet('QPushButton { background: #2368AD; color: white; font-weight: bold;} QPushButton:disabled { background: gray }') self.bt_refresh.clicked.connect(lambda: self.refresh_apps(keep_console=False)) toolbar.addWidget(self.bt_refresh) - self.bt_upgrade = QToolButton() + self.bt_upgrade = QPushButton() self.bt_upgrade.setToolTip(locale_keys['manage_window.bt.upgrade.tooltip']) - self.bt_upgrade.setIcon(QIcon(resource.get_path('img/update_green.svg'))) - self.bt_upgrade.setEnabled(False) + self.bt_upgrade.setIcon(QIcon(resource.get_path('img/app_update.svg'))) + self.bt_upgrade.setText(locale_keys['manage_window.bt.upgrade.text']) + self.bt_upgrade.setStyleSheet('QPushButton { background: #20A435; color: white; font-weight: bold;} QPushButton:disabled { background: gray }') # 19CC24 19B622 self.bt_upgrade.clicked.connect(self.update_selected) self.ref_bt_upgrade = toolbar.addWidget(self.bt_upgrade) @@ -437,7 +441,7 @@ class ManageWindow(QWidget): self.resize_and_center(accept_lower_width=visible_apps > 0) def change_update_state(self, change_filters: bool = True): - enable_bt_update = False + show_bt_upgrade = False app_updates, library_updates, not_installed = 0, 0, 0 for app_v in self.apps: @@ -452,10 +456,10 @@ class ManageWindow(QWidget): for app_v in self.apps: if not_installed == 0 and app_v.visible and app_v.update_checked: - enable_bt_update = True + show_bt_upgrade = True break - self.bt_upgrade.setEnabled(enable_bt_update) + self.ref_bt_upgrade.setVisible(show_bt_upgrade) total_updates = app_updates + library_updates @@ -535,6 +539,8 @@ class ManageWindow(QWidget): if available_types: for app_type in sorted(list(available_types)): checkbox_app_type = QCheckBox() + # TODO + # checkbox_app_type.setStyleSheet('QCheckBox::indicator:checked { border: 2px solid gray; background: white; } QCheckBox::indicator:unchecked { border: 1px solid; background: none; }') checkbox_app_type.setChecked(True) checkbox_app_type.setText(app_type.capitalize()) @@ -597,7 +603,7 @@ class ManageWindow(QWidget): if self._can_notify_user(): util.notify_user(self.locale_keys['notification.update_selected.failed']) - self.bt_upgrade.setEnabled(True) + self.ref_bt_upgrade.setVisible(True) self.checkbox_console.setChecked(True) def _update_action_output(self, output: str): @@ -611,7 +617,7 @@ class ManageWindow(QWidget): self.ref_progress_bar.setVisible(True) self.label_status.setText(action_label + "...") - self.bt_upgrade.setEnabled(False) + self.ref_bt_upgrade.setVisible(False) self.bt_refresh.setEnabled(False) self.checkbox_only_apps.setEnabled(False) self.table_apps.setEnabled(False)