Merge pull request #793 from Gelmir/f2_edit

Enable edit/rename via F2 or double click in various places

src/addnewtorrentdialog.cpp

@@ -81,6 +81,9 @@ AddNewTorrentDialog::AddNewTorrentDialog(QWidget *parent) :
   loadState();
   // Signal / slots
   connect(ui->adv_button, SIGNAL(clicked(bool)), SLOT(showAdvancedSettings(bool)));
+  editHotkey = new QShortcut(QKeySequence("F2"), ui->content_tree, 0, 0, Qt::WidgetShortcut);
+  connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedFile()));
+  connect(ui->content_tree, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedFile()));
 }
 
 AddNewTorrentDialog::~AddNewTorrentDialog()
@@ -89,6 +92,7 @@ AddNewTorrentDialog::~AddNewTorrentDialog()
   delete ui;
   if (m_contentModel)
     delete m_contentModel;
+  delete editHotkey;
 }
 
 void AddNewTorrentDialog::loadState()
@@ -390,7 +394,8 @@ void AddNewTorrentDialog::relayout()
 void AddNewTorrentDialog::renameSelectedFile()
 {
   const QModelIndexList selectedIndexes = ui->content_tree->selectionModel()->selectedRows(0);
-  Q_ASSERT(selectedIndexes.size() == 1);
+  if (selectedIndexes.size() != 1)
+    return;
   const QModelIndex &index = selectedIndexes.first();
   // Ask for new name
   bool ok;

src/addnewtorrentdialog.h

@@ -31,6 +31,7 @@
 #ifndef ADDNEWTORRENTDIALOG_H
 #define ADDNEWTORRENTDIALOG_H
 
+#include <QShortcut>
 #include <QDialog>
 #include <QUrl>
 #include <libtorrent/torrent_info.hpp>
@@ -86,6 +87,7 @@ private:
   boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo;
   QStringList m_filesPath;
   bool m_hasRenamedFile;
+  QShortcut *editHotkey;
 };
 
 #endif // ADDNEWTORRENTDIALOG_H

src/mainwindow.cpp

