Use sections for the various sorts

rschroll · Feb 14, 2015 · 9f8a299 · 9f8a299
1 parent ed7a22a
commit 9f8a299
Showing 1 changed file with 19 additions and 60 deletions.
diff --git a/ui/LocalBooks.qml b/ui/LocalBooks.qml
@@ -19,7 +19,7 @@ Page {
     id: localBooks
     title: i18n.tr("Library")
     flickable: gridview
-    property int sort: 0
+    property int sort: localBooks.head.sections.selectedIndex
     property bool needsort: false
     property bool firststart: false
     property bool wide: false
@@ -615,33 +615,25 @@ Page {
         }
     }
 
-    Item {
-        id: fakeSortButton
-        x: parent.width - units.gu(10)
-        y: units.gu(1)
-        width: units.gu(5)
-        height: units.gu(5)
-    }
-
-    head.actions: [
-        Action {
-            text: i18n.tr("Get Books")
-            iconName: "search"
-            onTriggered: pageStack.push(bookSources)
-        },
-
-        Action {
-            text: i18n.tr("Sort")
-            iconName: "filter"
-            onTriggered: PopupUtils.open(sortComponent, fakeSortButton)
-        },
-
-        Action {
-            text: i18n.tr("Settings")
-            iconName: "settings"
-            onTriggered: PopupUtils.open(writablehome ? settingsComponent : settingsDisabledComponent)
+    head {
+        actions: [
+            Action {
+                text: i18n.tr("Get Books")
+                iconName: "search"
+                onTriggered: pageStack.push(bookSources)
+            },
+
+            Action {
+                text: i18n.tr("Settings")
+                iconName: "settings"
+                onTriggered: PopupUtils.open(writablehome ? settingsComponent : settingsDisabledComponent)
+            }
+        ]
+
+        sections {
+            model: [i18n.tr("Recently Read"), i18n.tr("Title"), i18n.tr("Author")]
         }
-    ]
+    }
 
     Component {
         id: settingsComponent
@@ -762,37 +754,4 @@ Page {
             }
         }
     }
-
-    Component {
-        id: sortComponent
-
-        ActionSelectionPopover {
-            id: sortPopover
-
-            delegate: Standard {
-                text: action.text
-                selected: action.sort == localBooks.sort
-                onTriggered: {
-                    localBooks.sort = action.sort
-                    PopupUtils.close(sortPopover)
-                    localBooksToolbar.opened = false
-                }
-            }
-
-            actions: ActionList {
-                Action {
-                    text: i18n.tr("Recently Read")
-                    property int sort: 0
-                }
-                Action {
-                    text: i18n.tr("Title")
-                    property int sort: 1
-                }
-                Action {
-                    text: i18n.tr("Author")
-                    property int sort: 2
-                }
-            }
-        }
-    }
 }