Merge lp:~nik90/ureadit/migrate-15.04 into lp:ureadit/3.0

Proposed by Nekhelesh Ramananthan on 2015-07-24
Status: Needs review
Proposed branch: lp:~nik90/ureadit/migrate-15.04
Merge into: lp:ureadit/3.0
Diff against target: 1222 lines (+341/-217)
45 files modified
Main.qml (+2/-5)
components/BorderIcon.qml (+1/-1)
components/CommentListItem.qml (+2/-2)
components/EmptyState.qml (+49/-0)
components/KeyboardNavPage.qml (+2/-2)
components/LargeImagePostItem.qml (+2/-2)
components/MoreCommentsItem.qml (+2/-2)
components/MultiColumnListView.qml (+1/-1)
components/PostCommentItem.qml (+6/-17)
components/PostImage.qml (+1/-1)
components/PostListItem.qml (+6/-16)
components/PostMessageItem.qml (+3/-14)
components/ScrollToTop.qml (+1/-1)
components/SmallImagePostItem.qml (+2/-2)
components/StretchRow.qml (+1/-1)
components/UserMessageItem.qml (+8/-19)
manifest.json (+1/-1)
models/QReddit/ConnectionObject.qml (+1/-1)
models/QReddit/MoreCommentsListModel.qml (+1/-1)
models/QReddit/NotifierObject.qml (+1/-1)
models/QReddit/PostCommentsListModel.qml (+1/-1)
models/QReddit/QRHelper.js (+1/-1)
models/QReddit/QRObjects.js (+1/-1)
models/QReddit/SubredditListModel.qml (+1/-1)
models/QReddit/UserMessagesListModel.qml (+1/-1)
po/template.pot (+90/-49)
themes/Ambiance.qml (+2/-2)
themes/RedditDark.qml (+2/-2)
themes/RedditLight.qml (+2/-2)
themes/ThemeManager.qml (+2/-2)
ui/AboutPage.qml (+2/-2)
ui/ArticlePage.qml (+2/-2)
ui/CommentsPage.qml (+2/-2)
ui/Frontpage.qml (+3/-3)
ui/InternalBrowserPage.qml (+2/-2)
ui/MoreCommentsPage.qml (+2/-2)
ui/PostMessagePage.qml (+2/-2)
ui/SettingsPage.qml (+2/-2)
ui/ShareImagePage.qml (+2/-2)
ui/ShareLinkPage.qml (+2/-2)
ui/SubredditPage.qml (+3/-3)
ui/SubredditSwitcherPage.qml (+2/-2)
ui/UserAccountsPage.qml (+116/-36)
ui/UserMessagesPage.qml (+2/-2)
ureadit.apparmor (+1/-1)
To merge this branch: bzr merge lp:~nik90/ureadit/migrate-15.04
Reviewer Review Type Date Requested Status
Michael Hall 2015-07-24 Needs Information on 2015-07-25
Review via email: mp+265878@code.launchpad.net

Commit message

- Updated to 15.04 framework and QtQuick 2.4
- Removed uses of Haptics{} since it is now provided by the SDK as a singleton (already landed in stable phone images)
- Migrated UserAccountsPage to the new listitem. Fixed bug where a new user added is not shown by the listview immediately.
- Added an empty state to the user accounts page
- Made the UserAccountsPage strings translatable

Description of the change

This MP implements the following,

- Updated to 15.04 framework and QtQuick 2.4
- Removed uses of Haptics{} since it is now provided by the SDK as a singleton (already landed in stable phone images)
- Migrated UserAccountsPage to the new listitem. Fixed bug where a new user added is not shown by the listview immediately.
- Added an empty state to the user accounts page
- Made the UserAccountsPage strings translatable

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

I was meaning to push this for review, but completely forgot it during the last few days.

Michael Hall (mhall119) wrote :

Does Haptics.play() give the same intensity/duration as the manually defined one I was using?

review: Needs Information
Nekhelesh Ramananthan (nik90) wrote :

Fixed the EmptyState inline comment regarding Ubuntu.Components import version.

> Does Haptics.play() give the same intensity/duration as the manually defined
> one I was using?

It is possible to use custom values by doing something like Haptics.play({attackIntensity: 0.0, duration: 10, attackTime: 50, intensity: 1.0, fadeTime: 50, fadeIntensity: 0.0 }). May I ask the reason for custom values?

Haptics.play() will use the default values used elsewhere by the SDK while clicking on the back button, listitems etc.

Do you want me to set the custom values?

lp:~nik90/ureadit/migrate-15.04 updated on 2015-07-25
55. By Nekhelesh Ramananthan on 2015-07-25

Updated empty state ubuntu components import version

Unmerged revisions

55. By Nekhelesh Ramananthan on 2015-07-25

Updated empty state ubuntu components import version

54. By Nekhelesh Ramananthan on 2015-07-24

Added thin divider for listitem

53. By Nekhelesh Ramananthan on 2015-07-24

Merged lp:ureadit

52. By Nekhelesh Ramananthan on 2015-07-24

Fixed spacing in UserMessageItem.qml

51. By Nekhelesh Ramananthan on 2015-06-25

Made the UserAccountsPage strings translatable

50. By Nekhelesh Ramananthan on 2015-06-25

Added an empty state to the user accounts page

49. By Nekhelesh Ramananthan on 2015-06-25

Migrated UserAccountsPage to the new listitem. Fixed bug where a new user added is not shown by the listview immediately

48. By Nekhelesh Ramananthan on 2015-06-25

Removed uses of Haptics{} since it is now provided by the SDK as a singleton

47. By Nekhelesh Ramananthan on 2015-06-25

