FIX(client): Experimental notifications on OSX

Hartmnt · Jun 23, 2024 · d6ae3d5 · d6ae3d5
1 parent a1e8ad1
commit d6ae3d5
Showing 1 changed file with 18 additions and 94 deletions.
diff --git a/src/mumble/Log_macx.mm b/src/mumble/Log_macx.mm
@@ -4,102 +4,26 @@
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 #include "Log.h"
-
-#include <QtCore/QOperatingSystemVersion>
-
-#include <Foundation/Foundation.h>
-
+#include "widgets/TrayIcon.h"
 #include "Global.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-
-@interface MUUserNotificationCenterDelegate : NSObject <NSUserNotificationCenterDelegate>
-@end
-
-@implementation MUUserNotificationCenterDelegate
-- (void) userNotificationCenter:(NSUserNotificationCenter *)center didDeliverNotification:(NSUserNotification *)notification {
-	Q_UNUSED(center);
-	Q_UNUSED(notification);
-}
-
-- (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
-	[center removeDeliveredNotification:notification];
-}
-
-- (BOOL) userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification {
-	Q_UNUSED(center);
-	Q_UNUSED(notification);
-
-	return NO;
-}
-@end
-
-static NSString *Log_QString_to_NSString(const QString& string) {
-	return const_cast<NSString *>(reinterpret_cast<const NSString *>(CFStringCreateWithCharacters(kCFAllocatorDefault,
-	                                reinterpret_cast<const UniChar *>(string.unicode()), string.length())));
-}
-
-#endif
-
-#if QT_VERSION < 0x050800
-extern bool qt_mac_execute_apple_script(const QString &script, AEDesc *ret);
-
-static bool growl_available() {
-	static int isAvailable = -1;
-	if (isAvailable == -1)  {
-		OSStatus err = LSFindApplicationForInfo('GRRR', CFSTR("com.Growl.GrowlHelperApp"), CFSTR("GrowlHelperApp.app"), nullptr, nullptr);
-		isAvailable = (err != kLSApplicationNotFoundErr) ? 1 : 0;
-		if (isAvailable) {
-			QStringList qslAllEvents;
-			for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) {
-				Log::MsgType t = static_cast<Log::MsgType>(i);
-				qslAllEvents << QString::fromLatin1("\"%1\"").arg(Global::get().l->msgName(t));
-			}
-			QString qsScript = QString::fromLatin1(
-				"tell application \"GrowlHelperApp\"\n"
-				"	set the allNotificationsList to {%1}\n"
-				"	set the enabledNotificationsList to {%1}\n"
-				"	register as application \"Mumble\""
-				"		all notifications allNotificationsList"
-				"		default notifications enabledNotificationsList"
-				"		icon of application \"Mumble\"\n"
-				"end tell\n").arg(qslAllEvents.join(QLatin1String(",")));
-			qt_mac_execute_apple_script(qsScript, nullptr);
-		}
-	}
-	return isAvailable == 1;
-}
-#endif // QT_VERSION
-
 void Log::postNotification(MsgType mt, const QString &plain) {
-	QString title = msgName(mt);
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-# if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-	const QOperatingSystemVersion current = QOperatingSystemVersion::current();
-	if (current.majorVersion() > 10 || (current.majorVersion() == 10 && current.minorVersion() >= 8)) {
-# else
-	if (QSysInfo::MacintoshVersion >= QSysInfo::MV_MOUNTAINLION) {
-# endif
-		NSUserNotificationCenter *userNotificationCenter = [NSUserNotificationCenter defaultUserNotificationCenter];
-		if (userNotificationCenter.delegate == nil) {
-			// We hand the delegate property a delegate with a retain count of 1.  We don't keep
-			// a reference to the delegate anywhere else, so it's not really a leak.
-			userNotificationCenter.delegate = [[MUUserNotificationCenterDelegate alloc] init];
-		}
-		NSUserNotification *userNotification = [[[NSUserNotification alloc] init] autorelease];
-		userNotification.title = [Log_QString_to_NSString(title) autorelease];
-		userNotification.informativeText = [Log_QString_to_NSString(plain) autorelease];
-		[userNotificationCenter scheduleNotification:userNotification];
-	} else
-#endif
-	{
-#if QT_VERSION < 0x050800
-		QString qsScript = QString::fromLatin1(
-			"tell application \"GrowlHelperApp\"\n"
-			"	notify with name \"%1\" title \"%1\" description \"%2\" application name \"Mumble\"\n"
-			"end tell\n").arg(title).arg(plain);
-		if (growl_available())
-			qt_mac_execute_apple_script(qsScript, nullptr);
-#endif
+	QSystemTrayIcon::MessageIcon msgIcon;
+	switch (mt) {
+		case DebugInfo:
+		case CriticalError:
+			msgIcon = QSystemTrayIcon::Critical;
+			break;
+		case Warning:
+			msgIcon = QSystemTrayIcon::Warning;
+			break;
+		case TextMessage:
+		case PrivateTextMessage:
+			msgIcon = QSystemTrayIcon::NoIcon;
+			break;
+		default:
+			msgIcon = QSystemTrayIcon::Information;
+			break;
 	}
+	Global::get().trayIcon->showMessage(msgName(mt), plain, msgIcon);
 }