diff --git a/Changelog b/Changelog index 862a7cec9..cd75fe904 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,7 @@ * Tuesday October 06 2007 - Christophe Dumez - v1.1.0 - FEATURE: Option to start qBittorrent minimized in systray - FEATURE: Allow to define double-click actions in torrents lists + - FEATURE: Allow to open torrent destination folder - BUGFIX: Do not display seeds number in seeding list (always 0) * Unknown - Christophe Dumez - v1.0.0 diff --git a/TODO b/TODO index 03b3b072a..8ba067692 100644 --- a/TODO +++ b/TODO @@ -46,7 +46,7 @@ - Display in torrent addition dialog: * free disk space on selected drive * free disk space after torrent download (and/or torrent size) -- Add "Open destination dir" on double click +- Add "Open destination dir" on right click - Use ShareMonkey Web service (http://www.sharemonkey.com/) // in v1.0.0 - FEATURE FREEZE @@ -56,11 +56,3 @@ // RC8 - BUGFIX: Fix destination save dir in addition dialog -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 diff --git a/qBittorrent.kdevelop b/qBittorrent.kdevelop index 7e9ccd42c..1e56cdee4 100644 --- a/qBittorrent.kdevelop +++ b/qBittorrent.kdevelop @@ -94,13 +94,12 @@ 4 ExternalDesigner /usr/lib/qt4 - /usr/bin/qmake-qt4 - /usr/bin/designer-qt4 + /usr/bin/qmake + /usr/bin/designer - automatic_%2Fhome%2Fchris%2Fqbittorrent_svn%2Ftrunk - Qt4 + automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent true @@ -149,14 +148,14 @@ - + src executable - /home/chris/qbittorrent_svn/trunk/src/qbittorrent + /home/ishanarora/projects/qbittorrent/src/qbittorrent - /home/chris/qbittorrent_svn/trunk + /home/ishanarora/projects/qbittorrent true false true @@ -187,7 +186,7 @@ - /home/chris/qbittorrent_svn/trunk/tags + /home/ishanarora/projects/qbittorrent/tags diff --git a/src/GUI.cpp b/src/GUI.cpp index e93bba9c0..2bcd1d872 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -980,26 +980,10 @@ void GUI::torrentDoubleClicked(QString hash, bool finished) { case TOGGLE_PAUSE: this->togglePausedState(hash); break; - case DELETE_IT: { - int ret = QMessageBox::question( - this, - tr("Are you sure? -- qBittorrent"), - tr("Are you sure you want to delete the selected item(s) from download list and from hard drive?"), - tr("&Yes"), tr("&No"), - QString(), 0, 1); - if(ret) - return; - QString fileName = h.name(); - // Remove the torrent - BTSession->deleteTorrent(hash, true); - // Delete item from list - if(finished) { - finishedTorrentTab->deleteTorrent(hash); - } else { - downloadingTorrentTab->deleteTorrent(hash); - } - // Update info bar - downloadingTorrentTab->setInfoBar(tr("'%1' was removed permanently.", "'xxx.avi' was removed permanently.").arg(fileName)); + case OPEN_DEST: { + QTorrentHandle h = BTSession->getTorrentHandle(hash); + QString savePath = h.save_path(); + QDesktopServices::openUrl(QUrl(savePath)); break; } case SHOW_PROPERTIES : diff --git a/src/options.ui b/src/options.ui index 9fd70029f..338ac5b8a 100644 --- a/src/options.ui +++ b/src/options.ui @@ -610,12 +610,12 @@ - Delete torrent + Open destination folder - Show torrent's properties + Display torrent properties @@ -653,12 +653,12 @@ - Delete torrent + Open destination folder - Show torrent's properties + Display torrent properties diff --git a/src/options_imp.cpp b/src/options_imp.cpp index 17590fbce..91d9b5db2 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -998,14 +998,14 @@ QString options_imp::getScanDir() const { // Return action on double-click on a downloading torrent set in options int options_imp::getActionOnDblClOnTorrentDl() const { if(actionTorrentDlOnDblClBox->currentIndex()<1) - return 1; + return 0; return actionTorrentDlOnDblClBox->currentIndex(); } // Return action on double-click on a finished torrent set in options int options_imp::getActionOnDblClOnTorrentFn() const { if(actionTorrentFnOnDblClBox->currentIndex()<1) - return 1; + return 0; return actionTorrentFnOnDblClBox->currentIndex(); } diff --git a/src/options_imp.h b/src/options_imp.h index 6aeebd65f..9b86b2a30 100644 --- a/src/options_imp.h +++ b/src/options_imp.h @@ -38,7 +38,7 @@ // actions on double-click on torrents #define TOGGLE_PAUSE 0 -#define DELETE_IT 1 +#define OPEN_DEST 1 #define SHOW_PROPERTIES 2 using namespace libtorrent;