sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #165 from mardy/master

Browse source 
Update ubuntu version
This commit is contained in:
Hauke Schade 2016-04-10 10:59:51 +02:00
commit 0545abdfc0
17 changed files with 75 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qml/ttrss/ubuntu-touch/Categories.qml
View file

@ -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: {

4
qml/ttrss/ubuntu-touch/CategoryDelegate.qml
View file

@ -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

8
qml/ttrss/ubuntu-touch/ContextMenu.qml
View file

@ -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

4
qml/ttrss/ubuntu-touch/FeedDelegate.qml
View file

@ -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

4
qml/ttrss/ubuntu-touch/FeedItem.qml
View file

@ -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

4
qml/ttrss/ubuntu-touch/FeedItemDelegate.qml
View file

@ -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

8
qml/ttrss/ubuntu-touch/FeedItemSwipe.qml
View file

@ -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,10 +21,11 @@ Page {
property alias currentItem: listView.currentItem
anchors.fill: parent
header: PageHeader {
title: currentItem ? currentItem.title : ""
flickable: currentItem ? currentItem.flickable : null
head.actions: [
trailingActionBar.actions: [
Action {
iconSource: "../resources/ic_star_"+(currentItem.marked?"enabled":"disabled")+".png"
onTriggered: {
@ -38,6 +39,7 @@ Page {
}
}
]
}
ListView {
id: listView

28
qml/ttrss/ubuntu-touch/FeedItems.qml
View file

@ -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 {

13
qml/ttrss/ubuntu-touch/Feeds.qml
View file

@ -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: {

6
qml/ttrss/ubuntu-touch/FileSaver.qml
View file

@ -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

4
qml/ttrss/ubuntu-touch/MainPage.qml
View file

@ -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 {

8
qml/ttrss/ubuntu-touch/Settings.qml
View file

@ -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
header: PageHeader {
title: qsTr("Settings")
flickable: flickable
}
Flickable {
id: flickable

2
qml/ttrss/ubuntu-touch/SubtitledLabel.qml
View file

@ -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

5
qml/ttrss/ubuntu-touch/main.qml
View file

@ -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
@ -10,13 +10,10 @@ import "../models" 1.0
MainView {
id: rootWindow
applicationName: Qt.application.name
/* Disabled until QTBUG-43555 is fixed
automaticOrientation: true
*/
width: units.gu(45)
height: units.gu(75)
useDeprecatedToolbar: false
PageStack {
id: pageStack

2
ttrss-ubuntu.pro
View file

@ -1,5 +1,5 @@
VERSION = 0.5.2
UBUNTU_REVISION = 1
UBUNTU_REVISION = 2
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += Q_OS_UBUNTU_TOUCH

2
ubuntu/manifest.json.in
View file

@ -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\",

2
ubuntu/ttrss.json
View file

@ -4,5 +4,5 @@
"content_exchange_source",
"networking"
],
"policy_version": 1.2
"policy_version": 1.3
}