Tagged v2.3.0 release

Changelog

@@ -1,12 +1,3 @@
-* Tue Aug 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.1
-    - BUGFIX: Fix compilation with gcc 4.5
-    - BUGFIX: Fix about dialog layout
-    - BUGFIX: Remember previously selected paths in torrent creation dialog
-    - BUGFIX: Added missing right-click menu icon in Web UI
-    - BUGFIX: Fix speed limit sliders initialization in Web UI
-    - BUGFIX: Priority actions are only effective if the transfer list tab is displayed
-    - BUGFIX: Fix possible folder watching issues on Windows and OS/2
-
 * 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)
     - FEATURE: Remember previous save paths in torrent addition dialog

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.3.1
+Comment=V2.3.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.1</string>
+	<string>2.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about_imp.h

@@ -47,6 +47,7 @@ class about : public QDialog, private Ui::AboutDlg{
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks

src/createtorrent_imp.cpp

@@ -50,7 +50,6 @@
 #include "torrentpersistentdata.h"
 #include "createtorrent_imp.h"
 #include "misc.h"
-#include "qinisettings.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -81,11 +80,8 @@ createtorrent::~createtorrent() {
 }
 
 void createtorrent::on_addFolder_button_clicked(){
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), last_path, QFileDialog::ShowDirsOnly);
+  QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
   if(!dir.isEmpty()) {
-    settings.setValue("CreateTorrent/last_add_path", dir);
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
     dir = dir.replace("/", "\\");
 #endif
@@ -94,11 +90,8 @@ void createtorrent::on_addFolder_button_clicked(){
 }
 
 void createtorrent::on_addFile_button_clicked(){
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
-  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), last_path);
+  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath());
   if(!file.isEmpty()) {
-    settings.setValue("CreateTorrent/last_add_path", misc::removeLastPathPart(file));
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
     file = file.replace("/", "\\");
 #endif
@@ -184,14 +177,14 @@ void createtorrent::on_createButton_clicked(){
     return;
   }
   QStringList trackers = allItems(trackers_list);
-
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_save_path", QDir::homePath()).toString();
-
-  QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
+  /*if(!trackers.size()){
+    QMessageBox::critical(0, tr("No tracker path set"), tr("Please set at least one tracker"));
+    return;
+  }*/
+  QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), QDir::homePath(), tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!destination.isEmpty()) {
-    settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
-    destination += QString::fromUtf8(".torrent");
+    if(!destination.endsWith(QString::fromUtf8(".torrent")))
+      destination += QString::fromUtf8(".torrent");
   } else {
     return;
   }

src/filesystemwatcher.h

@@ -203,11 +203,7 @@ private:
   void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
     const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
     foreach(const QString &file, files)
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      torrents << dir.absoluteFilePath(file).replace("/", "\\");
-#else
-      torrents << dir.absoluteFilePath(file);
-#endif
+      torrents << dir.canonicalPath() + '/' + file;
   }
 
 };

src/lang.qrc

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

src/main.cpp

@@ -135,7 +135,7 @@ void sigsegvHandler(int) {
   std::cerr << "\n\n*************************************************************\n";
   std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
   print_stacktrace();
-  raise(SIGSEGV);
+  std::raise(SIGSEGV);
 }
 void sigabrtHandler(int) {
   signal(SIGABRT, 0);
@@ -143,7 +143,7 @@ void sigabrtHandler(int) {
   std::cerr << "\n\n*************************************************************\n";
   std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
   print_stacktrace();
-  raise(SIGABRT);
+  std::raise(SIGABRT);
 }
 #endif
 

src/misc.h

@@ -33,7 +33,6 @@
 
 #include <sstream>
 #include <QString>
-#include <QStringList>
 #include <QThread>
 #include <ctime>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
@@ -75,14 +74,6 @@ public:
     return QString(o.str().c_str());
   }
 
-  static inline QString removeLastPathPart(QString path) {
-    if(path.isEmpty()) return path;
-    path = path.replace("\\", "/");
-    QStringList tmp = path.split("/");
-    tmp.removeLast();
-    return tmp.join("/");
-  }
-
   static inline sha1_hash QStringToSha1(const QString& s) {
     std::string str(s.toLocal8Bit().data());
     std::istringstream i(str);

src/scannedfoldersmodel.cpp

@@ -80,15 +80,8 @@ QVariant ScanFoldersModel::data(const QModelIndex &index, int role) const {
     return QVariant();
 
   const PathData* pathData = m_pathList.at(index.row());
-  if (index.column() == PathColumn && role == Qt::DisplayRole) {
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    QString ret = pathData->path;
-    ret = ret.replace("/", "\\");
-    return ret;
-#else
-  return pathData->path;
-#endif
-  }
+  if (index.column() == PathColumn && role == Qt::DisplayRole)
+    return pathData->path;
   if (index.column() == DownloadAtTorrentColumn && role == Qt::CheckStateRole)
     return pathData->downloadAtPath ? Qt::Checked : Qt::Unchecked;
   return QVariant();

src/search.qrc

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

src/src.pro

@@ -12,13 +12,13 @@ CONFIG += qt \
 
 # Update this VERSION for each release
 os2 {
-    DEFINES += VERSION=\'\"v2.3.1\"\'
+    DEFINES += VERSION=\'\"v2.3.0\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.3.1\\\"
+    DEFINES += VERSION=\\\"v2.3.0\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=3
-DEFINES += VERSION_BUGFIX=1
+DEFINES += VERSION_BUGFIX=0
 
 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
 DEFINES += VERSION_TYPE=NORMAL

src/transferlistwidget.cpp

@@ -718,8 +718,8 @@ void TransferListWidget::deleteSelectedTorrents() {
   }
 }
 
+// FIXME: Should work only if the tab is displayed
 void TransferListWidget::increasePrioSelectedTorrents() {
-  if(main_window->getCurrentTabWidget() != this) return;
   const QStringList hashes = getSelectedTorrentsHashes();
   foreach(const QString &hash, hashes) {
     QTorrentHandle h = BTSession->getTorrentHandle(hash);
@@ -730,8 +730,8 @@ void TransferListWidget::increasePrioSelectedTorrents() {
   refreshList();
 }
 
+// FIXME: Should work only if the tab is displayed
 void TransferListWidget::decreasePrioSelectedTorrents() {
-  if(main_window->getCurrentTabWidget() != this) return;
   const QStringList hashes = getSelectedTorrentsHashes();
   foreach(const QString &hash, hashes) {
     QTorrentHandle h = BTSession->getTorrentHandle(hash);

src/ui/about.ui

@@ -88,18 +88,8 @@
       <attribute name="title">
        <string>About</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
-        <widget class="QLabel" name="mascot_lbl">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="pixmap">
-          <pixmap resource="../icons.qrc">:/Icons/skin/mascot.png</pixmap>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
         <widget class="QLabel" name="lb_about">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -133,6 +123,13 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="mascot_lbl">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab3">
@@ -300,8 +297,6 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources>
-  <include location="../icons.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/webui/scripts/parametrics.js

@@ -30,8 +30,6 @@ MochaUI.extend({
 						var tmp = data.toInt();
 						if(tmp > 0) {
 							maximum = tmp / 1024.
-						} else {
-							maximum = 0
 						}
 					}
 					// Get torrent upload limit
@@ -117,8 +115,6 @@ MochaUI.extend({
 						var tmp = data.toInt();
 						if(tmp > 0) {
 							maximum = tmp / 1024.
-						} else {
-							maximum = 0
 						}
 					}
 					// Get torrent download limit