Merge pull request #4436 from GuidC0DE/magnet_handler_osx

Set qBittorrent as default torrent app in Mac OS
This commit is contained in:
sledgehammer999 2016-01-11 12:28:38 -06:00
commit a19e2e48a1
3 changed files with 88 additions and 1 deletions

View file

@ -126,6 +126,9 @@ options_imp::options_imp(QWidget *parent)
#ifndef Q_OS_WIN
checkStartup->setVisible(false);
#endif
#if !(defined(Q_OS_WIN) || defined(Q_OS_MAC))
groupFileAssociation->setVisible(false);
#endif
@ -152,7 +155,7 @@ options_imp::options_imp(QWidget *parent)
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && !defined(QT_DBUS_LIB)
checkPreventFromSuspend->setDisabled(true);
#endif
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
connect(checkAssociateTorrents, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkAssociateMagnetLinks, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
#endif
@ -406,6 +409,18 @@ void options_imp::saveOptions()
// Windows: file association settings
Preferences::setTorrentFileAssoc(checkAssociateTorrents->isChecked());
Preferences::setMagnetLinkAssoc(checkAssociateMagnetLinks->isChecked());
#endif
#ifdef Q_OS_MAC
if (checkAssociateTorrents->isChecked()) {
Preferences::setTorrentFileAssoc();
checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
checkAssociateTorrents->setEnabled(!checkAssociateTorrents->isChecked());
}
if (checkAssociateMagnetLinks->isChecked()) {
Preferences::setMagnetLinkAssoc();
checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
checkAssociateMagnetLinks->setEnabled(!checkAssociateMagnetLinks->isChecked());
}
#endif
// End General preferences
@ -580,6 +595,12 @@ void options_imp::loadOptions()
checkStartup->setChecked(pref->WinStartup());
checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
#endif
#ifdef Q_OS_MAC
checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
checkAssociateTorrents->setEnabled(!checkAssociateTorrents->isChecked());
checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
checkAssociateMagnetLinks->setEnabled(!checkAssociateMagnetLinks->isChecked());
#endif
// End General preferences