1
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-10-28 14:50:53 +01:00

Compare commits

...

8 Commits

Author SHA1 Message Date
Christophe Dumez
5408daec10 Tagged v1.4.1 and v1.5.0beta1 releases 2009-08-21 11:57:28 +00:00
Christophe Dumez
be79db85b7 - Updated Changelog 2009-08-21 11:52:00 +00:00
Christophe Dumez
16fd7fd0af - BUGFIX: Don't save RSS feed state if it could not be updated 2009-08-19 06:39:16 +00:00
Christophe Dumez
a66dc5924d Fixed popup menu positioning in RSS feeds list 2009-08-18 08:49:17 +00:00
Christophe Dumez
4d4d313a8f - BUGFIX: Catching invalid_handle exception to avoid rare crashes 2009-08-17 06:41:32 +00:00
Christophe Dumez
265f1e661a - BUGFIX: Display real save path instead of the temporary one in torrent pro
perties
2009-08-16 00:36:15 +00:00
Christophe Dumez
a91aa92529 - BUGFIX: Fix problems when changing save path (if using temporary download folder)
- Bump to v1.4.1
2009-08-15 10:30:10 +00:00
Christophe Dumez
0612fe4c85 - Moved v1.4.x to a separate branch 2009-08-13 03:56:16 +00:00
12 changed files with 28 additions and 11 deletions

View File

@@ -1,3 +1,10 @@
* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
- BUGFIX: Fix problems when changing save path (if using temporary download folder)
- BUGFIX: Display real save path instead of the temporary one in torrent properties
- BUGFIX: Catching invalid_handle exception to avoid rare crashes
- BUGFIX: Fixed popup menu position in RSS feeds list
- BUGFIX: Don't save RSS feed state if it could not be updated
* Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0 * Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
- FEATURE: Display swarm information in lists - FEATURE: Display swarm information in lists
- FEATURE: Allow to define temporary download folder - FEATURE: Allow to define temporary download folder

View File

