=== modified file 'Main.qml'
--- Main.qml 2015-07-24 19:50:59 +0000
+++ Main.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Qt.labs.settings 1.0
import "ui"
@@ -25,9 +25,6 @@
*/
automaticOrientation: true
- // Removes the old toolbar and enables new features of the new header.
- useDeprecatedToolbar: false
-
// Make room for the keyboard
anchorToKeyboard: true
=== modified file 'components/BorderIcon.qml'
--- components/BorderIcon.qml 2014-12-21 20:02:53 +0000
+++ components/BorderIcon.qml 2015-07-25 07:54:46 +0000
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-import QtQuick 2.0
+import QtQuick 2.4
Item {
id: icon
=== modified file 'components/CommentListItem.qml'
--- components/CommentListItem.qml 2015-02-08 21:05:46 +0000
+++ components/CommentListItem.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
Item {
id: commentitemroot
=== added file 'components/EmptyState.qml'
--- components/EmptyState.qml 1970-01-01 00:00:00 +0000
+++ components/EmptyState.qml 2015-07-25 07:54:46 +0000
@@ -0,0 +1,49 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+Item {
+ id: emptyState
+
+ // Public APIs
+ property alias iconName: emptyIcon.name
+ property alias title: emptyLabel.text
+ property alias subTitle: emptySublabel.text
+ property alias iconSource: emptyIcon.source
+
+ property real iconHeight: units.gu(10)
+ property real iconWidth: units.gu(10)
+
+ height: childrenRect.height
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.margins: units.gu(2)
+
+ Icon {
+ id: emptyIcon
+ width: parent.iconWidth
+ height: parent.iconHeight
+ color: uReadIt.currentTheme.baseFontColor
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+
+ Label {
+ id: emptyLabel
+ anchors.top: emptyIcon.bottom
+ anchors.topMargin: units.gu(5)
+ width: parent.width
+ fontSize: "large"
+ font.bold: true
+ color: uReadIt.currentTheme.baseFontColor
+ horizontalAlignment: Text.AlignHCenter
+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+ }
+
+ Label {
+ id: emptySublabel
+ width: parent.width
+ anchors.top: emptyLabel.bottom
+ color: uReadIt.currentTheme.baseFontColor
+ horizontalAlignment: Text.AlignHCenter
+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+ }
+}
=== modified file 'components/KeyboardNavPage.qml'
--- components/KeyboardNavPage.qml 2015-04-23 10:16:22 +0000
+++ components/KeyboardNavPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
Page {
=== modified file 'components/LargeImagePostItem.qml'
--- components/LargeImagePostItem.qml 2015-04-23 10:16:22 +0000
+++ components/LargeImagePostItem.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
Item {
id: postitemroot
=== modified file 'components/MoreCommentsItem.qml'
--- components/MoreCommentsItem.qml 2015-04-23 10:16:22 +0000
+++ components/MoreCommentsItem.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import "../utils/RedditLinker.js" as AutoLinkText
Rectangle {
=== modified file 'components/MultiColumnListView.qml'
--- components/MultiColumnListView.qml 2015-02-01 04:44:25 +0000
+++ components/MultiColumnListView.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
Flickable {
id: display
=== modified file 'components/PostCommentItem.qml'
--- components/PostCommentItem.qml 2015-04-23 10:16:22 +0000
+++ components/PostCommentItem.qml 2015-07-25 07:54:46 +0000
@@ -1,6 +1,5 @@
-import QtQuick 2.0
-import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import "../utils/RedditLinker.js" as AutoLinkText
Rectangle {
@@ -15,16 +14,6 @@
height: childrenRect.height
anchors.horizontalCenter: parent.horizontalCenter
- HapticsEffect {
- id: pressEffect
- attackIntensity: 0.0
- attackTime: 50
- intensity: 1.0
- duration: 10
- fadeTime: 50
- fadeIntensity: 0.0
- }
-
Column {
id: commentContents
anchors.left: parent.left
@@ -54,7 +43,7 @@
text: AutoLinkText.Autolinker.link(commentObj.data.body).replace(/\n/g, "
\n")
- onLinkActivated: { pressEffect.start(); postCommentItem.parent.linkActivated(link); }
+ onLinkActivated: { Haptics.play(); postCommentItem.parent.linkActivated(link); }
}
Item {
@@ -80,7 +69,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); postCommentItem.parent.upvoteClicked(); }
+ onClicked: { Haptics.play(); postCommentItem.parent.upvoteClicked(); }
}
}
Icon {
@@ -94,7 +83,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); postCommentItem.parent.downvoteClicked(); }
+ onClicked: { Haptics.play(); postCommentItem.parent.downvoteClicked(); }
}
}
Icon {
@@ -109,7 +98,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); postCommentItem.parent.replyClicked(); }
+ onClicked: { Haptics.play(); postCommentItem.parent.replyClicked(); }
}
}
}
=== modified file 'components/PostImage.qml'
--- components/PostImage.qml 2015-01-05 02:58:08 +0000
+++ components/PostImage.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
Image {
id: postThumbnail
=== modified file 'components/PostListItem.qml'
--- components/PostListItem.qml 2015-02-23 22:32:46 +0000
+++ components/PostListItem.qml 2015-07-25 07:54:46 +0000
@@ -1,6 +1,5 @@
-import QtQuick 2.0
-import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Connectivity 1.0
Item {
@@ -23,15 +22,6 @@
height: (postItemLoader.item) ? postItemLoader.item.height : 0
width: parent ? parent.width : 0
- HapticsEffect {
- id: pressEffect
- attackIntensity: 0.0
- attackTime: 50
- intensity: 1.0
- duration: 10
- fadeTime: 50
- fadeIntensity: 0.0
- }
Connections {
target: NetworkingStatus
// full status can be retrieved from the base C++ class
@@ -63,10 +53,10 @@
signal upvoteClicked
signal downvoteClicked
signal commentsClicked
- onClicked: { pressEffect.start(); postitemroot.clicked(); }
- onUpvoteClicked: { pressEffect.start(); postitemroot.upvoteClicked(); }
- onDownvoteClicked: { pressEffect.start(); postitemroot.downvoteClicked(); }
- onCommentsClicked: { pressEffect.start(); postitemroot.commentsClicked(); }
+ onClicked: { Haptics.play(); postitemroot.clicked(); }
+ onUpvoteClicked: { Haptics.play(); postitemroot.upvoteClicked(); }
+ onDownvoteClicked: { Haptics.play(); postitemroot.downvoteClicked(); }
+ onCommentsClicked: { Haptics.play(); postitemroot.commentsClicked(); }
source: {
//console.log('Link: '+url)
=== modified file 'components/PostMessageItem.qml'
--- components/PostMessageItem.qml 2015-04-23 10:16:22 +0000
+++ components/PostMessageItem.qml 2015-07-25 07:54:46 +0000
@@ -1,6 +1,5 @@
-import QtQuick 2.0
-import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import "../utils/RedditLinker.js" as AutoLinkText
Rectangle {
@@ -14,16 +13,6 @@
color: uReadIt.currentTheme.commentBackgroundColorEven
anchors.leftMargin: units.gu(5)
- HapticsEffect {
- id: pressEffect
- attackIntensity: 0.0
- attackTime: 50
- intensity: 1.0
- duration: 10
- fadeTime: 50
- fadeIntensity: 0.0
- }
-
Label {
id: name
anchors.left: parent.left
@@ -51,7 +40,7 @@
text: {
return AutoLinkText.Autolinker.link(postObj.data.selftext || postObj.data.body).replace(/\n/g, "
\n")
}
- onLinkActivated: { pressEffect.start(); postMessageItem.linkActivated(link); }
+ onLinkActivated: { Haptics.play(); postMessageItem.linkActivated(link); }
}
=== modified file 'components/ScrollToTop.qml'
--- components/ScrollToTop.qml 2015-04-07 02:00:13 +0000
+++ components/ScrollToTop.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
MouseArea {
anchors.fill: parent
=== modified file 'components/SmallImagePostItem.qml'
--- components/SmallImagePostItem.qml 2015-07-24 20:07:32 +0000
+++ components/SmallImagePostItem.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
Item {
id: postitemroot
=== modified file 'components/StretchRow.qml'
--- components/StretchRow.qml 2014-11-07 17:00:05 +0000
+++ components/StretchRow.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
Item {
=== modified file 'components/UserMessageItem.qml'
--- components/UserMessageItem.qml 2015-07-24 20:07:32 +0000
+++ components/UserMessageItem.qml 2015-07-25 07:54:46 +0000
@@ -1,6 +1,5 @@
-import QtQuick 2.0
-import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import "../utils/RedditLinker.js" as AutoLinkText
Rectangle {
@@ -27,16 +26,6 @@
signal replyClicked
signal readStatusClicked
- HapticsEffect {
- id: pressEffect
- attackIntensity: 0.0
- attackTime: 50
- intensity: 1.0
- duration: 10
- fadeTime: 50
- fadeIntensity: 0.0
- }
-
Column {
id: messageContents
@@ -60,7 +49,7 @@
visible: messageObj ? (messageObj.kind === "t1" || messageObj.kind === "t3") : false
MouseArea {
anchors.fill: parent
- onClicked: { pressEffect.start(); userMessageItem.clicked(); }
+ onClicked: { Haptics.play(); userMessageItem.clicked(); }
}
}
@@ -85,7 +74,7 @@
textFormat: Text.StyledText
text: AutoLinkText.Autolinker.link(messageObj.data.body).replace(/\n/g, "
\n")
- onLinkActivated: { pressEffect.start(); userMessageItem.linkActivated(link); }
+ onLinkActivated: { Haptics.play(); userMessageItem.linkActivated(link); }
}
@@ -106,7 +95,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); readStatusClicked(); }
+ onClicked: { Haptics.play(); readStatusClicked(); }
}
}
Icon {
@@ -121,7 +110,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); upvoteClicked(); }
+ onClicked: { Haptics.play(); upvoteClicked(); }
}
}
Icon {
@@ -136,7 +125,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); downvoteClicked(); }
+ onClicked: { Haptics.play(); downvoteClicked(); }
}
}
Icon {
@@ -152,7 +141,7 @@
anchors.centerIn: parent
height: parent.height * 2
width: parent.width * 2
- onClicked: { pressEffect.start(); replyClicked(); }
+ onClicked: { Haptics.play(); replyClicked(); }
}
}
}
=== modified file 'manifest.json'
--- manifest.json 2015-07-24 19:50:59 +0000
+++ manifest.json 2015-07-25 07:54:46 +0000
@@ -1,7 +1,7 @@
{
"architecture": "all",
"description": "Reddit browser for Ubuntu",
- "framework": "ubuntu-sdk-14.10-qml",
+ "framework": "ubuntu-sdk-15.04-qml",
"hooks": {
"ureadit": {
"apparmor": "ureadit.apparmor",
=== modified file 'models/QReddit/ConnectionObject.qml'
--- models/QReddit/ConnectionObject.qml 2014-11-07 17:00:05 +0000
+++ models/QReddit/ConnectionObject.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
QtObject {
id: connectionObject
=== modified file 'models/QReddit/MoreCommentsListModel.qml'
--- models/QReddit/MoreCommentsListModel.qml 2014-12-28 02:16:01 +0000
+++ models/QReddit/MoreCommentsListModel.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
import "QReddit.js" as QReddit
ListModel {
=== modified file 'models/QReddit/NotifierObject.qml'
--- models/QReddit/NotifierObject.qml 2015-01-13 03:02:31 +0000
+++ models/QReddit/NotifierObject.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
QtObject {
=== modified file 'models/QReddit/PostCommentsListModel.qml'
--- models/QReddit/PostCommentsListModel.qml 2015-04-29 00:16:36 +0000
+++ models/QReddit/PostCommentsListModel.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
import "QReddit.js" as QReddit
ListModel {
=== modified file 'models/QReddit/QRHelper.js'
--- models/QReddit/QRHelper.js 2014-11-07 17:00:05 +0000
+++ models/QReddit/QRHelper.js 2015-07-25 07:54:46 +0000
@@ -2,7 +2,7 @@
//TODO: change method of adding listElements from string manipulation to listModel function calls.
function arrayToListModel(array) {
- var listStr = "import QtQuick 2.0; ListModel { "
+ var listStr = "import QtQuick 2.4; ListModel { "
for (var i = 0; i < array.length; i++) {
listStr += "ListElement { name: '" + array[i] + "' } ";
}
=== modified file 'models/QReddit/QRObjects.js'
--- models/QReddit/QRObjects.js 2015-02-08 21:05:46 +0000
+++ models/QReddit/QRObjects.js 2015-07-25 07:54:46 +0000
@@ -110,7 +110,7 @@
}
function createTimer(timeout) {
- return Qt.createQmlObject('import QtQuick 2.0; Timer{ interval: ' + timeout + '; running: true; repeat: false}', Qt.application);
+ return Qt.createQmlObject('import QtQuick 2.4; Timer{ interval: ' + timeout + '; running: true; repeat: false}', Qt.application);
}
=== modified file 'models/QReddit/SubredditListModel.qml'
--- models/QReddit/SubredditListModel.qml 2015-04-29 00:16:36 +0000
+++ models/QReddit/SubredditListModel.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
import "QReddit.js" as QReddit
ListModel {
=== modified file 'models/QReddit/UserMessagesListModel.qml'
--- models/QReddit/UserMessagesListModel.qml 2015-01-13 03:02:31 +0000
+++ models/QReddit/UserMessagesListModel.qml 2015-07-25 07:54:46 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
import "QReddit.js" as QReddit
ListModel {
=== modified file 'po/template.pot'
--- po/template.pot 2015-07-24 19:50:59 +0000
+++ po/template.pot 2015-07-25 07:54:46 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-07 23:12-0400\n"
+"POT-Creation-Date: 2015-07-24 21:17+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -29,51 +29,67 @@
msgid "Share image"
msgstr ""
-#: ui/SettingsPage.qml:8 ui/Frontpage.qml:210
+#: ui/AboutPage.qml:8 ui/Frontpage.qml:219
+msgid "About"
+msgstr ""
+
+#: ui/AboutPage.qml:30
+msgid "Name"
+msgstr ""
+
+#: ui/AboutPage.qml:34
+msgid "Author"
+msgstr ""
+
+#: ui/AboutPage.qml:38
+msgid "Version"
+msgstr ""
+
+#: ui/AboutPage.qml:42
+msgid "Released"
+msgstr ""
+
+#: ui/SettingsPage.qml:8 ui/Frontpage.qml:211
msgid "Settings"
msgstr ""
-#: ui/SettingsPage.qml:15
+#: ui/SettingsPage.qml:19
msgid "Startup"
msgstr ""
-#: ui/SettingsPage.qml:18
+#: ui/SettingsPage.qml:22
msgid "Login automatically at startup"
msgstr ""
-#: ui/SettingsPage.qml:29
+#: ui/SettingsPage.qml:33
msgid "Internal Browser"
msgstr ""
-#: ui/SettingsPage.qml:33
+#: ui/SettingsPage.qml:37
msgid "Open links internally"
msgstr ""
-#: ui/SettingsPage.qml:44
+#: ui/SettingsPage.qml:48
msgid "Image Previews"
msgstr ""
-#: ui/SettingsPage.qml:52
+#: ui/SettingsPage.qml:56
msgid "Don't show images"
msgstr ""
-#: ui/SettingsPage.qml:52
+#: ui/SettingsPage.qml:56
msgid "Show large previews"
msgstr ""
-#: ui/SettingsPage.qml:52
+#: ui/SettingsPage.qml:56
msgid "Show thumbnail previews"
msgstr ""
-#: ui/SettingsPage.qml:60
+#: ui/SettingsPage.qml:64
msgid "Theme"
msgstr ""
-#: ui/ArticlePage.qml:99
-msgid "Share image link"
-msgstr ""
-
-#: ui/Frontpage.qml:18 ui/Frontpage.qml:266 ui/Frontpage.qml:470
+#: ui/Frontpage.qml:18 ui/Frontpage.qml:267 ui/Frontpage.qml:471
msgid "Frontpage"
msgstr ""
@@ -97,74 +113,99 @@
msgid "Rising"
msgstr ""
-#: ui/Frontpage.qml:86
+#: ui/Frontpage.qml:87
msgid "Subscriptions"
msgstr ""
-#: ui/Frontpage.qml:86
+#: ui/Frontpage.qml:87
msgid "Defaults"
msgstr ""
-#: ui/Frontpage.qml:86
+#: ui/Frontpage.qml:87
msgid "Search"
msgstr ""
-#: ui/Frontpage.qml:165
+#: ui/Frontpage.qml:166
msgid "Subreddit"
msgstr ""
-#: ui/Frontpage.qml:174
+#: ui/Frontpage.qml:175
msgid "Login"
msgstr ""
-#: ui/Frontpage.qml:183
+#: ui/Frontpage.qml:184
msgid "Inbox"
msgstr ""
-#: ui/Frontpage.qml:192
+#: ui/Frontpage.qml:193
msgid "New Unread"
msgstr ""
-#: ui/Frontpage.qml:201
+#: ui/Frontpage.qml:202
msgid "Users"
msgstr ""
-#: ui/Frontpage.qml:218 ui/AboutPage.qml:8
-msgid "About"
-msgstr ""
-
-#: ui/Frontpage.qml:226
+#: ui/Frontpage.qml:227
msgid "Logout"
msgstr ""
-#: ui/Frontpage.qml:245
+#: ui/Frontpage.qml:246
msgid "Back"
msgstr ""
-#: ui/Frontpage.qml:255
+#: ui/Frontpage.qml:256
msgid "Confirm"
msgstr ""
-#: ui/Frontpage.qml:472
+#: ui/Frontpage.qml:473
msgid "All"
msgstr ""
-#: ui/AboutPage.qml:26
-msgid "Name"
-msgstr ""
-
-#: ui/AboutPage.qml:30
-msgid "Author"
-msgstr ""
-
-#: ui/AboutPage.qml:34
-msgid "Version"
-msgstr ""
-
-#: ui/AboutPage.qml:38
-msgid "Released"
-msgstr ""
-
-#: Main.qml:137
+#: ui/ArticlePage.qml:99
+msgid "Share image link"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:11
+msgid "User Accounts"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:16
+msgid "Add Account"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:149
+msgid "No users found"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:150
+msgid "Press the add user header button to add a new user"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:160
+#, qt-format
+msgid "Change Password for: %1"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:164 ui/UserAccountsPage.qml:204
+msgid "Password"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:172 ui/UserAccountsPage.qml:212
+msgid "Save"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:181 ui/UserAccountsPage.qml:222
+msgid "Cancel"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:193
+msgid "Add User Account"
+msgstr ""
+
+#: ui/UserAccountsPage.qml:197
+msgid "Username"
+msgstr ""
+
+#: Main.qml:134
msgid "Link to a Reddit thread"
msgstr ""
=== modified file 'themes/Ambiance.qml'
--- themes/Ambiance.qml 2015-04-23 10:16:22 +0000
+++ themes/Ambiance.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.Themes.Ambiance 0.1
QtObject {
=== modified file 'themes/RedditDark.qml'
--- themes/RedditDark.qml 2015-03-17 00:48:30 +0000
+++ themes/RedditDark.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
QtObject {
// MainView
=== modified file 'themes/RedditLight.qml'
--- themes/RedditLight.qml 2015-03-17 00:48:30 +0000
+++ themes/RedditLight.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.Themes.Ambiance 0.1
QtObject {
=== modified file 'themes/ThemeManager.qml'
--- themes/ThemeManager.qml 2015-03-17 00:48:30 +0000
+++ themes/ThemeManager.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
QtObject {
id: themeManager
=== modified file 'ui/AboutPage.qml'
--- ui/AboutPage.qml 2015-07-22 19:56:20 +0000
+++ ui/AboutPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import "../manifest.js" as Manifest
=== modified file 'ui/ArticlePage.qml'
--- ui/ArticlePage.qml 2015-07-06 18:22:36 +0000
+++ ui/ArticlePage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0
import Ubuntu.Web 0.2
import Ubuntu.Content 0.1
=== modified file 'ui/CommentsPage.qml'
--- ui/CommentsPage.qml 2015-06-05 02:02:46 +0000
+++ ui/CommentsPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0
import "../models/QReddit"
import "../components"
=== modified file 'ui/Frontpage.qml'
--- ui/Frontpage.qml 2015-07-22 19:49:53 +0000
+++ ui/Frontpage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import "../components"
import "../models/QReddit"
@@ -400,7 +400,7 @@
if(pf.atYEnd && !pf.atYBeginning && (pf.contentHeight >= parent.height)) {
moreLoaderItem.overflow = pf.contentY - pf.contentHeight + pf.height
if ((moreLoaderItem.overflow > moreLoaderItem.loadMoreLength) && !moreLoaderItem.spaceRect) {
- moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.0; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", frontpage)
+ moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.4; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", frontpage)
postsModel.loadMore()
}
=== modified file 'ui/InternalBrowserPage.qml'
--- ui/InternalBrowserPage.qml 2015-02-08 21:05:46 +0000
+++ ui/InternalBrowserPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0
import Ubuntu.Web 0.2
import Ubuntu.Content 0.1
=== modified file 'ui/MoreCommentsPage.qml'
--- ui/MoreCommentsPage.qml 2015-04-23 10:16:22 +0000
+++ ui/MoreCommentsPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0
import "../models/QReddit"
import "../components"
=== modified file 'ui/PostMessagePage.qml'
--- ui/PostMessagePage.qml 2015-06-05 02:02:46 +0000
+++ ui/PostMessagePage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0
import "../components"
import "../models/QReddit/QReddit.js" as QReddit
=== modified file 'ui/SettingsPage.qml'
--- ui/SettingsPage.qml 2015-07-22 19:56:20 +0000
+++ ui/SettingsPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import Ubuntu.Components.Popups 1.0
=== modified file 'ui/ShareImagePage.qml'
--- ui/ShareImagePage.qml 2015-04-23 10:16:22 +0000
+++ ui/ShareImagePage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import Ubuntu.Content 0.1
=== modified file 'ui/ShareLinkPage.qml'
--- ui/ShareLinkPage.qml 2015-04-23 10:16:22 +0000
+++ ui/ShareLinkPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import Ubuntu.Components.Popups 1.0 as Popups
import Ubuntu.Content 0.1
=== modified file 'ui/SubredditPage.qml'
--- ui/SubredditPage.qml 2015-07-22 19:49:53 +0000
+++ ui/SubredditPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import "../components"
import "../models/QReddit"
@@ -140,7 +140,7 @@
if(pf.atYEnd && !pf.atYBeginning && (pf.contentHeight >= parent.height)) {
moreLoaderItem.overflow = pf.contentY - pf.contentHeight + pf.height
if ((moreLoaderItem.overflow > moreLoaderItem.loadMoreLength) && !moreLoaderItem.spaceRect) {
- moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.0; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", subredditpage)
+ moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.4; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", subredditpage)
postsModel.loadMore()
}
=== modified file 'ui/SubredditSwitcherPage.qml'
--- ui/SubredditSwitcherPage.qml 2015-04-07 02:00:13 +0000
+++ ui/SubredditSwitcherPage.qml 2015-07-25 07:54:46 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItems
import "../components"
import "../models/QReddit"
=== modified file 'ui/UserAccountsPage.qml'
--- ui/UserAccountsPage.qml 2015-01-05 02:58:08 +0000
+++ ui/UserAccountsPage.qml 2015-07-25 07:54:46 +0000
@@ -1,43 +1,107 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.1 as ListItems
import Ubuntu.Components.Popups 1.0
+import "../components"
Page {
id: accountsPage
- title: "User Accounts"
+
+ title: i18n.tr("User Accounts")
head.actions: [
Action {
id: addAccountAction
- text: "Add Account"
+ text: i18n.tr("Add Account")
iconName: 'new-contact'
onTriggered: {
PopupUtils.open(addAccountComponent)
}
}
-
]
+
+ ListModel {
+ id: usersModel
+ }
+
+ Component.onCompleted: {
+ loadUsersModel()
+ }
+
+ /*
+ Function to convert the users variable returned by uReadIt.qreddit.getUsers() into a listmodel
+ so that the listview can automatically update when model changes are made.
+ */
+ function loadUsersModel() {
+ usersModel.clear()
+ var users = uReadIt.qreddit.getUsers()
+ for (var i=0; i