mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-06 15:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #682 from Gelmir/rss_dnd_sameplace

Browse Source 
Repopulate the feed tree after drag&drop to same location
This commit is contained in:
sledgehammer999 2013-06-30 12:48:39 -07:00
commit 2c7441b31d
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rss/feedlistwidget.cpp
View File

@ -205,7 +205,7 @@ void FeedListWidget::dropEvent(QDropEvent *event) {
foreach (QTreeWidgetItem *src_item, src_items) { foreach (QTreeWidgetItem *src_item, src_items) {
RssFilePtr file = getRSSItem(src_item); RssFilePtr file = getRSSItem(src_item);
if (dest_folder->hasChild(file->id())) { if (dest_folder->hasChild(file->id())) {
emit overwriteAttempt(file->id()); QTreeWidget::dropEvent(event);
return; return;
} }
} }

1
src/rss/feedlistwidget.h
View File

@ -71,7 +71,6 @@ public slots:
signals: signals:
void foldersAltered(const QList<QTreeWidgetItem*> &folders); void foldersAltered(const QList<QTreeWidgetItem*> &folders);
void overwriteAttempt(const QString &filename);
private slots: private slots:
void updateCurrentFeed(QTreeWidgetItem* new_item); void updateCurrentFeed(QTreeWidgetItem* new_item);

8
src/rss/rss_imp.cpp
View File

@ -168,13 +168,6 @@ void RSSImp::askNewFolder()
m_rssManager->saveStreamList(); m_rssManager->saveStreamList();
} }
void RSSImp::displayOverwriteError(const QString& filename)
{
QMessageBox::warning(this, tr("Overwrite attempt"),
tr("You cannot overwrite %1 item.", "You cannot overwrite myFolder item.").arg(filename),
QMessageBox::Ok);
}
// add a stream by a button // add a stream by a button
void RSSImp::on_newFeedButton_clicked() void RSSImp::on_newFeedButton_clicked()
{ {
@ -717,7 +710,6 @@ RSSImp::RSSImp(QWidget *parent) :
connect(m_feedList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(populateArticleList(QTreeWidgetItem*))); connect(m_feedList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(populateArticleList(QTreeWidgetItem*)));
connect(m_feedList, SIGNAL(foldersAltered(QList<QTreeWidgetItem*>)), this, SLOT(updateItemsInfos(QList<QTreeWidgetItem*>))); connect(m_feedList, SIGNAL(foldersAltered(QList<QTreeWidgetItem*>)), this, SLOT(updateItemsInfos(QList<QTreeWidgetItem*>)));
connect(m_feedList, SIGNAL(overwriteAttempt(QString)), this, SLOT(displayOverwriteError(QString)));
connect(listArticles, SIGNAL(itemSelectionChanged()), this, SLOT(refreshTextBrowser())); connect(listArticles, SIGNAL(itemSelectionChanged()), this, SLOT(refreshTextBrowser()));
connect(listArticles, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(downloadSelectedTorrents())); connect(listArticles, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(downloadSelectedTorrents()));

1
src/rss/rss_imp.h
View File

@ -79,7 +79,6 @@ private slots:
void askNewFolder(); void askNewFolder();
void saveFoldersOpenState(); void saveFoldersOpenState();
void loadFoldersOpenState(); void loadFoldersOpenState();
void displayOverwriteError(const QString &filename);
void on_actionManage_cookies_triggered(); void on_actionManage_cookies_triggered();
void on_settingsButton_clicked(); void on_settingsButton_clicked();
void on_rssDownloaderBtn_clicked(); void on_rssDownloaderBtn_clicked();