jeena/gpodder-ui-qml
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Various layout and UI fixes

Browse source
This commit is contained in:
Thomas Perl 2014-11-22 18:04:30 +01:00
parent 9610c51c30
commit b0c7071c56
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
touch/Directory.qml
View file

@ -23,12 +23,12 @@ import QtQuick 2.0
import 'common' import 'common'
SlidePage { SlidePage {
id: directory id: page
property string provider property string provider
property bool can_search property bool can_search
Component.onCompleted: { Component.onCompleted: {
if (!directory.can_search) { if (!page.can_search) {
// Load static data // Load static data
search(''); search('');
} }
@ -49,7 +49,7 @@ SlidePage {
PScrollDecorator { flickable: listView } PScrollDecorator { flickable: listView }
model: GPodderDirectorySearchModel { id: directorySearchModel; provider: directory.provider } model: GPodderDirectorySearchModel { id: directorySearchModel; provider: page.provider }
header: Column { header: Column {
anchors { anchors {
@ -57,10 +57,10 @@ SlidePage {
right: parent.right right: parent.right
} }
SlidePageHeader { title: directory.provider } SlidePageHeader { title: page.provider }
Column { Column {
visible: directory.can_search visible: page.can_search
spacing: 0.5 * 30 * pgst.scalef spacing: 0.5 * 30 * pgst.scalef
@ -74,7 +74,7 @@ SlidePage {
id: input id: input
width: parent.width width: parent.width
placeholderText: 'Search term' placeholderText: 'Search term'
onAccepted: directory.search(input.text); onAccepted: page.search(input.text);
} }
ButtonArea { ButtonArea {
@ -87,7 +87,7 @@ SlidePage {
text: 'Search' text: 'Search'
} }
onClicked: directory.search(input.text); onClicked: page.search(input.text);
} }
} }
} }
@ -95,7 +95,7 @@ SlidePage {
delegate: DirectoryItem { delegate: DirectoryItem {
onClicked: { onClicked: {
py.call('main.subscribe', [url], function () { py.call('main.subscribe', [url], function () {
directory.closePage(); page.closePage();
}); });
} }
} }

12
touch/PlayerPage.qml
View file

@ -24,11 +24,8 @@ import 'common/util.js' as Util
import 'common/constants.js' as Constants import 'common/constants.js' as Constants
import 'icons/icons.js' as Icons import 'icons/icons.js' as Icons
Dialog { SlidePage {
id: playerPage id: page
contentHeight: flickable.contentHeight
fullWidth: true
Flickable { Flickable {
id: flickable id: flickable
@ -51,6 +48,11 @@ Dialog {
margins: 30 * pgst.scalef margins: 30 * pgst.scalef
} }
SlidePageHeader {
title: 'Now playing'
width: parent.width
}
Item { width: parent.width; height: 20 * pgst.scalef } Item { width: parent.width; height: 20 * pgst.scalef }
PLabel { PLabel {