Tagged rc9 release

- Must add SOCKS5 proxy support in search engine plugins (python -> urllib2?)

AUTHORS

@@ -3,4 +3,3 @@ Author:
 
 Contributors:
 * Arnaud Demaizière <arnaud@qbittorrent.org>
-* Ishan Arora <ishanarora@gmail.com>

Changelog

@@ -1,29 +1,4 @@
-* Unknown - 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
-    - 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
-    - FEATURE: Real progress bar in torrent properties that displays downloaded pieces
-    - FEATURE: Allow to buy downloads using ShareMonkey
-    - FEATURE: Display if UPnP/NAT-PMP was successful or not
-    - FEATURE: Threadified torrent creation
-    - FEATURE: Improved eMule DAT ip filter parser
-    - FEATURE: Added support for PeerGuardian p2p filters (text)
-    - FEATURE: Added support for PeerGuardian p2b filters (binary)
-    - FEATURE: Allow to customize folder scan interval
-    - FEATURE: Allow to add several trackers at once
-    - BUGFIX: Do not display seeds number in seeding list (always 0)
-    - BUGFIX: Threadified IP filter file parser to avoid GUI freeze
-    - COSMETIC: Do not display progress bar in seeding list (always 100%)
-    - COSMETIC: Added a progress bar for torrent creation
-    - COSMETIC: Display tracker errors in a cleaner way
-    - 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
-
-* Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13
     - FEATURE: Added UPnP / NAT-PMP port forwarding support
     - FEATURE: Added encryption support (compatible with Azureus)
@@ -66,9 +41,11 @@
     - FEATURE: Added an option to automatically delete torrents when they reach a given ratio (>= 1.0)
     - FEATURE: Added an option to display current transfer speeds in title bar
     - FEATURE: Torrent content is now displayed as a tree
+    - FEATURE: Better media file preview (player detected automatically)
     - 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
@@ -91,6 +68,8 @@
     - BUGFIX: Fixed drag'n drop on non-KDE systems
     - BUGFIX: Removed build dependency on Python
     - BUGFIX: Catching DHT exception in case there is a problem
+    - BUGFIX: Remember properties window size and position
+    - BUGFIX: Improved proxy support in search engine (HTTP only)
     - COSMETIC: Redesigned torrent properties a little
     - COSMETIC: Totally redesigned program preferences
     - COSMETIC: Display more logs messages concerning features

TODO

@@ -23,15 +23,46 @@
   (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)
+    * Be carefull, the link can be relative
 
 // in v1.2.0
 - Allow user to organize the downloads into categories/folders?
 
 // in v1.1.0
-- Stop calculating ETAs when ETA column is hidden
--> See https://blueprints.launchpad.net/qbittorrent
+- Tabs support in search
+- Allow to hide columns?
+- Allow to scan multiple directories? (useful?)
+- Web interface (turbogears? php? python?)
+  * Webserver? Try to write a webserver as a plugin for qBittorrent in Python
+    * http://fragments.turtlemeat.com/pythonwebserver.php
+- improve and test tracker authentication code (remember login/pass) (need a tracker to test this)
+- support zipped torrents? (useful?)
+- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
+- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
+- Display the number of DHT node if possible
+- When adding a duplicate torrent, check if the trackers are different from the existing one and ask the user if he wants to add them
+- Display in torrent addition dialog:
+   * free disk space on selected drive
+   * free disk space after torrent download (and/or torrent size)
+- Start minimized option in program preferences
+- In finished list, replace "Seeds/Leechs" column by "Leechers" because Seeds are always 0.
+- Allow to change action on double-click
+  -> in download list
+  -> in seeding list
 
+rc8->rc9 changelog:
+- FEATURE: Better media file preview (player detected automatically)
+- BUGFIX: Remember properties window size and position
+- BUGFIX: Added HTTP and SOCKS5 proxy support in downloads from urls, RSS
+- BUGFIX: Added HTTP proxy support in search engine (no SOCKS yet)
+- BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed)
+- BUGFIX: Save fast resume data regularly (every 60 seconds) to avoid downloading from scratch if qBittorrent crashes
+- BUGFIX: Do not save fastresume data for checking torrents anymore
+- BUGFIX: Saving trackers file only when necessary
+- BUGFIX: Fixed possible segfault when unfiltering files in torrent addition dialog
+- BUGFIX: Fixed possible overflow in ETA calculation
+- BUGFIX: title bar is now reset when "Display speed in title" is disabled
+- BUGFIX: Fixed HTTP_PW and SOCKS5_PW in proxy combobox
+- BUGFIX: Fixed proxy auth disable problem when disabling proxy
+- BUGFIX: Fixed proxy layout in program preferences
+- BUGFIX: Fixed everlasting libtorrent session destruction on exit

configure

@@ -594,9 +594,9 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
 		if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "Magick++")) {
-				return false;
-			}
+			if(!QFile::exists(s+QString("/libMagick++.so"))){
+                          return false;
+                        }
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
@@ -605,9 +605,9 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "Magick++")) {
+				if(QFile::exists(s+QString("libMagick++.so"))){
 					found = true;
-                                        break;
+					break;
 				}
 			}
 			if(!found)

doc/qbittorrent.1

