- Tagged rc2 release

- fixed resizing in torrent addition dialog

Changelog

@@ -1,13 +1,4 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
-    - FEATURE: Torrent queueing system (with priorities)
-    - FEATURE: DHT is always ON (no longer used as fallback)
-    - FEATURE: The number of DHT nodes is displayed
-    - FEATURE: RSS can now be disabled from program preferences
-    - BUGFIX: Disable ETA calculation when ETA column is hidden
-    - COSMETIC: Transfer speed, ratio and DHT nodes are displayed in status bar    
-    - COSMETIC: RSS Tab is now hidden as a default
-
-* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* 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

TODO

@@ -31,10 +31,6 @@
 // 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
-
 Translations updated:
 - French
 - Chinese
@@ -44,3 +40,9 @@ Translations updated:
 - Slovak
 - Swedish
 - Romanian
+- Finnish
+- Italian
+- Turkish
+- Korean
+- Hungarian
+- German

src/DLListDelegate.h

@@ -40,8 +40,7 @@
 #define SEEDSLEECH 5
 #define RATIO 6
 #define ETA 7
-#define PRIORITY 8
-#define HASH 9
+#define HASH 8
 
 class DLListDelegate: public QItemDelegate {
   Q_OBJECT

src/FinishedListDelegate.h

@@ -37,8 +37,7 @@
 #define F_UPSPEED 2
 #define F_LEECH 3
 #define F_RATIO 4
-#define F_PRIORITY 5
-#define F_HASH 6
+#define F_HASH 5
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT

src/FinishedTorrents.cpp

@@ -38,17 +38,14 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
-  finishedListModel = new QStandardItemModel(0,7);
+  finishedListModel = new QStandardItemModel(0,6);
   finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
   finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
-  finishedListModel->setHeaderData(F_PRIORITY, Qt::Horizontal, tr("Priority"));
   finishedList->setModel(finishedListModel);
   loadHiddenColumns();
-  // Hide priority column
-  finishedList->hideColumn(F_PRIORITY);
   // Hide hash column
   finishedList->hideColumn(F_HASH);
   // Load last columns width for download list
@@ -85,7 +82,6 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
   connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
-  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 }
 
 FinishedTorrents::~FinishedTorrents(){
@@ -101,10 +97,6 @@ void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   emit torrentDoubleClicked(hash, true);
 }
 
-void FinishedTorrents::hidePriorityColumn(bool hide) {
-  finishedList->setColumnHidden(F_PRIORITY, hide);
-}
-
 void FinishedTorrents::addTorrent(QString hash){
   if(!BTSession->isFinished(hash)){
     BTSession->setFinishedTorrent(hash);
@@ -120,8 +112,6 @@ void FinishedTorrents::addTorrent(QString hash){
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
   finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
   finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
-  if(BTSession->isQueueingEnabled())
-    finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
   if(h.is_paused()) {
     finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
@@ -247,14 +237,6 @@ void FinishedTorrents::updateFinishedList(){
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
-    // Update priority
-    if(BTSession->isQueueingEnabled()) {
-      finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
-      if(h.is_paused() && BTSession->isUploadQueued(hash)) {
-        finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
-        setRowColor(row, QString::fromUtf8("grey"));
-      }
-    }
     if(h.is_paused()) continue;
     if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
       continue;
@@ -412,7 +394,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,59));
 }
 
 
@@ -424,17 +406,11 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol;
-  if(BTSession->isQueueingEnabled()) {
-    lastCol = F_PRIORITY;
-  } else {
-    lastCol = F_RATIO;
-  }
   for(int i=0; i<=F_RATIO; i++) {
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,32));
 }
 
 // toggle hide/show a column
@@ -488,10 +464,6 @@ void FinishedTorrents::hideOrShowColumnRatio() {
   hideOrShowColumn(F_RATIO);
 }
 
-void FinishedTorrents::hideOrShowColumnPriority() {
-  hideOrShowColumn(F_PRIORITY);
-}
-
 // load the previous settings, and hide the columns
 bool FinishedTorrents::loadHiddenColumns() {
   bool loaded = false;
@@ -553,9 +525,6 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
     case F_RATIO :
       return actionHOSColRatio;
       break;
-    case F_PRIORITY :
-      return actionHOSColPriority;
-      break;
     default :
       return NULL;
   }

src/FinishedTorrents.h

@@ -72,7 +72,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnUpSpeed();
     void hideOrShowColumnLeechers();
     void hideOrShowColumnRatio();
-    void hideOrShowColumnPriority();
 
   public slots:
     void addTorrent(QString hash);
