Merge lp:~carlos-mazieri/ubuntu-filemanager-app/plugin-goback-feature into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Just implemented a goBack() navigation feature

Just implemented a goBack() navigation feature, it differs from cdUp().

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:267
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/321/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1831
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/119

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/321/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Looks proper.

review: Approve

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2014-08-09 19:57:42 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2014-09-03 22:28:01 +0000
@@ -433,6 +433,12 @@
     Location *location = mLocationFactory->setNewPath(pathName);
     if (location == 0)
     {
+        // perhaps a goBack() operation to a folder/location that was removed,
+        // in this case we remove that folder/location from the list
+        if (mPathList.count() > 0 && mPathList.last() == pathName)
+        {
+            mPathList.removeLast();
+        }
         emit error(tr("path or url may not exist or cannot be read"), pathName);
         qDebug() << Q_FUNC_INFO << this << "path or url may not exist or cannot be read:" << pathName;
         return;
@@ -459,11 +465,27 @@
 
     mCurLocation->fetchItems(currentDirFilter(), mIsRecursive);
 
-    mCurrentDir = mCurLocation->urlPath();
+    mCurrentDir = mCurLocation->urlPath();    
+    if (mPathList.count() == 0 || mPathList.last() != mCurrentDir)
+    {
+        mPathList.append(mCurrentDir);
+    }
     emit pathChanged(mCurLocation->urlPath());
 }
 
 
+void DirModel::goBack()
+{
+    if (mPathList.count() > 1 && !mAwaitingResults)
+    {
+        mPathList.removeLast();
+#if DEBUG_MESSAGES
+    qDebug() << Q_FUNC_INFO << this << "changing to" << mPathList.last();
+#endif
+        setPath(mPathList.last());
+    }
+}
+
 void DirModel::onItemsFetched() {
     if (mAwaitingResults) {
 #if DEBUG_MESSAGES

=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2014-08-09 19:31:32 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2014-09-03 22:28:01 +0000
@@ -351,6 +351,13 @@
     void goTrash();
 
     /*!
+     * \brief goBack() goes to the previous folder if available
+     *
+     */
+    void goBack();
+
+
+    /*!
      * \brief cdUp() sets the parent directory as current directory
      *
      *  It can work as a back function if there is no user input path
@@ -457,6 +464,7 @@
     DirSelection *      mSelection;
     LocationsFactory *  mLocationFactory;
     Location         *  mCurLocation;
+    QStringList         mPathList;    //!< it will be used for goBack()
 
 private:
     FileSystemAction  *  m_fsAction;  //!< it does file system recursive remove/copy/move

=== modified file 'src/plugin/test_folderlistmodel/simpleUI/simplelist.cpp'
--- src/plugin/test_folderlistmodel/simpleUI/simplelist.cpp	2014-08-13 15:25:21 +0000
+++ src/plugin/test_folderlistmodel/simpleUI/simplelist.cpp	2014-09-03 22:28:01 +0000
@@ -123,6 +123,7 @@
             this,    SLOT(onPathChanged(QString)));
 
     connect(ui->toolButtonUp,     SIGNAL(clicked()),    m_model, SLOT(cdUp()));
+    connect(ui->toolButtonBack,   SIGNAL(clicked()),    m_model, SLOT(goBack()));
     connect(ui->actionCopy,       SIGNAL(triggered()),  m_model, SLOT(copySelection()));
     connect(ui->actionCut,        SIGNAL(triggered()),  m_model, SLOT(cutSelection()));
     connect(ui->actionDelete,     SIGNAL(triggered()),  m_model, SLOT(removeSelection()));

=== modified file 'src/plugin/test_folderlistmodel/simpleUI/simplelist.ui'
--- src/plugin/test_folderlistmodel/simpleUI/simplelist.ui	2014-08-13 15:25:21 +0000
+++ src/plugin/test_folderlistmodel/simpleUI/simplelist.ui	2014-09-03 22:28:01 +0000
@@ -20,7 +20,7 @@
       <item>
        <widget class="QToolButton" name="toolButtonBack">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="text">
          <string>back</string>

=== modified file 'src/plugin/test_folderlistmodel/simpleUI/simpleslots.cpp'
--- src/plugin/test_folderlistmodel/simpleUI/simpleslots.cpp	2014-08-13 15:25:21 +0000
+++ src/plugin/test_folderlistmodel/simpleUI/simpleslots.cpp	2014-09-03 22:28:01 +0000
@@ -133,11 +133,16 @@
 
 void SimpleList::onPathChanged(QString path)
 {
-    if (ui->comboBoxPath->findText(path) == -1)
+    int index = ui->comboBoxPath->findText(path);
+    if (index == -1)
     {
         ui->comboBoxPath->insertItem(0, path);
         ui->comboBoxPath->setCurrentIndex(0);
     }
+    else
+    {
+        ui->comboBoxPath->setCurrentIndex(index);
+    }
     this->setWindowTitle(path);
     allowTrashActions(false);
 }