@@ -1,28 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT" "1" "September 1st 2007" "Bittorrent client written in C++ / Qt4" ""
-
-.SH NAME
-qBittorrent \- a Bittorrent client written in C++ / Qt4
-.SH SYNOPSIS
-
-\fBqbittorrent\fR [FILE | URL] [FILE | URL...]
-
-\fBqbittorrent\fR \-\-help
-
-\fBqbittorrent\fR \-\-version
-.PP
-.SH "DESCRIPTION"
-
-\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
-using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
-to be a good alternative to all other bittorrent clients out there. qBittorrent
-is fast, stable, light, it supports unicode and it provides a good integrated search engine.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), FAST extension (mainline) and PeX support (utorrent compatible).
-
-Please report any problem to http://bugs.qbittorrent.org
-.PP
-.SH "AUTHOR"
-
-Christophe Dumez <chris@qbittorrent.org>

qBittorrent.kdevelop

@@ -94,12 +94,13 @@
       <includestyle>4</includestyle>
       <designerintegration>ExternalDesigner</designerintegration>
       <root>/usr/lib/qt4</root>
-      <qmake>/usr/bin/qmake</qmake>
-      <designer>/usr/bin/designer</designer>
+      <qmake>/usr/bin/qmake-qt4</qmake>
+      <designer>/usr/bin/designer-qt4</designer>
       <designerpluginpaths/>
     </qt>
     <references>
-      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
+      <pcs>automatic_%2Fhome%2Fchris%2Fqbittorrent_svn%2Ftrunk</pcs>
+      <pcs>Qt4</pcs>
     </references>
     <codecompletion>
       <automaticCodeCompletion>true</automaticCodeCompletion>
@@ -148,14 +149,14 @@
   </kdevfilecreate>
   <kdevtrollproject>
     <general>
-      <activedir>src</activedir>
+      <activedir></activedir>
     </general>
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
+      <mainprogram>/home/chris/qbittorrent_svn/trunk/src/qbittorrent</mainprogram>
       <programargs/>
       <globaldebugarguments/>
-      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
+      <globalcwd>/home/chris/qbittorrent_svn/trunk</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
@@ -186,7 +187,7 @@
   </cppsupportpart>
   <ctagspart>
     <customArguments/>
-    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
+    <customTagfilePath>/home/chris/qbittorrent_svn/trunk/tags</customTagfilePath>
     <activeTagsFiles/>
   </ctagspart>
   <kdevdocumentation>

qcm/libmagick.qcm

@@ -44,9 +44,9 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
 		if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "Magick++")) {
-				return false;
-			}
+			if(!QFile::exists(s+QString("/libMagick++.so"))){
+                          return false;
+                        }
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
@@ -55,9 +55,9 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "Magick++")) {
+				if(QFile::exists(s+QString("libMagick++.so"))){
 					found = true;
-                                        break;
+					break;
 				}
 			}
 			if(!found)

src/FinishedListDelegate.h

@@ -34,10 +34,11 @@
 // Defines for download list list columns
 #define F_NAME 0
 #define F_SIZE 1
-#define F_UPSPEED 2
-#define F_LEECH 3
-#define F_RATIO 4
-#define F_HASH 5
+#define F_PROGRESS 2
+#define F_UPSPEED 3
+#define F_SEEDSLEECH 4
+#define F_RATIO 5
+#define F_HASH 6
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT
@@ -66,6 +67,20 @@ class FinishedListDelegate: public QItemDelegate {
           QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
           break;
         }
+        case F_PROGRESS:{
+          QStyleOptionProgressBarV2 newopt;
+          double progress = index.data().toDouble()*100.;
+          newopt.rect = opt.rect;
+          newopt.text = QString(QByteArray::number(progress, 'f', 1))+QString::fromUtf8("%");
+          newopt.progress = (int)progress;
+          newopt.maximum = 100;
+          newopt.minimum = 0;
+          newopt.state |= QStyle::State_Enabled;
+          newopt.textVisible = true;
+          QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
+          painter);
+          break;
+        }
         default:
           QItemDelegate::paint(painter, option, index);
       }

src/FinishedTorrents.h

@@ -39,10 +39,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     FinishedListDelegate *finishedListDelegate;
     QStandardItemModel *finishedListModel;
     unsigned int nbFinished;
-    void hideOrShowColumn(int index);
-    bool loadHiddenColumns();
-    void saveHiddenColumns();
-    QAction* getActionHoSCol(int index);
 
   public:
     FinishedTorrents(QObject *parent, bittorrent *BTSession);
@@ -57,7 +53,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
   protected slots:
     void showProperties(const QModelIndex &index);
     void displayFinishedListMenu(const QPoint&);
-    void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
     void sortFinishedList(int index);
@@ -67,11 +62,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
     void on_actionSet_upload_limit_triggered();
     void notifyTorrentDoubleClicked(const QModelIndex& index);
-    void hideOrShowColumnName();
-    void hideOrShowColumnSize();
-    void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnLeechers();
-    void hideOrShowColumnRatio();
 
   public slots:
     void addTorrent(QString hash);
@@ -80,11 +70,10 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void resumeTorrent(QString hash);
     void propertiesSelection();
     void deleteTorrent(QString hash);
-    void showPropertiesFromHash(QString hash);
 
   signals:
     void torrentMovedFromFinishedList(QString);
-    void torrentDoubleClicked(QString hash, bool finished);
+    void torrentDoubleClicked(QString hash);
     void finishedTorrentsNumberChanged(unsigned int);
 
 };

src/GUI.h

@@ -46,7 +46,6 @@ class options_imp;
 class QTabWidget;
 class QLabel;
 class QModelIndex;
-class HttpServer;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -60,7 +59,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QTabWidget *tabs;
     options_imp *options;
     QSystemTrayIcon *myTrayIcon;