@@ -82,7 +81,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void propertiesSelection();
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
-    void hidePriorityColumn(bool hide);
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.h

@@ -52,7 +52,6 @@ class QTabWidget;
 class QLabel;
 class QModelIndex;
 class HttpServer;
-class QFrame;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -76,20 +75,12 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool force_exit;
     unsigned int refreshInterval;
     QTimer *refresher;
-    QLabel *dlSpeedLbl;
-    QLabel *upSpeedLbl;
-    QLabel *ratioLbl;
-    QLabel *DHTLbl;
-    QFrame *statusSep1;
-    QFrame *statusSep2;
-    QFrame *statusSep3;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
     QShortcut *switchSearchShortcut2;
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
-    QAction *prioSeparator;
     // Search
     SearchEngine *searchEngine;
     // RSS
@@ -125,8 +116,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readSettings();
     void on_actionExit_triggered();
     void createTrayIcon();
-    void updateUnfinishedTorrentNumberCalc();
-    void updateFinishedTorrentNumberCalc();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
@@ -165,8 +154,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void updateLists();
     bool initWebUi(QString username, QString password, int port);
     void pauseTorrent(QString hash);
-    void on_actionIncreasePriority_triggered();
-    void on_actionDecreasePriority_triggered();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(QString info, bool deleteOptions);
@@ -183,8 +170,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
 
   protected:
     void closeEvent(QCloseEvent *);
-    bool event(QEvent * event);
-    void displayRSSTab(bool enable);
+    void hideEvent(QHideEvent *);
 
   public:
     // Construct / Destruct

src/Icons/qBittorrent.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P
-Comment=V1.2.0
-Exec=qbittorrent %f
+Categories=Qt;Application;Network;P2P
+Comment=V1.1.0
+Exec=qbittorrent
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
 GenericName[de]=Bittorren Client
@@ -19,7 +19,7 @@ GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт
 GenericName[zh]=Bittorrent之用户
 Icon=qbittorrent
-MimeType=application/x-bittorrent;
+MimeType=application/x-bittorrent
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false

src/SearchTab.cpp

@@ -187,3 +187,4 @@ bool SearchTab::loadColWidthSearchList(){
   qDebug("Search list columns width loaded");
   return true;
 }
+

src/about_imp.h

@@ -56,9 +56,9 @@ class about : public QDialog, private Ui::AboutDlg{
           "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
-          - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
+          - <u>Chinese (Simplified):</u> Guo Yue (guoyue0418@hotmail.com)<br>\
           - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
-          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\
+          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net)<br>\
           - <u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net)<br>\
           - <u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)<br>\
           - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
@@ -70,9 +70,9 @@ class about : public QDialog, private Ui::AboutDlg{
           - <u>Polish:</u> Jarek Smieja (ajep9691@wp.pl)<br>\
           - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
-          - <u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)<br>\
+          - <u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net)<br>\
           - <u>Slovak:</u>  helix84<br>\
-          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net) and Gabriel de Oliveira (deadloop@hotmail.com)<br>\
+          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)<br>\
           - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
           - <u>Turkish:</u> Erdem Bingöl (erdem84@gmail.com)<br>\
           - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));

src/bittorrent.h

