Add option to open torrent's file or download directory on double cli…

…ck (#128)

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## [Unreleased]
 ### Added
-- Add support of xdg-activation protocol on Wayland with Qt < 6.3
+- Support of xdg-activation protocol on Wayland with Qt < 6.3
+- Option to open torrent's file or download directory on double click
 
 ### Changed
 - "Open" and "Show in file manager" actions now show error dialog if file/directory does not exist,

src/settings.cpp

@@ -13,11 +13,11 @@
 
 #include "log/log.h"
 #include "target_os.h"
-#include "ui/systemcolorsprovider.h"
 
 SPECIALIZE_FORMATTER_FOR_Q_ENUM(Qt::ToolButtonStyle)
 SPECIALIZE_FORMATTER_FOR_Q_ENUM(tremotesf::TorrentsProxyModel::StatusFilter)
 SPECIALIZE_FORMATTER_FOR_Q_ENUM(tremotesf::Settings::DarkThemeMode)
+SPECIALIZE_FORMATTER_FOR_Q_ENUM(tremotesf::Settings::TorrentDoubleClickAction)
 
 #define SETTINGS_PROPERTY_DEF_IMPL(type, getter, setterType, setter, key, defaultValue)    \
     type Settings::getter() const { return getValue<type>(mSettings, key, defaultValue); } \
@@ -196,6 +196,13 @@ namespace tremotesf {
         Settings::DarkThemeMode, darkThemeMode, setDarkThemeMode, "darkThemeMode", Settings::DarkThemeMode::FollowSystem
     )
     SETTINGS_PROPERTY_DEF_TRIVIAL(bool, useSystemAccentColor, setUseSystemAccentColor, "useSystemAccentColor", true)
+    SETTINGS_PROPERTY_DEF_TRIVIAL(
+        Settings::TorrentDoubleClickAction,
+        torrentDoubleClickAction,
+        setTorrentDoubleClickAction,
+        "torrentDoubleClickAction",
+        Settings::TorrentDoubleClickAction::OpenPropertiesDialog
+    )
 
     Settings::Settings(QObject* parent) : QObject(parent) {
         if constexpr (isTargetOsWindows) {
@@ -214,11 +221,13 @@ namespace tremotesf {
         qRegisterMetaType<TorrentData::Priority>();
         qRegisterMetaType<TorrentsProxyModel::StatusFilter>();
         qRegisterMetaType<Settings::DarkThemeMode>();
+        qRegisterMetaType<Settings::TorrentDoubleClickAction>();
 #if QT_VERSION_MAJOR < 6
         qRegisterMetaTypeStreamOperators<Qt::ToolButtonStyle>();
         qRegisterMetaTypeStreamOperators<TorrentData::Priority>();
         qRegisterMetaTypeStreamOperators<TorrentsProxyModel::StatusFilter>();
         qRegisterMetaTypeStreamOperators<Settings::DarkThemeMode>();
+        qRegisterMetaTypeStreamOperators<Settings::TorrentDoubleClickAction>();
 #endif
     }
 

src/settings.h

@@ -83,8 +83,16 @@ namespace tremotesf {
         enum class DarkThemeMode { FollowSystem, On, Off };
         Q_ENUM(DarkThemeMode)
 
+        enum class TorrentDoubleClickAction {
+            OpenPropertiesDialog,
+            OpenTorrentFile,
+            OpenDownloadDirectory
+        };
+        Q_ENUM(TorrentDoubleClickAction)
+
         SETTINGS_PROPERTY_TRIVIAL(Settings::DarkThemeMode, darkThemeMode, setDarkThemeMode)
         SETTINGS_PROPERTY_TRIVIAL(bool, useSystemAccentColor, setUseSystemAccentColor)
+        SETTINGS_PROPERTY_TRIVIAL(Settings::TorrentDoubleClickAction, torrentDoubleClickAction, setTorrentDoubleClickAction)
 
     public:
         static Settings* instance();

src/ui/screens/mainwindow/mainwindow.cpp

@@ -209,7 +209,7 @@ namespace tremotesf {
                 &mTorrentsView,
                 &TorrentsView::activated,
                 this,
-                &MainWindow::Impl::showTorrentsPropertiesDialogs
+                &MainWindow::Impl::performTorrentDoubleClickAction
             );
 
             setupTorrentsPlaceholder(torrentsViewLayout);
@@ -328,7 +328,8 @@ namespace tremotesf {
         QAction mAddTorrentFileAction{
             QIcon::fromTheme("list-add"_l1),
             //: Menu item
-            qApp->translate("tremotesf", "&Add Torrent File...")};
+            qApp->translate("tremotesf", "&Add Torrent File...")
+        };
         QAction mAddTorrentLinkAction{
             QIcon::fromTheme("insert-link"_l1),
             //: Menu item
@@ -801,6 +802,22 @@ namespace tremotesf {
             mOpenTorrentDownloadDirectoryAction->setEnabled(localOrMounted);
         }
 
+        void performTorrentDoubleClickAction() {
+            switch (Settings::instance()->torrentDoubleClickAction()) {
+            case Settings::TorrentDoubleClickAction::OpenPropertiesDialog:
+                showTorrentsPropertiesDialogs();
+                break;
+            case Settings::TorrentDoubleClickAction::OpenTorrentFile:
+                openTorrentsFiles();
+                break;
+            case Settings::TorrentDoubleClickAction::OpenDownloadDirectory:
+                showTorrentsInFileManager();
+                break;
+            default:
+                break;
+            }
+        }
+
         void showTorrentsPropertiesDialogs() {
             const QModelIndexList selectedRows(mTorrentsView.selectionModel()->selectedRows());
 

src/ui/screens/settingsdialog.cpp

@@ -6,6 +6,7 @@
 
 #include "settingsdialog.h"
 
+#include <array>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QCoreApplication>
@@ -22,6 +23,21 @@
 #include "ui/systemcolorsprovider.h"
 
 namespace tremotesf {
+    namespace {
+        constexpr std::array torrentDoubleClickActionComboBoxValues{
+            Settings::TorrentDoubleClickAction::OpenPropertiesDialog,
+            Settings::TorrentDoubleClickAction::OpenTorrentFile,
+            Settings::TorrentDoubleClickAction::OpenDownloadDirectory
+        };
+
+        Settings::TorrentDoubleClickAction torrentDoubleClickActionFromComboBoxIndex(int index) {
+            if (index == -1) {
+                return Settings::TorrentDoubleClickAction::OpenPropertiesDialog;
+            }
+            return torrentDoubleClickActionComboBoxValues.at(static_cast<size_t>(index));
+        }
+    }
+
     SettingsDialog::SettingsDialog(QWidget* parent) : QDialog(parent) {
         //: Dialog title
         setWindowTitle(qApp->translate("tremotesf", "Options"));
@@ -36,6 +52,7 @@ namespace tremotesf {
             //: Options section
             auto appearanceGroupBox = new QGroupBox(qApp->translate("tremotesf", "Appearance"), this);
             auto appearanceGroupBoxLayout = new QFormLayout(appearanceGroupBox);
+            appearanceGroupBoxLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 
             darkThemeComboBox = new QComboBox(this);
             //: Dark theme mode
@@ -102,6 +119,33 @@ namespace tremotesf {
 
         layout->addWidget(addTorrentsGroupBox);
 
+        //: Options section
+        auto otherBehaviourGroupBox = new QGroupBox(qApp->translate("tremotesf", "Other behaviour"), this);
+        layout->addWidget(otherBehaviourGroupBox);
+        auto otherBehaviourGroupBoxLayout = new QFormLayout(otherBehaviourGroupBox);
+        otherBehaviourGroupBoxLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+
+        auto torrentDoubleClickActionComboBox = new QComboBox(this);
+        for (const auto action : torrentDoubleClickActionComboBoxValues) {
+            switch (action) {
+            case Settings::TorrentDoubleClickAction::OpenPropertiesDialog:
+                torrentDoubleClickActionComboBox->addItem(qApp->translate("tremotesf", "Open properties dialog"));
+                break;
+            case Settings::TorrentDoubleClickAction::OpenTorrentFile:
+                torrentDoubleClickActionComboBox->addItem(qApp->translate("tremotesf", "Open torrent's file"));
+                break;
+            case Settings::TorrentDoubleClickAction::OpenDownloadDirectory:
+                torrentDoubleClickActionComboBox->addItem(qApp->translate("tremotesf", "Open download directory"));
+                break;
+            default:
+                break;
+            }
+        }
+        otherBehaviourGroupBoxLayout->addRow(
+            qApp->translate("tremotesf", "What to do when torrent in the list is double clicked:"),
+            torrentDoubleClickActionComboBox
+        );
+
         //: Options section
         auto notificationsGroupBox = new QGroupBox(qApp->translate("tremotesf", "Notifications"), this);
         auto notificationsGroupBoxLayout = new QVBoxLayout(notificationsGroupBox);
@@ -167,12 +211,16 @@ namespace tremotesf {
 
         auto settings = Settings::instance();
         connectOnStartupCheckBox->setChecked(settings->connectOnStartup());
-        notificationOnDisconnectingCheckBox->setChecked(settings->notificationOnDisconnecting());
-        notificationOnAddingTorrentCheckBox->setChecked(settings->notificationOnAddingTorrent());
-        notificationOfFinishedTorrentsCheckBox->setChecked(settings->notificationOfFinishedTorrents());
         rememberOpenTorrentDirCheckbox->setChecked(settings->rememberOpenTorrentDir());
         rememberAddTorrentParameters->setChecked(settings->rememberAddTorrentParameters());
+        torrentDoubleClickActionComboBox->setCurrentIndex(
+            // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+            indexOfCasted<int>(torrentDoubleClickActionComboBoxValues, settings->torrentDoubleClickAction()).value()
+        );
         fillTorrentLinkFromKeyboardCheckBox->setChecked(settings->fillTorrentLinkFromClipboard());
+        notificationOnDisconnectingCheckBox->setChecked(settings->notificationOnDisconnecting());
+        notificationOnAddingTorrentCheckBox->setChecked(settings->notificationOnAddingTorrent());
+        notificationOfFinishedTorrentsCheckBox->setChecked(settings->notificationOfFinishedTorrents());
         trayIconCheckBox->setChecked(settings->showTrayIcon());
         addedSinceLastConnectionCheckBox->setChecked(settings->notificationsOnAddedTorrentsSinceLastConnection());
         finishedSinceLastConnectionCheckBox->setChecked(settings->notificationsOnFinishedTorrentsSinceLastConnection());
@@ -190,6 +238,12 @@ namespace tremotesf {
         QObject::connect(this, &SettingsDialog::accepted, this, [=] {
             auto settings = Settings::instance();
             settings->setConnectOnStartup(connectOnStartupCheckBox->isChecked());
+            settings->setRememberOpenTorrentDir(rememberOpenTorrentDirCheckbox->isChecked());
+            settings->setRememberTorrentAddParameters(rememberAddTorrentParameters->isChecked());
+            settings->setFillTorrentLinkFromClipboard(fillTorrentLinkFromKeyboardCheckBox->isChecked());
+            settings->setTorrentDoubleClickAction(
+                torrentDoubleClickActionFromComboBoxIndex(torrentDoubleClickActionComboBox->currentIndex())
+            );
             settings->setNotificationOnDisconnecting(notificationOnDisconnectingCheckBox->isChecked());
             settings->setNotificationOnAddingTorrent(notificationOnAddingTorrentCheckBox->isChecked());
             settings->setNotificationOfFinishedTorrents(notificationOfFinishedTorrentsCheckBox->isChecked());
@@ -198,9 +252,6 @@ namespace tremotesf {
             settings->setNotificationsOnFinishedTorrentsSinceLastConnection(
                 finishedSinceLastConnectionCheckBox->isChecked()
             );
-            settings->setRememberOpenTorrentDir(rememberOpenTorrentDirCheckbox->isChecked());
-            settings->setRememberTorrentAddParameters(rememberAddTorrentParameters->isChecked());
-            settings->setFillTorrentLinkFromClipboard(fillTorrentLinkFromKeyboardCheckBox->isChecked());
             if constexpr (isTargetOsWindows) {
                 if (const int index = darkThemeComboBox->currentIndex(); index != -1) {
                     settings->setDarkThemeMode(darkThemeComboBoxValues[static_cast<size_t>(index)]);