|
59 | 59 | #endif
|
60 | 60 | #include <QStatusBar>
|
61 | 61 | #include <QStringList>
|
62 |
| -#include <QSystemTrayIcon> |
63 | 62 | #include <QTcpSocket>
|
64 | 63 | #include <QTextStream>
|
65 | 64 | #include <QtGlobal>
|
@@ -1362,13 +1361,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
|
1362 | 1361 | QgsGui::instance()->nativePlatformInterface()->setApplicationBadgeCount( count );
|
1363 | 1362 | } );
|
1364 | 1363 |
|
1365 |
| - if ( !( QgsGui::nativePlatformInterface()->capabilities() & QgsNative::NativeDesktopNotifications ) ) |
1366 |
| - { |
1367 |
| - mTray = new QSystemTrayIcon(); |
1368 |
| - mTray->setIcon( QIcon( QgsApplication::appIconPath() ) ); |
1369 |
| - mTray->hide(); |
1370 |
| - } |
1371 |
| - |
1372 | 1364 | // supposedly all actions have been added, now register them to the shortcut manager
|
1373 | 1365 | QgsGui::shortcutsManager()->registerAllChildren( this );
|
1374 | 1366 | QgsGui::shortcutsManager()->registerAllChildren( mSnappingWidget );
|
@@ -1556,7 +1548,6 @@ QgisApp::~QgisApp()
|
1556 | 1548 | delete mPythonUtils;
|
1557 | 1549 | #endif
|
1558 | 1550 |
|
1559 |
| - delete mTray; |
1560 | 1551 | delete mDataSourceManagerDialog;
|
1561 | 1552 | qDeleteAll( mCustomDropHandlers );
|
1562 | 1553 | qDeleteAll( mCustomLayoutDropHandlers );
|
@@ -13983,15 +13974,8 @@ void QgisApp::showSystemNotification( const QString &title, const QString &messa
|
13983 | 13974 |
|
13984 | 13975 | if ( !result.successful )
|
13985 | 13976 | {
|
13986 |
| - // fallback - use system tray notification |
13987 |
| - if ( mTray ) |
13988 |
| - { |
13989 |
| - // Menubar icon is hidden by default. Show to enable notification bubbles |
13990 |
| - mTray->show(); |
13991 |
| - mTray->showMessage( title, message ); |
13992 |
| - // Re-hide menubar icon |
13993 |
| - mTray->hide(); |
13994 |
| - } |
| 13977 | + // fallback - use message bar |
| 13978 | + messageBar()->pushInfo( title, message ); |
13995 | 13979 | }
|
13996 | 13980 | else
|
13997 | 13981 | {
|
|
0 commit comments