-    QTimer *systrayCreator;
     QMenu *myTrayIconMenu;
     DownloadingTorrents *downloadingTorrentTab;
     FinishedTorrents *finishedTorrentTab;
@@ -80,8 +78,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     SearchEngine *searchEngine;
     // RSS
     RSSImp *rssWidget;
-    // Web UI
-    HttpServer *httpServer;
     // Misc
     QTcpServer *tcpServer;
     QTcpSocket *clientConnection;
@@ -98,7 +94,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readParamsOnSocket();
     void acceptConnection();
     void togglePausedState(QString hash);
-    void torrentDoubleClicked(QString hash, bool finished);
     void on_actionPreview_file_triggered();
     void previewFile(QString filePath);
     void balloonClicked();
@@ -110,7 +105,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
-    void createSystrayDelayed();
     // Keyboard shortcuts
     void createKeyboardShortcuts();
     void displayDownTab() const;
@@ -137,13 +131,10 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void processScannedFiles(const QStringList& params);
     void processDownloadedFiles(QString path, QString url);
     void downloadFromURLList(const QStringList& urls);
-    void deleteTorrent(QString hash);
-    void deleteRatioTorrent(QString fileName);
+    void deleteTorrent(QString hash, QString fileName, bool finished);
     void finishedTorrent(QTorrentHandle& h) const;
     void torrentChecked(QString hash) const;
     void updateLists();
-    bool initWebUi(QString username, QString password, int port);
-    void pauseTorrent(QString hash);
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(QString info, bool deleteOptions);
@@ -154,9 +145,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   public slots:
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void setTabText(int index, QString text) const;
-    void openDestinationFolder() const;
-    void goBuyPage() const;
-    void updateRatio();
 
   protected:
     void closeEvent(QCloseEvent *);
@@ -167,7 +155,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
     ~GUI();
     // Methods
-    int getCurrentTabIndex() const;
+    unsigned int getCurrentTabIndex() const;
     QPoint screenCenter() const;
 };
 

src/Icons/qBittorrent.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Categories=Qt;Application;Network;P2P
-Comment=V1.1.0
+Comment=V1.0.0
+Encoding=UTF-8
 Exec=qbittorrent
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
@@ -8,7 +9,6 @@ GenericName[de]=Bittorren Client
 GenericName[el]=Τορεντ πελάτης
 GenericName[es]=Cliente Bittorrent
 GenericName[fr]=Client Bittorrent
-GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント
 GenericName[ko]=비토렌트 클라이언트
 GenericName[nl]=Bittorrent client

src/MainWindow.ui

@@ -16,194 +16,13 @@
    <string/>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>58</y>
-     <width>849</width>
-     <height>505</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout" >
-    <item>
-     <layout class="QHBoxLayout" name="_3" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="lbl_DLSpeed_2" >
-        <property name="text" >
-         <string>Total DL Speed:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLCDNumber" name="LCD_DownSpeed" >
-        <property name="autoFillBackground" >
-         <bool>true</bool>
-        </property>
-        <property name="frameShadow" >
-         <enum>QFrame::Raised</enum>
-        </property>
-        <property name="smallDecimalPoint" >
-         <bool>false</bool>
-        </property>
-        <property name="numDigits" >
-         <number>6</number>
-        </property>
-        <property name="segmentStyle" >
-         <enum>QLCDNumber::Flat</enum>
-        </property>
-        <property name="value" stdset="0" >
-         <double>0.000000000000000</double>
-        </property>
-        <property name="intValue" stdset="0" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="unitDL_2" >
-        <property name="text" >
-         <string>KiB/s</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_2" >
-        <property name="text" >
-         <string>Session ratio: </string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLCDNumber" name="LCD_Ratio" >
-        <property name="autoFillBackground" >
-         <bool>true</bool>
-        </property>
-        <property name="numDigits" >
-         <number>4</number>
-        </property>
-        <property name="segmentStyle" >
-         <enum>QLCDNumber::Flat</enum>
-        </property>
-        <property name="value" stdset="0" >
-         <double>1.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="lbl_ratio_icon" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="lbl_UPSpeed_2" >
-        <property name="text" >
-         <string>Total UP Speed:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLCDNumber" name="LCD_UpSpeed" >
-        <property name="autoFillBackground" >
-         <bool>true</bool>
-        </property>
-        <property name="smallDecimalPoint" >
-         <bool>false</bool>
-        </property>
-        <property name="numDigits" >
-         <number>6</number>
-        </property>
-        <property name="segmentStyle" >
-         <enum>QLCDNumber::Flat</enum>
-        </property>
-        <property name="value" stdset="0" >
-         <double>0.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="unitUP_2" >
-        <property name="text" >
-         <string>KiB/s</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
+   <layout class="QVBoxLayout" >
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <property name="margin" >
+     <number>9</number>
+    </property>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar" >
@@ -212,7 +31,7 @@
      <x>0</x>
      <y>0</y>
      <width>849</width>
-     <height>26</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_Edit" >
@@ -263,14 +82,6 @@
    <property name="enabled" >
     <bool>true</bool>
    </property>
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>26</y>
-     <width>849</width>
-     <height>32</height>
-    </rect>
-   </property>
    <property name="contextMenuPolicy" >
     <enum>Qt::NoContextMenu</enum>
    </property>
@@ -287,7 +98,7 @@
     </size>
    </property>
    <attribute name="toolBarArea" >
-    <enum>TopToolBarArea</enum>
+    <number>4</number>
    </attribute>
    <attribute name="toolBarBreak" >
     <bool>false</bool>

