- tagged beta2 release

Changelog

@@ -7,7 +7,7 @@
     - COSMETIC: Transfer speed, ratio and DHT nodes are displayed in status bar    
     - COSMETIC: RSS Tab is now hidden as a default
 
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
     - FEATURE: Web interface to control qbittorrent (Ishan Arora)
     - FEATURE: Can spoof Azureus peer id to avoid ban
     - FEATURE: Allow to hide/show some columns in download and seeding lists
@@ -36,6 +36,7 @@
     - COSMETIC: Display "unpaused/total_torrent" in download/upload tabs
     - COSMETIC: Allow to resize RSS column
     - COSMETIC: Global UP/DL speeds and ratio are displayed above tabs
+    - COSMETIC: Use infinity symbol for ETA when time is infinite
 
 * Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13

src/GUI.cpp

@@ -656,15 +656,18 @@ void GUI::on_actionCreate_torrent_triggered() {
   connect(ct, SIGNAL(torrent_to_seed(QString)), this, SLOT(addTorrent(QString)));
 }
 
-// Called when we minimize the program
+bool GUI::event(QEvent * e) {
-void GUI::hideEvent(QHideEvent *e) {
+  if(e->type() == QEvent::WindowStateChange) {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+    //Now check to see if the window is minimised
-  if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+    if(isMinimized()) {
-    // Hide window
+      qDebug("minimisation");
-    hide();
+      QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+      if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+        hide();
+      }
+    }
   }
-  // Accept hiding
+  return QMainWindow::event(e);
-  e->accept();
 }
 
 // Action executed when a file is dropped

src/GUI.h

@@ -183,7 +183,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
 
   protected:
     void closeEvent(QCloseEvent *);
-    void hideEvent(QHideEvent *);
+    bool event(QEvent * event);
     void displayRSSTab(bool enable);
 
   public:

src/bittorrent.cpp

