From 6ecb5fe1e123baa8993ffe033e6f4f267773f368 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 14 Nov 2007 21:51:47 +0000 Subject: [PATCH] - Tagged rc8 --- Changelog | 1 + TODO | 12 ++++-------- configure | 20 -------------------- qcm/libcommoncpp2.qcm | 10 ---------- qcm/libtorrent.qcm | 10 ---------- src/PropListDelegate.h | 1 + src/bittorrent.cpp | 1 + src/properties_imp.cpp | 2 ++ src/searchEngine.cpp | 7 +++++++ src/src.pro | 2 +- 10 files changed, 17 insertions(+), 49 deletions(-) diff --git a/Changelog b/Changelog index 52a26cc74..af00479a2 100644 --- a/Changelog +++ b/Changelog @@ -44,6 +44,7 @@ - I18N: Added Hungarian translation - I18N: Added Brazilian translation - BUGFIX: Progress of paused torrents is now correct on restart + - BUGFIX: clear the results of a search stops searching - BUGFIX: Progress column gets sorted on restart it is was during last execution - BUGFIX: Made ETA more reliable using stats instead of instant values - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty diff --git a/TODO b/TODO index 0176928f6..6e35e2983 100644 --- a/TODO +++ b/TODO @@ -57,11 +57,7 @@ - Recheck doc - Translations update (IN PROGRESS) -rc6->rc7 changelog: -- BUGFIX: Catching DHT exception in case there is a problem -- BUGFIX: Removed build dependency on Python -- BUGFIX: Fixed a bug in children update when changing files priorities -- BUGFIX: Pause/Start All now affect all tabs, not only the current one -- BUGFIX: Don't reload all torrents everytime settings are saved -- BUGFIX: Don't reload seeding torrents anymore (no point) -- I18N: Updated Turkish translation \ No newline at end of file +rc7->rc8 changelog: +- BUGFIX: Fixed torrent files filtering +- BUGFIX: Stop search when clearing results +- BUGFIX: Fixed compilation on Fedora 8 diff --git a/configure b/configure index 533754184..5f8fbcdcd 100755 --- a/configure +++ b/configure @@ -425,16 +425,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent"); - } - } return true; } }; @@ -558,16 +548,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt"); - } - } return true; } }; diff --git a/qcm/libcommoncpp2.qcm b/qcm/libcommoncpp2.qcm index 76575b17d..494cf8869 100644 --- a/qcm/libcommoncpp2.qcm +++ b/qcm/libcommoncpp2.qcm @@ -60,16 +60,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt"); - } - } return true; } }; diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm index 808a9d822..f0a093497 100644 --- a/qcm/libtorrent.qcm +++ b/qcm/libtorrent.qcm @@ -65,16 +65,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent"); - } - } return true; } }; diff --git a/src/PropListDelegate.h b/src/PropListDelegate.h index 155d92c8e..701ef72e0 100644 --- a/src/PropListDelegate.h +++ b/src/PropListDelegate.h @@ -181,6 +181,7 @@ class PropListDelegate: public QItemDelegate { // } else { model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(NORMAL)); + *filteredFilesChanged = true; // } break; case 2: diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp index beb367d31..92106436f 100644 --- a/src/bittorrent.cpp +++ b/src/bittorrent.cpp @@ -708,6 +708,7 @@ void bittorrent::loadTorrentSpeedLimits(QString hash) { // Read pieces priorities from .priorities file // and ask QTorrentHandle to consider them void bittorrent::loadFilesPriorities(QTorrentHandle &h) { + qDebug("Applying pieces priorities"); if(!h.is_valid()) { qDebug("/!\\ Error: Invalid handle"); return; diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp index b322b0e7f..ffd8c37a5 100644 --- a/src/properties_imp.cpp +++ b/src/properties_imp.cpp @@ -304,6 +304,7 @@ bool properties::allFiltered() const { void properties::getPriorities(QStandardItem *parent, int *priorities) { + qDebug("In getPriorities"); unsigned int nbRows = parent->rowCount(); for(unsigned int i=0; ichild(i, INDEX); @@ -313,6 +314,7 @@ void properties::getPriorities(QStandardItem *parent, int *priorities) { } else { item = parent->child(i, PRIORITY); priorities[index] = item->text().toInt(); + qDebug("File at index %d has priority %d", index, priorities[index]); } } } diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp index 7e8691927..b47692a05 100644 --- a/src/searchEngine.cpp +++ b/src/searchEngine.cpp @@ -452,12 +452,19 @@ void SearchEngine::on_stop_search_button_clicked(){ // Clear search results list void SearchEngine::on_clear_button_clicked(){ + // Kill process + searchProcess->terminate(); + search_stopped = true; + searchResultsUrls.clear(); SearchListModel->removeRows(0, SearchListModel->rowCount()); // Disable clear & download buttons clear_button->setEnabled(false); download_button->setEnabled(false); results_lbl->setText(tr("Results")+" (0):"); + // focus on search pattern + search_pattern->clear(); + search_pattern->setFocus(); } void SearchEngine::on_clearPatternButton_clicked() { diff --git a/src/src.pro b/src/src.pro index b041c547c..1f59ce52a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,7 +11,7 @@ TARGET = qbittorrent CONFIG += qt thread x11 network # Update this VERSION for each release -DEFINES += VERSION=\\\"v1.0.0rc7\\\" +DEFINES += VERSION=\\\"v1.0.0rc8\\\" DEFINES += VERSION_MAJOR=1 DEFINES += VERSION_MINOR=0 DEFINES += VERSION_BUGFIX=0