From 05e217537cc9f49bf16b1e56bf20b4b9c762ff82 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 17 Jan 2021 12:10:55 +0800
Subject: [PATCH] Move menu actions out of .ui files

This is to move related code together.
---
 src/gui/addnewtorrentdialog.cpp         | 15 ++++-----------
 src/gui/addnewtorrentdialog.ui          | 20 --------------------
 src/gui/properties/propertieswidget.cpp | 19 ++++++-------------
 src/gui/properties/propertieswidget.ui  | 23 -----------------------
 4 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index 68d549cb0..25ed53b82 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -525,29 +525,22 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &)
 
     QMenu *subMenu = menu->addMenu(tr("Priority"));
 
-    connect(m_ui->actionNotDownloaded, &QAction::triggered, subMenu, [applyPriorities]()
+    subMenu->addAction(tr("Do not download"), subMenu, [applyPriorities]()
     {
         applyPriorities(BitTorrent::DownloadPriority::Ignored);
     });
-    subMenu->addAction(m_ui->actionNotDownloaded);
-
-    connect(m_ui->actionNormal, &QAction::triggered, subMenu, [applyPriorities]()
+    subMenu->addAction(tr("Normal"), subMenu, [applyPriorities]()
     {
         applyPriorities(BitTorrent::DownloadPriority::Normal);
     });
-    subMenu->addAction(m_ui->actionNormal);
-
-    connect(m_ui->actionHigh, &QAction::triggered, subMenu, [applyPriorities]()
+    subMenu->addAction(tr("High"), subMenu, [applyPriorities]()
     {
         applyPriorities(BitTorrent::DownloadPriority::High);
     });
-    subMenu->addAction(m_ui->actionHigh);
-
-    connect(m_ui->actionMaximum, &QAction::triggered, subMenu, [applyPriorities]()
+    subMenu->addAction(tr("Maximum"), subMenu, [applyPriorities]()
     {
         applyPriorities(BitTorrent::DownloadPriority::Maximum);
     });
-    subMenu->addAction(m_ui->actionMaximum);
 
     menu->popup(QCursor::pos());
 }
diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui
index ef10963b7..7c2a20e6c 100644
--- a/src/gui/addnewtorrentdialog.ui
+++ b/src/gui/addnewtorrentdialog.ui
@@ -449,26 +449,6 @@
     </layout>
    </item>
   </layout>
-  <action name="actionNormal">
-   <property name="text">
-    <string>Normal</string>
-   </property>
-  </action>
-  <action name="actionHigh">
-   <property name="text">
-    <string>High</string>
-   </property>
-  </action>
-  <action name="actionMaximum">
-   <property name="text">
-    <string>Maximum</string>
-   </property>
-  </action>
-  <action name="actionNotDownloaded">
-   <property name="text">
-    <string>Do not download</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp
index 49c113620..f296a42b9 100644
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@@ -600,8 +600,6 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
 
     if (!m_torrent->isSeed())
     {
-        QMenu *subMenu = menu->addMenu(tr("Priority"));
-
         const auto applyPriorities = [this, selectedRows](const BitTorrent::DownloadPriority prio)
         {
             for (const QModelIndex &index : selectedRows)
@@ -614,29 +612,24 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
             filteredFilesChanged();
         };
 
-        connect(m_ui->actionNotDownloaded, &QAction::triggered, subMenu, [applyPriorities]()
+        QMenu *subMenu = menu->addMenu(tr("Priority"));
+
+        subMenu->addAction(tr("Do not download"), subMenu, [applyPriorities]()
         {
             applyPriorities(BitTorrent::DownloadPriority::Ignored);
         });
-        subMenu->addAction(m_ui->actionNotDownloaded);
-
-        connect(m_ui->actionNormal, &QAction::triggered, subMenu, [applyPriorities]()
+        subMenu->addAction(tr("Normal"), subMenu, [applyPriorities]()
         {
             applyPriorities(BitTorrent::DownloadPriority::Normal);
         });
-        subMenu->addAction(m_ui->actionNormal);
-
-        connect(m_ui->actionHigh, &QAction::triggered, subMenu, [applyPriorities]()
+        subMenu->addAction(tr("High"), subMenu, [applyPriorities]()
         {
             applyPriorities(BitTorrent::DownloadPriority::High);
         });
-        subMenu->addAction(m_ui->actionHigh);
-
-        connect(m_ui->actionMaximum, &QAction::triggered, subMenu, [applyPriorities]()
+        subMenu->addAction(tr("Maximum"), subMenu, [applyPriorities]()
         {
             applyPriorities(BitTorrent::DownloadPriority::Maximum);
         });
-        subMenu->addAction(m_ui->actionMaximum);
     }
 
     // The selected torrent might have disappeared during exec()
diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui
index 5a6dac08e..8ca6b278d 100644
--- a/src/gui/properties/propertieswidget.ui
+++ b/src/gui/properties/propertieswidget.ui
@@ -1086,29 +1086,6 @@
     </widget>
    </item>
   </layout>
-  <action name="actionNotDownloaded">
-   <property name="text">
-    <string>Do not download</string>
-   </property>
-   <property name="toolTip">
-    <string>Do not download</string>
-   </property>
-  </action>
-  <action name="actionMaximum">
-   <property name="text">
-    <string>Maximum</string>
-   </property>
-  </action>
-  <action name="actionHigh">
-   <property name="text">
-    <string>High</string>
-   </property>
-  </action>
-  <action name="actionNormal">
-   <property name="text">
-    <string>Normal</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>