squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-01 13:18:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate away from deprecated methods for setting the standard application on macOS

Browse Source 
The methods for checking if qBittorrent is set as the standard application for opening torrent files and magnet links and setting qBittorrent as the standard application for those is using deprecated methods now. For example `LSCopyDefaultHandlerForURLScheme` and `kUTTagClassFilenameExtension`.
The new methods have been moved to `macutilities.mm` because in `os.cpp` cocoa couldn't be imported.

PR #23059.
This commit is contained in:
Ryu481
2025-08-09 12:13:18 +02:00
committed by GitHub
parent fa3531dcb4
commit 02d72179fe
5 changed files with 54 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/macutilities.h
View File

@@ -44,6 +44,11 @@ namespace MacUtils
void displayNotification(const QString &title, const QString &message);
void openFiles(const PathList &pathList);
bool isMagnetLinkAssocSet();
void setMagnetLinkAssoc();
bool isTorrentFileAssocSet();
void setTorrentFileAssoc();
QString badgeLabelText();
void setBadgeLabelText(const QString &text);
}

40
src/gui/macutilities.mm
View File

@@ -143,6 +143,46 @@ namespace MacUtils
}
}
bool isMagnetLinkAssocSet()
{
@autoreleasepool
{
const NSURL *magnetStandardURL = [[NSWorkspace sharedWorkspace] URLForApplicationToOpenURL:[NSURL URLWithString:@"magnet:"]];
const NSURL *qbtURL = [[NSBundle mainBundle] bundleURL];
return [magnetStandardURL isEqual:qbtURL];
}
}
void setMagnetLinkAssoc()
{
@autoreleasepool
{
[[NSWorkspace sharedWorkspace] setDefaultApplicationAtURL:[[NSBundle mainBundle] bundleURL]
toOpenURLsWithScheme:@"magnet" completionHandler:nil];
}
}
bool isTorrentFileAssocSet()
{
@autoreleasepool
{
const NSURL *torrentStandardURL = [[NSWorkspace sharedWorkspace]
URLForApplicationToOpenContentType:[UTType typeWithFilenameExtension:@"torrent"]];
const NSURL *qbtURL = [[NSBundle mainBundle] bundleURL];
return [torrentStandardURL isEqual:qbtURL];
}
}
void setTorrentFileAssoc()
{
@autoreleasepool
{
[[NSWorkspace sharedWorkspace] setDefaultApplicationAtURL:[[NSBundle mainBundle] bundleURL]
toOpenContentType:[UTType typeWithFilenameExtension:@"torrent"]
completionHandler:nil];
}
}
QString badgeLabelText()
{
return QString::fromNSString(NSApp.dockTile.badgeLabel);

18
src/gui/optionsdialog.cpp
View File

@@ -88,9 +88,9 @@
#include "base/net/dnsupdater.h"
#endif
#if defined Q_OS_MACOS || defined Q_OS_WIN
#include "base/utils/os.h"
#endif // defined Q_OS_MACOS || defined Q_OS_WIN
#ifdef Q_OS_MACOS
#include "macutilities.h"
#endif
#define SETTINGS_KEY(name) u"OptionsDialog/" name
@@ -329,9 +329,9 @@ void OptionsDialog::loadBehaviorTabOptions()
#ifdef Q_OS_MACOS
m_ui->checkShowSystray->setVisible(false);
m_ui->checkAssociateTorrents->setChecked(Utils::OS::isTorrentFileAssocSet());
m_ui->checkAssociateTorrents->setChecked(MacUtils::isTorrentFileAssocSet());
m_ui->checkAssociateTorrents->setEnabled(!m_ui->checkAssociateTorrents->isChecked());
m_ui->checkAssociateMagnetLinks->setChecked(Utils::OS::isMagnetLinkAssocSet());
m_ui->checkAssociateMagnetLinks->setChecked(MacUtils::isMagnetLinkAssocSet());
m_ui->checkAssociateMagnetLinks->setEnabled(!m_ui->checkAssociateMagnetLinks->isChecked());
#endif
@@ -517,14 +517,14 @@ void OptionsDialog::saveBehaviorTabOptions() const
#ifdef Q_OS_MACOS
if (m_ui->checkAssociateTorrents->isChecked())
{
Utils::OS::setTorrentFileAssoc();
m_ui->checkAssociateTorrents->setChecked(Utils::OS::isTorrentFileAssocSet());
MacUtils::setTorrentFileAssoc();
m_ui->checkAssociateTorrents->setChecked(MacUtils::isTorrentFileAssocSet());
m_ui->checkAssociateTorrents->setEnabled(!m_ui->checkAssociateTorrents->isChecked());
}
if (m_ui->checkAssociateMagnetLinks->isChecked())
{
Utils::OS::setMagnetLinkAssoc();
m_ui->checkAssociateMagnetLinks->setChecked(Utils::OS::isMagnetLinkAssocSet());
MacUtils::setMagnetLinkAssoc();
m_ui->checkAssociateMagnetLinks->setChecked(MacUtils::isMagnetLinkAssocSet());
m_ui->checkAssociateMagnetLinks->setEnabled(!m_ui->checkAssociateMagnetLinks->isChecked());
}
#endif