AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support Growl >=1.3 in QSystemTrayIcon

Browse Source 
The app name has changed in Growl 1.3, but the id
stays the same. Also don't send notifications if
Growl is not running to follow recommendations.

Change-Id: I31ff7df272b4af1b4f1e4db80c47e7ba75038dec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Vincent A 2012-03-07 19:24:29 +01:00 committed by Qt by Nokia
parent 0e905e9138
commit 37546c563e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/util/qsystemtrayicon_mac.mm
View File

@ -260,7 +260,11 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString
notificationIcon = QLatin1String("image from location \"file://") + notificationIconFile.fileName() + QLatin1String("\""); notificationIcon = QLatin1String("image from location \"file://") + notificationIconFile.fileName() + QLatin1String("\"");
} }
const QString script(QLatin1String( const QString script(QLatin1String(
"tell application \"GrowlHelperApp\"\n" "tell application \"System Events\"\n"
"set isRunning to (count of (every process whose bundle identifier is \"com.Growl.GrowlHelperApp\")) > 0\n"
"end tell\n"
"if isRunning\n"
"tell application id \"com.Growl.GrowlHelperApp\"\n"
"-- Make a list of all the notification types (all)\n" "-- Make a list of all the notification types (all)\n"
"set the allNotificationsList to {\"") + notificationType + QLatin1String("\"}\n" "set the allNotificationsList to {\"") + notificationType + QLatin1String("\"}\n"
@ -276,7 +280,7 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString
QLatin1String("\" description \"") + message + QLatin1String("\" description \"") + message +
QLatin1String("\" application name \"") + notificationApp + QLatin1String("\" application name \"") + notificationApp +
QLatin1String("\" ") + notificationIcon + QLatin1String("\" ") + notificationIcon +
QLatin1String("\nend tell")); QLatin1String("\nend tell\nend if"));
qt_mac_execute_apple_script(script, 0); qt_mac_execute_apple_script(script, 0);
#elif 0 #elif 0
Q_Q(QSystemTrayIcon); Q_Q(QSystemTrayIcon);