@@ -204,6 +204,7 @@ void bittorrent::setMaxActiveTorrents(int val) {
 }
 
 void bittorrent::increaseDlTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
   int index = downloadQueue->indexOf(hash);
   Q_ASSERT(index != -1);
   if(index > 0) {
@@ -215,6 +216,7 @@ void bittorrent::increaseDlTorrentPriority(QString hash) {
 }
 
 void bittorrent::increaseUpTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
   int index = uploadQueue->indexOf(hash);
   Q_ASSERT(index != -1);
   if(index > 0) {
@@ -226,6 +228,7 @@ void bittorrent::increaseUpTorrentPriority(QString hash) {
 }
 
 void bittorrent::decreaseDlTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
   int index = downloadQueue->indexOf(hash);
   Q_ASSERT(index != -1);
   if(index >= 0 && index < (downloadQueue->size()-1)) {
@@ -237,6 +240,7 @@ void bittorrent::decreaseDlTorrentPriority(QString hash) {
 }
 
 void bittorrent::decreaseUpTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
   int index = uploadQueue->indexOf(hash);
   Q_ASSERT(index != -1);
   if(index >= 0 && index < (uploadQueue->size()-1)) {
@@ -757,6 +761,10 @@ bool bittorrent::pauseTorrent(QString hash) {
     change = true;
     // Save fast resume data
     saveFastResumeAndRatioData(hash);
+    if(queueingEnabled) {
+      updateDownloadQueue();
+      updateUploadQueue();
+    }
     qDebug("Torrent paused successfully");
     emit pausedTorrent(hash);
   }else{
@@ -817,8 +825,10 @@ bool bittorrent::resumeTorrent(QString hash) {
     torrentsToPauseAfterChecking.removeAt(index);
     success = true;
   }
-  updateDownloadQueue();
+  if(queueingEnabled) {
-  updateUploadQueue();
+    updateDownloadQueue();
+    updateUploadQueue();
+  }
   return success;
 }
 

src/icons.qrc

@@ -1,106 +1,106 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/folder.png</file>
+  <file>Icons/add_file.png</file>
-  <file>Icons/qbittorrent32.png</file>
+  <file>Icons/add_folder.png</file>
-  <file>Icons/file.png</file>
+  <file>Icons/bt_settings.png</file>
-  <file>Icons/qbittorrent22.png</file>
+  <file>Icons/button_cancel.png</file>
-  <file>Icons/mascot.png</file>
+  <file>Icons/button_ok.png</file>
-  <file>Icons/downarrow.png</file>
-  <file>Icons/unavailable.png</file>
-  <file>Icons/proxy.png</file>
-  <file>Icons/description.png</file>
-  <file>Icons/log.png</file>
-  <file>Icons/uparrow.png</file>
-  <file>Icons/home.png</file>
-  <file>Icons/unsubscribe.png</file>
-  <file>Icons/url.png</file>
-  <file>Icons/unsubscribe16.png</file>
-  <file>Icons/qbittorrent16.png</file>
-  <file>Icons/locale.png</file>
-  <file>Icons/splash.png</file>
-  <file>Icons/subscribe16.png</file>
-  <file>Icons/loading.png</file>
-  <file>Icons/star.png</file>
-  <file>Icons/gnome-shutdown.png</file>
-  <file>Icons/style.png</file>
-  <file>Icons/rss16.png</file>
   <file>Icons/configure.png</file>
   <file>Icons/connection.png</file>
-  <file>Icons/systemtray.png</file>
+  <file>Icons/description.png</file>
-  <file>Icons/sphere.png</file>
+  <file>Icons/downarrow.png</file>
-  <file>Icons/add_folder.png</file>
-  <file>Icons/button_cancel.png</file>
-  <file>Icons/encrypted.png</file>
-  <file>Icons/wizard.png</file>
-  <file>Icons/edit_clear.png</file>
-  <file>Icons/rss32.png</file>
-  <file>Icons/subscribe.png</file>
-  <file>Icons/bt_settings.png</file>
-  <file>Icons/password.png</file>
-  <file>Icons/newmsg.png</file>
-  <file>Icons/sphere2.png</file>
-  <file>Icons/button_ok.png</file>
-  <file>Icons/add_file.png</file>
-  <file>Icons/filter.png</file>
-  <file>Icons/money.png</file>
   <file>Icons/download.png</file>
-  <file>Icons/time.png</file>
+  <file>Icons/edit_clear.png</file>
-  <file>Icons/refresh.png</file>
+  <file>Icons/encrypted.png</file>
+  <file>Icons/file.png</file>
+  <file>Icons/filter.png</file>
+  <file>Icons/folder.png</file>
   <file>Icons/gear.png</file>
-  <file>Icons/skin/new.png</file>
+  <file>Icons/gnome-shutdown.png</file>
-  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/home.png</file>
-  <file>Icons/skin/play.png</file>
+  <file>Icons/loading.png</file>
-  <file>Icons/skin/connecting.png</file>
+  <file>Icons/locale.png</file>
-  <file>Icons/skin/settings.png</file>
+  <file>Icons/log.png</file>
-  <file>Icons/skin/add.png</file>
+  <file>Icons/mascot.png</file>
-  <file>Icons/skin/open.png</file>
+  <file>Icons/money.png</file>
-  <file>Icons/skin/play_all.png</file>
+  <file>Icons/newmsg.png</file>
-  <file>Icons/skin/info.png</file>
+  <file>Icons/password.png</file>
-  <file>Icons/skin/connected.png</file>
+  <file>Icons/proxy.png</file>
-  <file>Icons/skin/search.png</file>
+  <file>Icons/qbittorrent16.png</file>
-  <file>Icons/skin/url.png</file>
+  <file>Icons/qbittorrent22.png</file>
-  <file>Icons/skin/firewalled.png</file>
+  <file>Icons/qbittorrent32.png</file>
-  <file>Icons/skin/properties.png</file>
+  <file>Icons/refresh.png</file>
-  <file>Icons/skin/preview.png</file>
+  <file>Icons/rss16.png</file>
-  <file>Icons/skin/remove.png</file>
+  <file>Icons/rss32.png</file>
-  <file>Icons/skin/queued.png</file>
+  <file>Icons/sphere.png</file>
-  <file>Icons/skin/decrease.png</file>
+  <file>Icons/sphere2.png</file>
-  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/splash.png</file>
-  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/star.png</file>
-  <file>Icons/skin/delete_all.png</file>
+  <file>Icons/style.png</file>
-  <file>Icons/skin/stalled.png</file>
+  <file>Icons/subscribe.png</file>
-  <file>Icons/skin/downloading.png</file>
+  <file>Icons/subscribe16.png</file>
-  <file>Icons/skin/delete.png</file>
+  <file>Icons/systemtray.png</file>
-  <file>Icons/skin/exit.png</file>
+  <file>Icons/time.png</file>
-  <file>Icons/skin/seeding.png</file>
+  <file>Icons/unavailable.png</file>
-  <file>Icons/skin/paused.png</file>
+  <file>Icons/unsubscribe.png</file>
-  <file>Icons/skin/increase.png</file>
+  <file>Icons/unsubscribe16.png</file>
-  <file>Icons/skin/disconnected.png</file>
+  <file>Icons/uparrow.png</file>
-  <file>Icons/skin/pause.png</file>
+  <file>Icons/url.png</file>
-  <file>Icons/flags/turkey.png</file>
+  <file>Icons/wizard.png</file>
-  <file>Icons/flags/portugal.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/ukraine.png</file>
-  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
   <file>Icons/flags/brazil.png</file>
-  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/slovakia.png</file>
-  <file>Icons/flags/romania.png</file>
-  <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/flags/netherlands.png</file>
   <file>Icons/flags/china.png</file>
   <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/greece.png</file>
-  <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/italy.png</file>
-  <file>Icons/flags/germany.png</file>
-  <file>Icons/flags/russia.png</file>
-  <file>Icons/flags/japan.png</file>
-  <file>Icons/flags/south_korea.png</file>
   <file>Icons/flags/france.png</file>
-  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/germany.png</file>
+  <file>Icons/flags/greece.png</file>
+  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/italy.png</file>
+  <file>Icons/flags/japan.png</file>
+  <file>Icons/flags/netherlands.png</file>
+  <file>Icons/flags/norway.png</file>
   <file>Icons/flags/poland.png</file>
+  <file>Icons/flags/portugal.png</file>
+  <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/russia.png</file>
+  <file>Icons/flags/slovakia.png</file>
+  <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/spain.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/turkey.png</file>
+  <file>Icons/flags/ukraine.png</file>
+  <file>Icons/flags/united_kingdom.png</file>
+  <file>Icons/skin/add.png</file>
+  <file>Icons/skin/connected.png</file>
+  <file>Icons/skin/connecting.png</file>
+  <file>Icons/skin/decrease.png</file>
+  <file>Icons/skin/delete.png</file>
+  <file>Icons/skin/delete_all.png</file>
+  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/disconnected.png</file>
+  <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/exit.png</file>
+  <file>Icons/skin/firewalled.png</file>
+  <file>Icons/skin/increase.png</file>
+  <file>Icons/skin/info.png</file>
+  <file>Icons/skin/new.png</file>
+  <file>Icons/skin/open.png</file>
+  <file>Icons/skin/pause.png</file>
+  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/play.png</file>
+  <file>Icons/skin/play_all.png</file>
+  <file>Icons/skin/preview.png</file>
+  <file>Icons/skin/properties.png</file>
+  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/queued.png</file>
+  <file>Icons/skin/remove.png</file>
+  <file>Icons/skin/search.png</file>
+  <file>Icons/skin/seeding.png</file>
+  <file>Icons/skin/settings.png</file>
+  <file>Icons/skin/stalled.png</file>
+  <file>Icons/skin/url.png</file>
 </qresource>
 </RCC>

src/lang.qrc

@@ -1,29 +1,29 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_tr.qm</file>
+  <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_de.qm</file>
-  <file>lang/qbittorrent_ru.qm</file>
-  <file>lang/qbittorrent_fr.qm</file>
   <file>lang/qbittorrent_da.qm</file>
+  <file>lang/qbittorrent_de.qm</file>
+  <file>lang/qbittorrent_el.qm</file>
+  <file>lang/qbittorrent_en.qm</file>
+  <file>lang/qbittorrent_es.qm</file>
   <file>lang/qbittorrent_fi.qm</file>
-  <file>lang/qbittorrent_pl.qm</file>
+  <file>lang/qbittorrent_fr.qm</file>
+  <file>lang/qbittorrent_hu.qm</file>
+  <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
   <file>lang/qbittorrent_ko.qm</file>
   <file>lang/qbittorrent_nb.qm</file>
-  <file>lang/qbittorrent_sv.qm</file>
+  <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_pl.qm</file>
-  <file>lang/qbittorrent_el.qm</file>
-  <file>lang/qbittorrent_sk.qm</file>
-  <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_hu.qm</file>
-  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_it.qm</file>
   <file>lang/qbittorrent_pt.qm</file>
-  <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_pt_BR.qm</file>
-  <file>lang/qbittorrent_ja.qm</file>
   <file>lang/qbittorrent_ro.qm</file>
-  <file>lang/qbittorrent_es.qm</file>
+  <file>lang/qbittorrent_ru.qm</file>
+  <file>lang/qbittorrent_sk.qm</file>
+  <file>lang/qbittorrent_sv.qm</file>
+  <file>lang/qbittorrent_tr.qm</file>
+  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_zh.qm</file>
 </qresource>
 </RCC>