@@ -267,6 +267,7 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
} }
void FinishedTorrents::updateTorrent(QTorrentHandle h) { void FinishedTorrents::updateTorrent(QTorrentHandle h) {
if(!h.is_valid()) return;
QString hash = h.hash(); QString hash = h.hash();
int row = getRowFromHash(hash); int row = getRowFromHash(hash);
if(row == -1){ if(row == -1){

View File

@@ -1420,6 +1420,7 @@ void GUI::updateLists(bool force) {
for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) { for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
QTorrentHandle h = QTorrentHandle(*torrentIT); QTorrentHandle h = QTorrentHandle(*torrentIT);
if(!h.is_valid()) continue; if(!h.is_valid()) continue;
try {
if(h.is_seed()) { if(h.is_seed()) {
// Update in finished list // Update in finished list
finishedTorrentTab->updateTorrent(h); finishedTorrentTab->updateTorrent(h);
@@ -1431,6 +1432,7 @@ void GUI::updateLists(bool force) {
QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished"); QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished");
} }
} }
} catch(invalid_handle) {}
} }
} }
if(displaySpeedInTitle) { if(displaySpeedInTitle) {

View File

@@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Categories=Qt;Network;P2P Categories=Qt;Network;P2P
Comment=V1.4.0 Comment=V1.4.1
Exec=qbittorrent %f Exec=qbittorrent %f
GenericName=Bittorrent client GenericName=Bittorrent client
GenericName[bg]=Торент клиент GenericName[bg]=Торент клиент

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@@ -151,6 +151,10 @@ void bittorrent::setDownloadLimit(QString hash, long val) {
saveTorrentSpeedLimits(hash); saveTorrentSpeedLimits(hash);
} }
bool bittorrent::useTemporaryFolder() const {
return !defaultTempPath.isEmpty();
}
bool bittorrent::isQueueingEnabled() const { bool bittorrent::isQueueingEnabled() const {
return queueingEnabled; return queueingEnabled;
} }

View File

@@ -77,9 +77,6 @@ class bittorrent : public QObject {
bool queueingEnabled; bool queueingEnabled;
QStringList url_skippingDlg; QStringList url_skippingDlg;
protected:
QString getSavePath(QString hash);
public: public:
// Constructor / Destructor // Constructor / Destructor
bittorrent(); bittorrent();
@@ -107,6 +104,8 @@ class bittorrent : public QObject {
QStringList getConsoleMessages() const; QStringList getConsoleMessages() const;
QStringList getPeerBanMessages() const; QStringList getPeerBanMessages() const;
qlonglong getETA(QString hash) const; qlonglong getETA(QString hash) const;
bool useTemporaryFolder() const;
QString getSavePath(QString hash);
public slots: public slots:
QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false); QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);

View File

@@ -482,6 +482,7 @@ QStringList DownloadingTorrents::getSelectedTorrents(bool only_one) const{
// get information from torrent handles and // get information from torrent handles and
// update download list accordingly // update download list accordingly
bool DownloadingTorrents::updateTorrent(QTorrentHandle h) { bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
if(!h.is_valid()) return false;
bool added = false; bool added = false;
try{ try{
QString hash = h.hash(); QString hash = h.hash();

View File

@@ -86,7 +86,7 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h
// get Infos from torrent handle // get Infos from torrent handle
fileName->setText(h.name()); fileName->setText(h.name());
// Torrent Infos // Torrent Infos
save_path->setText(h.save_path()); save_path->setText(BTSession->getSavePath(hash));
QString author = h.creator().trimmed(); QString author = h.creator().trimmed();
if(author.isEmpty()) if(author.isEmpty())
author = tr("Unknown"); author = tr("Unknown");
@@ -711,6 +711,7 @@ void properties::on_changeSavePathButton_clicked() {
savepath_file.write(savePath.path().toLocal8Bit()); savepath_file.write(savePath.path().toLocal8Bit());
savepath_file.close(); savepath_file.close();
// Actually move storage // Actually move storage
if(!BTSession->useTemporaryFolder() || h.is_seed())
h.move_storage(savePath.path()); h.move_storage(savePath.path());
// Update save_path in dialog // Update save_path in dialog
save_path->setText(savePath.path()); save_path->setText(savePath.path());

View File

@@ -329,8 +329,10 @@ class RssStream : public QObject{
} }
~RssStream(){ ~RssStream(){
if(refreshed) {
QSettings qBTRSS("qBittorrent-rss"); QSettings qBTRSS("qBittorrent-rss");
qBTRSS.setValue(url, getAllReadHashes()); qBTRSS.setValue(url, getAllReadHashes());
}
removeAllItems(); removeAllItems();
if(QFile::exists(filePath)) if(QFile::exists(filePath))
QFile::remove(filePath); QFile::remove(filePath);

View File

@@ -54,7 +54,7 @@
myFinishedListMenu.addAction(actionCreate); myFinishedListMenu.addAction(actionCreate);
myFinishedListMenu.addAction(actionRefreshAll); myFinishedListMenu.addAction(actionRefreshAll);
} }
myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,33)); myFinishedListMenu.exec(QCursor::pos());
} }
// add a stream by a button // add a stream by a button

View File

@@ -14,10 +14,10 @@ CONFIG += qt \
network network
# Update this VERSION for each release # Update this VERSION for each release
DEFINES += VERSION=\\\"v1.4.0\\\" DEFINES += VERSION=\\\"v1.4.1\\\"
DEFINES += VERSION_MAJOR=1 DEFINES += VERSION_MAJOR=1
DEFINES += VERSION_MINOR=4 DEFINES += VERSION_MINOR=4
DEFINES += VERSION_BUGFIX=0 DEFINES += VERSION_BUGFIX=1
!mac:QMAKE_LFLAGS += -Wl,--as-needed !mac:QMAKE_LFLAGS += -Wl,--as-needed
contains(DEBUG_MODE, 1) { contains(DEBUG_MODE, 1) {
CONFIG += debug CONFIG += debug