diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index e6d66993b..f6bc5963d 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -511,37 +511,7 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &) , static_cast(prio)); } }; - - QMenu *menu = new QMenu(this); - menu->setAttribute(Qt::WA_DeleteOnClose); - - if (selectedRows.size() == 1) - { - menu->addAction(UIThemeManager::instance()->getIcon("edit-rename"), tr("Rename...") - , this, [this]() { m_ui->contentTreeView->renameSelectedFile(m_torrentInfo); }); - menu->addSeparator(); - } - - QMenu *subMenu = menu->addMenu(tr("Priority")); - - subMenu->addAction(tr("Do not download"), subMenu, [applyPriorities]() - { - applyPriorities(BitTorrent::DownloadPriority::Ignored); - }); - subMenu->addAction(tr("Normal"), subMenu, [applyPriorities]() - { - applyPriorities(BitTorrent::DownloadPriority::Normal); - }); - subMenu->addAction(tr("High"), subMenu, [applyPriorities]() - { - applyPriorities(BitTorrent::DownloadPriority::High); - }); - subMenu->addAction(tr("Maximum"), subMenu, [applyPriorities]() - { - applyPriorities(BitTorrent::DownloadPriority::Maximum); - }); - subMenu->addSeparator(); - subMenu->addAction(tr("By shown file order"), subMenu, [this]() + const auto applyPrioritiesByOrder = [this]() { // Equally distribute the selected items into groups and for each group assign // a download priority that will apply to each item. The number of groups depends on how @@ -573,7 +543,57 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &) m_contentModel->setData(index.sibling(index.row(), PRIORITY) , static_cast(priority)); } - }); + }; + + QMenu *menu = new QMenu(this); + menu->setAttribute(Qt::WA_DeleteOnClose); + if (selectedRows.size() == 1) + { + menu->addAction(UIThemeManager::instance()->getIcon("edit-rename"), tr("Rename...") + , this, [this]() { m_ui->contentTreeView->renameSelectedFile(m_torrentInfo); }); + menu->addSeparator(); + + QMenu *priorityMenu = menu->addMenu(tr("Priority")); + priorityMenu->addAction(tr("Do not download"), priorityMenu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Ignored); + }); + priorityMenu->addAction(tr("Normal"), priorityMenu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Normal); + }); + priorityMenu->addAction(tr("High"), priorityMenu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::High); + }); + priorityMenu->addAction(tr("Maximum"), priorityMenu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Maximum); + }); + priorityMenu->addSeparator(); + priorityMenu->addAction(tr("By shown file order"), priorityMenu, applyPrioritiesByOrder); + } + else + { + menu->addAction(tr("Do not download"), menu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Ignored); + }); + menu->addAction(tr("Normal priority"), menu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Normal); + }); + menu->addAction(tr("High priority"), menu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::High); + }); + menu->addAction(tr("Maximum priority"), menu, [applyPriorities]() + { + applyPriorities(BitTorrent::DownloadPriority::Maximum); + }); + menu->addSeparator(); + menu->addAction(tr("Priority by shown file order"), menu, applyPrioritiesByOrder); + } menu->popup(QCursor::pos()); }