Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify '\n' handling in tray notifies

Browse Source 
Do not request the caller to encode them properly for current
notification service, but fix the encoding in notify function.
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-12 15:33:18 +02:00
parent ba70ee74f0
commit 4d54815ce3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubesmanager/main.py
View File

@ -746,11 +746,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
def update_block_devices(self): def update_block_devices(self):
res, msg = self.blk_manager.check_for_updates() res, msg = self.blk_manager.check_for_updates()
if msg != None and len(msg) > 0: if msg != None and len(msg) > 0:
if trayIcon.tray_notifier_type == "KDE": trayIcon.showMessage ('\n'.join(msg), msecs=5000)
str = "<br/>\n".join(msg)
else:
str = "\n".join(msg)
trayIcon.showMessage (str, msecs=5000)
return res return res
@pyqtSlot(bool, str) @pyqtSlot(bool, str)
@ -1674,6 +1670,8 @@ class QubesTrayIcon(QSystemTrayIcon):
v_replace_id.convert(QVariant.UInt) v_replace_id.convert(QVariant.UInt)
v_actions = QVariant([]) v_actions = QVariant([])
v_actions.convert(QVariant.StringList) v_actions.convert(QVariant.StringList)
if self.tray_notifier_type == "KDE":
message = message.replace('\n', '<br/>\n')
self.tray_notifier.call("Notify", "Qubes", v_replace_id, self.tray_notifier.call("Notify", "Qubes", v_replace_id,
"/usr/share/qubes/icons/qubes.png", "Qubes VM Manager", "/usr/share/qubes/icons/qubes.png", "Qubes VM Manager",
message, v_actions, QVariant.fromMap({}), msecs) message, v_actions, QVariant.fromMap({}), msecs)