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

New icon

Browse Source
This commit is contained in:
Vinicius Moreira
2019-07-01 11:07:50 -03:00
parent da00eacd1f
commit 7ac23ef7df
16 changed files with 977 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Adding expiration time for cached app data. Default to 1 hour. The environment variable **FPAKMAN_CACHE_EXPIRATION** can change this value.
- Minor GUI improvements
- Notifying only new updates
- New icon
## [0.2.1] - 2019-06-24
### Features

2
aur/desktop_entry.py
View File

@@ -10,7 +10,7 @@ Name = fpakman
Categories = System;
Comment = Manage your Flatpak applications
Exec = /usr/bin/fpakman
Icon = /usr/lib/python{version}/site-packages/fpakman/resources/img/flathub_45.svg
Icon = /usr/lib/python{version}/site-packages/fpakman/resources/img/logo.svg
""".format(version="{}.{}".format(sys.version_info.major, sys.version_info.minor))
with open('fpakman.desktop', 'w+') as f:

2
fpakman/app.py
View File

@@ -18,7 +18,7 @@ args = parser.parse_args()
locale_keys = util.get_locale_keys(os.getenv('FPAKMAN_LOCALE', None))
app = QApplication(sys.argv)
app.setWindowIcon(QIcon(resource.get_path('img/flathub_45.svg')))
app.setWindowIcon(QIcon(resource.get_path('img/logo.svg')))
manager = FlatpakManager(cache_expire=int(os.getenv('FPAKMAN_CACHE_EXPIRATION', 60 * 60)))

2
fpakman/core/system.py
View File

@@ -14,6 +14,6 @@ def stream_cmd(cmd: List[str]):
return subprocess.Popen(cmd, stdout=subprocess.PIPE, env={'LANG': 'en'}).stdout
def notify_user(msg: str, icon_path: str = resource.get_path('img/flathub_45.svg')):
def notify_user(msg: str, icon_path: str = resource.get_path('img/logo.svg')):
if bool(os.getenv('FPAKMAN_UPDATE_NOTIFICATION', 1)):
os.system("notify-send {} '{}'".format("-i {}".format(icon_path) if icon_path else '', msg))

24
fpakman/resources/img/flathub_45.svg → fpakman/resources/img/flathub.svg
View File

@@ -9,13 +9,13 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="43.449291"
height="41.737198"
viewBox="0 0 11.495958 11.042967"
width="47.919052"
height="48.110374"
viewBox="0 0 12.678582 12.729203"
version="1.1"
id="svg3871"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="flathub_logo.svg">
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="flathub.svg">
<defs
id="defs3865" />
<sodipodi:namedview
@@ -26,16 +26,16 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="354.2246"
inkscape:cy="117.98098"
inkscape:cx="8.4698372"
inkscape:cy="118.04149"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showborder="false"
inkscape:window-width="1360"
inkscape:window-height="707"
inkscape:window-width="1366"
inkscape:window-height="703"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-y="260"
inkscape:window-maximized="1"
fit-margin-bottom="-0.2"
fit-margin-top="0"
@@ -58,9 +58,9 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-12.111406,-169.00616)">
transform="translate(-12.122116,-167.33593)">
<g
transform="matrix(0.08047549,0,0,0.0997485,-51.028672,86.747244)"
transform="matrix(0.08875425,0,0,0.11490723,-57.513376,72.576168)"
id="g10674"
style="stroke-width:0.77710575">
<path
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

477
fpakman/resources/img/logo.svg Executable file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

473
fpakman/resources/img/logo_update.svg Executable file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 74 KiB

69
fpakman/resources/img/update.svg
View File

@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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: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"
enable-background="new 0 0 26 26"
id="svg8"
sodipodi:docname="update.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
width="45"
height="45">
<metadata
id="metadata14">
<rdf:RDF>
<cc:Work
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
id="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="739"
id="namedview10"
showgrid="false"
showborder="false"
inkscape:zoom="9.0769231"
inkscape:cx="13"
inkscape:cy="20.813559"
inkscape:window-x="0"
inkscape:window-y="260"
inkscape:window-maximized="1"
inkscape:current-layer="svg8"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<g
id="g6"
transform="matrix(1.7307692,0,0,1.875,0,-1.875)">
<path
d="m 25,17 h -2 c -0.6,0 -1,0.4 -1,1 v 2.5 C 22,20.8 21.8,21 21.5,21 H 4.5 C 4.2,21 4,20.8 4,20.5 V 18 C 4,17.4 3.6,17 3,17 H 1 c -0.6,0 -1,0.4 -1,1 v 6 c 0,0.6 0.4,1 1,1 h 24 c 0.6,0 1,-0.4 1,-1 v -6 c 0,-0.6 -0.4,-1 -1,-1 z"
id="path2"
inkscape:connector-curvature="0" />
<path
d="m 12.3,16.7 c 0.2,0.2 0.5,0.3 0.7,0.3 0.2,0 0.5,-0.1 0.7,-0.3 l 6,-6 C 19.9,10.5 20,10.3 20,10 20,9.7 19.9,9.5 19.7,9.3 L 18.3,7.9 C 18.1,7.7 17.9,7.6 17.6,7.6 c -0.3,0 -0.5,0.1 -0.7,0.3 l -1,1 C 15.6,9.2 15,9 15,8.5 V 2 C 15,1.4 14.6,1 14,1 H 12 C 11.4,1 11,1.4 11,2 V 8.6 C 11,9 10.5,9.3 10.1,9 L 9.1,8 C 8.9,7.8 8.7,7.7 8.4,7.7 8.1,7.7 7.9,7.8 7.7,8 L 6.3,9.4 C 6.1,9.6 6,9.8 6,10.1 c 0,0.3 0.1,0.5 0.3,0.7 z"
id="path4"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

2
fpakman/resources/locale/en
View File

@@ -42,7 +42,7 @@ tray.action.manage=Manage applications
tray.action.exit=Exit
tray.action.about=About
tray.action.refreshing=Refreshing
notification.new_updates=Updates found
notification.new_updates={} updates
flatpak.info.arch=arch
flatpak.info.branch=branch
flatpak.info.collection=collection

2
fpakman/resources/locale/es
View File

@@ -42,7 +42,7 @@ tray.action.manage=Administrar aplicativos
tray.action.exit=Salir
tray.action.about=Sobre
tray.action.refreshing=Recargando
notification.new_updates=Actualizaciones encontradas
notification.new_updates=Actualizaciones {}
flatpak.info.arch=arquitectura
flatpak.info.branch=rama
flatpak.info.collection=colección

2
fpakman/resources/locale/pt
View File

@@ -42,7 +42,7 @@ tray.action.manage=Gerenciar aplicativos
tray.action.exit=Sair
tray.action.about=Sobre
tray.action.refreshing=Recarregando
notification.new_updates=Atualizações encontradas
notification.new_updates=Atualizações {}
flatpak.info.arch=arquitetura
flatpak.info.branch=ramo
flatpak.info.collection=coleção

9
fpakman/view/qt/about.py
View File

@@ -18,7 +18,7 @@ class AboutDialog(QDialog):
self.setLayout(layout)
label_logo = QLabel(self)
label_logo.setPixmap(QPixmap(resource.get_path('img/flathub_45.svg')))
label_logo.setPixmap(QPixmap(resource.get_path('img/logo.svg')))
label_logo.setAlignment(Qt.AlignCenter)
layout.addWidget(label_logo)
@@ -27,13 +27,6 @@ class AboutDialog(QDialog):
label_name.setAlignment(Qt.AlignCenter)
layout.addWidget(label_name)
label_flathub = QLabel()
label_flathub.setStyleSheet('font-size: 7px; color: red; font-weight: bold;')
label_flathub.setText('* logo by Flathub (' + " <a href='{url}'>{url}</a> )".format(url='https://flathub.org'))
label_flathub.setOpenExternalLinks(True)
label_flathub.setAlignment(Qt.AlignRight)
layout.addWidget(label_flathub)
layout.addWidget(QLabel(''))
line_desc = QLabel(self)

2
fpakman/view/qt/apps_table.py
View File

@@ -55,7 +55,7 @@ class AppsTable(QTableWidget):
self.setSelectionBehavior(QTableView.SelectRows)
self.setHorizontalHeaderLabels(self.column_names)
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.icon_flathub = QIcon(resource.get_path('img/flathub_45.svg'))
self.icon_flathub = QIcon(resource.get_path('img/flathub.svg'))
self.network_man = QNetworkAccessManager()
self.network_man.finished.connect(self._load_icon)

4
fpakman/view/qt/dialog.py
View File

@@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QMessageBox
from fpakman.core import resource
def show_error(title: str, body: str, icon: QIcon = QIcon(resource.get_path('img/flathub_45.svg'))):
def show_error(title: str, body: str, icon: QIcon = QIcon(resource.get_path('img/logo.svg'))):
error_msg = QMessageBox()
error_msg.setIcon(QMessageBox.Critical)
error_msg.setWindowTitle(title)
@@ -16,7 +16,7 @@ def show_error(title: str, body: str, icon: QIcon = QIcon(resource.get_path('img
error_msg.exec_()
def ask_confirmation(title: str, body: str, locale_keys: dict, icon: QIcon = QIcon(resource.get_path('img/flathub_45.svg'))):
def ask_confirmation(title: str, body: str, locale_keys: dict, icon: QIcon = QIcon(resource.get_path('img/logo.svg'))):
dialog_confirmation = QMessageBox()
dialog_confirmation.setIcon(QMessageBox.Question)
dialog_confirmation.setWindowTitle(title)

6
fpakman/view/qt/systray.py
View File

@@ -54,8 +54,8 @@ class TrayIcon(QSystemTrayIcon):
self.locale_keys = locale_keys
self.manager = manager
self.icon_default = QIcon(resource.get_path('img/flathub_45.svg'))
self.icon_update = QIcon(resource.get_path('img/update_logo.svg'))
self.icon_default = QIcon(resource.get_path('img/logo.svg'))
self.icon_update = QIcon(resource.get_path('img/logo_update.svg'))
self.setIcon(self.icon_default)
self.menu = QMenu()
@@ -103,7 +103,7 @@ class TrayIcon(QSystemTrayIcon):
if update_keys.difference(self.last_updates):
self.last_updates = update_keys
msg = '{}: {}'.format(self.locale_keys['notification.new_updates'], len(updates))
msg = '{}: {}'.format(self.locale_keys['notification.new_updates'].format('Flatpak'), len(updates))
self.setToolTip(msg)
system.notify_user(msg)

2
fpakman/view/qt/window.py
View File

@@ -33,7 +33,7 @@ class ManageWindow(QWidget):
self.apps = []
self.label_flatpak = None
self.icon_flathub = QIcon(resource.get_path('img/flathub_45.svg'))
self.icon_flathub = QIcon(resource.get_path('img/logo.svg'))
self._check_flatpak_installed()
self.resize(ManageWindow.__BASE_HEIGHT__, ManageWindow.__BASE_HEIGHT__)
self.setWindowTitle(locale_keys['manage_window.title'])