diff --git a/qml/ttrss/ubuntu-touch/Categories.qml b/qml/ttrss/ubuntu-touch/Categories.qml index 0cf1be7..13149e9 100644 --- a/qml/ttrss/ubuntu-touch/Categories.qml +++ b/qml/ttrss/ubuntu-touch/Categories.qml @@ -10,23 +10,25 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Page { id: categoriesPage - title: qsTr("Tiny Tiny RSS Reader") property var categories - head { - actions: [ + header: PageHeader { + title: qsTr("Tiny Tiny RSS Reader") + flickable: listView + trailingActionBar.actions: [ Action { iconName: "settings" onTriggered: pageStack.push(Qt.resolvedUrl("Settings.qml")) } ] - sections { + extension: Sections { + anchors { left: parent.left; right: parent.right; bottom: parent.bottom } model: [ qsTr("Unread"), qsTr("All") ] selectedIndex: settings.showAll ? 1 : 0 onSelectedIndexChanged: { diff --git a/qml/ttrss/ubuntu-touch/CategoryDelegate.qml b/qml/ttrss/ubuntu-touch/CategoryDelegate.qml index 79f4149..75aee2c 100644 --- a/qml/ttrss/ubuntu-touch/CategoryDelegate.qml +++ b/qml/ttrss/ubuntu-touch/CategoryDelegate.qml @@ -10,8 +10,8 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 0.1 -import Ubuntu.Components.ListItems 0.1 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem ListItem.SingleValue { id: listItem diff --git a/qml/ttrss/ubuntu-touch/ContextMenu.qml b/qml/ttrss/ubuntu-touch/ContextMenu.qml index 00b86b2..63f3ec8 100644 --- a/qml/ttrss/ubuntu-touch/ContextMenu.qml +++ b/qml/ttrss/ubuntu-touch/ContextMenu.qml @@ -10,10 +10,10 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem -import Ubuntu.Components.Popups 1.0 -import Ubuntu.Content 1.1 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem +import Ubuntu.Components.Popups 1.3 +import Ubuntu.Content 1.3 ActionSelectionPopover { id: root diff --git a/qml/ttrss/ubuntu-touch/FeedDelegate.qml b/qml/ttrss/ubuntu-touch/FeedDelegate.qml index 89227d3..be88c1b 100644 --- a/qml/ttrss/ubuntu-touch/FeedDelegate.qml +++ b/qml/ttrss/ubuntu-touch/FeedDelegate.qml @@ -10,8 +10,8 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 0.1 -import Ubuntu.Components.ListItems 0.1 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem ListItem.Empty { id: listItem diff --git a/qml/ttrss/ubuntu-touch/FeedItem.qml b/qml/ttrss/ubuntu-touch/FeedItem.qml index 4c96bc6..b2021ed 100644 --- a/qml/ttrss/ubuntu-touch/FeedItem.qml +++ b/qml/ttrss/ubuntu-touch/FeedItem.qml @@ -10,8 +10,8 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 Item { id: root diff --git a/qml/ttrss/ubuntu-touch/FeedItemDelegate.qml b/qml/ttrss/ubuntu-touch/FeedItemDelegate.qml index 0bf4eba..f815375 100644 --- a/qml/ttrss/ubuntu-touch/FeedItemDelegate.qml +++ b/qml/ttrss/ubuntu-touch/FeedItemDelegate.qml @@ -10,8 +10,8 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 0.1 -import Ubuntu.Components.ListItems 0.1 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem ListItem.Empty { id: listItem diff --git a/qml/ttrss/ubuntu-touch/FeedItemSwipe.qml b/qml/ttrss/ubuntu-touch/FeedItemSwipe.qml index 8974fc9..052c20a 100644 --- a/qml/ttrss/ubuntu-touch/FeedItemSwipe.qml +++ b/qml/ttrss/ubuntu-touch/FeedItemSwipe.qml @@ -10,7 +10,7 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Page { id: root @@ -21,23 +21,25 @@ Page { property alias currentItem: listView.currentItem anchors.fill: parent - title: currentItem ? currentItem.title : "" - flickable: currentItem ? currentItem.flickable : null - head.actions: [ - Action { - iconSource: "../resources/ic_star_"+(currentItem.marked?"enabled":"disabled")+".png" - onTriggered: { - model.toggleStar() + header: PageHeader { + title: currentItem ? currentItem.title : "" + flickable: currentItem ? currentItem.flickable : null + trailingActionBar.actions: [ + Action { + iconSource: "../resources/ic_star_"+(currentItem.marked?"enabled":"disabled")+".png" + onTriggered: { + model.toggleStar() + } + }, + Action { + iconSource: "../resources/ic_"+(currentItem.unread?"unread":"read")+".png" + onTriggered: { + model.toggleRead() + } } - }, - Action { - iconSource: "../resources/ic_"+(currentItem.unread?"unread":"read")+".png" - onTriggered: { - model.toggleRead() - } - } - ] + ] + } ListView { id: listView diff --git a/qml/ttrss/ubuntu-touch/FeedItems.qml b/qml/ttrss/ubuntu-touch/FeedItems.qml index 38eee2c..6a52d1e 100644 --- a/qml/ttrss/ubuntu-touch/FeedItems.qml +++ b/qml/ttrss/ubuntu-touch/FeedItems.qml @@ -10,15 +10,13 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem Page { id: feeditemsPage property variant feed - title: feed.title - Component.onCompleted: { feedItemModel.feed = feeditemsPage.feed feedItemModel.hasMoreItems = false @@ -30,8 +28,18 @@ Page { pullToRefresh.enabled = true } - head { - sections { + header: PageHeader { + title: feed.title + flickable: listView + trailingActionBar.actions: [ + Action { + text: qsTr('Mark all read') + iconName: "tick" + onTriggered: feedItemModel.catchUp() + } + ] + extension: Sections { + anchors { left: parent.left; right: parent.right; bottom: parent.bottom } model: [ qsTr("Unread"), qsTr("All") ] selectedIndex: settings.showAll ? 1 : 0 onSelectedIndexChanged: { @@ -47,14 +55,6 @@ Page { } } } - - actions: [ - Action { - text: qsTr('Mark all read') - iconName: "tick" - onTriggered: feedItemModel.catchUp() - } - ] } ListView { diff --git a/qml/ttrss/ubuntu-touch/Feeds.qml b/qml/ttrss/ubuntu-touch/Feeds.qml index 269fac8..315306a 100644 --- a/qml/ttrss/ubuntu-touch/Feeds.qml +++ b/qml/ttrss/ubuntu-touch/Feeds.qml @@ -10,14 +10,12 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Page { id: feedsPage property var category - title: category.title - Component.onCompleted: { feedModel.category = feedsPage.category feedModel.clear() @@ -28,15 +26,18 @@ Page { pullToRefresh.enabled = true } - head { - actions: [ + header: PageHeader { + title: category.title + flickable: listView + trailingActionBar.actions: [ Action { iconName: "settings" onTriggered: pageStack.push(Qt.resolvedUrl("Settings.qml")) } ] - sections { + extension: Sections { + anchors { left: parent.left; right: parent.right; bottom: parent.bottom } model: [ qsTr("Unread"), qsTr("All") ] selectedIndex: settings.showAll ? 1 : 0 onSelectedIndexChanged: { diff --git a/qml/ttrss/ubuntu-touch/FileSaver.qml b/qml/ttrss/ubuntu-touch/FileSaver.qml index 153def7..20690e7 100644 --- a/qml/ttrss/ubuntu-touch/FileSaver.qml +++ b/qml/ttrss/ubuntu-touch/FileSaver.qml @@ -10,9 +10,9 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Content 1.1 -import Ubuntu.DownloadManager 0.1 +import Ubuntu.Components 1.3 +import Ubuntu.Content 1.3 +import Ubuntu.DownloadManager 1.2 Page { id: root diff --git a/qml/ttrss/ubuntu-touch/MainPage.qml b/qml/ttrss/ubuntu-touch/MainPage.qml index 23484a4..28714a3 100644 --- a/qml/ttrss/ubuntu-touch/MainPage.qml +++ b/qml/ttrss/ubuntu-touch/MainPage.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 -import Ubuntu.Components 0.1 -import Ubuntu.Components.ListItems 1.0 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem import Ubuntu.Keyboard 0.1 Item { diff --git a/qml/ttrss/ubuntu-touch/Settings.qml b/qml/ttrss/ubuntu-touch/Settings.qml index 1efa107..c0dc553 100644 --- a/qml/ttrss/ubuntu-touch/Settings.qml +++ b/qml/ttrss/ubuntu-touch/Settings.qml @@ -20,12 +20,16 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem Page { id: settingsPage - title: qsTr("Settings") + + header: PageHeader { + title: qsTr("Settings") + flickable: flickable + } Flickable { id: flickable diff --git a/qml/ttrss/ubuntu-touch/SubtitledLabel.qml b/qml/ttrss/ubuntu-touch/SubtitledLabel.qml index 223a2d9..5320519 100644 --- a/qml/ttrss/ubuntu-touch/SubtitledLabel.qml +++ b/qml/ttrss/ubuntu-touch/SubtitledLabel.qml @@ -10,7 +10,7 @@ //in /usr/share/common-licenses. If not, see http://www.gnu.org/licenses/. import QtQuick 2.0 -import Ubuntu.Components 0.1 +import Ubuntu.Components 1.3 Item { id: root diff --git a/qml/ttrss/ubuntu-touch/main.qml b/qml/ttrss/ubuntu-touch/main.qml index deaeba9..f05f559 100644 --- a/qml/ttrss/ubuntu-touch/main.qml +++ b/qml/ttrss/ubuntu-touch/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import Ubuntu.Components 0.1 +import Ubuntu.Components 1.3 import "../models/tinytinyrss.js" as TTRss import "../models" 1.0 @@ -16,7 +16,6 @@ MainView { width: units.gu(45) height: units.gu(75) - useDeprecatedToolbar: false PageStack { id: pageStack diff --git a/ubuntu/manifest.json.in b/ubuntu/manifest.json.in index e8548b1..348985e 100644 --- a/ubuntu/manifest.json.in +++ b/ubuntu/manifest.json.in @@ -1,6 +1,6 @@ { \"description\": \"Tiny Tiny RSS client\", - \"framework\": \"ubuntu-sdk-14.10-qml\", + \"framework\": \"ubuntu-sdk-15.04.1-qml\", \"hooks\": { \"ttrss\": { \"apparmor\": \"ttrss.json\", diff --git a/ubuntu/ttrss.json b/ubuntu/ttrss.json index 2a7c3f0..927d414 100644 --- a/ubuntu/ttrss.json +++ b/ubuntu/ttrss.json @@ -4,5 +4,5 @@ "content_exchange_source", "networking" ], - "policy_version": 1.2 + "policy_version": 1.3 }