@@ -557,11 +557,6 @@ void MainWindow::createKeyboardShortcuts() {
   connect(switchRSSShortcut, SIGNAL(activated()), this, SLOT(displayRSSTab()));
   actionDocumentation->setShortcut(QKeySequence("F1"));
   actionOptions->setShortcut(QKeySequence(QString::fromUtf8("Alt+O")));
-#ifdef Q_WS_MAC
-  actionDelete->setShortcut(QKeySequence("Ctrl+Backspace"));
-#else
-  actionDelete->setShortcut(QKeySequence(QString::fromUtf8("Del")));
-#endif
   actionStart->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+S")));
   actionStart_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+S")));
   actionPause->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+P")));

src/properties/propertieswidget.cpp

@@ -119,6 +119,13 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
   refreshTimer = new QTimer(this);
   connect(refreshTimer, SIGNAL(timeout()), this, SLOT(loadDynamicData()));
   refreshTimer->start(3000); // 3sec
+  editHotkeyFile = new QShortcut(QKeySequence("F2"), filesList, 0, 0, Qt::WidgetShortcut);
+  connect(editHotkeyFile, SIGNAL(activated()), SLOT(renameSelectedFile()));
+  editHotkeyWeb = new QShortcut(QKeySequence("F2"), listWebSeeds, 0, 0, Qt::WidgetShortcut);
+  connect(editHotkeyWeb, SIGNAL(activated()), SLOT(editWebSeed()));
+  connect(listWebSeeds, SIGNAL(doubleClicked(QModelIndex)), SLOT(editWebSeed()));
+  deleteHotkeyWeb = new QShortcut(QKeySequence(QKeySequence::Delete), listWebSeeds, 0, 0, Qt::WidgetShortcut);
+  connect(deleteHotkeyWeb, SIGNAL(activated()), SLOT(deleteSelectedUrlSeeds()));
 }
 
 PropertiesWidget::~PropertiesWidget() {
@@ -131,6 +138,9 @@ PropertiesWidget::~PropertiesWidget() {
   delete PropListModel;
   delete PropDelegate;
   delete m_tabBar;
+  delete editHotkeyFile;
+  delete editHotkeyWeb;
+  delete deleteHotkeyWeb;
   qDebug() << Q_FUNC_INFO << "EXIT";
 }
 
@@ -519,7 +529,8 @@ void PropertiesWidget::displayWebSeedListMenu(const QPoint&) {
 
 void PropertiesWidget::renameSelectedFile() {
   const QModelIndexList selectedIndexes = filesList->selectionModel()->selectedRows(0);
-  Q_ASSERT(selectedIndexes.size() == 1);
+  if (selectedIndexes.size() != 1)
+    return;
   const QModelIndex index = selectedIndexes.first();
   // Ask for new name
   bool ok;
@@ -655,6 +666,8 @@ void PropertiesWidget::askWebSeed() {
 
 void PropertiesWidget::deleteSelectedUrlSeeds() {
   const QList<QListWidgetItem *> selectedItems = listWebSeeds->selectedItems();
+  if (selectedItems.isEmpty())
+    return;
   bool change = false;
   foreach (const QListWidgetItem *item, selectedItems) {
     QString url_seed = item->text();
@@ -683,7 +696,7 @@ void PropertiesWidget::copySelectedWebSeedsToClipboard() const {
 
 void PropertiesWidget::editWebSeed() {
   const QList<QListWidgetItem *> selected_items = listWebSeeds->selectedItems();
-  if (selected_items.isEmpty())
+  if (selected_items.size() != 1)
     return;
 
   const QListWidgetItem *selected_item = selected_items.last();

src/properties/propertieswidget.h

@@ -31,6 +31,7 @@
 #ifndef PROPERTIESWIDGET_H
 #define PROPERTIESWIDGET_H
 
+#include <QShortcut>
 #include <QWidget>
 #include "ui_propertieswidget.h"
 #include "qtorrenthandle.h"
@@ -112,6 +113,9 @@ private:
   PieceAvailabilityBar *pieces_availability;
   PropTabBar *m_tabBar;
   LineEdit *m_contentFilerLine;
+  QShortcut *editHotkeyFile;
+  QShortcut *editHotkeyWeb;
+  QShortcut *deleteHotkeyWeb;
 };
 
 #endif // PROPERTIESWIDGET_H

src/properties/trackerlist.cpp

@@ -75,11 +75,16 @@ TrackerList::TrackerList(PropertiesWidget *properties): QTreeWidget(), propertie
   lsd_item = new QTreeWidgetItem(QStringList() << "" << "** [LSD] **");
   insertTopLevelItem(2, lsd_item);
   setRowColor(2, QColor("grey"));
+  editHotkey = new QShortcut(QKeySequence("F2"), this, SLOT(editSelectedTracker()), 0, Qt::WidgetShortcut);
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(editSelectedTracker()));
+  deleteHotkey = new QShortcut(QKeySequence(QKeySequence::Delete), this, SLOT(deleteSelectedTrackers()), 0, Qt::WidgetShortcut);
 
   loadSettings();
 }
 
 TrackerList::~TrackerList() {
+  delete editHotkey;
+  delete deleteHotkey;
   saveSettings();
 }
 

src/properties/trackerlist.h

@@ -31,6 +31,7 @@
 #ifndef TRACKERLIST_H
 #define TRACKERLIST_H
 
+#include <QShortcut>
 #include <QTreeWidget>
 #include <QList>
 #include <QClipboard>
@@ -52,6 +53,8 @@ private:
   QTreeWidgetItem* dht_item;
   QTreeWidgetItem* pex_item;
   QTreeWidgetItem* lsd_item;
+  QShortcut *editHotkey;
+  QShortcut *deleteHotkey;
 
 public:
   TrackerList(PropertiesWidget *properties);

src/rss/automatedrssdownloader.cpp

@@ -95,6 +95,14 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& m
   Q_ASSERT(ok);
   ok = connect(this, SIGNAL(finished(int)), SLOT(on_finished(int)));
   Q_ASSERT(ok);
+  editHotkey = new QShortcut(QKeySequence("F2"), ui->listRules, 0, 0, Qt::WidgetShortcut);
+  ok = connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedRule()));
+  Q_ASSERT(ok);
+  ok = connect(ui->listRules, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedRule()));
+  Q_ASSERT(ok);
+  deleteHotkey = new QShortcut(QKeySequence(QKeySequence::Delete), ui->listRules, 0, 0, Qt::WidgetShortcut);
+  ok = connect(deleteHotkey, SIGNAL(activated()), SLOT(on_removeRuleBtn_clicked()));
+  Q_ASSERT(ok);
   updateRuleDefinitionBox();
   updateFeedList();
 }
@@ -102,6 +110,8 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& m
 AutomatedRssDownloader::~AutomatedRssDownloader()
 {
   qDebug() << Q_FUNC_INFO;
+  delete editHotkey;
+  delete deleteHotkey;
   delete ui;
   delete m_editableRuleList;
 }
@@ -421,8 +431,11 @@ void AutomatedRssDownloader::displayRulesListMenu(const QPoint &pos)
 
 void AutomatedRssDownloader::renameSelectedRule()
 {
-  QListWidgetItem *item = ui->listRules->currentItem();
-  if (!item) return;
+  const QList<QListWidgetItem*> selection = ui->listRules->selectedItems();
+  if (selection.isEmpty())
+    return;
+
+  QListWidgetItem *item = selection.first();
   forever {
     QString new_name = QInputDialog::getText(this, tr("Rule renaming"), tr("Please type the new rule name"), QLineEdit::Normal, item->text());
     new_name = new_name.trimmed();

src/rss/automatedrssdownloader.h

@@ -33,6 +33,7 @@
 
 #include <QDialog>
 #include <QWeakPointer>
+#include <QShortcut>
 #include "rssdownloadrule.h"
 
 QT_BEGIN_NAMESPACE
@@ -93,6 +94,8 @@ private:
   QListWidgetItem* m_editedRule;
   RssDownloadRuleList *m_ruleList;
   RssDownloadRuleList *m_editableRuleList;
+  QShortcut *editHotkey;
+  QShortcut *deleteHotkey;
 };
 
 #endif // AUTOMATEDRSSDOWNLOADER_H

src/rss/rss_imp.cpp

@@ -237,10 +237,13 @@ void RSSImp::deleteSelectedItems()
     ret = QMessageBox::question(this, tr("Are you sure? -- qBittorrent"), tr("Are you sure you want to delete these elements from the list?"),
                                 tr("&Yes"), tr("&No"),
                                 QString(), 0, 1);
-  else
+  else {
+    if (selectedItems.first() == m_feedList->stickyUnreadItem())
+      return;
     ret = QMessageBox::question(this, tr("Are you sure? -- qBittorrent"), tr("Are you sure you want to delete this element from the list?"),
                                 tr("&Yes"), tr("&No"),
                                 QString(), 0, 1);
+  }
   if (ret)
     return;
 
@@ -250,6 +253,8 @@ void RSSImp::deleteSelectedItems()
       m_currentArticle = 0;
       listArticles->clear();
     }
+    if (item == m_feedList->stickyUnreadItem())
+      continue;
     RssFilePtr rss_item = m_feedList->getRSSItem(item);
     QTreeWidgetItem* parent = item->parent();
     // Notify TreeWidget
@@ -366,8 +371,11 @@ void RSSImp::openSelectedArticlesUrls()
 void RSSImp::renameSelectedRssFile()
 {
   QList<QTreeWidgetItem*> selectedItems = m_feedList->selectedItems();
-  Q_ASSERT(selectedItems.size() == 1);
+  if (selectedItems.size() != 1)
+    return;
   QTreeWidgetItem* item = selectedItems.first();
+  if (item == m_feedList->stickyUnreadItem())
+    return;
   RssFilePtr rss_item = m_feedList->getRSSItem(item);
   bool ok;
   QString newName;
@@ -681,6 +689,11 @@ RSSImp::RSSImp(QWidget *parent) :
   splitter_h->insertWidget(0, m_feedList);
   listArticles->setSelectionBehavior(QAbstractItemView::SelectItems);
   listArticles->setSelectionMode(QAbstractItemView::SingleSelection);
+  editHotkey = new QShortcut(QKeySequence("F2"), m_feedList, 0, 0, Qt::WidgetShortcut);
+  connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedRssFile()));
+  connect(m_feedList, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedRssFile()));
+  deleteHotkey = new QShortcut(QKeySequence(QKeySequence::Delete), m_feedList, 0, 0, Qt::WidgetShortcut);
+  connect(deleteHotkey, SIGNAL(activated()), SLOT(deleteSelectedItems()));
 
   m_rssManager->loadStreamList();
   fillFeedsList();
