diff --git a/bauh/app.py b/bauh/app.py index 28bdce9b..01602d06 100755 --- a/bauh/app.py +++ b/bauh/app.py @@ -3,6 +3,7 @@ import sys from threading import Thread import urllib3 +from PyQt5.QtCore import Qt from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication @@ -71,6 +72,7 @@ def main(): app.setApplicationVersion(__version__) app_icon = util.get_default_icon()[1] app.setWindowIcon(app_icon) + app.setAttribute(Qt.AA_UseHighDpiPixmaps) # This fix images on HDPI resolution, not tested on non HDPI if local_config['ui']['style']: app.setStyle(str(local_config['ui']['style'])) diff --git a/bauh/view/qt/apps_table.py b/bauh/view/qt/apps_table.py index 1b3001c9..a463395b 100644 --- a/bauh/view/qt/apps_table.py +++ b/bauh/view/qt/apps_table.py @@ -2,7 +2,7 @@ import os from threading import Lock from typing import List -from PyQt5.QtCore import Qt, QUrl +from PyQt5.QtCore import Qt, QUrl, QSize from PyQt5.QtGui import QPixmap, QIcon, QCursor from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply from PyQt5.QtWidgets import QTableWidget, QTableView, QMenu, QAction, QTableWidgetItem, QToolButton, QWidget, \ @@ -78,7 +78,7 @@ class AppsTable(QTableWidget): self.setHorizontalHeaderLabels(['' for _ in range(self.columnCount())]) self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) self.icon_logo = QIcon(resource.get_path('img/logo.svg')) - self.pixmap_verified = QPixmap(resource.get_path('img/verified.svg')) + self.pixmap_verified = QIcon(resource.get_path('img/verified.svg')).pixmap(QSize(10, 10)) self.network_man = QNetworkAccessManager() self.network_man.finished.connect(self._load_icon_and_cache) @@ -342,9 +342,8 @@ class AppsTable(QTableWidget): item.setText(name) - icon_path = pkg.model.get_disk_icon_path() - if self.disk_cache and pkg.model.supports_disk_cache() and icon_path and os.path.isfile(icon_path): - with open(icon_path, 'rb') as f: + if self.disk_cache and pkg.model.supports_disk_cache() and pkg.model.get_disk_icon_path() and os.path.exists(pkg.model.get_disk_icon_path()): + with open(pkg.model.get_disk_icon_path(), 'rb') as f: icon_bytes = f.read() pixmap = QPixmap() pixmap.loadFromData(icon_bytes) @@ -428,26 +427,26 @@ class AppsTable(QTableWidget): def run(): self.window.run_app(pkg) - item.addWidget(IconButton(load_resource_icon('img/app_play.svg', 12), action=run, background='#088A08', tooltip=self.i18n['action.run.tooltip'])) + item.addWidget(IconButton(icon_path=resource.get_path('img/app_play.svg'), action=run, background='#088A08', tooltip=self.i18n['action.run.tooltip'])) if pkg.model.has_info(): def get_info(): self.window.get_app_info(pkg) - item.addWidget(IconButton(QIcon(resource.get_path('img/app_info.svg')), action=get_info, background='#2E68D3', tooltip=self.i18n['action.info.tooltip'])) + item.addWidget(IconButton(icon_path=resource.get_path('img/app_info.svg'), action=get_info, background='#2E68D3', tooltip=self.i18n['action.info.tooltip'])) if pkg.model.has_screenshots(): def get_screenshots(): self.window.get_screenshots(pkg) - item.addWidget(IconButton(QIcon(resource.get_path('img/camera.svg')), action=get_screenshots, background='purple', tooltip=self.i18n['action.screenshots.tooltip'])) + item.addWidget(IconButton(icon_path=resource.get_path('img/camera.svg'), action=get_screenshots, background='purple', tooltip=self.i18n['action.screenshots.tooltip'])) def handle_click(): self.show_pkg_settings(pkg) if self.has_any_settings(pkg): - bt = IconButton(QIcon(resource.get_path('img/app_settings.svg')), action=handle_click, background='#12ABAB', tooltip=self.i18n['action.settings.tooltip']) + bt = IconButton(icon_path=resource.get_path('img/app_settings.svg'), action=handle_click, background='#12ABAB', tooltip=self.i18n['action.settings.tooltip']) item.addWidget(bt) self.setCellWidget(pkg.table_index, col, item) diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index 92b39f97..400ea6c5 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -118,7 +118,8 @@ class ManageWindow(QWidget): self.toolbar_search.addWidget(self.input_search) label_pos_search = QLabel() - label_pos_search.setPixmap(QPixmap(resource.get_path('img/search.svg'))) + # label_pos_search.setPixmap(QPixmap(resource.get_path('img/search.svg'))) + label_pos_search.setPixmap(QIcon(resource.get_path('img/search.svg')).pixmap(QSize(10,10))) label_pos_search.setStyleSheet(""" background: white; padding-right: 10px; border-top-right-radius: 5px; @@ -157,7 +158,7 @@ class ManageWindow(QWidget): self.combo_filter_type.lineEdit().setReadOnly(True) self.combo_filter_type.lineEdit().setAlignment(Qt.AlignCenter) self.combo_filter_type.activated.connect(self._handle_type_filter) - self.combo_filter_type.addItem(load_resource_icon('img/logo.svg', 14), self.i18n['type'].capitalize(), self.any_type_filter) + self.combo_filter_type.addItem(load_resource_icon('img/logo.svg', 48), self.i18n['type'].capitalize(), self.any_type_filter) self.ref_combo_filter_type = self.toolbar.addWidget(self.combo_filter_type) self.any_category_filter = 'any' @@ -318,7 +319,7 @@ class ManageWindow(QWidget): self.combo_styles.setStyleSheet('QComboBox {font-size: 12px;}') self.ref_combo_styles = self.toolbar_bottom.addWidget(self.combo_styles) - bt_settings = IconButton(QIcon(resource.get_path('img/app_settings.svg')), + bt_settings = IconButton(icon_path=resource.get_path('img/app_settings.svg'), action=self._show_settings_menu, background='#12ABAB', tooltip=self.i18n['manage_window.bt_settings.tooltip']) diff --git a/bauh/view/resources/img/app_play.svg b/bauh/view/resources/img/app_play.svg index a46bfd74..284bd52e 100755 --- a/bauh/view/resources/img/app_play.svg +++ b/bauh/view/resources/img/app_play.svg @@ -1,5 +1,5 @@ - + image/svg+xml + inkscape:current-layer="Layer_1" + showguides="true" + inkscape:guide-bbox="true"> + id="g819" + transform="matrix(0.03104434,0,0,0.03104584,0.64059904,4.1014743)" + style="fill:#ffffff;stroke:#333333"> + + style="fill:#ffffff;stroke:#333333" + d="M 557.49784,206.99848 C 556.02332,209.32745 299.06055,50.553292 184.31451,-1.6920377 154.70662,-15.172888 152.32141,8.7631987 152.154,44.419264 c -0.8137,173.309056 -0.17793,416.751146 0,425.492356 0.73587,36.15214 -4.3986,60.9816 32.16051,42.58838 96.93285,-48.76779 383.3103,-210.32654 375.2762,-204.82682 68.97152,-41.77019 82.39599,-46.93515 -2.09287,-100.6747 z" + id="path817" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csssscc" /> + id="g821" + transform="translate(-152.62981,-488.02344)"> + id="g823" + transform="translate(-152.62981,-488.02344)"> + id="g825" + transform="translate(-152.62981,-488.02344)"> + id="g827" + transform="translate(-152.62981,-488.02344)"> + id="g829" + transform="translate(-152.62981,-488.02344)"> + id="g831" + transform="translate(-152.62981,-488.02344)"> + id="g833" + transform="translate(-152.62981,-488.02344)"> + id="g835" + transform="translate(-152.62981,-488.02344)"> + id="g837" + transform="translate(-152.62981,-488.02344)"> + id="g839" + transform="translate(-152.62981,-488.02344)"> + id="g841" + transform="translate(-152.62981,-488.02344)"> + id="g843" + transform="translate(-152.62981,-488.02344)"> + id="g845" + transform="translate(-152.62981,-488.02344)"> + id="g847" + transform="translate(-152.62981,-488.02344)"> + id="g849" + transform="translate(-152.62981,-488.02344)"> - \ No newline at end of file +