Mercurial > trustbridge
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1150:a72d59f8c3ea | 1151:22b3daa4e464 |
|---|---|
| 32 void show(); | 32 void show(); |
| 33 bool isAlternative() {return useAlt;} | 33 bool isAlternative() {return useAlt;} |
| 34 | 34 |
| 35 public Q_SLOTS: | 35 public Q_SLOTS: |
| 36 void showMessage(const QString &title, const QString &msg, | 36 void showMessage(const QString &title, const QString &msg, |
| 37 QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000); | 37 QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000, |
| 38 const QString &okBtnText = QString()); | |
| 38 private Q_SLOTS: | 39 private Q_SLOTS: |
| 39 void messageDestroyed(); | 40 void messageDestroyed(); |
| 40 | 41 |
| 41 private: | 42 private: |
| 42 bool useAlt; | 43 bool useAlt; |