Merge commit 'refs/merge-requests/4' of git://gitorious.org/qbittorrent/qbittorrent into merge-requests/4

src/preferences/preferences.h

@@ -229,6 +229,22 @@ public:
     setValue("Preferences/Downloads/AppendLabel", b);
   }
 
+  bool rememberLastLocation() const {
+    return value(QString::fromUtf8("Preferences/Downloads/RememberLastLocation"), false).toBool();
+  }
+
+  void setRememberLastLocation(bool b) {
+    setValue("Preferences/Downloads/RememberLastLocation", b);
+  }
+
+  QString lastLocationPath() const {
+    return value(QString::fromUtf8("Preferences/Downloads/LastLocationPath"), QString()).toString();
+}
+
+  void setLastLocationPath(const QString &path) {
+    setValue(QString::fromUtf8("Preferences/Downloads/LastLocationPath"), path);
+  }
+
   bool preAllocateAllFiles() const {
     return value(QString::fromUtf8("Preferences/Downloads/PreAllocation"), false).toBool();
   }

src/torrentadditiondlg.cpp

@@ -60,7 +60,7 @@ using namespace libtorrent;
 
 torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
   QDialog(parent), old_label(""), hidden_height(0), m_showContentList(true) {
-  const Preferences pref;
+  Preferences pref;
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
   setMinimumSize(0, 0);
@@ -87,7 +87,19 @@ torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
   // Important: as a default, it inserts at the bottom which is not desirable
   savePathTxt->setInsertPolicy(QComboBox::InsertAtCurrent);
   //torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);
-  defaultSavePath = pref.getSavePath();
+  QString lastLocation = pref.lastLocationPath();
+  checkLastFolder->setChecked(pref.rememberLastLocation());
+  //lastLocation will always have '/' as separator since it is saved in
+  //::on_OkButton_clicked()  after the conversion is done.
+  if (pref.rememberLastLocation() && !lastLocation.isEmpty() && QFile(lastLocation).exists())
+      defaultSavePath = lastLocation;
+  else
+  {
+    defaultSavePath = pref.getSavePath();
+    //In case of the LastLocationPath doesn't exist anymore, empty the string
+    pref.setLastLocationPath(QString());
+  }
+
   appendLabelToSavePath = pref.appendTorrentLabel();
   QString display_path = defaultSavePath.replace("\\", "/");
   if(!display_path.endsWith("/"))
@@ -686,6 +698,14 @@ void torrentAdditionDialog::on_OkButton_clicked(){
       return;
     }
   }
+  //Save last location path
+  {//limit the scope of pref
+    Preferences pref;
+    bool isChecked = checkLastFolder->isChecked();
+    if (pref.rememberLastLocation() != isChecked) pref.setRememberLastLocation(isChecked);
+    if (pref.rememberLastLocation() && save_path != pref.lastLocationPath())
+        pref.setLastLocationPath(save_path);
+}
   // save filtered files
   if(!is_magnet && t->num_files() > 1)
     savePiecesPriorities();

src/torrentadditiondlg.ui

@@ -190,6 +190,12 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
       </spacer>
      </item>
     </layout>
@@ -217,6 +223,12 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
       </spacer>
      </item>
      <item>
@@ -238,6 +250,12 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
       </spacer>
      </item>
     </layout>
@@ -263,6 +281,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="checkLastFolder">
+     <property name="text">
+      <string>Remember last used folder</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout">
      <property name="spacing">