Tagged v2.3.1 release

Changelog

@@ -1,4 +1,13 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
+* 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
     - FEATURE: Max number of half-open connections can now be edited

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.3.0
+Comment=V2.3.1
 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.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about_imp.h

@@ -47,7 +47,6 @@ 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,6 +50,7 @@
 #include "torrentpersistentdata.h"
 #include "createtorrent_imp.h"
 #include "misc.h"
+#include "qinisettings.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -80,8 +81,11 @@ createtorrent::~createtorrent() {
 }
 
 void createtorrent::on_addFolder_button_clicked(){
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
+  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);
   if(!dir.isEmpty()) {
+    settings.setValue("CreateTorrent/last_add_path", dir);
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
     dir = dir.replace("/", "\\");
 #endif
@@ -90,8 +94,11 @@ void createtorrent::on_addFolder_button_clicked(){
 }
 
 void createtorrent::on_addFile_button_clicked(){
-  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath());
+  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);
   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
@@ -177,14 +184,14 @@ void createtorrent::on_createButton_clicked(){
     return;
   }
   QStringList trackers = allItems(trackers_list);
-  /*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)"));
+
+  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(!destination.isEmpty()) {
-    if(!destination.endsWith(QString::fromUtf8(".torrent")))
-      destination += QString::fromUtf8(".torrent");
+    settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
+    destination += QString::fromUtf8(".torrent");
   } else {
     return;
   }

src/filesystemwatcher.h

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

src/lang.qrc

@@ -1,34 +1,34 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_sk.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_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_uk.qm</file>
-  <file>lang/qbittorrent_cs.qm</file>
-  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_sk.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_hr.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_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>
 </qresource>
 </RCC>