@@ -70,15 +70,6 @@ class bittorrent : public QObject{
     FilterParserThread *filterParser;
     QString filterPath;
     int folderScanInterval; // in seconds
-    bool queueingEnabled;
-    int maxActiveDownloads;
-    int maxActiveTorrents;
-    int currentActiveDownloads;
-    QStringList *downloadQueue;
-    QStringList *queuedDownloads;
-    QStringList *uploadQueue;
-    QStringList *queuedUploads;
-    bool calculateETA;
 
   protected:
     QString getSavePath(QString hash);
@@ -106,14 +97,6 @@ class bittorrent : public QObject{
     bool has_filtered_files(QString hash) const;
     unsigned int getFinishedPausedTorrentsNb() const;
     unsigned int getUnfinishedPausedTorrentsNb() const;
-    bool isQueueingEnabled() const;
-    int getDlTorrentPriority(QString hash) const;
-    int getUpTorrentPriority(QString hash) const;
-    int getMaximumActiveDownloads() const;
-    int getMaximumActiveTorrents() const;
-    bool isDownloadQueued(QString hash) const;
-    bool isUploadQueued(QString hash) const;
-    int loadTorrentPriority(QString hash);
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -133,7 +116,6 @@ class bittorrent : public QObject{
     void enablePeerExchange();
     void enableIPFilter(QString filter);
     void disableIPFilter();
-    void setQueueingEnabled(bool enable);
     void resumeUnfinishedTorrents();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
@@ -141,13 +123,6 @@ class bittorrent : public QObject{
     void loadDownloadUploadForTorrent(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
-    void updateDownloadQueue();
-    void updateUploadQueue();
-    void increaseDlTorrentPriority(QString hash);
-    void decreaseDlTorrentPriority(QString hash);
-    void increaseUpTorrentPriority(QString hash);
-    void decreaseUpTorrentPriority(QString hash);
-    void saveTorrentPriority(QString hash, int prio);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -174,9 +149,6 @@ class bittorrent : public QObject{
     bool enableDHT(bool b);
     void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
     void setTimerScanInterval(int secs);
-    void setMaxActiveDownloads(int val);
-    void setMaxActiveTorrents(int val);
-    void setETACalculation(bool enable);
 
   protected slots:
     void scanDirectory();
@@ -210,8 +182,6 @@ class bittorrent : public QObject{
     void torrent_ratio_deleted(QString fileName);
     void UPnPError(QString msg);
     void UPnPSuccess(QString msg);
-    void updateFinishedTorrentNumber();
-    void updateUnfinishedTorrentNumber();
 };
 
 #endif

src/download.ui

@@ -239,11 +239,6 @@
     <string>Buy it</string>
    </property>
   </action>
-  <action name="actionHOSColPriority" >
-   <property name="text" >
-    <string>Priority</string>
-   </property>
-  </action>
   <zorder>tabBottom</zorder>
   <zorder></zorder>
  </widget>

src/downloadingTorrents.cpp

@@ -49,7 +49,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
 //   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));
 
   // Set Download list model
-  DLListModel = new QStandardItemModel(0,10);
+  DLListModel = new QStandardItemModel(0,9);
   DLListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   DLListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   DLListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
@@ -58,12 +58,9 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   DLListModel->setHeaderData(SEEDSLEECH, Qt::Horizontal, tr("Seeds/Leechs", "i.e: full/partial sources"));
   DLListModel->setHeaderData(RATIO, Qt::Horizontal, tr("Ratio"));
   DLListModel->setHeaderData(ETA, Qt::Horizontal, tr("ETA", "i.e: Estimated Time of Arrival / Time left"));
-  DLListModel->setHeaderData(PRIORITY, Qt::Horizontal, tr("Priority"));
   downloadList->setModel(DLListModel);
   DLDelegate = new DLListDelegate(downloadList);
   downloadList->setItemDelegate(DLDelegate);
-  // Hide priority column
-  downloadList->hideColumn(PRIORITY);
   // Hide hash column
   downloadList->hideColumn(HASH);
   loadHiddenColumns();
@@ -111,7 +108,6 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   connect(actionHOSColSeedersLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSeedersLeechers()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
   connect(actionHOSColEta, SIGNAL(triggered()), this, SLOT(hideOrShowColumnEta()));
-  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 
   // Set info Bar infos
   setInfoBar(tr("qBittorrent %1 started.", "e.g: qBittorrent v0.x started.").arg(QString::fromUtf8(""VERSION)));
@@ -125,13 +121,6 @@ DownloadingTorrents::~DownloadingTorrents() {
   delete DLListModel;
 }
 
-void DownloadingTorrents::enablePriorityColumn(bool enable) {
-  if(enable) {
-    downloadList->showColumn(PRIORITY);
-  } else {
-    downloadList->hideColumn(PRIORITY);
-  }
-}
 
 void DownloadingTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   unsigned int row = index.row();
@@ -334,13 +323,7 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
 void DownloadingTorrents::displayDLHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol;
-  if(BTSession->isQueueingEnabled()) {
-    lastCol = PRIORITY;
-  } else {
-    lastCol = ETA;
-  }
-  for(int i=0; i <= lastCol; ++i) {
+  for(int i=0; i<=ETA; i++) {
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
@@ -364,19 +347,11 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
     downloadList->setColumnHidden(index, true);
     getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     --nbVisibleColumns;
-    if(index == ETA) {
-      BTSession->setETACalculation(false);
-      qDebug("Disable ETA calculation");
-    }
   } else {
     // User want to display the column
     downloadList->setColumnHidden(index, false);
     getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     ++nbVisibleColumns;
-    if(index == ETA) {
-      BTSession->setETACalculation(true);
-      qDebug("Enable ETA calculation");
-    }
   }
   //resize all others non-hidden columns
   for(unsigned int i=0; i<nbCols; ++i) {
@@ -386,10 +361,6 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
   }
 }
 
-void DownloadingTorrents::hidePriorityColumn(bool hide) {
-  downloadList->setColumnHidden(PRIORITY, hide);
-}
-
 // save the hidden columns in settings
 void DownloadingTorrents::saveHiddenColumns() {
   QSettings settings("qBittorrent", "qBittorrent");
@@ -465,9 +436,6 @@ void DownloadingTorrents::hideOrShowColumnEta() {
   hideOrShowColumn(ETA);
 }
 
-void DownloadingTorrents::hideOrShowColumnPriority() {
-  hideOrShowColumn(PRIORITY);
-}
 
 void DownloadingTorrents::on_actionClearLog_triggered() {
   infoBar->clear();
@@ -500,9 +468,6 @@ QAction* DownloadingTorrents::getActionHoSCol(int index) {
     case ETA :
       return actionHOSColEta;
     break;
-    case PRIORITY :
-      return actionHOSColPriority;
-      break;
     default :
       return NULL;
   }
@@ -559,17 +524,6 @@ void DownloadingTorrents::updateDlList() {
         row = getRowFromHash(hash);
       }
       Q_ASSERT(row != -1);
-      // Update Priority
-      if(BTSession->isQueueingEnabled()) {
-        DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
-        if(h.is_paused() && BTSession->isDownloadQueued(hash)) {
-          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
-          if(!downloadList->isColumnHidden(ETA)) {
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-          }
-          setRowColor(row, QString::fromUtf8("grey"));
-        }
-      }
       // No need to update a paused torrent
       if(h.is_paused()) continue;
       if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
@@ -679,8 +633,6 @@ void DownloadingTorrents::addTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-  if(BTSession->isQueueingEnabled())
-    DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
   DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
   // Pause torrent if it was paused last time
   if(BTSession->isPaused(hash)) {

src/downloadingTorrents.h

@@ -55,7 +55,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     QString getHashFromRow(unsigned int row) const;
     QStringList getSelectedTorrents(bool only_one=false) const;
     unsigned int getNbTorrentsInList() const;
-    void enablePriorityColumn(bool enable);
 
   signals:
     void unfinishedTorrentsNumberChanged(unsigned int);
@@ -93,7 +92,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void hideOrShowColumnSeedersLeechers();
     void hideOrShowColumnRatio();
     void hideOrShowColumnEta();
-    void hideOrShowColumnPriority();
     void displayUPnPError(QString msg);
     void displayUPnPSuccess(QString msg);
 
@@ -108,7 +106,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void sortProgressColumnDelayed();
     void updateFileSizeAndProgress(QString hash);
     void showPropertiesFromHash(QString hash);
-    void hidePriorityColumn(bool hide);
 
 };
 

src/httpconnection.cpp

@@ -30,7 +30,6 @@
 #include <QHttpResponseHeader>
 #include <QFile>
 #include <QDebug>
-#include <QTemporaryFile>
 
 HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
 	: QObject(parent), socket(socket), parent(parent)
@@ -46,17 +45,11 @@ HttpConnection::~HttpConnection()
 
 void HttpConnection::read()
 {
-	QByteArray input = socket->readAll();
+	QString input = socket->readAll();
 	qDebug(" -------");
 	qDebug("|REQUEST|");
 	qDebug(" -------");
-	//qDebug("%s", input.toAscii().constData());
-	if(input.size() > 100000) {
-		qDebug("Request too big");
-		generator.setStatusLine(400, "Bad Request");
-		write();
-		return;
-	}
+	qDebug("%s", input.toAscii().constData());
 	parser.write(input);
 	if(parser.isError())
 	{
@@ -81,7 +74,6 @@ void HttpConnection::write()
 
 void HttpConnection::respond()
 {
-	qDebug("Respond called");
 	QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
 	if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toUtf8()))
 	{
@@ -184,25 +176,6 @@ void HttpConnection::respondCommand(QString command)
 		emit urlsReadyToBeDownloaded(url_list_cleaned);
 		return;
 	}
-	if(command == "upload")
-	{
-		QByteArray torrentfile = parser.torrent();
-		// XXX: Trick to get a unique filename
-		QString filePath;
-		QTemporaryFile *tmpfile = new QTemporaryFile();
-		if (tmpfile->open()) {
-			filePath = tmpfile->fileName();
-		}
-		delete tmpfile;
-		// write it to HD
-		QFile torrent(filePath);
-		if(torrent.open(QIODevice::WriteOnly)) {
-			torrent.write(torrentfile);
-			torrent.close();
-		}
-		emit torrentReadyToBeDownloaded(filePath, false, QString(), false);
-		return;
-	}
 	if(command == "resumeall")
 	{
 		emit resumeAllTorrents();

src/httpconnection.h

@@ -57,7 +57,6 @@ class HttpConnection : public QObject
 
 	signals:
 		void urlsReadyToBeDownloaded(const QStringList&);
-		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
 		void deleteTorrent(QString hash);
 		void resumeTorrent(QString hash);
 		void pauseTorrent(QString hash);

src/httprequestparser.cpp

@@ -49,11 +49,11 @@ QString HttpRequestParser::url() const
 	return path;
 }
 
-QByteArray HttpRequestParser::message() const
+QString HttpRequestParser::message() const
 {
 	if(isParsable())
 		return data;
-	return QByteArray();
+	return QString();
 }
 
 QString HttpRequestParser::get(const QString key) const
@@ -66,12 +66,7 @@ QString HttpRequestParser::post(const QString key) const
 	return postMap[key];
 }
 
-QByteArray HttpRequestParser::torrent() const
-{
-	return torrent_content;
-}
-
-void HttpRequestParser::write(QByteArray str)
+void HttpRequestParser::write(QString str)
 {
 	while (!headerDone && str.size()>0)
 	{
@@ -116,7 +111,7 @@ void HttpRequestParser::write(QByteArray str)
 				if(contentType() == "application/x-www-form-urlencoded")
 				{
 					QUrl url;
-					url.setEncodedQuery(data);
+					url.setEncodedQuery(data.toAscii());
 					QListIterator<QPair<QString, QString> > i(url.queryItems());
 					while (i.hasNext())
 					{
@@ -125,15 +120,9 @@ void HttpRequestParser::write(QByteArray str)
 						qDebug() << pair.first << "=" << post(pair.first);
 					}
 				}
-				if(contentType() == "multipart/form-data")
-				{
-					//qDebug() << data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
-					torrent_content = data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
-				}
 			}
 		}
 		else
 			error = true;
 	}
-	qDebug() << "isError: " << isError();
 }

src/httprequestparser.h

@@ -30,11 +30,10 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool headerDone;
 		bool messageDone;
 		bool error;
-		QByteArray data;
+		QString data;
 		QString path;
 		QMap<QString, QString> postMap;
 		QMap<QString, QString> getMap;
-		QByteArray torrent_content;
 
 	public:
 		HttpRequestParser();
@@ -42,11 +41,10 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool isParsable() const;
 		bool isError() const;
 		QString url() const;
-		QByteArray message() const;
+		QString message() const;
 		QString get(const QString key) const;
 		QString post(const QString key) const;
-		QByteArray torrent() const;
-		void write(QByteArray str);
+		void write(QString str);
 };
 
 #endif

src/httpserver.cpp

@@ -62,7 +62,6 @@ void HttpServer::newHttpConnection()
 		HttpConnection *connection = new HttpConnection(socket, this);
 		//connect connection to BTSession
 		connect(connection, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
-		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
 		connect(connection, SIGNAL(deleteTorrent(QString)), BTSession, SLOT(deleteTorrent(QString)));
 		connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
 		connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));

src/icons.qrc

@@ -1,106 +1,106 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <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/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/configure.png</file>
   <file>Icons/connection.png</file>
-  <file>Icons/description.png</file>
-  <file>Icons/downarrow.png</file>
-  <file>Icons/download.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/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/sphere.png</file>
-  <file>Icons/sphere2.png</file>
-  <file>Icons/splash.png</file>
-  <file>Icons/star.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/unsubscribe.png</file>
-  <file>Icons/unsubscribe16.png</file>
-  <file>Icons/uparrow.png</file>
-  <file>Icons/url.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/flags/brazil.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/download.png</file>
+  <file>Icons/time.png</file>
+  <file>Icons/refresh.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/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/china.png</file>
   <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/france.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/greece.png</file>
   <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/spain_catalunya.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/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>
+  <file>Icons/flags/poland.png</file>
 </qresource>
 </RCC>

src/lang.qrc

@@ -1,29 +1,29 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_da.qm</file>
+  <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_el.qm</file>
-  <file>lang/qbittorrent_en.qm</file>
-  <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_ru.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_da.qm</file>
+  <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_pl.qm</file>
   <file>lang/qbittorrent_ko.qm</file>
   <file>lang/qbittorrent_nb.qm</file>
-  <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_pl.qm</file>
-  <file>lang/qbittorrent_pt.qm</file>
-  <file>lang/qbittorrent_pt_BR.qm</file>
-  <file>lang/qbittorrent_ro.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>
+  <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>
 </qresource>
 </RCC>