QML UI: Move filter to episode list header

gpodder · Jun 28, 2014 · 528d637 · 528d637
1 parent 233fc42
commit 528d637
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/share/gpodder/ui/qml/Main.qml b/share/gpodder/ui/qml/Main.qml
@@ -238,18 +238,26 @@ Item {
                 id: episodesHeaderRow
                 width: parent.width
                 height: Config.listItemHeight
-
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: mainObject.showFilterDialog();
+                }
+
                 Text {
                     id: headerCaption
 
-                    text: main.currentPodcast.qtitle
+                    text: main.currentPodcast.qtitle + ' - ' + mainObject.currentFilterText
                     color: Config.settingsHeaderColor
 
                     anchors {
                         left: parent.left  
+                        right: counters.left
                         leftMargin: Config.smallSpacing
+                        rightMargin: Config.smallSpacing
                         verticalCenter: parent.verticalCenter                        
                     }
+                    elide: Text.ElideRight
 
                     font.pixelSize: Config.headerHeight * .5
                     wrapMode: Text.NoWrap
@@ -262,8 +270,8 @@ Item {
                     property int downloadedEpisodes: main.currentPodcast.qdownloaded
 
                     anchors {
-                        right: parent.right
-                        rightMargin: Config.smallSpacing                        
+                        right: filterIcon.left
+                        rightMargin: Config.smallSpacing
                         verticalCenter: parent.verticalCenter                        
                     }
 
@@ -274,6 +282,19 @@ Item {
                     font.pixelSize: Config.headerHeight * .5
                 }
 
+                Image {
+                    id: filterIcon
+
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                    }
+
+                    visible: !spinner.visible
+
+                    source: 'image://theme/icon-m-common-filter'
+                }
+
                 BusyIndicator {
                     id: spinner
 
@@ -324,12 +345,6 @@ Item {
                     main.clickPlayButton();
                 }
             },
-            Action {
-                text: _('Filter:') + ' ' + mainObject.currentFilterText
-                onClicked: {
-                    mainObject.showFilterDialog();
-                }
-            },
             Action {
                 text: _('Update')
                 onClicked: {