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

Workaround KDE notification, which ignores '\n' (#844)

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-05 02:15:37 +02:00
parent 04c0f4472a
commit d78e5b7b40
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesmanager/main.py
View File

@ -746,7 +746,10 @@ 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:
str = "\n".join(msg) if trayIcon.tray_notifier_type == "KDE":
str = "<br/>\n".join(msg)
else:
str = "\n".join(msg)
trayIcon.showMessage (str, msecs=5000) trayIcon.showMessage (str, msecs=5000)
return res return res
@ -1561,6 +1564,8 @@ class QubesTrayIcon(QSystemTrayIcon):
self.tray_notifier = QDBusInterface("org.freedesktop.Notifications", self.tray_notifier = QDBusInterface("org.freedesktop.Notifications",
"/org/freedesktop/Notifications", "/org/freedesktop/Notifications",
"org.freedesktop.Notifications", session_bus) "org.freedesktop.Notifications", session_bus)
srv_info = self.tray_notifier.call("GetServerInformation")
self.tray_notifier_type = srv_info.arguments()[1]
def update_blk_menu(self): def update_blk_menu(self):
global manager_window global manager_window
@ -1882,7 +1887,7 @@ def main():
show_manager() show_manager()
app.exec_() app.exec_()
lock.remove_pidfile() lock.remove_pidfile()
trayIcon = None trayIcon = None