github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

migrateAwayFromDeprecatedNSUserNotification

Browse source 
migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification

migrateAwayFromDeprecatedNSUserNotification
This commit is contained in:
Ryu481 2025-07-21 20:01:01 +02:00
commit 6e60669214
No known key found for this signature in database
GPG key ID: 0A721B47A5620B99
4 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/CMakeLists.txt
View file

@ -296,7 +296,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
programupdater.h programupdater.h
programupdater.cpp programupdater.cpp
) )
target_link_libraries(qbt_gui PRIVATE objc) target_link_libraries(qbt_gui PRIVATE
objc
"-framework UserNotifications"
)
endif() endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if (CMAKE_SYSTEM_NAME STREQUAL "Windows")

1
src/gui/desktopintegration.cpp
View file

@ -80,6 +80,7 @@ DesktopIntegration::DesktopIntegration(QObject *parent)
{ {
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
desktopIntegrationInstance = this; desktopIntegrationInstance = this;
MacUtils::askForNotificationPermission();
MacUtils::overrideDockClickHandler(handleDockClicked); MacUtils::overrideDockClickHandler(handleDockClicked);
m_menu->setAsDockMenu(); m_menu->setAsDockMenu();
#else #else

1
src/gui/macutilities.h
View file

@ -40,6 +40,7 @@ namespace MacUtils
{ {
QPixmap pixmapForExtension(const QString &ext, const QSize &size); QPixmap pixmapForExtension(const QString &ext, const QSize &size);
void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...)); void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...));
void askForNotificationPermission();
void displayNotification(const QString &title, const QString &message); void displayNotification(const QString &title, const QString &message);
void openFiles(const PathList &pathList); void openFiles(const PathList &pathList);

36
src/gui/macutilities.mm
View file

@ -29,13 +29,17 @@
#include "macutilities.h" #include "macutilities.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h> #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
#import <UserNotifications/UserNotifications.h>
#include <objc/message.h> #include <objc/message.h>
#include <QCoreApplication>
#include <QPixmap> #include <QPixmap>
#include <QSize> #include <QSize>
#include <QString> #include <QString>
#include "base/logger.h"
#include "base/path.h" #include "base/path.h"
QImage qt_mac_toQImage(CGImageRef image); QImage qt_mac_toQImage(CGImageRef image);
@ -85,16 +89,36 @@ namespace MacUtils
} }
} }
void askForNotificationPermission()
{
@autoreleasepool
{
[UNUserNotificationCenter.currentNotificationCenter requestAuthorizationWithOptions:
(UNAuthorizationOptionAlert + UNAuthorizationOptionSound)
completionHandler:^([[maybe_unused]] BOOL granted, NSError * _Nullable error)
{
if (error)
{
LogMsg(QCoreApplication::translate("MacUtils", "Permission for notifications not granted. Error: \"%1\"").arg
(QString::fromNSString(error.localizedDescription)), Log::WARNING);
}
}];
}
}
void displayNotification(const QString &title, const QString &message) void displayNotification(const QString &title, const QString &message)
{ {
@autoreleasepool @autoreleasepool
{ {
NSUserNotification *notification = [[NSUserNotification alloc] init]; UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init];
notification.title = title.toNSString(); content.title = title.toNSString();
notification.informativeText = message.toNSString(); content.body = message.toNSString();
notification.soundName = NSUserNotificationDefaultSoundName; content.sound = [UNNotificationSound defaultSound];
UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:
[[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification]; [[NSUUID UUID] UUIDString] content:content
trigger:nil];
[UNUserNotificationCenter.currentNotificationCenter
addNotificationRequest:request withCompletionHandler:nil];
} }
} }