diff ui/trayicon.h @ 1151:22b3daa4e464

Merged
author Sascha Wilde <wilde@intevation.de>
date Thu, 18 Sep 2014 13:29:32 +0200
parents a4282bc67a8b
children 2a1aa9df8f11
line wrap: on
line diff
--- a/ui/trayicon.h	Thu Sep 18 13:27:57 2014 +0200
+++ b/ui/trayicon.h	Thu Sep 18 13:29:32 2014 +0200
@@ -34,7 +34,8 @@
 
 public Q_SLOTS:
     void showMessage(const QString &title, const QString &msg,
-                     QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000);
+                     QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000,
+                     const QString &okBtnText = QString());
 private Q_SLOTS:
     void messageDestroyed();
 

http://wald.intevation.org/projects/trustbridge/