From 61da0ff8290cfabd1094be0c02952d08e3afe94e Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 28 Jan 2015 16:14:43 +0300 Subject: [PATCH] enabled custom notifies in os x 10.7, added content image in os x native notifiers --- Telegram/Resources/style.txt | 1 + Telegram/SourceFiles/mainwidget.cpp | 2 -- Telegram/SourceFiles/pspecific_mac.cpp | 4 +++- Telegram/SourceFiles/pspecific_mac_p.h | 2 +- Telegram/SourceFiles/pspecific_mac_p.mm | 25 +++++++++++++++++-------- Telegram/SourceFiles/settings.cpp | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 8cb4691c5..54e9174db 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -1038,6 +1038,7 @@ notifyBorder: #f1f1f1; notifyBorderWidth: 1px; notifySlowHide: 4000; notifyPhotoSize: 62px; +notifyMacPhotoSize: 64px; notifyPhotoPos: point(9px, 9px); notifyClosePos: point(1px, 2px); notifyClose: iconedButton(btnDefIconed) { diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index f4c02637f..977b375f1 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2448,7 +2448,6 @@ void MainWidget::updateOnline(bool gotOtherOffline) { int updateIn = cOnlineUpdatePeriod(); if (isOnline) { uint64 idle = psIdleTime(); - LOG(("Idle: %1").arg(idle)); if (idle >= uint64(cOfflineIdleTimeout())) { isOnline = false; if (!_isIdle) { @@ -2478,7 +2477,6 @@ void MainWidget::updateOnline(bool gotOtherOffline) { } else if (isOnline) { updateIn = qMin(updateIn, int(_lastSetOnline + cOnlineUpdatePeriod() - ms)); } - LOG(("UPDATE IN: %1").arg(updateIn)); _onlineTimer.start(updateIn); } diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp index 3b82b8a80..fb430faf3 100644 --- a/Telegram/SourceFiles/pspecific_mac.cpp +++ b/Telegram/SourceFiles/pspecific_mac.cpp @@ -480,8 +480,10 @@ void PsMainWindow::psNotifyShown(NotifyWindow *w) { void PsMainWindow::psPlatformNotify(HistoryItem *item) { QString title = (cNotifyView() <= dbinvShowName) ? item->history()->peer->name : qsl("Telegram Desktop"); QString subtitle = (cNotifyView() <= dbinvShowName) ? item->notificationHeader() : QString(); + QPixmap pix = (cNotifyView() <= dbinvShowName) ? item->history()->peer->photo->pix(st::notifyMacPhotoSize) : QPixmap(); QString msg = (cNotifyView() <= dbinvShowPreview) ? item->notificationText() : lang(lng_notification_preview); - _private.showNotify(item->history()->peer->id, title, subtitle, msg, (cNotifyView() <= dbinvShowPreview)); + + _private.showNotify(item->history()->peer->id, pix, title, subtitle, msg, (cNotifyView() <= dbinvShowPreview)); } bool PsMainWindow::eventFilter(QObject *obj, QEvent *evt) { diff --git a/Telegram/SourceFiles/pspecific_mac_p.h b/Telegram/SourceFiles/pspecific_mac_p.h index a3a4e184d..0f9c637d9 100644 --- a/Telegram/SourceFiles/pspecific_mac_p.h +++ b/Telegram/SourceFiles/pspecific_mac_p.h @@ -29,7 +29,7 @@ public: void updateDelegate(); - void showNotify(uint64 peer, const QString &title, const QString &subtitle, const QString &msg, bool withReply); + void showNotify(uint64 peer, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply); void clearNotifies(uint64 peer = 0); void enableShadow(WId winId); diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm index 25dee8e57..1fcb2b25f 100644 --- a/Telegram/SourceFiles/pspecific_mac_p.mm +++ b/Telegram/SourceFiles/pspecific_mac_p.mm @@ -148,13 +148,15 @@ public: void onNotifyClick(NSUserNotification *notification) { NSNumber *peerObj = [[notification userInfo] objectForKey:@"peer"]; - unsigned long long peerLong = [peerObj unsignedLongLongValue]; + unsigned long long peerLong = peerObj ? [peerObj unsignedLongLongValue] : 0; + LOG(("Received notification click with peer %1").arg(peerLong)); wnd->notifyClicked(peerLong); } void onNotifyReply(NSUserNotification *notification) { NSNumber *peerObj = [[notification userInfo] objectForKey:@"peer"]; - unsigned long long peerLong = [peerObj unsignedLongLongValue]; + unsigned long long peerLong = peerObj ? [peerObj unsignedLongLongValue] : 0; + LOG(("Received notification reply with peer %1").arg(peerLong)); wnd->notifyReplied(peerLong, [[[notification response] string] UTF8String]); } @@ -202,11 +204,12 @@ public: - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification { NSNumber *instObj = [[notification userInfo] objectForKey:@"inst"]; - unsigned long long instLong = [instObj unsignedLongLongValue]; + unsigned long long instLong = instObj ? [instObj unsignedLongLongValue] : 0; + DEBUG_LOG(("Received notification with instance %1").arg(instLong)); if (instLong != cInstance()) { // other app instance notification return; } - if (notification.activationType == NSUserNotificationActivationTypeReplied){ + if (notification.activationType == NSUserNotificationActivationTypeReplied) { wnd->data->onNotifyReply(notification); } else if (notification.activationType == NSUserNotificationActivationTypeContentsClicked) { wnd->data->onNotifyClick(notification); @@ -255,7 +258,7 @@ void objc_showOverAll(WId winId, bool canFocus) { [wnd setLevel:NSPopUpMenuWindowLevel]; if (!canFocus) { [wnd setStyleMask:NSUtilityWindowMask | NSNonactivatingPanelMask]; - [wnd setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle]; + [wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle]; } } @@ -269,14 +272,19 @@ void objc_activateWnd(WId winId) { [wnd orderFront:wnd]; } -void PsMacWindowPrivate::showNotify(uint64 peer, const QString &title, const QString &subtitle, const QString &msg, bool withReply) { +NSImage *qt_mac_create_nsimage(const QPixmap &pm); + +void PsMacWindowPrivate::showNotify(uint64 peer, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply) { NSUserNotification *notification = [[NSUserNotification alloc] init]; - + NSImage *img = qt_mac_create_nsimage(pix); + + DEBUG_LOG(("Sending notification with userinfo: peer %1 and instance %2").arg(peer).arg(cInstance())); [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer],@"peer",[NSNumber numberWithUnsignedLongLong:cInstance()],@"inst",nil]]; [notification setTitle:QNSString(title).s()]; [notification setSubtitle:QNSString(subtitle).s()]; [notification setInformativeText:QNSString(msg).s()]; + [notification setContentImage:img]; if (withReply) [notification setHasReplyButton:YES]; @@ -284,7 +292,8 @@ void PsMacWindowPrivate::showNotify(uint64 peer, const QString &title, const QSt NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter]; [center deliverNotification:notification]; - + + if (img) [img release]; [notification release]; } diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 71fbcb879..75edd29ac 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -129,7 +129,7 @@ int gOtherOnline = 0; void settingsParseArgs(int argc, char *argv[]) { if (cPlatform() == dbipMac) { - gCustomNotifies = false; + gCustomNotifies = (QSysInfo::macVersion() < QSysInfo::MV_10_8); } else { gCustomNotifies = true; }