spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-08 20:14:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hdpi_fix' into svg

Browse Source 
# Conflicts:
#	bauh/view/qt/apps_table.py
#	bauh/view/qt/window.py
#	bauh/view/resources/img/app_play.svg
This commit is contained in:
Vinícius Moreira
2019-12-27 15:01:57 -03:00
parent f3937e939e aff1312532
commit c90971dbc2
4 changed files with 103 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bauh/app.py
View File

@@ -3,6 +3,7 @@ import sys
from threading import Thread from threading import Thread
import urllib3 import urllib3
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QIcon from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
@@ -71,6 +72,7 @@ def main():
app.setApplicationVersion(__version__) app.setApplicationVersion(__version__)
app_icon = util.get_default_icon()[1] app_icon = util.get_default_icon()[1]
app.setWindowIcon(app_icon) 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']: if local_config['ui']['style']:
app.setStyle(str(local_config['ui']['style'])) app.setStyle(str(local_config['ui']['style']))

17
bauh/view/qt/apps_table.py
View File

@@ -2,7 +2,7 @@ import os
from threading import Lock from threading import Lock
from typing import List 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.QtGui import QPixmap, QIcon, QCursor
from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
from PyQt5.QtWidgets import QTableWidget, QTableView, QMenu, QAction, QTableWidgetItem, QToolButton, QWidget, \ 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.setHorizontalHeaderLabels(['' for _ in range(self.columnCount())])
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.icon_logo = QIcon(resource.get_path('img/logo.svg')) 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 = QNetworkAccessManager()
self.network_man.finished.connect(self._load_icon_and_cache) self.network_man.finished.connect(self._load_icon_and_cache)
@@ -342,9 +342,8 @@ class AppsTable(QTableWidget):
item.setText(name) item.setText(name)
icon_path = pkg.model.get_disk_icon_path() 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()):
if self.disk_cache and pkg.model.supports_disk_cache() and icon_path and os.path.isfile(icon_path): with open(pkg.model.get_disk_icon_path(), 'rb') as f:
with open(icon_path, 'rb') as f:
icon_bytes = f.read() icon_bytes = f.read()
pixmap = QPixmap() pixmap = QPixmap()
pixmap.loadFromData(icon_bytes) pixmap.loadFromData(icon_bytes)
@@ -428,26 +427,26 @@ class AppsTable(QTableWidget):
def run(): def run():
self.window.run_app(pkg) 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(): if pkg.model.has_info():
def get_info(): def get_info():
self.window.get_app_info(pkg) 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(): if pkg.model.has_screenshots():
def get_screenshots(): def get_screenshots():
self.window.get_screenshots(pkg) 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(): def handle_click():
self.show_pkg_settings(pkg) self.show_pkg_settings(pkg)
if self.has_any_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) item.addWidget(bt)
self.setCellWidget(pkg.table_index, col, item) self.setCellWidget(pkg.table_index, col, item)

7
bauh/view/qt/window.py
View File

@@ -118,7 +118,8 @@ class ManageWindow(QWidget):
self.toolbar_search.addWidget(self.input_search) self.toolbar_search.addWidget(self.input_search)
label_pos_search = QLabel() 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(""" label_pos_search.setStyleSheet("""
background: white; padding-right: 10px; background: white; padding-right: 10px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
@@ -157,7 +158,7 @@ class ManageWindow(QWidget):
self.combo_filter_type.lineEdit().setReadOnly(True) self.combo_filter_type.lineEdit().setReadOnly(True)
self.combo_filter_type.lineEdit().setAlignment(Qt.AlignCenter) self.combo_filter_type.lineEdit().setAlignment(Qt.AlignCenter)
self.combo_filter_type.activated.connect(self._handle_type_filter) 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.ref_combo_filter_type = self.toolbar.addWidget(self.combo_filter_type)
self.any_category_filter = 'any' self.any_category_filter = 'any'
@@ -318,7 +319,7 @@ class ManageWindow(QWidget):
self.combo_styles.setStyleSheet('QComboBox {font-size: 12px;}') self.combo_styles.setStyleSheet('QComboBox {font-size: 12px;}')
self.ref_combo_styles = self.toolbar_bottom.addWidget(self.combo_styles) 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, action=self._show_settings_menu,
background='#12ABAB', background='#12ABAB',
tooltip=self.i18n['manage_window.bt_settings.tooltip']) tooltip=self.i18n['manage_window.bt_settings.tooltip'])

