Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
Showing only changes of commit 229cf1ded9 - Show all commits

View File

@ -1413,7 +1413,8 @@ class MyForm(settingsmixin.SMainWindow):
def notifierInit(self): def notifierInit(self):
def _simple_notify( def _simple_notify(
title, subtitle, category, label=None, icon=None): title, subtitle, category, label=None, icon=None):
self.tray.showMessage(title, subtitle, 1, 2000) self.tray.showMessage(
title, subtitle, self.tray.NoIcon, msecs=2000)
self._notifier = _simple_notify self._notifier = _simple_notify