Browse Source

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

adaptive-webui-19844
Nick Tiskov 11 years ago
parent
commit
7adf012f9c
  1. 7
      src/addnewtorrentdialog.cpp
  2. 2
      src/addnewtorrentdialog.h
  3. 10
      src/properties/propertieswidget.cpp
  4. 3
      src/properties/propertieswidget.h
  5. 3
      src/properties/trackerlist.cpp
  6. 2
      src/properties/trackerlist.h
  7. 3
      src/transferlistwidget.cpp
  8. 2
      src/transferlistwidget.h

7
src/addnewtorrentdialog.cpp

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

2
src/addnewtorrentdialog.h

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

10
src/properties/propertieswidget.cpp

@ -119,6 +119,11 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
refreshTimer = new QTimer(this); refreshTimer = new QTimer(this);
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(loadDynamicData())); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(loadDynamicData()));
refreshTimer->start(3000); // 3sec 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()));
} }
PropertiesWidget::~PropertiesWidget() { PropertiesWidget::~PropertiesWidget() {
@ -131,6 +136,8 @@ PropertiesWidget::~PropertiesWidget() {
delete PropListModel; delete PropListModel;
delete PropDelegate; delete PropDelegate;
delete m_tabBar; delete m_tabBar;
delete editHotkeyFile;
delete editHotkeyWeb;
qDebug() << Q_FUNC_INFO << "EXIT"; qDebug() << Q_FUNC_INFO << "EXIT";
} }
@ -519,7 +526,8 @@ void PropertiesWidget::displayWebSeedListMenu(const QPoint&) {
void PropertiesWidget::renameSelectedFile() { void PropertiesWidget::renameSelectedFile() {
const QModelIndexList selectedIndexes = filesList->selectionModel()->selectedRows(0); const QModelIndexList selectedIndexes = filesList->selectionModel()->selectedRows(0);
Q_ASSERT(selectedIndexes.size() == 1); if (selectedIndexes.size() != 1)
return;
const QModelIndex index = selectedIndexes.first(); const QModelIndex index = selectedIndexes.first();
// Ask for new name // Ask for new name
bool ok; bool ok;

3
src/properties/propertieswidget.h

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

3
src/properties/trackerlist.cpp

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

2
src/properties/trackerlist.h

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

3
src/transferlistwidget.cpp

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

2
src/transferlistwidget.h

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

Loading…
Cancel
Save