140
bauh/view/resources/img/app_play.svg
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -10,19 +10,19 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="Capa_1" id="Layer_1"
x="0px" x="0px"
y="0px" y="0px"
viewBox="0 0 11.999962 12.000047" viewBox="0 0 24 24"
xml:space="preserve" xml:space="preserve"
sodipodi:docname="app_play.svg" sodipodi:docname="app_play_s.svg"
width="11.999962" width="24"
height="12.000047" height="24"
inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
id="metadata931"><rdf:RDF><cc:Work id="metadata856"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs929" /><sodipodi:namedview id="defs854" /><sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
bordercolor="#666666" bordercolor="#666666"
borderopacity="1" borderopacity="1"
@@ -31,90 +31,126 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1360" inkscape:window-width="3840"
inkscape:window-height="703" inkscape:window-height="2051"
id="namedview927" id="namedview852"
showgrid="false" showgrid="false"
showborder="false" showborder="false"
fit-margin-top="0" fit-margin-top="0"
fit-margin-left="0" fit-margin-left="0"
fit-margin-right="0" fit-margin-right="0"
fit-margin-bottom="0" fit-margin-bottom="0"
inkscape:zoom="1.6269004" inkscape:zoom="34.0625"
inkscape:cx="-82.73211" inkscape:cx="-8.9291475"
inkscape:cy="-34.834767" inkscape:cy="7.3386416"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="Capa_1" /> inkscape:current-layer="Layer_1"
showguides="true"
inkscape:guide-bbox="true"><sodipodi:guide
position="-31.324771,24.014679"
orientation="0,1"
id="guide829"
inkscape:locked="false" /><sodipodi:guide
position="-31.706423,0"
orientation="0,1"
id="guide831"
inkscape:locked="false" /><sodipodi:guide
position="0,27.126606"
orientation="1,0"
id="guide833"
inkscape:locked="false" /><sodipodi:guide
position="16,22.957798"
orientation="1,0"
id="guide835"
inkscape:locked="false" /><sodipodi:guide
position="1.5559633,26.979817"
orientation="1,0"
id="guide947"
inkscape:locked="false" /><sodipodi:guide
position="-6.4587157,1.9963303"
orientation="0,1"
id="guide949"
inkscape:locked="false" /><sodipodi:guide
position="-12.770642,21.959633"
orientation="0,1"
id="guide951"
inkscape:locked="false" /><sodipodi:guide
position="24.044037,29.240367"
orientation="1,0"
id="guide836"
inkscape:locked="false" /></sodipodi:namedview>
<g <g
id="Play" id="g819"
style="fill:#ffffff;stroke:#4d4d4d" transform="matrix(0.03104434,0,0,0.03104584,0.64059904,4.1014743)"
transform="matrix(0.0607014,0,0,0.05146676,-1.0458834,0.02595018)"> style="fill:#ffffff;stroke:#333333">
<path <path
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d" style="fill:#ffffff;stroke:#333333"
d="M 203.791,99.628 49.307,2.294 C 44.74,-0.425 39.069,0.028 34.786,0.028 17.654,0.028 17.73,13.255 17.73,16.606 v 198.94 c 0,2.833 -0.075,16.579 17.056,16.579 4.283,0 9.955,0.451 14.521,-2.267 L 203.79,132.525 c 12.68,-7.545 10.489,-16.449 10.489,-16.449 0,0 2.192,-8.904 -10.488,-16.448 z" 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="path893" id="path817"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0"
sodipodi:nodetypes="csssscc" />
</g> </g>
<g <g
id="g896" id="g821"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g898" id="g823"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g900" id="g825"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g902" id="g827"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g904" id="g829"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g906" id="g831"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g908" id="g833"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g910" id="g835"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g912" id="g837"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g914" id="g839"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g916" id="g841"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g918" id="g843"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g920" id="g845"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g922" id="g847"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
<g <g
id="g924" id="g849"
transform="matrix(0.24221467,0,0,0.20479051,-4.195635,-35.668245)"> transform="translate(-152.62981,-488.02344)">
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB