Add a back button to the action bar

Author: iBelieve

po/io.papyros.files.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-20 21:37-0600\n"
+"POT-Creation-Date: 2015-02-20 22:12-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,14 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/backend/FolderModel.qml:142
+#: ../build/po/io.papyros.files.desktop.in.in.h:1
+#: io.papyros.files.desktop.in.in.h:1
+msgid "Files"
+msgstr ""
+
+#: ../build/src/app/qml/backend/FolderModel.qml:143
+#: ../src/app/qml/backend/FolderModel.qml:143
 msgid "Home"
 msgstr ""
 
-#: ../src/app/qml/backend/FolderModel.qml:144
+#: ../build/src/app/qml/backend/FolderModel.qml:145
+#: ../src/app/qml/backend/FolderModel.qml:145
 msgid "Device"
 msgstr ""
 
+#: ../build/src/app/qml/components/FolderListView.qml:150
 #: ../src/app/qml/components/FolderListView.qml:150
 msgid "No files"
 msgstr ""
@@ -33,15 +41,15 @@ msgstr ""
 msgid "path or url may not exist or cannot be read"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:591
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:597
 msgid "Rename error"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:616
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:622
 msgid "Error creating new folder"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:1258
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:1264
 msgid "items"
 msgstr ""
 
@@ -133,7 +141,3 @@ msgstr ""
 #: ../src/plugin/folderlistmodel/filesystemaction.cpp:1507
 msgid "Could not remove the trash info file"
 msgstr ""
-
-#: io.papyros.files.desktop.in.in.h:1
-msgid "Files"
-msgstr ""

src/app/qml/FolderPage.qml

@@ -25,6 +25,16 @@ Page {
     id: folderPage
 
     title: folderModel.title
+    actionBar.elevation: 0
+
+    backAction: Action {
+        iconName: "navigation/arrow_back"
+        name: "Back"
+        enabled: folderModel.canGoBack
+        visible: true
+
+        onTriggered: folderModel.goBack()
+    }
 
     actions: [
         Action {

src/app/qml/backend/FolderModel.qml

@@ -28,7 +28,8 @@ Object {
     property string title: pathTitle(path)
     property string folder: pathName(path)
 
-    property bool busy: model.awaitingResults
+    property alias busy: __model.awaitingResults
+    property alias canGoBack: __model.canGoBack
 
     property bool showHiddenFiles
     property string sortingMethod: "Name" // or "Date"

src/app/qml/components/FolderListView.qml

@@ -24,13 +24,17 @@ import Material.ListItems 0.1 as ListItem
 Item {
     id: folderListView
 
-    Rectangle {
+    clip: true
+
+    View {
         id: header
 
         visible: listView.count > 0
 
         z: 1
-        color: Theme.backgroundColor
+        backgroundColor: Theme.backgroundColor
+        elevation: 1
+        fullWidth: true
 
         anchors {
             left: parent.left
@@ -40,10 +44,6 @@ Item {
 
         height: units.dp(48)
 
-        ThinDivider {
-            anchors.bottom: parent.bottom
-        }
-
         RowLayout {
             anchors {
                 left: parent.left