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

refactoring

Browse Source
This commit is contained in:
Vinicius Moreira
2019-07-30 18:29:15 -03:00
parent 9cc0d8adad
commit 73171079ee
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fpakman/util/util.py
View File

@@ -1,12 +1,12 @@
import glob
import locale import locale
import re
from fpakman_api.util import system from fpakman_api.util import system
from fpakman_api.util.resource import get_fpakman_logo_path from fpakman_api.util.resource import get_path
from fpakman import ROOT_DIR, __app_name__ from fpakman import ROOT_DIR, __app_name__
from fpakman.core import resource from fpakman.core import resource
import glob
import re
HTML_RE = re.compile(r'<[^>]+>') HTML_RE = re.compile(r'<[^>]+>')
@@ -49,5 +49,5 @@ def strip_html(string: str):
return HTML_RE.sub('', string) return HTML_RE.sub('', string)
def notify_user(msg: str, icon_path: str = get_fpakman_logo_path(ROOT_DIR)): def notify_user(msg: str, icon_path: str = get_path('img/logo.svg', ROOT_DIR)):
system.notify_user(msg=msg, app_name=__app_name__, icon_path=icon_path) system.notify_user(msg=msg, app_name=__app_name__, icon_path=icon_path)

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

@@ -7,11 +7,11 @@ from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QSystemTrayIcon, QMenu from PyQt5.QtWidgets import QSystemTrayIcon, QMenu
from fpakman_api.abstract.model import ApplicationUpdate from fpakman_api.abstract.model import ApplicationUpdate
from fpakman_api.util import system from fpakman_api.util import system
from fpakman_api.util.resource import get_fpakman_logo_path
from fpakman import __app_name__, ROOT_DIR from fpakman import __app_name__, ROOT_DIR
from fpakman.core import resource from fpakman.core import resource
from fpakman.core.controller import ApplicationManager from fpakman.core.controller import ApplicationManager
from fpakman.util import util
from fpakman.view.qt.about import AboutDialog from fpakman.view.qt.about import AboutDialog
from fpakman.view.qt.window import ManageWindow from fpakman.view.qt.window import ManageWindow
@@ -101,7 +101,7 @@ class TrayIcon(QSystemTrayIcon):
self.setToolTip(msg) self.setToolTip(msg)
if self.update_notification and notify_user: if self.update_notification and notify_user:
system.notify_user(app_name=__app_name__, msg=msg, icon_path=get_fpakman_logo_path(ROOT_DIR)) util.notify_user(msg=msg)
else: else:
self.last_updates.clear() self.last_updates.clear()