diff --git a/CHANGELOG.md b/CHANGELOG.md index d60e2773..f74c6599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - not detecting some updates ( e.g: RPCS3 ) ### UI -- Changed the **Installed** button color +- Changed the main toolbar buttons style - Removed the **x** button from some windows ## [0.9.0] - 2020-04-15 diff --git a/bauh/view/qt/apps_table.py b/bauh/view/qt/apps_table.py index 1986c48e..12c22c5b 100644 --- a/bauh/view/qt/apps_table.py +++ b/bauh/view/qt/apps_table.py @@ -302,7 +302,7 @@ class AppsTable(QTableWidget): def uninstall(): self._uninstall_app(pkg) - item = self._gen_row_button(self.i18n['uninstall'].capitalize(), INSTALL_BT_STYLE.format(back='#cc0000'), uninstall) + item = self._gen_row_button(self.i18n['uninstall'].capitalize(), INSTALL_BT_STYLE.format(back='#ff1a1a'), uninstall) else: item = QLabel() item.setPixmap((QPixmap(resource.get_path('img/checked.svg')))) diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index 0f10290c..5cd5a3bb 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -41,8 +41,17 @@ from bauh.view.util.translation import I18n DARK_ORANGE = '#FF4500' -def toolbar_button_style(bg: str): - return 'QPushButton { color: white; font-weight: bold; background: ' + bg + '}' +def toolbar_button_style(bg: str = None, color: str = None): + style = 'QPushButton { font-weight: 500;' + + if bg: + style += 'background: {};'.format(bg) + + if color: + style += 'color: {};'.format(color) + + style += ' }' + return style class ManageWindow(QWidget): @@ -187,21 +196,12 @@ class ManageWindow(QWidget): toolbar_bts = [] - self.bt_installed = QPushButton() - self.bt_installed.setToolTip(self.i18n['manage_window.bt.installed.tooltip']) - self.bt_installed.setIcon(QIcon(resource.get_path('img/disk.svg'))) - self.bt_installed.setText(self.i18n['manage_window.bt.installed.text'].capitalize()) - self.bt_installed.clicked.connect(self._begin_loading_installed) - self.bt_installed.setStyleSheet(toolbar_button_style('#8716CF')) - self.ref_bt_installed = self.toolbar.addWidget(self.bt_installed) - toolbar_bts.append(self.bt_installed) - if config['suggestions']['enabled']: self.bt_suggestions = QPushButton() - self.bt_installed.setToolTip(self.i18n['manage_window.bt.suggestions.tooltip']) + self.bt_suggestions.setToolTip(self.i18n['manage_window.bt.suggestions.tooltip']) self.bt_suggestions.setText(self.i18n['manage_window.bt.suggestions.text'].capitalize()) self.bt_suggestions.setIcon(QIcon(resource.get_path('img/suggestions.svg'))) - self.bt_suggestions.setStyleSheet(toolbar_button_style('#FF8000')) + self.bt_suggestions.setStyleSheet(toolbar_button_style()) self.bt_suggestions.clicked.connect(self.read_suggestions) self.ref_bt_suggestions = self.toolbar.addWidget(self.bt_suggestions) toolbar_bts.append(self.bt_suggestions) @@ -209,11 +209,20 @@ class ManageWindow(QWidget): self.bt_suggestions = None self.ref_bt_suggestions = None + self.bt_installed = QPushButton() + self.bt_installed.setToolTip(self.i18n['manage_window.bt.installed.tooltip']) + self.bt_installed.setIcon(QIcon(resource.get_path('img/disk.svg'))) + self.bt_installed.setText(self.i18n['manage_window.bt.installed.text'].capitalize()) + self.bt_installed.clicked.connect(self._begin_loading_installed) + self.bt_installed.setStyleSheet(toolbar_button_style()) + self.ref_bt_installed = self.toolbar.addWidget(self.bt_installed) + toolbar_bts.append(self.bt_installed) + self.bt_refresh = QPushButton() self.bt_refresh.setToolTip(i18n['manage_window.bt.refresh.tooltip']) self.bt_refresh.setIcon(QIcon(resource.get_path('img/refresh.svg'))) self.bt_refresh.setText(self.i18n['manage_window.bt.refresh.text']) - self.bt_refresh.setStyleSheet(toolbar_button_style('#2368AD')) + self.bt_refresh.setStyleSheet(toolbar_button_style()) self.bt_refresh.clicked.connect(lambda: self.refresh_packages(keep_console=False)) toolbar_bts.append(self.bt_refresh) self.ref_bt_refresh = self.toolbar.addWidget(self.bt_refresh) @@ -222,7 +231,7 @@ class ManageWindow(QWidget): self.bt_upgrade.setToolTip(i18n['manage_window.bt.upgrade.tooltip']) self.bt_upgrade.setIcon(QIcon(resource.get_path('img/app_update.svg'))) self.bt_upgrade.setText(i18n['manage_window.bt.upgrade.text']) - self.bt_upgrade.setStyleSheet(toolbar_button_style('#20A435')) + self.bt_upgrade.setStyleSheet(toolbar_button_style('#20A435', 'white')) self.bt_upgrade.clicked.connect(self.update_selected) toolbar_bts.append(self.bt_upgrade) self.ref_bt_upgrade = self.toolbar.addWidget(self.bt_upgrade) diff --git a/bauh/view/resources/img/disk.svg b/bauh/view/resources/img/disk.svg index a3fa07a0..0769fa0d 100755 --- a/bauh/view/resources/img/disk.svg +++ b/bauh/view/resources/img/disk.svg @@ -15,15 +15,15 @@ y="0px" viewBox="0 0 24.000261 23.700262" xml:space="preserve" - sodipodi:docname="disc.svg" + sodipodi:docname="disk.svg" width="24.000261" height="23.700262" - inkscape:version="0.92.4 5da689c313, 2019-01-14" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" inkscape:export-xdpi="96" inkscape:export-ydpi="96">image/svg+xml @@ -37,8 +37,8 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1360" - inkscape:window-height="644" + inkscape:window-width="1366" + inkscape:window-height="739" id="namedview854" showgrid="false" showborder="false" @@ -47,7 +47,7 @@ fit-margin-right="0" fit-margin-bottom="-0.3" inkscape:zoom="4.5416668" - inkscape:cx="55.143227" + inkscape:cx="-23.902643" inkscape:cy="1.3146742" inkscape:window-x="0" inkscape:window-y="0" @@ -116,14 +116,15 @@ \ No newline at end of file diff --git a/bauh/view/resources/img/downgrade.svg b/bauh/view/resources/img/downgrade.svg index aea4c0e8..605ad3d7 100755 --- a/bauh/view/resources/img/downgrade.svg +++ b/bauh/view/resources/img/downgrade.svg @@ -12,7 +12,7 @@ enable-background="new 0 0 26 26" id="svg8" sodipodi:docname="downgrade.svg" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" width="24" height="24"> image/svg+xml - + @@ -39,15 +39,15 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" - inkscape:window-height="703" + inkscape:window-height="739" id="namedview10" showgrid="false" showborder="false" inkscape:zoom="4.5384616" - inkscape:cx="-20.270304" + inkscape:cx="-59.821151" inkscape:cy="12.13426" inkscape:window-x="0" - inkscape:window-y="260" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg8" fit-margin-top="0" @@ -57,16 +57,16 @@ + style="fill:#ff7f2a"> + style="fill:#ff7f2a" /> + style="fill:#ff7f2a" /> diff --git a/bauh/view/resources/img/refresh.svg b/bauh/view/resources/img/refresh.svg index c82e9923..a0d12a94 100755 --- a/bauh/view/resources/img/refresh.svg +++ b/bauh/view/resources/img/refresh.svg @@ -17,11 +17,11 @@ height="24.049257" viewBox="0 0 24.052713 24.049257" xml:space="preserve" - sodipodi:docname="new_refresh.svg" - inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml + style="fill:none;fill-opacity:1;stroke:#2c89a0;stroke-width:29.43085561"> + style="fill:none;fill-opacity:1;stroke:#2c89a0;stroke-width:29.43085561"> + style="fill:none;fill-opacity:1;stroke:#2c89a0;stroke-width:29.43085561" /> + style="fill:none;fill-opacity:1;stroke:#2c89a0;stroke-width:29.43085561" /> image/svg+xml + style="fill:#aa8800"> + style="fill:#aa8800"> + style="fill:#aa8800">