@@ -729,6 +742,8 @@ RSSImp::~RSSImp()
 {
   qDebug("Deleting RSSImp...");
   saveFoldersOpenState();
+  delete editHotkey;
+  delete deleteHotkey;
   delete m_feedList;
   qDebug("RSSImp deleted");
 }

src/rss/rss_imp.h

@@ -33,6 +33,7 @@
 #define REFRESH_MAX_LATENCY 600000
 
 #include <QPointer>
+#include <QShortcut>
 
 #include "ui_rss.h"
 #include "rssfolder.h"
@@ -91,6 +92,8 @@ private:
   RssManagerPtr m_rssManager;
   FeedListWidget *m_feedList;
   QListWidgetItem* m_currentArticle;
+  QShortcut *editHotkey;
+  QShortcut *deleteHotkey;
 
 };
 

src/transferlistwidget.cpp

@@ -141,6 +141,9 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window,
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayListMenu(const QPoint&)));
   header()->setContextMenuPolicy(Qt::CustomContextMenu);
   connect(header(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayDLHoSMenu(const QPoint&)));
+
+  editHotkey = new QShortcut(QKeySequence("F2"), this, SLOT(renameSelectedTorrent()), 0, Qt::WidgetShortcut);
+  deleteHotkey = new QShortcut(QKeySequence::Delete, this, SLOT(deleteSelectedTorrents()), 0, Qt::WidgetShortcut);
 }
 
 TransferListWidget::~TransferListWidget() {
@@ -153,6 +156,8 @@ TransferListWidget::~TransferListWidget() {
   delete nameFilterModel;
   delete listModel;
   delete listDelegate;
+  delete editHotkey;
+  delete deleteHotkey;
   qDebug() << Q_FUNC_INFO << "EXIT";
 }
 

src/transferlistwidget.h

@@ -31,6 +31,7 @@
 #ifndef TRANSFERLISTWIDGET_H
 #define TRANSFERLISTWIDGET_H
 
+#include <QShortcut>
 #include <QTreeView>
 #include <libtorrent/version.hpp>
 #include "qtorrenthandle.h"
@@ -116,6 +117,8 @@ private:
   QSortFilterProxyModel *labelFilterModel;
   QBtSession* BTSession;
   MainWindow *main_window;
+  QShortcut *editHotkey;
+  QShortcut *deleteHotkey;
 };
 
 #endif // TRANSFERLISTWIDGET_H