Updated to 15.04 Framework and QtQuick 2.4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Main.qml'
2--- Main.qml 2015-07-24 19:50:59 +0000
3+++ Main.qml 2015-07-25 07:54:46 +0000
4@@ -1,5 +1,5 @@
5-import QtQuick 2.0
6-import Ubuntu.Components 1.1
7+import QtQuick 2.4
8+import Ubuntu.Components 1.2
9 import Qt.labs.settings 1.0
10
11 import "ui"
12@@ -25,9 +25,6 @@
13 */
14 automaticOrientation: true
15
16- // Removes the old toolbar and enables new features of the new header.
17- useDeprecatedToolbar: false
18-
19 // Make room for the keyboard
20 anchorToKeyboard: true
21
22
23=== modified file 'components/BorderIcon.qml'
24--- components/BorderIcon.qml 2014-12-21 20:02:53 +0000
25+++ components/BorderIcon.qml 2015-07-25 07:54:46 +0000
26@@ -14,7 +14,7 @@
27 * along with this program. If not, see <http://www.gnu.org/licenses/>.
28 */
29
30-import QtQuick 2.0
31+import QtQuick 2.4
32
33 Item {
34 id: icon
35
36=== modified file 'components/CommentListItem.qml'
37--- components/CommentListItem.qml 2015-02-08 21:05:46 +0000
38+++ components/CommentListItem.qml 2015-07-25 07:54:46 +0000
39@@ -1,5 +1,5 @@
40-import QtQuick 2.0
41-import Ubuntu.Components 1.1
42+import QtQuick 2.4
43+import Ubuntu.Components 1.2
44
45 Item {
46 id: commentitemroot
47
48=== added file 'components/EmptyState.qml'
49--- components/EmptyState.qml 1970-01-01 00:00:00 +0000
50+++ components/EmptyState.qml 2015-07-25 07:54:46 +0000
51@@ -0,0 +1,49 @@
52+import QtQuick 2.4
53+import Ubuntu.Components 1.2
54+
55+Item {
56+ id: emptyState
57+
58+ // Public APIs
59+ property alias iconName: emptyIcon.name
60+ property alias title: emptyLabel.text
61+ property alias subTitle: emptySublabel.text
62+ property alias iconSource: emptyIcon.source
63+
64+ property real iconHeight: units.gu(10)
65+ property real iconWidth: units.gu(10)
66+
67+ height: childrenRect.height
68+ anchors.left: parent.left
69+ anchors.right: parent.right
70+ anchors.margins: units.gu(2)
71+
72+ Icon {
73+ id: emptyIcon
74+ width: parent.iconWidth
75+ height: parent.iconHeight
76+ color: uReadIt.currentTheme.baseFontColor
77+ anchors.horizontalCenter: parent.horizontalCenter
78+ }
79+
80+ Label {
81+ id: emptyLabel
82+ anchors.top: emptyIcon.bottom
83+ anchors.topMargin: units.gu(5)
84+ width: parent.width
85+ fontSize: "large"
86+ font.bold: true
87+ color: uReadIt.currentTheme.baseFontColor
88+ horizontalAlignment: Text.AlignHCenter
89+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
90+ }
91+
92+ Label {
93+ id: emptySublabel
94+ width: parent.width
95+ anchors.top: emptyLabel.bottom
96+ color: uReadIt.currentTheme.baseFontColor
97+ horizontalAlignment: Text.AlignHCenter
98+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
99+ }
100+}
101
102=== modified file 'components/KeyboardNavPage.qml'
103--- components/KeyboardNavPage.qml 2015-04-23 10:16:22 +0000
104+++ components/KeyboardNavPage.qml 2015-07-25 07:54:46 +0000
105@@ -1,5 +1,5 @@
106-import QtQuick 2.0
107-import Ubuntu.Components 1.1
108+import QtQuick 2.4
109+import Ubuntu.Components 1.2
110
111 Page {
112
113
114=== modified file 'components/LargeImagePostItem.qml'
115--- components/LargeImagePostItem.qml 2015-04-23 10:16:22 +0000
116+++ components/LargeImagePostItem.qml 2015-07-25 07:54:46 +0000
117@@ -1,5 +1,5 @@
118-import QtQuick 2.0
119-import Ubuntu.Components 1.1
120+import QtQuick 2.4
121+import Ubuntu.Components 1.2
122
123 Item {
124 id: postitemroot
125
126=== modified file 'components/MoreCommentsItem.qml'
127--- components/MoreCommentsItem.qml 2015-04-23 10:16:22 +0000
128+++ components/MoreCommentsItem.qml 2015-07-25 07:54:46 +0000
129@@ -1,5 +1,5 @@
130-import QtQuick 2.0
131-import Ubuntu.Components 1.1
132+import QtQuick 2.4
133+import Ubuntu.Components 1.2
134 import "../utils/RedditLinker.js" as AutoLinkText
135
136 Rectangle {
137
138=== modified file 'components/MultiColumnListView.qml'
139--- components/MultiColumnListView.qml 2015-02-01 04:44:25 +0000
140+++ components/MultiColumnListView.qml 2015-07-25 07:54:46 +0000
141@@ -1,4 +1,4 @@
142-import QtQuick 2.0
143+import QtQuick 2.4
144
145 Flickable {
146 id: display
147
148=== modified file 'components/PostCommentItem.qml'
149--- components/PostCommentItem.qml 2015-04-23 10:16:22 +0000
150+++ components/PostCommentItem.qml 2015-07-25 07:54:46 +0000
151@@ -1,6 +1,5 @@
152-import QtQuick 2.0
153-import QtFeedback 5.0
154-import Ubuntu.Components 1.1
155+import QtQuick 2.4
156+import Ubuntu.Components 1.2
157 import "../utils/RedditLinker.js" as AutoLinkText
158
159 Rectangle {
160@@ -15,16 +14,6 @@
161 height: childrenRect.height
162 anchors.horizontalCenter: parent.horizontalCenter
163
164- HapticsEffect {
165- id: pressEffect
166- attackIntensity: 0.0
167- attackTime: 50
168- intensity: 1.0
169- duration: 10
170- fadeTime: 50
171- fadeIntensity: 0.0
172- }
173-
174 Column {
175 id: commentContents
176 anchors.left: parent.left
177@@ -54,7 +43,7 @@
178
179 text: AutoLinkText.Autolinker.link(commentObj.data.body).replace(/\n/g, "<br>\n")
180
181- onLinkActivated: { pressEffect.start(); postCommentItem.parent.linkActivated(link); }
182+ onLinkActivated: { Haptics.play(); postCommentItem.parent.linkActivated(link); }
183 }
184
185 Item {
186@@ -80,7 +69,7 @@
187 anchors.centerIn: parent
188 height: parent.height * 2
189 width: parent.width * 2
190- onClicked: { pressEffect.start(); postCommentItem.parent.upvoteClicked(); }
191+ onClicked: { Haptics.play(); postCommentItem.parent.upvoteClicked(); }
192 }
193 }
194 Icon {
195@@ -94,7 +83,7 @@
196 anchors.centerIn: parent
197 height: parent.height * 2
198 width: parent.width * 2
199- onClicked: { pressEffect.start(); postCommentItem.parent.downvoteClicked(); }
200+ onClicked: { Haptics.play(); postCommentItem.parent.downvoteClicked(); }
201 }
202 }
203 Icon {
204@@ -109,7 +98,7 @@
205 anchors.centerIn: parent
206 height: parent.height * 2
207 width: parent.width * 2
208- onClicked: { pressEffect.start(); postCommentItem.parent.replyClicked(); }
209+ onClicked: { Haptics.play(); postCommentItem.parent.replyClicked(); }
210 }
211 }
212 }
213
214=== modified file 'components/PostImage.qml'
215--- components/PostImage.qml 2015-01-05 02:58:08 +0000
216+++ components/PostImage.qml 2015-07-25 07:54:46 +0000
217@@ -1,4 +1,4 @@
218-import QtQuick 2.0
219+import QtQuick 2.4
220
221 Image {
222 id: postThumbnail
223
224=== modified file 'components/PostListItem.qml'
225--- components/PostListItem.qml 2015-02-23 22:32:46 +0000
226+++ components/PostListItem.qml 2015-07-25 07:54:46 +0000
227@@ -1,6 +1,5 @@
228-import QtQuick 2.0
229-import QtFeedback 5.0
230-import Ubuntu.Components 1.1
231+import QtQuick 2.4
232+import Ubuntu.Components 1.2
233 import Ubuntu.Connectivity 1.0
234
235 Item {
236@@ -23,15 +22,6 @@
237 height: (postItemLoader.item) ? postItemLoader.item.height : 0
238 width: parent ? parent.width : 0
239
240- HapticsEffect {
241- id: pressEffect
242- attackIntensity: 0.0
243- attackTime: 50
244- intensity: 1.0
245- duration: 10
246- fadeTime: 50
247- fadeIntensity: 0.0
248- }
249 Connections {
250 target: NetworkingStatus
251 // full status can be retrieved from the base C++ class
252@@ -63,10 +53,10 @@
253 signal upvoteClicked
254 signal downvoteClicked
255 signal commentsClicked
256- onClicked: { pressEffect.start(); postitemroot.clicked(); }
257- onUpvoteClicked: { pressEffect.start(); postitemroot.upvoteClicked(); }
258- onDownvoteClicked: { pressEffect.start(); postitemroot.downvoteClicked(); }
259- onCommentsClicked: { pressEffect.start(); postitemroot.commentsClicked(); }
260+ onClicked: { Haptics.play(); postitemroot.clicked(); }
261+ onUpvoteClicked: { Haptics.play(); postitemroot.upvoteClicked(); }
262+ onDownvoteClicked: { Haptics.play(); postitemroot.downvoteClicked(); }
263+ onCommentsClicked: { Haptics.play(); postitemroot.commentsClicked(); }
264
265 source: {
266 //console.log('Link: '+url)
267
268=== modified file 'components/PostMessageItem.qml'
269--- components/PostMessageItem.qml 2015-04-23 10:16:22 +0000
270+++ components/PostMessageItem.qml 2015-07-25 07:54:46 +0000
271@@ -1,6 +1,5 @@
272-import QtQuick 2.0
273-import QtFeedback 5.0
274-import Ubuntu.Components 1.1
275+import QtQuick 2.4
276+import Ubuntu.Components 1.2
277 import "../utils/RedditLinker.js" as AutoLinkText
278
279 Rectangle {
280@@ -14,16 +13,6 @@
281 color: uReadIt.currentTheme.commentBackgroundColorEven
282 anchors.leftMargin: units.gu(5)
283
284- HapticsEffect {
285- id: pressEffect
286- attackIntensity: 0.0
287- attackTime: 50
288- intensity: 1.0
289- duration: 10
290- fadeTime: 50
291- fadeIntensity: 0.0
292- }
293-
294 Label {
295 id: name
296 anchors.left: parent.left
297@@ -51,7 +40,7 @@
298 text: {
299 return AutoLinkText.Autolinker.link(postObj.data.selftext || postObj.data.body).replace(/\n/g, "<br>\n")
300 }
301- onLinkActivated: { pressEffect.start(); postMessageItem.linkActivated(link); }
302+ onLinkActivated: { Haptics.play(); postMessageItem.linkActivated(link); }
303
304 }
305
306
307=== modified file 'components/ScrollToTop.qml'
308--- components/ScrollToTop.qml 2015-04-07 02:00:13 +0000
309+++ components/ScrollToTop.qml 2015-07-25 07:54:46 +0000
310@@ -1,4 +1,4 @@
311-import QtQuick 2.0
312+import QtQuick 2.4
313
314 MouseArea {
315 anchors.fill: parent
316
317=== modified file 'components/SmallImagePostItem.qml'
318--- components/SmallImagePostItem.qml 2015-07-24 20:07:32 +0000
319+++ components/SmallImagePostItem.qml 2015-07-25 07:54:46 +0000
320@@ -1,5 +1,5 @@
321-import QtQuick 2.0
322-import Ubuntu.Components 1.1
323+import QtQuick 2.4
324+import Ubuntu.Components 1.2
325
326 Item {
327 id: postitemroot
328
329=== modified file 'components/StretchRow.qml'
330--- components/StretchRow.qml 2014-11-07 17:00:05 +0000
331+++ components/StretchRow.qml 2015-07-25 07:54:46 +0000
332@@ -1,4 +1,4 @@
333-import QtQuick 2.0
334+import QtQuick 2.4
335
336 Item {
337
338
339=== modified file 'components/UserMessageItem.qml'
340--- components/UserMessageItem.qml 2015-07-24 20:07:32 +0000
341+++ components/UserMessageItem.qml 2015-07-25 07:54:46 +0000
342@@ -1,6 +1,5 @@
343-import QtQuick 2.0
344-import QtFeedback 5.0
345-import Ubuntu.Components 1.1
346+import QtQuick 2.4
347+import Ubuntu.Components 1.2
348 import "../utils/RedditLinker.js" as AutoLinkText
349
350 Rectangle {
351@@ -27,16 +26,6 @@
352 signal replyClicked
353 signal readStatusClicked
354
355- HapticsEffect {
356- id: pressEffect
357- attackIntensity: 0.0
358- attackTime: 50
359- intensity: 1.0
360- duration: 10
361- fadeTime: 50
362- fadeIntensity: 0.0
363- }
364-
365 Column {
366 id: messageContents
367
368@@ -60,7 +49,7 @@
369 visible: messageObj ? (messageObj.kind === "t1" || messageObj.kind === "t3") : false
370 MouseArea {
371 anchors.fill: parent
372- onClicked: { pressEffect.start(); userMessageItem.clicked(); }
373+ onClicked: { Haptics.play(); userMessageItem.clicked(); }
374 }
375 }
376
377@@ -85,7 +74,7 @@
378 textFormat: Text.StyledText
379
380 text: AutoLinkText.Autolinker.link(messageObj.data.body).replace(/\n/g, "<br>\n")
381- onLinkActivated: { pressEffect.start(); userMessageItem.linkActivated(link); }
382+ onLinkActivated: { Haptics.play(); userMessageItem.linkActivated(link); }
383
384 }
385
386@@ -106,7 +95,7 @@
387 anchors.centerIn: parent
388 height: parent.height * 2
389 width: parent.width * 2
390- onClicked: { pressEffect.start(); readStatusClicked(); }
391+ onClicked: { Haptics.play(); readStatusClicked(); }
392 }
393 }
394 Icon {
395@@ -121,7 +110,7 @@
396 anchors.centerIn: parent
397 height: parent.height * 2
398 width: parent.width * 2
399- onClicked: { pressEffect.start(); upvoteClicked(); }
400+ onClicked: { Haptics.play(); upvoteClicked(); }
401 }
402 }
403 Icon {
404@@ -136,7 +125,7 @@
405 anchors.centerIn: parent
406 height: parent.height * 2
407 width: parent.width * 2
408- onClicked: { pressEffect.start(); downvoteClicked(); }
409+ onClicked: { Haptics.play(); downvoteClicked(); }
410 }
411 }
412 Icon {
413@@ -152,7 +141,7 @@
414 anchors.centerIn: parent
415 height: parent.height * 2
416 width: parent.width * 2
417- onClicked: { pressEffect.start(); replyClicked(); }
418+ onClicked: { Haptics.play(); replyClicked(); }
419 }
420 }
421 }
422
423=== modified file 'manifest.json'
424--- manifest.json 2015-07-24 19:50:59 +0000
425+++ manifest.json 2015-07-25 07:54:46 +0000
426@@ -1,7 +1,7 @@
427 {
428 "architecture": "all",
429 "description": "Reddit browser for Ubuntu",
430- "framework": "ubuntu-sdk-14.10-qml",
431+ "framework": "ubuntu-sdk-15.04-qml",
432 "hooks": {
433 "ureadit": {
434 "apparmor": "ureadit.apparmor",
435
436=== modified file 'models/QReddit/ConnectionObject.qml'
437--- models/QReddit/ConnectionObject.qml 2014-11-07 17:00:05 +0000
438+++ models/QReddit/ConnectionObject.qml 2015-07-25 07:54:46 +0000
439@@ -1,4 +1,4 @@
440-import QtQuick 2.0
441+import QtQuick 2.4
442
443 QtObject {
444 id: connectionObject
445
446=== modified file 'models/QReddit/MoreCommentsListModel.qml'
447--- models/QReddit/MoreCommentsListModel.qml 2014-12-28 02:16:01 +0000
448+++ models/QReddit/MoreCommentsListModel.qml 2015-07-25 07:54:46 +0000
449@@ -1,4 +1,4 @@
450-import QtQuick 2.0
451+import QtQuick 2.4
452 import "QReddit.js" as QReddit
453
454 ListModel {
455
456=== modified file 'models/QReddit/NotifierObject.qml'
457--- models/QReddit/NotifierObject.qml 2015-01-13 03:02:31 +0000
458+++ models/QReddit/NotifierObject.qml 2015-07-25 07:54:46 +0000
459@@ -1,4 +1,4 @@
460-import QtQuick 2.0
461+import QtQuick 2.4
462
463 QtObject {
464
465
466=== modified file 'models/QReddit/PostCommentsListModel.qml'
467--- models/QReddit/PostCommentsListModel.qml 2015-04-29 00:16:36 +0000
468+++ models/QReddit/PostCommentsListModel.qml 2015-07-25 07:54:46 +0000
469@@ -1,4 +1,4 @@
470-import QtQuick 2.0
471+import QtQuick 2.4
472 import "QReddit.js" as QReddit
473
474 ListModel {
475
476=== modified file 'models/QReddit/QRHelper.js'
477--- models/QReddit/QRHelper.js 2014-11-07 17:00:05 +0000
478+++ models/QReddit/QRHelper.js 2015-07-25 07:54:46 +0000
479@@ -2,7 +2,7 @@
480
481 //TODO: change method of adding listElements from string manipulation to listModel function calls.
482 function arrayToListModel(array) {
483- var listStr = "import QtQuick 2.0; ListModel { "
484+ var listStr = "import QtQuick 2.4; ListModel { "
485 for (var i = 0; i < array.length; i++) {
486 listStr += "ListElement { name: '" + array[i] + "' } ";
487 }
488
489=== modified file 'models/QReddit/QRObjects.js'
490--- models/QReddit/QRObjects.js 2015-02-08 21:05:46 +0000
491+++ models/QReddit/QRObjects.js 2015-07-25 07:54:46 +0000
492@@ -110,7 +110,7 @@
493 }
494
495 function createTimer(timeout) {
496- return Qt.createQmlObject('import QtQuick 2.0; Timer{ interval: ' + timeout + '; running: true; repeat: false}', Qt.application);
497+ return Qt.createQmlObject('import QtQuick 2.4; Timer{ interval: ' + timeout + '; running: true; repeat: false}', Qt.application);
498 }
499
500
501
502=== modified file 'models/QReddit/SubredditListModel.qml'
503--- models/QReddit/SubredditListModel.qml 2015-04-29 00:16:36 +0000
504+++ models/QReddit/SubredditListModel.qml 2015-07-25 07:54:46 +0000
505@@ -1,4 +1,4 @@
506-import QtQuick 2.0
507+import QtQuick 2.4
508 import "QReddit.js" as QReddit
509
510 ListModel {
511
512=== modified file 'models/QReddit/UserMessagesListModel.qml'
513--- models/QReddit/UserMessagesListModel.qml 2015-01-13 03:02:31 +0000
514+++ models/QReddit/UserMessagesListModel.qml 2015-07-25 07:54:46 +0000
515@@ -1,4 +1,4 @@
516-import QtQuick 2.0
517+import QtQuick 2.4
518 import "QReddit.js" as QReddit
519
520 ListModel {
521
522=== modified file 'po/template.pot'
523--- po/template.pot 2015-07-24 19:50:59 +0000
524+++ po/template.pot 2015-07-25 07:54:46 +0000
525@@ -8,7 +8,7 @@
526 msgstr ""
527 "Project-Id-Version: PACKAGE VERSION\n"
528 "Report-Msgid-Bugs-To: \n"
529-"POT-Creation-Date: 2015-07-07 23:12-0400\n"
530+"POT-Creation-Date: 2015-07-24 21:17+0000\n"
531 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
532 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
533 "Language-Team: LANGUAGE <LL@li.org>\n"
534@@ -29,51 +29,67 @@
535 msgid "Share image"
536 msgstr ""
537
538-#: ui/SettingsPage.qml:8 ui/Frontpage.qml:210
539+#: ui/AboutPage.qml:8 ui/Frontpage.qml:219
540+msgid "About"
541+msgstr ""
542+
543+#: ui/AboutPage.qml:30
544+msgid "Name"
545+msgstr ""
546+
547+#: ui/AboutPage.qml:34
548+msgid "Author"
549+msgstr ""
550+
551+#: ui/AboutPage.qml:38
552+msgid "Version"
553+msgstr ""
554+
555+#: ui/AboutPage.qml:42
556+msgid "Released"
557+msgstr ""
558+
559+#: ui/SettingsPage.qml:8 ui/Frontpage.qml:211
560 msgid "Settings"
561 msgstr ""
562
563-#: ui/SettingsPage.qml:15
564+#: ui/SettingsPage.qml:19
565 msgid "Startup"
566 msgstr ""
567
568-#: ui/SettingsPage.qml:18
569+#: ui/SettingsPage.qml:22
570 msgid "Login automatically at startup"
571 msgstr ""
572
573-#: ui/SettingsPage.qml:29
574+#: ui/SettingsPage.qml:33
575 msgid "Internal Browser"
576 msgstr ""
577
578-#: ui/SettingsPage.qml:33
579+#: ui/SettingsPage.qml:37
580 msgid "Open links internally"
581 msgstr ""
582
583-#: ui/SettingsPage.qml:44
584+#: ui/SettingsPage.qml:48
585 msgid "Image Previews"
586 msgstr ""
587
588-#: ui/SettingsPage.qml:52
589+#: ui/SettingsPage.qml:56
590 msgid "Don't show images"
591 msgstr ""
592
593-#: ui/SettingsPage.qml:52
594+#: ui/SettingsPage.qml:56
595 msgid "Show large previews"
596 msgstr ""
597
598-#: ui/SettingsPage.qml:52
599+#: ui/SettingsPage.qml:56
600 msgid "Show thumbnail previews"
601 msgstr ""
602
603-#: ui/SettingsPage.qml:60
604+#: ui/SettingsPage.qml:64
605 msgid "Theme"
606 msgstr ""
607
608-#: ui/ArticlePage.qml:99
609-msgid "Share image link"
610-msgstr ""
611-
612-#: ui/Frontpage.qml:18 ui/Frontpage.qml:266 ui/Frontpage.qml:470
613+#: ui/Frontpage.qml:18 ui/Frontpage.qml:267 ui/Frontpage.qml:471
614 msgid "Frontpage"
615 msgstr ""
616
617@@ -97,74 +113,99 @@
618 msgid "Rising"
619 msgstr ""
620
621-#: ui/Frontpage.qml:86
622+#: ui/Frontpage.qml:87
623 msgid "Subscriptions"
624 msgstr ""
625
626-#: ui/Frontpage.qml:86
627+#: ui/Frontpage.qml:87
628 msgid "Defaults"
629 msgstr ""
630
631-#: ui/Frontpage.qml:86
632+#: ui/Frontpage.qml:87
633 msgid "Search"
634 msgstr ""
635
636-#: ui/Frontpage.qml:165
637+#: ui/Frontpage.qml:166
638 msgid "Subreddit"
639 msgstr ""
640
641-#: ui/Frontpage.qml:174
642+#: ui/Frontpage.qml:175
643 msgid "Login"
644 msgstr ""
645
646-#: ui/Frontpage.qml:183
647+#: ui/Frontpage.qml:184
648 msgid "Inbox"
649 msgstr ""
650
651-#: ui/Frontpage.qml:192
652+#: ui/Frontpage.qml:193
653 msgid "New Unread"
654 msgstr ""
655
656-#: ui/Frontpage.qml:201
657+#: ui/Frontpage.qml:202
658 msgid "Users"
659 msgstr ""
660
661-#: ui/Frontpage.qml:218 ui/AboutPage.qml:8
662-msgid "About"
663-msgstr ""
664-
665-#: ui/Frontpage.qml:226
666+#: ui/Frontpage.qml:227
667 msgid "Logout"
668 msgstr ""
669
670-#: ui/Frontpage.qml:245
671+#: ui/Frontpage.qml:246
672 msgid "Back"
673 msgstr ""
674
675-#: ui/Frontpage.qml:255
676+#: ui/Frontpage.qml:256
677 msgid "Confirm"
678 msgstr ""
679
680-#: ui/Frontpage.qml:472
681+#: ui/Frontpage.qml:473
682 msgid "All"
683 msgstr ""
684
685-#: ui/AboutPage.qml:26
686-msgid "Name"
687-msgstr ""
688-
689-#: ui/AboutPage.qml:30
690-msgid "Author"
691-msgstr ""
692-
693-#: ui/AboutPage.qml:34
694-msgid "Version"
695-msgstr ""
696-
697-#: ui/AboutPage.qml:38
698-msgid "Released"
699-msgstr ""
700-
701-#: Main.qml:137
702+#: ui/ArticlePage.qml:99
703+msgid "Share image link"
704+msgstr ""
705+
706+#: ui/UserAccountsPage.qml:11
707+msgid "User Accounts"
708+msgstr ""
709+
710+#: ui/UserAccountsPage.qml:16
711+msgid "Add Account"
712+msgstr ""
713+
714+#: ui/UserAccountsPage.qml:149
715+msgid "No users found"
716+msgstr ""
717+
718+#: ui/UserAccountsPage.qml:150
719+msgid "Press the add user header button to add a new user"
720+msgstr ""
721+
722+#: ui/UserAccountsPage.qml:160
723+#, qt-format
724+msgid "Change Password for: %1"
725+msgstr ""
726+
727+#: ui/UserAccountsPage.qml:164 ui/UserAccountsPage.qml:204
728+msgid "Password"
729+msgstr ""
730+
731+#: ui/UserAccountsPage.qml:172 ui/UserAccountsPage.qml:212
732+msgid "Save"
733+msgstr ""
734+
735+#: ui/UserAccountsPage.qml:181 ui/UserAccountsPage.qml:222
736+msgid "Cancel"
737+msgstr ""
738+
739+#: ui/UserAccountsPage.qml:193
740+msgid "Add User Account"
741+msgstr ""
742+
743+#: ui/UserAccountsPage.qml:197
744+msgid "Username"
745+msgstr ""
746+
747+#: Main.qml:134
748 msgid "Link to a Reddit thread"
749 msgstr ""
750
751=== modified file 'themes/Ambiance.qml'
752--- themes/Ambiance.qml 2015-04-23 10:16:22 +0000
753+++ themes/Ambiance.qml 2015-07-25 07:54:46 +0000
754@@ -1,5 +1,5 @@
755-import QtQuick 2.0
756-import Ubuntu.Components 1.1
757+import QtQuick 2.4
758+import Ubuntu.Components 1.2
759 import Ubuntu.Components.Themes.Ambiance 0.1
760
761 QtObject {
762
763=== modified file 'themes/RedditDark.qml'
764--- themes/RedditDark.qml 2015-03-17 00:48:30 +0000
765+++ themes/RedditDark.qml 2015-07-25 07:54:46 +0000
766@@ -1,5 +1,5 @@
767-import QtQuick 2.0
768-import Ubuntu.Components 1.1
769+import QtQuick 2.4
770+import Ubuntu.Components 1.2
771
772 QtObject {
773 // MainView
774
775=== modified file 'themes/RedditLight.qml'
776--- themes/RedditLight.qml 2015-03-17 00:48:30 +0000
777+++ themes/RedditLight.qml 2015-07-25 07:54:46 +0000
778@@ -1,5 +1,5 @@
779-import QtQuick 2.0
780-import Ubuntu.Components 1.1
781+import QtQuick 2.4
782+import Ubuntu.Components 1.2
783 import Ubuntu.Components.Themes.Ambiance 0.1
784
785 QtObject {
786
787=== modified file 'themes/ThemeManager.qml'
788--- themes/ThemeManager.qml 2015-03-17 00:48:30 +0000
789+++ themes/ThemeManager.qml 2015-07-25 07:54:46 +0000
790@@ -1,5 +1,5 @@
791-import QtQuick 2.0
792-import Ubuntu.Components 1.1
793+import QtQuick 2.4
794+import Ubuntu.Components 1.2
795
796 QtObject {
797 id: themeManager
798
799=== modified file 'ui/AboutPage.qml'
800--- ui/AboutPage.qml 2015-07-22 19:56:20 +0000
801+++ ui/AboutPage.qml 2015-07-25 07:54:46 +0000
802@@ -1,5 +1,5 @@
803-import QtQuick 2.0
804-import Ubuntu.Components 1.1
805+import QtQuick 2.4
806+import Ubuntu.Components 1.2
807 import Ubuntu.Components.ListItems 1.0 as ListItems
808 import "../manifest.js" as Manifest
809
810
811=== modified file 'ui/ArticlePage.qml'
812--- ui/ArticlePage.qml 2015-07-06 18:22:36 +0000
813+++ ui/ArticlePage.qml 2015-07-25 07:54:46 +0000
814@@ -1,5 +1,5 @@
815-import QtQuick 2.0
816-import Ubuntu.Components 1.1
817+import QtQuick 2.4
818+import Ubuntu.Components 1.2
819 import Ubuntu.Components.ListItems 1.0
820 import Ubuntu.Web 0.2
821 import Ubuntu.Content 0.1
822
823=== modified file 'ui/CommentsPage.qml'
824--- ui/CommentsPage.qml 2015-06-05 02:02:46 +0000
825+++ ui/CommentsPage.qml 2015-07-25 07:54:46 +0000
826@@ -1,5 +1,5 @@
827-import QtQuick 2.0
828-import Ubuntu.Components 1.1
829+import QtQuick 2.4
830+import Ubuntu.Components 1.2
831 import Ubuntu.Components.ListItems 1.0
832 import "../models/QReddit"
833 import "../components"
834
835=== modified file 'ui/Frontpage.qml'
836--- ui/Frontpage.qml 2015-07-22 19:49:53 +0000
837+++ ui/Frontpage.qml 2015-07-25 07:54:46 +0000
838@@ -1,5 +1,5 @@
839-import QtQuick 2.0
840-import Ubuntu.Components 1.1
841+import QtQuick 2.4
842+import Ubuntu.Components 1.2
843 import Ubuntu.Components.ListItems 1.0 as ListItems
844 import "../components"
845 import "../models/QReddit"
846@@ -400,7 +400,7 @@
847 if(pf.atYEnd && !pf.atYBeginning && (pf.contentHeight >= parent.height)) {
848 moreLoaderItem.overflow = pf.contentY - pf.contentHeight + pf.height
849 if ((moreLoaderItem.overflow > moreLoaderItem.loadMoreLength) && !moreLoaderItem.spaceRect) {
850- moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.0; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", frontpage)
851+ moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.4; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", frontpage)
852 postsModel.loadMore()
853 }
854
855
856=== modified file 'ui/InternalBrowserPage.qml'
857--- ui/InternalBrowserPage.qml 2015-02-08 21:05:46 +0000
858+++ ui/InternalBrowserPage.qml 2015-07-25 07:54:46 +0000
859@@ -1,5 +1,5 @@
860-import QtQuick 2.0
861-import Ubuntu.Components 1.1
862+import QtQuick 2.4
863+import Ubuntu.Components 1.2
864 import Ubuntu.Components.ListItems 1.0
865 import Ubuntu.Web 0.2
866 import Ubuntu.Content 0.1
867
868=== modified file 'ui/MoreCommentsPage.qml'
869--- ui/MoreCommentsPage.qml 2015-04-23 10:16:22 +0000
870+++ ui/MoreCommentsPage.qml 2015-07-25 07:54:46 +0000
871@@ -1,5 +1,5 @@
872-import QtQuick 2.0
873-import Ubuntu.Components 1.1
874+import QtQuick 2.4
875+import Ubuntu.Components 1.2
876 import Ubuntu.Components.ListItems 1.0
877 import "../models/QReddit"
878 import "../components"
879
880=== modified file 'ui/PostMessagePage.qml'
881--- ui/PostMessagePage.qml 2015-06-05 02:02:46 +0000
882+++ ui/PostMessagePage.qml 2015-07-25 07:54:46 +0000
883@@ -1,5 +1,5 @@
884-import QtQuick 2.0
885-import Ubuntu.Components 1.1
886+import QtQuick 2.4
887+import Ubuntu.Components 1.2
888 import Ubuntu.Components.ListItems 1.0
889 import "../components"
890 import "../models/QReddit/QReddit.js" as QReddit
891
892=== modified file 'ui/SettingsPage.qml'
893--- ui/SettingsPage.qml 2015-07-22 19:56:20 +0000
894+++ ui/SettingsPage.qml 2015-07-25 07:54:46 +0000
895@@ -1,5 +1,5 @@
896-import QtQuick 2.0
897-import Ubuntu.Components 1.1
898+import QtQuick 2.4
899+import Ubuntu.Components 1.2
900 import Ubuntu.Components.ListItems 1.0 as ListItems
901 import Ubuntu.Components.Popups 1.0
902
903
904=== modified file 'ui/ShareImagePage.qml'
905--- ui/ShareImagePage.qml 2015-04-23 10:16:22 +0000
906+++ ui/ShareImagePage.qml 2015-07-25 07:54:46 +0000
907@@ -1,5 +1,5 @@
908-import QtQuick 2.0
909-import Ubuntu.Components 1.1
910+import QtQuick 2.4
911+import Ubuntu.Components 1.2
912 import Ubuntu.Components.ListItems 1.0 as ListItems
913 import Ubuntu.Content 0.1
914
915
916=== modified file 'ui/ShareLinkPage.qml'
917--- ui/ShareLinkPage.qml 2015-04-23 10:16:22 +0000
918+++ ui/ShareLinkPage.qml 2015-07-25 07:54:46 +0000
919@@ -1,5 +1,5 @@
920-import QtQuick 2.0
921-import Ubuntu.Components 1.1
922+import QtQuick 2.4
923+import Ubuntu.Components 1.2
924 import Ubuntu.Components.ListItems 1.0 as ListItems
925 import Ubuntu.Components.Popups 1.0 as Popups
926 import Ubuntu.Content 0.1
927
928=== modified file 'ui/SubredditPage.qml'
929--- ui/SubredditPage.qml 2015-07-22 19:49:53 +0000
930+++ ui/SubredditPage.qml 2015-07-25 07:54:46 +0000
931@@ -1,5 +1,5 @@
932-import QtQuick 2.0
933-import Ubuntu.Components 1.1
934+import QtQuick 2.4
935+import Ubuntu.Components 1.2
936 import Ubuntu.Components.ListItems 1.0 as ListItems
937 import "../components"
938 import "../models/QReddit"
939@@ -140,7 +140,7 @@
940 if(pf.atYEnd && !pf.atYBeginning && (pf.contentHeight >= parent.height)) {
941 moreLoaderItem.overflow = pf.contentY - pf.contentHeight + pf.height
942 if ((moreLoaderItem.overflow > moreLoaderItem.loadMoreLength) && !moreLoaderItem.spaceRect) {
943- moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.0; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", subredditpage)
944+ moreLoaderItem.spaceRect = Qt.createQmlObject("import QtQuick 2.4; Item{width: 1; height: " + moreLoaderItem.loadMoreLength + "}", subredditpage)
945 postsModel.loadMore()
946 }
947
948
949=== modified file 'ui/SubredditSwitcherPage.qml'
950--- ui/SubredditSwitcherPage.qml 2015-04-07 02:00:13 +0000
951+++ ui/SubredditSwitcherPage.qml 2015-07-25 07:54:46 +0000
952@@ -1,5 +1,5 @@
953-import QtQuick 2.0
954-import Ubuntu.Components 1.1
955+import QtQuick 2.4
956+import Ubuntu.Components 1.2
957 import Ubuntu.Components.ListItems 1.0 as ListItems
958 import "../components"
959 import "../models/QReddit"
960
961=== modified file 'ui/UserAccountsPage.qml'
962--- ui/UserAccountsPage.qml 2015-01-05 02:58:08 +0000
963+++ ui/UserAccountsPage.qml 2015-07-25 07:54:46 +0000
964@@ -1,43 +1,107 @@
965-import QtQuick 2.0
966-import Ubuntu.Components 1.1
967-import Ubuntu.Components.ListItems 1.0 as ListItems
968+import QtQuick 2.4
969+import QtQuick.Layouts 1.1
970+import Ubuntu.Components 1.2
971+import Ubuntu.Components.ListItems 1.1 as ListItems
972 import Ubuntu.Components.Popups 1.0
973+import "../components"
974
975 Page {
976 id: accountsPage
977- title: "User Accounts"
978+
979+ title: i18n.tr("User Accounts")
980
981 head.actions: [
982 Action {
983 id: addAccountAction
984- text: "Add Account"
985+ text: i18n.tr("Add Account")
986 iconName: 'new-contact'
987 onTriggered: {
988 PopupUtils.open(addAccountComponent)
989 }
990 }
991-
992 ]
993+
994+ ListModel {
995+ id: usersModel
996+ }
997+
998+ Component.onCompleted: {
999+ loadUsersModel()
1000+ }
1001+
1002+ /*
1003+ Function to convert the users variable returned by uReadIt.qreddit.getUsers() into a listmodel
1004+ so that the listview can automatically update when model changes are made.
1005+ */
1006+ function loadUsersModel() {
1007+ usersModel.clear()
1008+ var users = uReadIt.qreddit.getUsers()
1009+ for (var i=0; i<users.length; i++) {
1010+ usersModel.append({"name" : users[i]})
1011+ }
1012+ }
1013+
1014 ListView {
1015 id: accountsList
1016+
1017 anchors.fill: parent
1018-
1019- model: uReadIt.qreddit.getUsers()
1020-
1021- delegate: ListItems.Standard {
1022- text: modelData || "Anonymous"
1023- progression: true
1024- removable: (modelData) ? true : false
1025- confirmRemoval: true
1026- iconName: 'contact'
1027- iconSource: {
1028- if (!modelData) {
1029- return ""
1030- } else if (uReadIt.qreddit.notifier.isLoggedIn && modelData == uReadIt.qreddit.notifier.activeUser) {
1031- return Qt.resolvedUrl('../images/contact-active.svg')
1032- } else {
1033- return Qt.resolvedUrl('../images/contact.svg')
1034- }
1035+ model: usersModel
1036+
1037+ delegate: ListItem {
1038+ id: listitem
1039+
1040+ divider.visible: false
1041+
1042+ ListItems.ThinDivider { anchors.bottom: parent.bottom }
1043+
1044+ RowLayout {
1045+ spacing: units.gu(2)
1046+ anchors.left: parent.left
1047+ anchors.right: parent.right
1048+ anchors.margins: units.gu(2)
1049+ height: parent.height
1050+
1051+ Icon {
1052+ anchors.verticalCenter: parent.verticalCenter
1053+ width: units.gu(3)
1054+ height: width
1055+ name: 'contact'
1056+ source: {
1057+ if (!modelData) {
1058+ return ""
1059+ } else if (uReadIt.qreddit.notifier.isLoggedIn && modelData == uReadIt.qreddit.notifier.activeUser) {
1060+ return Qt.resolvedUrl('../images/contact-active.svg')
1061+ } else {
1062+ return Qt.resolvedUrl('../images/contact.svg')
1063+ }
1064+ }
1065+ }
1066+
1067+ Label {
1068+ text: modelData || "Anonymous"
1069+ Layout.fillWidth: true
1070+ anchors.verticalCenter: parent.verticalCenter
1071+ }
1072+
1073+ Icon {
1074+ name: 'go-next'
1075+ width: units.gu(2)
1076+ height: width
1077+ anchors.verticalCenter: parent.verticalCenter
1078+ }
1079+ }
1080+
1081+ leadingActions: ListItemActions {
1082+ actions: [
1083+ Action {
1084+ enabled: modelData ? true : false
1085+ iconName: 'delete'
1086+ onTriggered: {
1087+ uReadIt.qreddit.deleteUser(modelData)
1088+ usersModel.remove(index, 1)
1089+ }
1090+ }
1091+ ]
1092 }
1093
1094 onClicked: {
1095@@ -65,10 +129,25 @@
1096 PopupUtils.open(editAccountComponent, null, {'username':modelData, 'text':response})
1097 })
1098 }
1099-
1100- onItemRemoved: {
1101- uReadIt.qreddit.deleteUser(modelData)
1102- }
1103+ }
1104+ }
1105+
1106+ Loader {
1107+ id: emptyState
1108+ anchors.left: parent.left
1109+ anchors.right: parent.right
1110+ anchors.verticalCenter: parent.verticalCenter
1111+ sourceComponent: usersModel.count === 0 ? emptyStateComponent : undefined
1112+ }
1113+
1114+ Component {
1115+ id: emptyStateComponent
1116+ EmptyState {
1117+ iconHeight: units.gu(12)
1118+ iconWidth: units.gu(12)
1119+ iconSource: Qt.resolvedUrl("../images/contact-active.svg")
1120+ title: i18n.tr("No users found")
1121+ subTitle: i18n.tr("Press the add user header button to add a new user")
1122 }
1123 }
1124
1125@@ -78,11 +157,11 @@
1126 Dialog {
1127 id: editAccountDialog
1128 property string username: ""
1129- title: "Change Password for: "+username
1130+ title: i18n.tr("Change Password for: %1").arg(username)
1131
1132 TextField {
1133 id: editPasswordField
1134- placeholderText: "Password"
1135+ placeholderText: i18n.tr("Password")
1136 width: parent.width
1137 text: ""
1138 echoMode: TextInput.PasswordEchoOnEdit
1139@@ -90,7 +169,7 @@
1140 }
1141 Button {
1142 id: editConfirmButton
1143- text: "Save"
1144+ text: i18n.tr("Save")
1145 gradient: UbuntuColors.orangeGradient
1146 onClicked: {
1147 uReadIt.qreddit._addUser(username, editPasswordField.text)
1148@@ -99,7 +178,7 @@
1149 }
1150 Button {
1151 id: addCancelButton
1152- text: "Cancel"
1153+ text: i18n.tr("Cancel")
1154 onClicked: {
1155 PopupUtils.close(editAccountDialog)
1156 }
1157@@ -111,18 +190,18 @@
1158
1159 Dialog {
1160 id: addAccountDialog
1161- title: "Add User Account"
1162+ title: i18n.tr("Add User Account")
1163
1164 TextField {
1165 id: addUsernameField
1166- placeholderText: "Username"
1167+ placeholderText: i18n.tr("Username")
1168 width: parent.width
1169 //text: ""
1170 //inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase
1171 }
1172 TextField {
1173 id: addPasswordField
1174- placeholderText: "Password"
1175+ placeholderText: i18n.tr("Password")
1176 width: parent.width
1177 text: ""
1178 echoMode: TextInput.PasswordEchoOnEdit
1179@@ -130,16 +209,17 @@
1180 }
1181 Button {
1182 id: addConfirmButton
1183- text: "Save"
1184+ text: i18n.tr("Save")
1185 gradient: UbuntuColors.orangeGradient
1186 onClicked: {
1187 uReadIt.qreddit._addUser(addUsernameField.text, addPasswordField.text)
1188+ usersModel.append({"name": addUsernameField.text})
1189 PopupUtils.close(addAccountDialog)
1190 }
1191 }
1192 Button {
1193 id: addCancelButton
1194- text: "Cancel"
1195+ text: i18n.tr("Cancel")
1196 onClicked: {
1197 PopupUtils.close(addAccountDialog)
1198 }
1199
1200=== modified file 'ui/UserMessagesPage.qml'
1201--- ui/UserMessagesPage.qml 2015-07-24 20:07:32 +0000
1202+++ ui/UserMessagesPage.qml 2015-07-25 07:54:46 +0000
1203@@ -1,5 +1,5 @@
1204-import QtQuick 2.0
1205-import Ubuntu.Components 1.1
1206+import QtQuick 2.4
1207+import Ubuntu.Components 1.2
1208 import Ubuntu.Components.ListItems 1.0
1209 import "../models/QReddit"
1210 import "../components"
1211
1212=== modified file 'ureadit.apparmor'
1213--- ureadit.apparmor 2015-04-28 21:48:12 +0000
1214+++ ureadit.apparmor 2015-07-25 07:54:46 +0000
1215@@ -6,5 +6,5 @@
1216 "content_exchange_source",
1217 "content_exchange"
1218 ],
1219- "policy_version": 1.2
1220+ "policy_version": 1.3
1221 }
1222\ No newline at end of file

Subscribers

People subscribed via source and target branches