Tagged v2.4.0beta3 release

AUTHORS

@@ -12,7 +12,7 @@ Contributors:
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
+* files src/qtsingleapp/*
   copyright: Nokia Corporation
   license: LGPL
 

Changelog

@@ -4,8 +4,6 @@
     - FEATURE: Email notification on download completion
     - FEATURE: Added button to password-lock the UI
     - FEATURE: Added label-level Pause/Resume/Delete actions
-    - FEATURE: Torrents can now be filtered by name
-    - FEATURE: Run external program on torrent completion
 
 * Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)

src/GUI.cpp

@@ -69,7 +69,6 @@
 #include "qmacapplication.h"
 void qt_mac_set_dock_menu(QMenu *menu);
 #endif
-#include "lineedit.h"
 
 using namespace libtorrent;
 
@@ -155,12 +154,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
   connect(transferList, SIGNAL(torrentStatusUpdate(uint,uint,uint,uint,uint)), this, SLOT(updateNbTorrents(uint,uint,uint,uint,uint)));
   vboxLayout->addWidget(tabs);
 
-  // Name filter
-  search_filter = new LineEdit();
-  toolBar->addWidget(search_filter);
-  search_filter->setFixedWidth(200);
-  connect(search_filter, SIGNAL(textChanged(QString)), transferList, SLOT(applyNameFilter(QString)));
-
   // Transfer list slots
   connect(actionStart, SIGNAL(triggered()), transferList, SLOT(startSelectedTorrents()));
   connect(actionStart_All, SIGNAL(triggered()), transferList, SLOT(startAllTorrents()));
@@ -257,7 +250,6 @@ GUI::~GUI() {
   disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
   // Delete other GUI objects
   delete status_bar;
-  delete search_filter;
   delete transferList;
   delete guiUpdater;
   if(createTorrentDlg)

src/GUI.h

@@ -57,7 +57,6 @@ class about;
 class createtorrent;
 class downloadFromURL;
 class HidableTabWidget;
-class LineEdit;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -156,7 +155,6 @@ private:
   bool displaySpeedInTitle;
   bool force_exit;
   bool ui_locked;
-  LineEdit *search_filter;
   // Keyboard shortcuts
   QShortcut *switchSearchShortcut;
   QShortcut *switchSearchShortcut2;

src/bittorrent.cpp

@@ -34,7 +34,6 @@
 #include <QNetworkInterface>
 #include <QHostAddress>
 #include <QNetworkAddressEntry>
-#include <QProcess>
 #include <stdlib.h>
 
 #include "smtp.h"
@@ -1969,32 +1968,6 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       }
     }
   }
-
-  void Bittorrent::cleanUpAutoRunProcess(int) {
-    sender()->deleteLater();
-  }
-
-  void Bittorrent::autoRunExternalProgram(QTorrentHandle h, bool async) {
-    if(!h.is_valid()) return;
-    QString program = Preferences::getAutoRunProgram().trimmed();
-    if(program.isEmpty()) return;
-    // Replace %f by torrent path
-    QString torrent_path;
-    if(h.num_files() == 1)
-      torrent_path = h.firstFileSavePath();
-    else
-      torrent_path = h.save_path();
-    program.replace("%f", torrent_path);
-    QProcess *process = new QProcess;
-    if(async) {
-      connect(process, SIGNAL(finished(int)), this, SLOT(cleanUpAutoRunProcess(int)));
-      process->start(program);
-    } else {
-      process->execute(program);
-      delete process;
-    }
-  }
-
   void Bittorrent::sendNotificationEmail(QTorrentHandle h) {
     // Prepare mail content
     QString content = tr("Torrent name: %1").arg(h.name()) + "\n";
@@ -2067,15 +2040,11 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           }
           qDebug("Received finished alert for %s", qPrintable(h.name()));
           if(!was_already_seeded) {
-            bool will_shutdown = Preferences::shutdownWhenDownloadsComplete() && !hasDownloadingTorrents();
-            // AutoRun program
-            if(Preferences::isAutoRunEnabled())
-              autoRunExternalProgram(h, will_shutdown);
             // Mail notification
             if(Preferences::isMailNotificationEnabled())
               sendNotificationEmail(h);
             // Auto-Shutdown
-            if(will_shutdown) {
+            if(Preferences::shutdownWhenDownloadsComplete() && !hasDownloadingTorrents()) {
               qDebug("Preparing for auto-shutdown because all downloads are complete!");
 #if LIBTORRENT_VERSION_MINOR < 15
               saveDHTEntry();

src/bittorrent.h

@@ -201,8 +201,6 @@ protected slots:
   void exportTorrentFiles(QString path);
   void saveTempFastResumeData();
   void sendNotificationEmail(QTorrentHandle h);
-  void autoRunExternalProgram(QTorrentHandle h, bool async=true);
-  void cleanUpAutoRunProcess(int);
 
 signals:
   void addedTorrent(QTorrentHandle& h);

src/lang/qbittorrent_hr.ts

@@ -1290,13 +1290,6 @@ Neće biti daljnjih napomena.</translation>
         <translation>Slažem se</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -2331,14 +2324,6 @@ QGroupBox {
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_nl.ts

@@ -3136,13 +3136,6 @@ No further notices will be issued.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4183,14 +4176,6 @@ No further notices will be issued.</source>
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_pl.ts

@@ -3243,13 +3243,6 @@ W przyszłości powiadomienie nie będzie wyświetlane.</translation>
         <translation>Nacisnij klawisz %1 aby zaakceptować i kontynuować...</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4476,14 +4469,6 @@ W przyszłości powiadomienie nie będzie wyświetlane.</translation>
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_pt.ts

@@ -3118,13 +3118,6 @@ Nenhum outro aviso será dado.</translation>
         <translation>Pressione a tecla %1 para aceitar e continuar...</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4363,14 +4356,6 @@ QGroupBox {
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_pt_BR.ts

@@ -3118,13 +3118,6 @@ Nenhum outro aviso será dado.</translation>
         <translation>Pressione a tecla %1 para aceitar e continuar...</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4363,14 +4356,6 @@ QGroupBox {
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_ro.ts

@@ -3044,13 +3044,6 @@ No further notices will be issued.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4253,14 +4246,6 @@ QGroupBox {(new line)
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_ru.ts

@@ -3242,13 +3242,6 @@ No further notices will be issued.</source>
         <translation>Нажмите %1 чтобы принять и продолжить...</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4479,14 +4472,6 @@ No further notices will be issued.</source>
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_sk.ts

@@ -3148,13 +3148,6 @@ Už vás nebudeme ďalej upozorňovať.</translation>
         <translation>Pokračujte stlačením klávesu %1...</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -4389,14 +4382,6 @@ QGroupBox {
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>

src/lang/qbittorrent_sr.ts

@@ -1796,13 +1796,6 @@ No further notices will be issued.</source>
         <translation>Сагласан сам</translation>
     </message>
 </context>
-<context>
-    <name>LineEdit</name>
-    <message>
-        <source>Clear the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -2913,14 +2906,6 @@ QGroupBox {
         <source>SMTP server:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run an external program on torrent completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use %f to pass the torrent path in parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PropListDelegate</name>