- Tagged v1.1.2 release

Changelog

@@ -1,4 +1,7 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.1
+    - BUGFIX: Fixed bad resource file for icons
+
+* 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

INSTALL

@@ -18,7 +18,6 @@ Dependencies:
   Qt >= 4.4.0 is advised
 
 - libtorrent-rasterbar by Arvid Norberg (>= v0.13.1 REQUIRED)
-    -> http://www.qbittorrent.org/download.php (advised)
     -> http://www.libtorrent.net
     Be careful: another library (the one used by rTorrent) uses a similar name.
 

TODO

@@ -1,37 +1,6 @@
-// Easy
-- Translations into as many languages as possible
-- Use Launchpad/Rosetta for translations once it supports TS files
+See https://blueprints.launchpad.net/qbittorrent/
 
-// Intermediate
-- Port on MacOS, Windows (and create an installer for Windows) - Slow progress
-- Add some transparency (menus,...), improve look / usabilty
-- Skins support? (contact Mateusz)
-
-// Harder
-- Torrent scheduler ala µtorrent/Bitcomet
-
-// Waiting for libtorrent
-- Allow to prioritize torrents (may code this in qBittorrent?)
-
-// Unsure
-- Display the peers we are connected to for each torrent with infos (like flag, dl/up speeds, ...)
-- Azureus spoofing to prevent ban from trackers?
-- Option to shutdown computer when downloads are finished
-- NAT checker/Tester
-- Display hard drive space left?
-- Make use of dbus on Linux for the single instance instead of socket communication?
-  (http://techbase.kde.org/Development/Tutorials/D-Bus/Accessing_Interfaces)
-- When favicon can't be downloaded, try to parse the webpage for:
-  <link rel="icon" href="http://example.com/favicon.ico" type="image/vnd.microsoft.icon">
-    * Be careful, the link can be relative
-- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
-- support zipped torrents? (useful?)
-- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
-
-// in v1.2.0
-- Allow user to organize the downloads into categories/folders?
-
-Translations updated:
+Translations updated in v1.1.0:
 - French
 - Chinese
 - Polish

src/FinishedTorrents.cpp

@@ -247,7 +247,7 @@ void FinishedTorrents::updateFinishedList(){
       if (reponse == QMessageBox::Yes) {
         qDebug("Info: a torrent was moved from finished to download tab");
         deleteTorrent(hash);
-        BTSession->setFinishedTorrent(hash);
+        BTSession->setUnfinishedTorrent(hash);
         emit torrentMovedFromFinishedList(hash);
       }
       else if (reponse == QMessageBox::No) {

src/Icons/qBittorrent.desktop

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

src/icons.qrc

@@ -1,106 +1,106 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/folder.png</file>
-  <file>Icons/qbittorrent32.png</file>
-  <file>Icons/file.png</file>
-  <file>Icons/smile.png</file>
-  <file>Icons/qbittorrent22.png</file>
-  <file>Icons/mascot.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/stare.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/add_file.png</file>
+  <file>Icons/add_folder.png</file>
+  <file>Icons/bt_settings.png</file>
+  <file>Icons/button_cancel.png</file>
+  <file>Icons/button_ok.png</file>
   <file>Icons/configure.png</file>
   <file>Icons/connection.png</file>
-  <file>Icons/systemtray.png</file>
-  <file>Icons/sphere.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/unhappy.png</file>
-  <file>Icons/add_file.png</file>
-  <file>Icons/filter.png</file>
-  <file>Icons/money.png</file>
+  <file>Icons/description.png</file>
+  <file>Icons/downarrow.png</file>
   <file>Icons/download.png</file>
-  <file>Icons/time.png</file>
-  <file>Icons/refresh.png</file>
+  <file>Icons/edit_clear.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/skin/qb_question.png</file>
-  <file>Icons/skin/play.png</file>
-  <file>Icons/skin/connecting.png</file>
-  <file>Icons/skin/settings.png</file>
-  <file>Icons/skin/add.png</file>
-  <file>Icons/skin/open.png</file>
-  <file>Icons/skin/play_all.png</file>
-  <file>Icons/skin/info.png</file>
-  <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/search.png</file>
-  <file>Icons/skin/url.png</file>
-  <file>Icons/skin/firewalled.png</file>
-  <file>Icons/skin/properties.png</file>
-  <file>Icons/skin/preview.png</file>
-  <file>Icons/skin/remove.png</file>
-  <file>Icons/skin/delete_perm.png</file>
-  <file>Icons/skin/pause_all.png</file>
-  <file>Icons/skin/delete_all.png</file>
-  <file>Icons/skin/stalled.png</file>
-  <file>Icons/skin/downloading.png</file>
-  <file>Icons/skin/delete.png</file>
-  <file>Icons/skin/exit.png</file>
-  <file>Icons/skin/seeding.png</file>
-  <file>Icons/skin/paused.png</file>
-  <file>Icons/skin/disconnected.png</file>
-  <file>Icons/skin/pause.png</file>
-  <file>Icons/flags/turkey.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/gnome-shutdown.png</file>
+  <file>Icons/home.png</file>
+  <file>Icons/loading.png</file>
+  <file>Icons/locale.png</file>
+  <file>Icons/log.png</file>
+  <file>Icons/mascot.png</file>
+  <file>Icons/money.png</file>
+  <file>Icons/newmsg.png</file>
+  <file>Icons/password.png</file>
+  <file>Icons/proxy.png</file>
+  <file>Icons/qbittorrent16.png</file>
+  <file>Icons/qbittorrent22.png</file>
+  <file>Icons/qbittorrent32.png</file>
+  <file>Icons/refresh.png</file>
+  <file>Icons/rss16.png</file>
+  <file>Icons/rss32.png</file>
+  <file>Icons/smile.png</file>
+  <file>Icons/sphere.png</file>
+  <file>Icons/sphere2.png</file>
+  <file>Icons/splash.png</file>
+  <file>Icons/star.png</file>
+  <file>Icons/stare.png</file>
+  <file>Icons/style.png</file>
+  <file>Icons/subscribe.png</file>
+  <file>Icons/subscribe16.png</file>
+  <file>Icons/systemtray.png</file>
+  <file>Icons/time.png</file>
+  <file>Icons/unavailable.png</file>
+  <file>Icons/unhappy.png</file>
+  <file>Icons/unsubscribe.png</file>
+  <file>Icons/unsubscribe16.png</file>
+  <file>Icons/uparrow.png</file>
+  <file>Icons/url.png</file>
+  <file>Icons/wizard.png</file>
   <file>Icons/flags/brazil.png</file>
-  <file>Icons/flags/norway.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/bulgaria.png</file>
   <file>Icons/flags/china.png</file>
   <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/hungary.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/finland.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/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/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/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_tr.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_bg.qm</file>
+  <file>lang/qbittorrent_ca.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_zh.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_nl.qm</file>
+  <file>lang/qbittorrent_pl.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>

src/qtorrenthandle.cpp

@@ -57,6 +57,8 @@ float QTorrentHandle::progress() const {
   Q_ASSERT(h.is_valid());
   if(!h.status().total_wanted)
     return 0.;
+  if (h.status().total_wanted_done == h.status().total_wanted)
+    return 1.;
   float progress = (float)h.status().total_wanted_done/(float)h.status().total_wanted;
   Q_ASSERT(progress >= 0. && progress <= 1.);
   return progress;

src/search.qrc

@@ -1,16 +1,16 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>search_engine/novaprinter.py</file>
   <file>search_engine/nova2.py</file>
+  <file>search_engine/novaprinter.py</file>
+  <file>search_engine/engines/btjunkie.png</file>
+  <file>search_engine/engines/btjunkie.py</file>
   <file>search_engine/engines/isohunt.png</file>
-  <file>search_engine/engines/piratebay.png</file>
+  <file>search_engine/engines/isohunt.py</file>
   <file>search_engine/engines/mininova.png</file>
   <file>search_engine/engines/mininova.py</file>
-  <file>search_engine/engines/btjunkie.py</file>
+  <file>search_engine/engines/piratebay.png</file>
   <file>search_engine/engines/piratebay.py</file>
-  <file>search_engine/engines/isohunt.py</file>
   <file>search_engine/engines/torrentreactor.png</file>
-  <file>search_engine/engines/btjunkie.png</file>
   <file>search_engine/engines/torrentreactor.py</file>
 </qresource>
 </RCC>

src/src.pro

@@ -11,10 +11,10 @@ TARGET = qbittorrent
 CONFIG += qt thread x11 network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.1.0rc2\\\"
+DEFINES += VERSION=\\\"v1.1.2\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=1
-DEFINES += VERSION_BUGFIX=0
+DEFINES += VERSION_BUGFIX=2
 
 QMAKE_LFLAGS += -Wl,--as-needed