src/TrackersAdditionDlg.h

@@ -1,53 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef TRACKERSADDITION_H
-#define TRACKERSADDITION_H
-
-#include <QDialog>
-#include <QStringList>
-#include "ui_trackersAdd.h"
-
-class TrackersAddDlg : public QDialog, private Ui::TrackersAdditionDlg{
-  Q_OBJECT
-
-  public:
-    TrackersAddDlg(QWidget *parent): QDialog(parent){
-      setupUi(this);
-      setAttribute(Qt::WA_DeleteOnClose);
-      show();
-    }
-    
-    ~TrackersAddDlg(){}
-    
-  signals:
-    void TrackersToAdd(QStringList trackers);
-    
-  public slots:
-    void on_buttonBox_accepted() {
-      QStringList trackers = trackers_list->toPlainText().trimmed().split("\n");
-      if(trackers.size()) {
-        emit TrackersToAdd(trackers);
-      }
-    }
-};
-
-#endif

src/arborescence.h

@@ -27,19 +27,19 @@
 #include <QDir>
 #include "misc.h"
 
-class torrent_file {
+class file {
   private:
-    torrent_file *parent;
+    file *parent;
     bool is_dir;
     QString rel_path;
-    QList<torrent_file*> children;
+    QList<file*> children;
     size_type size;
     float progress;
     int priority;
     int index; // Index in torrent_info
 
   public:
-    torrent_file(torrent_file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
+    file(file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
       qDebug("created a file with index %d", index);
       rel_path = QDir::cleanPath(path);
       if(parent) {
@@ -48,7 +48,7 @@ class torrent_file {
       }
     }
 
-    ~torrent_file() {
+    ~file() {
       qDeleteAll(children);
     }
 
@@ -68,7 +68,7 @@ class torrent_file {
       }
       float wanted = 0.;
       float done = 0.;
-      torrent_file *child;
+      file *child;
       foreach(child, children) {
         wanted += child->getSize();
         done += child->getSize()*child->getProgress();
@@ -80,7 +80,7 @@ class torrent_file {
 
     void updatePriority(int prio) {
       Q_ASSERT(is_dir);
-      torrent_file *child;
+      file *child;
       foreach(child, children) {
         if(child->getPriority() != prio) return;
       }
@@ -111,13 +111,13 @@ class torrent_file {
       return (!children.isEmpty());
     }
 
-    QList<torrent_file*> getChildren() const {
+    QList<file*> getChildren() const {
       return children;
     }
 
-    torrent_file* getChild(QString fileName) const {
+    file* getChild(QString fileName) const {
       Q_ASSERT(is_dir);
-      torrent_file* f;
+      file* f;
       foreach(f, children) {
         if(f->name() == fileName) return f;
       }
@@ -130,10 +130,10 @@ class torrent_file {
         parent->addBytes(b);
     }
 
-    torrent_file* addChild(QString fileName, bool dir, size_type size=0, int index = -1, float progress=0., int priority=1) {
+    file* addChild(QString fileName, bool dir, size_type size=0, int index = -1, float progress=0., int priority=1) {
       Q_ASSERT(is_dir);
       qDebug("Adding a new child of size: %ld", (long)size);
-      torrent_file *f = new torrent_file(this, QDir::cleanPath(rel_path+QDir::separator()+fileName), dir, size, index, progress, priority);
+      file *f = new file(this, QDir::cleanPath(rel_path+QDir::separator()+fileName), dir, size, index, progress, priority);
       children << f;
       if(size) {
         addBytes(size);
@@ -148,7 +148,7 @@ class torrent_file {
         return true;
       }
       bool success = true;
-      torrent_file *f;
+      file *f;
       qDebug("We have %d children", children.size());
       foreach(f, children) {
         bool s = f->removeFromFS(saveDir);
@@ -169,16 +169,16 @@ class torrent_file {
 
 class arborescence {
   private:
-    torrent_file *root;
+    file *root;
 
   public:
     arborescence(torrent_info t) {
       torrent_info::file_iterator fi = t.begin_files();
       if(t.num_files() > 1) {
-        root = new torrent_file(0, misc::toQString(t.name()), true);
+        root = new file(0, misc::toQString(t.name()), true);
       } else {
         // XXX: Will crash if there is no file in torrent
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0);
+        root = new file(0, misc::toQString(t.name()), false, fi->size, 0);
         return;
       }
       int i = 0;
@@ -196,11 +196,11 @@ class arborescence {
       torrent_info::file_iterator fi = t.begin_files();
       if(t.num_files() > 1) {
         qDebug("More than one file in the torrent, setting a folder as root");
-        root = new torrent_file(0, misc::toQString(t.name()), true);
+        root = new file(0, misc::toQString(t.name()), true);
       } else {
         // XXX: Will crash if there is no file in torrent
         qDebug("one file in the torrent, setting it as root with index 0");
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0], prioritiesTab[0]);
+        root = new file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0], prioritiesTab[0]);
         return;
       }
       int i = 0;
@@ -218,7 +218,7 @@ class arborescence {
       delete root;
     }
 
-    torrent_file* getRoot() const {
+    file* getRoot() const {
       return root;
     }
 
@@ -240,13 +240,13 @@ class arborescence {
         relative_path.remove(0, 1);
       QStringList fileNames = relative_path.split(QDir::separator());
       QString fileName;
-      torrent_file *dad = root;
+      file *dad = root;
       unsigned int nb_i = 0;
       unsigned int size = fileNames.size();
       foreach(fileName, fileNames) {
         ++nb_i;
         if(fileName == ".") continue;
-        torrent_file* child = dad->getChild(fileName);
+        file* child = dad->getChild(fileName);
         if(!child) {
           if(nb_i != size) {
             // Folder

src/bittorrent.h

@@ -25,7 +25,6 @@
 #include <QList>
 #include <QPair>
 #include <QStringList>
-#include <QDateTime>
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -36,7 +35,6 @@ using namespace libtorrent;
 class downloadThread;
 class deleteThread;
 class QTimer;
-class FilterParserThread;
 
 class bittorrent : public QObject{
   Q_OBJECT
@@ -47,15 +45,15 @@ class bittorrent : public QObject{
     QTimer *timerScan;
     QTimer *timerAlerts;
     QTimer *fastResumeSaver;
-    QTimer *BigRatioTimer;
     bool DHTEnabled;
     downloadThread *downloader;
     QString defaultSavePath;
     QStringList torrentsToPauseAfterChecking;
-    QHash<QString, QDateTime> TorrentsStartTime;
-    QHash<QString, size_type> TorrentsStartData;
+    QHash<QString, QList<qlonglong> > ETAstats;
+    QHash<QString, qlonglong> ETAs;
     QHash<QString, QPair<size_type,size_type> > ratioData;
-    QHash<QString, QHash<QString, QString> > trackersErrors;
+    QTimer *ETARefresher;
+    QHash<QString, QList<QPair<QString, QString> > > trackersErrors;
     deleteThread *deleter;
     QStringList finishedTorrents;
     QStringList unfinishedTorrents;
@@ -67,9 +65,6 @@ class bittorrent : public QObject{
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;
-    FilterParserThread *filterParser;
-    QString filterPath;
-    int folderScanInterval; // in seconds
 
   protected:
     QString getSavePath(QString hash);
@@ -87,16 +82,14 @@ class bittorrent : public QObject{
     session_status getSessionStatus() const;
     int getListenPort() const;
     QStringList getTorrentsToPauseAfterChecking() const;
-    qlonglong getETA(QString hash) const;
+    long getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
-    QHash<QString, QString> getTrackersErrors(QString hash) const;
+    QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
     QStringList getFinishedTorrents() const;
     QStringList getUnfinishedTorrents() const;
     bool isFinished(QString hash) const;
     bool has_filtered_files(QString hash) const;
-    unsigned int getFinishedPausedTorrentsNb() const;
-    unsigned int getUnfinishedPausedTorrentsNb() const;
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -105,8 +98,6 @@ class bittorrent : public QObject{
     void deleteTorrent(QString hash, bool permanent = false);
     bool pauseTorrent(QString hash);
     bool resumeTorrent(QString hash);
-    void pauseAllTorrents();
-    void resumeAllTorrents();
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
     void saveFastResumeAndRatioData();
@@ -114,9 +105,10 @@ class bittorrent : public QObject{
     void enableDirectoryScanning(QString scan_dir);
     void disableDirectoryScanning();
     void enablePeerExchange();
-    void enableIPFilter(QString filter);
+    void enableIPFilter(ip_filter filter);
     void disableIPFilter();
     void resumeUnfinishedTorrents();
+    void updateETAs();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void saveDownloadUploadForTorrent(QString hash);
@@ -148,7 +140,6 @@ class bittorrent : public QObject{
     void enableLSD(bool b);
     bool enableDHT(bool b);
     void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
-    void setTimerScanInterval(int secs);
 
   protected slots:
     void scanDirectory();
@@ -162,9 +153,6 @@ class bittorrent : public QObject{
     void invalidTorrent(QString path);
     void duplicateTorrent(QString path);
     void addedTorrent(QString path, QTorrentHandle& h, bool fastResume);
-    void deletedTorrent(QString hash);
-    void pausedTorrent(QString hash);
-    void resumedTorrent(QString hash);
     void finishedTorrent(QTorrentHandle& h);
     void fullDiskError(QTorrentHandle& h);
     void trackerError(QString hash, QString time, QString msg);
@@ -179,9 +167,7 @@ class bittorrent : public QObject{
     void fastResumeDataRejected(QString name);
     void urlSeedProblem(QString url, QString msg);
     void torrentFinishedChecking(QString hash);
-    void torrent_ratio_deleted(QString fileName);
-    void UPnPError(QString msg);
-    void UPnPSuccess(QString msg);
+    void torrent_deleted(QString hash, QString fileName, bool finished);
 };
 
 #endif

src/createtorrent.ui

@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>592</width>
-    <height>655</height>
+    <height>590</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -477,20 +477,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QLabel" name="progressLbl" >
-     <property name="text" >
-      <string>Progress:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="progressBar" >
-     <property name="value" >
-      <number>0</number>
-     </property>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" >
      <property name="spacing" >

src/createtorrent_imp.cpp

@@ -36,7 +36,6 @@
 #include <libtorrent/file_pool.hpp>
 
 #include "createtorrent_imp.h"
-#include "misc.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -44,17 +43,9 @@ using namespace boost::filesystem;
 createtorrent::createtorrent(QWidget *parent): QDialog(parent){
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  creatorThread = new torrentCreatorThread();
-  connect(creatorThread, SIGNAL(creationSuccess(QString)), this, SLOT(handleCreationSucess(QString)));
-  connect(creatorThread, SIGNAL(creationFailure(QString)), this, SLOT(handleCreationFailure(QString)));
-  connect(creatorThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgressBar(int)));
   show();
 }
 
-createtorrent::~createtorrent() {
-  delete creatorThread;
-}
-
 void createtorrent::on_addFolder_button_clicked(){
   QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
   if(!dir.isEmpty())
@@ -129,13 +120,11 @@ void createtorrent::on_addURLSeed_button_clicked(){
 // Subfunction to add files to a torrent_info structure
 // Written by Arvid Norberg (libtorrent Author)
 void add_files(torrent_info& t, path const& p, path const& l){
-  qDebug("p: %s, l: %s, l.leaf(): %s", p.string().c_str(), l.string().c_str(), l.leaf().c_str());
   path f(p / l);
   if (is_directory(f)){
     for (directory_iterator i(f), end; i != end; ++i)
       add_files(t, p, l / i->leaf());
   }else{
-    qDebug("Adding %s", l.string().c_str());
     t.add_file(l, file_size(f));
   }
 }
@@ -152,8 +141,6 @@ QStringList createtorrent::allItems(QListWidget *list){
 // Main function that create a .torrent file
 void createtorrent::on_createButton_clicked(){
   QString input = textInputPath->text().trimmed();
-  if (input.endsWith(QDir::separator()))
-    input.chop(1);
   if(input.isEmpty()){
     QMessageBox::critical(0, tr("No input path set"), tr("Please type an input path first"));
     return;
@@ -170,70 +157,27 @@ void createtorrent::on_createButton_clicked(){
   } else {
     return;
   }
-  QStringList url_seeds = allItems(URLSeeds_list);
-  QString comment = txt_comment->toPlainText();
-  creatorThread->create(input, destination, trackers, url_seeds, comment, check_private->isChecked(), getPieceSize());
-}
-
-void createtorrent::handleCreationFailure(QString msg) {
-  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(msg));
-  hide();
-}
-
-void createtorrent::handleCreationSuccess(QString path, const char* branch_path, QString hash) {
-  if(checkStartSeeding->isChecked()) {
-    // Create save path file
-    QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".savepath"));
-    savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
-    savepath_file.write(branch_path);
-    savepath_file.close();
-    emit torrent_to_seed(path);
-  }
-  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+path);
-  hide();
-}
-
-void createtorrent::updateProgressBar(int progress) {
-  progressBar->setValue(progress);
-}
-
-//
-// Torrent Creator Thread
-//
-
-void torrentCreatorThread::create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size) {
-  input_path = _input_path;
-  save_path = _save_path;
-  trackers = _trackers;
-  url_seeds = _url_seeds;
-  comment = _comment;
-  is_private = _is_private;
-  piece_size = _piece_size;
-  abort = false;
-  start();
-}
-
-void torrentCreatorThread::run() {
-  emit updateProgress(0);
   char const* creator_str = "qBittorrent "VERSION;
   try {
     boost::intrusive_ptr<torrent_info> t(new torrent_info);
-    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
+    ofstream out(complete(path((const char*)destination.toUtf8())), std::ios_base::binary);
+    path full_path;
     // Adding files to the torrent
-    path full_path = complete(path(input_path.toUtf8().data()));
+    full_path = complete(path(input.toUtf8().data()));
     add_files(*t, full_path.branch_path(), full_path.leaf());
-    if(abort) return;
     // Set piece size
+    int piece_size = getPieceSize();
     t->set_piece_size(piece_size);
     // Add url seeds
+    QStringList urlSeeds = allItems(URLSeeds_list);
     QString seed;
-    foreach(seed, url_seeds){
+    foreach(seed, urlSeeds){
       t->add_url_seed(seed.toUtf8().data());
     }
     for(int i=0; i<trackers.size(); ++i){
       t->add_tracker(trackers.at(i).toUtf8().data());
     }
-    if(abort) return;
+
     // calculate the hash for all pieces
     file_pool fp;
     boost::scoped_ptr<storage_interface> st(default_storage_constructor(t, full_path.branch_path(), fp));
@@ -243,26 +187,28 @@ void torrentCreatorThread::run() {
       st->read(&buf[0], i, 0, t->piece_size(i));
       hasher h(&buf[0], t->piece_size(i));
       t->set_hash(i, h.final());
-      emit updateProgress((int)(i*100./(float)num));
-      if(abort) return;
     }
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
     t->set_creator(creator_str);
-    t->set_comment((const char*)comment.toUtf8());
+    t->set_comment((const char*)txt_comment->toPlainText().toUtf8());
     // Is private ?
-    if(is_private){
+    if(check_private->isChecked()){
       t->set_priv(true);
     }
-    if(abort) return;
     // create the torrent and print it to out
     entry e = t->create_torrent();
     libtorrent::bencode(std::ostream_iterator<char>(out), e);
     out.flush();
-    emit updateProgress(100);
-    emit creationSuccess(save_path, full_path.branch_path().string().c_str(), misc::toQString(t->info_hash()));
+    if(checkStartSeeding->isChecked())
+      emit torrent_to_seed(destination);
   }
   catch (std::exception& e){
-    emit creationFailure(QString::fromUtf8(e.what()));
+    std::cerr << e.what() << "\n";
+    QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(QString::fromUtf8(e.what())));
+    hide();
+    return;
   }
+  hide();
+  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+destination);
 }

src/createtorrent_imp.h

@@ -22,48 +22,13 @@
 #ifndef CREATE_TORRENT_IMP_H
 #define CREATE_TORRENT_IMP_H
 
-#include <QThread>
-
 #include "ui_createtorrent.h"
 
-class torrentCreatorThread : public QThread {
-  Q_OBJECT
-  
-  QString input_path;
-  QString save_path;
-  QStringList trackers;
-  QStringList url_seeds;
-  QString comment;
-  bool is_private;
-  int piece_size;
-  bool abort;
-  
-  public:
-    torrentCreatorThread() {}
-    ~torrentCreatorThread() {
-      abort = true;
-      wait();
-    }
-    void create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size);
-  
-  protected:
-    void run();
-    
-  signals:
-    void creationFailure(QString msg);
-    void creationSuccess(QString path, const char* branch_path, QString hash);
-    void updateProgress(int progress);
-};
-
 class createtorrent : public QDialog, private Ui::createTorrentDialog{
   Q_OBJECT
 
-  private:
-    torrentCreatorThread *creatorThread;
-    
   public:
     createtorrent(QWidget *parent = 0);
-    ~createtorrent();
     QStringList allItems(QListWidget *list);
     int getPieceSize() const;
 
@@ -78,9 +43,6 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
     void on_removeTracker_button_clicked();
     void on_addURLSeed_button_clicked();
     void on_removeURLSeed_button_clicked();
-    void handleCreationFailure(QString msg);
-    void handleCreationSuccess(QString path, const char* branch_path, QString hash);
-    void updateProgressBar(int progress);
 };
 
 #endif

src/downloadThread.cpp

@@ -73,7 +73,7 @@ void subDownloadThread::run(){
     filePath = tmpfile->fileName();
   }
   delete tmpfile;
-  FILE *f = fopen(filePath.toUtf8().data(), "wb");
+  FILE *f = fopen(filePath.toUtf8().data(), "w");
   if(!f) {
     std::cerr << "couldn't open destination file" << "\n";
     return;
@@ -109,17 +109,8 @@ void subDownloadThread::run(){
         curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
       }
     }
-    // We have to define CURLOPT_WRITEFUNCTION or it will crash on windows
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
+    // TODO: define CURLOPT_WRITEFUNCTION or it will crash on windows
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, f);
-    // Verbose
-    //curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-    // No progress info (we don't use it)
-    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-    // Redirections
-    curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1);
-    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-    curl_easy_setopt(curl, CURLOPT_MAXREDIRS, -1);
     qDebug("Downloading %s", url.toUtf8().data());
     res = curl_easy_perform(curl);
     /* always cleanup */

src/downloadingTorrents.h

@@ -41,10 +41,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     bool delayedSorting;
     unsigned int nbTorrents;
     Qt::SortOrder delayedSortingOrder;
-    void hideOrShowColumn(int index);
-    bool loadHiddenColumns();
-    void saveHiddenColumns();
-    QAction* getActionHoSCol(int index);
 
   public:
     DownloadingTorrents(QObject *parent, bittorrent *BTSession);
@@ -58,7 +54,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
 
   signals:
     void unfinishedTorrentsNumberChanged(unsigned int);
-    void torrentDoubleClicked(QString hash, bool finished);
+    void torrentDoubleClicked(QString hash);
     void torrentFinished(QString hash);
 
   protected slots:
@@ -69,7 +65,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void notifyTorrentDoubleClicked(const QModelIndex& index);
     void on_actionSet_upload_limit_triggered();
     void displayDLListMenu(const QPoint& pos);
-    void displayDLHoSMenu(const QPoint&);
     void on_actionClearLog_triggered();
     void displayInfoBarMenu(const QPoint& pos);
     void addTorrent(QString hash);
@@ -84,28 +79,18 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void setRowColor(int row, QColor color);
     void displayDownloadingUrlInfos(QString url);
     void showProperties(const QModelIndex &index);
-    void hideOrShowColumnName();
-    void hideOrShowColumnSize();
-    void hideOrShowColumnProgress();
-    void hideOrShowColumnDownSpeed();
-    void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnSeedersLeechers();
-    void hideOrShowColumnRatio();
-    void hideOrShowColumnEta();
-    void displayUPnPError(QString msg);
-    void displayUPnPSuccess(QString msg);
 
   public slots:
     void updateDlList();
-    void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText));
+    void setInfoBar(QString info, QColor color=QPalette::WindowText);
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
+    void updateRatio();
     void deleteTorrent(QString hash);
     void setBottomTabEnabled(unsigned int index, bool b);
     void propertiesSelection();
     void sortProgressColumnDelayed();
     void updateFileSizeAndProgress(QString hash);
-    void showPropertiesFromHash(QString hash);
 
 };
 

src/engineSelectDlg.cpp

@@ -250,13 +250,11 @@ void engineSelectDlg::setRowColor(int row, QString color){
 bool engineSelectDlg::checkInstalled(QString plugin_name) const {
   QProcess nova;
   QStringList params;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   QList<QByteArray> plugins_list = result.split(',');
   return plugins_list.contains(plugin_name.toUtf8());
@@ -282,13 +280,11 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
   QStringList params;
   // Ask nova core for the supported search engines
   QProcess nova;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   QByteArray e;
@@ -299,13 +295,11 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
     installed_engines[en] = old_engines.value(en, true);
   }
   params.clear();
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines_infos";
-  nova.start("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   result = nova.readAll();
-  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   unsigned int i = 0;

src/eventmanager.cpp

@@ -1,186 +0,0 @@
-/*
- *   Copyright (C) 2007 by Ishan Arora
- *   ishanarora@gmail.com
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-
-#include "eventmanager.h"
-#include "json.h"
-#include <QDebug>
-
-EventManager::EventManager(QObject *parent)
-	: QObject(parent)
-{
-	revision = 0;
-}
-
-void EventManager::update(QVariantMap event)
-{
-	revision++;
-	events << QPair<ulong, QVariantMap>(revision, event);
-	emit updated();
-	qDebug("Added the following event");
-	qDebug() << event;
-/*	QLinkedList<QPair<ulong, QVariantMap> >::iterator i;
-	for (i = events.begin(); i != events.end(); i++)
-		qDebug() << *i;*/
-}
-
-QVariant EventManager::querySince(ulong r) const
-{
-	QVariantList list;
-	QLinkedListIterator<QPair<ulong, QVariantMap> > i(events);
-	i.toBack();
-	while (i.hasPrevious())
-	{
-		QPair<ulong, QVariantMap> pair = i.previous();
-		if (pair.first <= r)
-			break;
-		list.prepend(QVariant(pair.second));
-	}
-	QVariantMap map;
-	map["events"] = QVariant(list);
-	map["revision"] = QVariant((qulonglong) revision);
-	return QVariant(map);
-}
-
-bool EventManager::isUpdated(ulong r) const
-{
-	return (r < revision);
-}
-
-void EventManager::addedTorrent(QString, QTorrentHandle& h)
-{
-	QVariantMap event;
-	event["type"] = QVariant("add");
-	event["hash"] = QVariant(h.hash());
-	event["name"] = QVariant(h.name());
-	update(event);
-}
-
-void EventManager::deletedTorrent(QString hash)
-{
-	QVariantMap event;
-	event["type"] = QVariant("delete");
-	event["hash"] = QVariant(hash);
-	QLinkedList<QPair<ulong, QVariantMap> >::iterator i = events.end();
-	bool loop = true;
-	while (loop && i != events.begin()) {
-		--i;
-		QVariantMap oldevent = i->second;
-		if(oldevent["hash"] == QVariant(hash))
-		{
-			if(oldevent["type"] == QVariant("add"))
-				loop = false;
-			i = events.erase(i);
-		}
-	}
-	update(event);
-}
-
-void EventManager::modifiedTorrent(QTorrentHandle h)
-{
-	QString hash = h.hash();
-	QVariantMap event;
-	QVariant v;
-	
-	if(h.is_paused())
-		v = QVariant("paused");
-	else
-	{
-		switch(h.state())
-		{
-			case torrent_status::finished:
-			case torrent_status::seeding:
-				v = QVariant("seeding");
-				break;
-			case torrent_status::checking_files:
-			case torrent_status::queued_for_checking:
-				v = QVariant("checking");
-				break;
-			case torrent_status::connecting_to_tracker:
-				if(h.download_payload_rate() > 0)
-					v = QVariant("downloading");
-				else
-					v = QVariant("connecting");
-				break;
-			case torrent_status::downloading:
-			case torrent_status::downloading_metadata:
-				if(h.download_payload_rate() > 0)
-					v = QVariant("downloading");
-				else
-					v = QVariant("stalled");
-				break;
-			default:
-				v = QVariant();
-		}
-	}
-	if(modify(hash, "state", v))
-		event["state"] = v;
-	
-	v = QVariant((qlonglong)h.actual_size());
-	if(modify(hash, "size", v))
-		event["size"] = v;
-	
-	v = QVariant(h.progress());
-	if(modify(hash, "progress", v))
-		event["progress"] = v;
-	
-	v = QVariant(h.download_payload_rate());
-	if(modify(hash, "dlspeed", v))
-		event["dlspeed"] = v;
-	
-	v = QVariant(h.upload_payload_rate());
-	if(modify(hash, "upspeed", v))
-		event["upspeed"] = v;
-	
-	if(event.size() > 0)
-	{
-		event["type"] = QVariant("modify");
-		event["hash"] = QVariant(hash);
-		update(event);
-	}
-}
-
-bool EventManager::modify(QString hash, QString key, QVariant value)
-{
-	QLinkedList<QPair<ulong, QVariantMap> >::iterator i = events.end();
-	while (i != events.begin()) {
-		--i;
-		QVariantMap event = i->second;
-		if(event["hash"] == QVariant(hash))
-		{
-			if(event["type"] == QVariant("add"))
-				return true;
-			if(event.contains(key))
-			{
-				if(event[key] == value)
-					return false;
-				else
-				{
-					if(event.size() <= 3)
-						i = events.erase(i);
-					else
-						i->second.remove(key);
-					return true;
-				}
-			}
-		}
-	}
-	return true;
-}

src/eventmanager.h

@@ -1,55 +0,0 @@
-/*
- *   Copyright (C) 2007 by Ishan Arora
- *   ishanarora@gmail.com
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-
-#ifndef EVENTMANAGER_H
-#define EVENTMANAGER_H
-
-#include "qtorrenthandle.h"
-#include <QLinkedList>
-#include <QPair>
-#include <QVariant>
-
-class EventManager : public QObject
-{
-	Q_OBJECT
-	private:
-		ulong revision;
-		QLinkedList<QPair <ulong, QVariantMap> > events;
-		bool modify(QString hash, QString key, QVariant value);
-
-	protected:
-		void update(QVariantMap event);
-
-	public:
-		EventManager(QObject *parent = 0);
-		QVariant querySince(ulong r) const;
-		bool isUpdated(ulong r) const;
-
-	signals:
-		void updated();
-
-	public slots:
-		void addedTorrent(QString path, QTorrentHandle& h);
-		void deletedTorrent(QString hash);
-		void modifiedTorrent(QTorrentHandle h);
-};
-
-#endif