diff --git a/touch/EpisodesPage.qml b/touch/EpisodesPage.qml index cd43ed8..e4f879a 100644 --- a/touch/EpisodesPage.qml +++ b/touch/EpisodesPage.qml @@ -81,6 +81,11 @@ SlidePage { title: episodesPage.title model: GPodderEpisodeListModel { id: episodeListModel } + PPlaceholder { + text: 'No episodes' + visible: episodeList.count === 0 + } + delegate: EpisodeItem { } } } diff --git a/touch/Settings.qml b/touch/PPlaceholder.qml similarity index 80% rename from touch/Settings.qml rename to touch/PPlaceholder.qml index 65a1bf1..960c59c 100644 --- a/touch/Settings.qml +++ b/touch/PPlaceholder.qml @@ -2,7 +2,7 @@ /** * * gPodder QML UI Reference Implementation - * Copyright (c) 2013, Thomas Perl + * Copyright (c) 2014, Thomas Perl * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -20,12 +20,11 @@ import QtQuick 2.0 -SlidePage { - SlidePageHeader { title: 'Settings' } +import 'common/constants.js' as Constants - PLabel { - anchors.centerIn: parent - text: 'TODO' - } + +PLabel { + anchors.centerIn: parent + font.pixelSize: 40 * pgst.scalef + color: Constants.colors.text } - diff --git a/touch/PodcastsPage.qml b/touch/PodcastsPage.qml index a5e230b..edcc9c1 100644 --- a/touch/PodcastsPage.qml +++ b/touch/PodcastsPage.qml @@ -67,6 +67,11 @@ SlidePage { section.property: 'section' section.delegate: SectionHeader { text: section } + PPlaceholder { + text: 'No podcasts' + visible: podcastList.count === 0 + } + model: podcastListModel delegate: PodcastItem { diff --git a/touch/SlidePage.qml b/touch/SlidePage.qml index f1996e3..ef873d0 100644 --- a/touch/SlidePage.qml +++ b/touch/SlidePage.qml @@ -49,8 +49,6 @@ Rectangle { Dragging { id: dragging stacking: stacking - - onPulled: console.log('have pulled it!') } Rectangle { diff --git a/touch/StartPage.qml b/touch/StartPage.qml index d33c900..28fa7db 100644 --- a/touch/StartPage.qml +++ b/touch/StartPage.qml @@ -120,7 +120,7 @@ SlidePage { } StartPageButton { - id: freshEpisodesPage + id: freshEpisodes enabled: freshEpisodesRepeater.count > 0 title: py.refreshing ? 'Refreshing feeds' : 'Fresh episodes' @@ -186,8 +186,8 @@ SlidePage { onClicked: pgst.loadPage('PlayerPage.qml'); anchors { - left: recommendationsPane.left - right: recommendationsPane.right + left: freshEpisodes.left + right: freshEpisodes.right } height: 100 * pgst.scalef @@ -199,51 +199,18 @@ SlidePage { } ButtonArea { - onClicked: pgst.loadPage('Settings.qml'); + onClicked: pgst.loadPage('Directory.qml'); anchors { - left: recommendationsPane.left - right: recommendationsPane.right + left: freshEpisodes.left + right: freshEpisodes.right } height: 100 * pgst.scalef PLabel { anchors.centerIn: parent - text: 'Settings' - } - } - - StartPageButton { - id: recommendationsPane - - title: 'gpodder.net' - onClicked: pgst.loadPage('Directory.qml'); - - Row { - anchors { - horizontalCenter: parent.horizontalCenter - bottom: parent.bottom - margins: 40 * pgst.scalef - } - - spacing: 20 * pgst.scalef - - Connections { - target: py - onReadyChanged: { - if (py.ready) { - py.call('main.load_podcasts', [], function (podcasts) { - recommendationsRepeater.model = podcasts.splice(0, 4); - }); - } - } - } - - Repeater { - id: recommendationsRepeater - Image { source: modelData.coverart; sourceSize { width: 80 * pgst.scalef; height: 80 * pgst.scalef } } - } + text: 'gpodder.net' } } } diff --git a/touch/Subscribe.qml b/touch/Subscribe.qml index ec79ab0..30c1339 100644 --- a/touch/Subscribe.qml +++ b/touch/Subscribe.qml @@ -60,19 +60,6 @@ SlidePage { } } - ButtonArea { - id: directory - width: input.width - height: input.height - - PLabel { - anchors.centerIn: parent - text: 'gpodder.net' - } - - onClicked: pgst.loadPage('Directory.qml'); - } - PBusyIndicator { id: loading visible: false