Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/uitk-1_3 into lp:ubuntu-rssreader-app

  1. uitk-1_3
  2. Merge into reboot
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 410
Merged at revision: 410
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/uitk-1_3
Merge into: lp:ubuntu-rssreader-app
Diff against target: 589 lines (+105/-97)
29 files modified
manifest.json.in (+1/-1)
shorts.apparmor (+1/-1)
shorts/po/com.ubuntu.shorts.pot (+38/-30)
shorts/qml/components/ArticleViewItem.qml (+3/-3)
shorts/qml/components/BottomEdgeTabs.qml (+1/-1)
shorts/qml/components/FakeHeader.qml (+1/-1)
shorts/qml/components/GridModeItem.qml (+3/-3)
shorts/qml/components/ListModeItem.qml (+3/-3)
shorts/qml/components/NetworkManager.qml (+3/-3)
shorts/qml/components/OrganicGrid.qml (+1/-1)
shorts/qml/components/ReadingOptions.qml (+3/-3)
shorts/qml/content/SharePage.qml (+1/-1)
shorts/qml/delegates/ArticleFullImg.qml (+2/-2)
shorts/qml/delegates/ArticleOneImgA.qml (+2/-2)
shorts/qml/delegates/ArticleTextA.qml (+2/-2)
shorts/qml/delegates/ArticleTextB.qml (+2/-2)
shorts/qml/pages/AppendFeedPage.qml (+3/-3)
shorts/qml/pages/ArticleViewPage.qml (+3/-3)
shorts/qml/pages/ChooseTopicPage.qml (+3/-3)
shorts/qml/pages/CreateTopicPage.qml (+3/-3)
shorts/qml/pages/EditFeedPage.qml (+5/-5)
shorts/qml/pages/FeedComponent.qml (+1/-1)
shorts/qml/pages/TopicComponent.qml (+2/-2)
shorts/qml/pages/TopicManagement.qml (+3/-3)
shorts/qml/shorts-app.qml (+3/-3)
shorts/qml/tabs/BaseTab.qml (+3/-3)
shorts/qml/tabs/SavedTab.qml (+3/-3)
shorts/qml/tabs/ShortsTab.qml (+3/-3)
shorts/qml/tabs/TopicTab.qml (+3/-3)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/uitk-1_3
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Roman Shchekin Needs Fixing
Review via email: mp+275620@code.launchpad.net

Commit message

migrate to UITK 1.3

Description of the change

migrate to UITK 1.3

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:410
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/3/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/53/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote :

Please see inline comments!

Revision history for this message
Roman Shchekin (mrqtros) wrote :

Misslicked on "Approve", but you should fix some staff :)

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:410
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/344/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/72/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/69/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/344/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/200/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-autolanding/52/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-autolanding/22/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:410
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/134/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/8/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.in'
2--- manifest.json.in 2015-07-17 14:42:42 +0000
3+++ manifest.json.in 2015-10-24 07:10:31 +0000
4@@ -1,7 +1,7 @@
5 {
6 "architecture": "@CLICK_ARCH@",
7 "description": "Rss Reader application",
8- "framework": "ubuntu-sdk-15.04",
9+ "framework": "ubuntu-sdk-15.04.1-qml",
10 "hooks": {
11 "shorts": {
12 "apparmor": "shorts.apparmor",
13
14=== modified file 'shorts.apparmor'
15--- shorts.apparmor 2015-07-04 08:38:18 +0000
16+++ shorts.apparmor 2015-10-24 07:10:31 +0000
17@@ -4,4 +4,4 @@
18 "content_exchange_source"
19 ],
20 "policy_version": 1.3
21-}
22\ No newline at end of file
23+}
24
25=== modified file 'shorts/po/com.ubuntu.shorts.pot'
26--- shorts/po/com.ubuntu.shorts.pot 2015-08-11 12:07:22 +0000
27+++ shorts/po/com.ubuntu.shorts.pot 2015-10-24 07:10:31 +0000
28@@ -8,7 +8,7 @@
29 msgstr ""
30 "Project-Id-Version: \n"
31 "Report-Msgid-Bugs-To: \n"
32-"POT-Creation-Date: 2015-08-11 20:00+0800\n"
33+"POT-Creation-Date: 2015-10-23 22:15+0800\n"
34 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
35 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
36 "Language-Team: LANGUAGE <LL@li.org>\n"
37@@ -18,32 +18,32 @@
38 "Content-Transfer-Encoding: 8bit\n"
39 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
40
41-#: ../qml/components/ArticleViewItem.qml:122
42+#: ../qml/components/ArticleViewItem.qml:120
43 msgid "Select article"
44 msgstr ""
45
46-#: ../qml/components/ReadingOptions.qml:40
47+#: ../qml/components/ReadingOptions.qml:39
48 msgid "Dark"
49 msgstr ""
50
51-#: ../qml/components/ReadingOptions.qml:50
52+#: ../qml/components/ReadingOptions.qml:46
53 msgid "Light"
54 msgstr ""
55
56-#: ../qml/components/ReadingOptions.qml:107
57+#: ../qml/components/ReadingOptions.qml:96
58 msgid "Small"
59 msgstr ""
60
61-#: ../qml/components/ReadingOptions.qml:109
62-msgid "Mid"
63+#: ../qml/components/ReadingOptions.qml:98
64+msgid "Normal"
65 msgstr ""
66
67-#: ../qml/components/ReadingOptions.qml:110
68+#: ../qml/components/ReadingOptions.qml:99
69 msgid "Large"
70 msgstr ""
71
72-#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:234
73-#: ../qml/shorts-app.qml:369
74+#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:243
75+#: ../qml/shorts-app.qml:378
76 msgid "Add feeds"
77 msgstr ""
78
79@@ -63,28 +63,28 @@
80 msgid "Type a keyword or URL"
81 msgstr ""
82
83-#: ../qml/pages/AppendFeedPage.qml:187
84+#: ../qml/pages/AppendFeedPage.qml:185
85 msgid "Search results"
86 msgstr ""
87
88-#: ../qml/pages/AppendFeedPage.qml:245 ../qml/pages/CreateTopicPage.qml:38
89-#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:447
90+#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
91+#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:456
92 msgid "Cancel"
93 msgstr ""
94
95-#: ../qml/pages/AppendFeedPage.qml:278
96+#: ../qml/pages/AppendFeedPage.qml:276
97 msgid "Next"
98 msgstr ""
99
100-#: ../qml/pages/AppendFeedPage.qml:307 ../qml/pages/CreateTopicPage.qml:181
101+#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
102 msgid "No feeds"
103 msgstr ""
104
105-#: ../qml/pages/ArticleViewPage.qml:44
106+#: ../qml/pages/ArticleViewPage.qml:47
107 msgid "Save"
108 msgstr ""
109
110-#: ../qml/pages/ArticleViewPage.qml:44
111+#: ../qml/pages/ArticleViewPage.qml:47
112 msgid "Remove"
113 msgstr ""
114
115@@ -161,7 +161,7 @@
116 msgid "Topic: "
117 msgstr ""
118
119-#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:218
120+#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:217
121 msgid "Edit topics"
122 msgstr ""
123
124@@ -185,51 +185,59 @@
125 msgid "List view"
126 msgstr ""
127
128-#: ../qml/shorts-app.qml:300
129+#: ../qml/shorts-app.qml:227
130+msgid "Disable night mode"
131+msgstr ""
132+
133+#: ../qml/shorts-app.qml:227
134+msgid "Enable night mode"
135+msgstr ""
136+
137+#: ../qml/shorts-app.qml:309
138 msgid "Saved"
139 msgstr ""
140
141-#: ../qml/shorts-app.qml:308 shorts.desktop.in.in.h:1
142+#: ../qml/shorts-app.qml:317 shorts.desktop.in.in.h:1
143 msgid "Shorts"
144 msgstr ""
145
146-#: ../qml/shorts-app.qml:439
147+#: ../qml/shorts-app.qml:448
148 msgid "Checking for new articles"
149 msgstr ""
150
151-#: ../qml/shorts-app.qml:463
152+#: ../qml/shorts-app.qml:472
153 msgid "Perhaps some of the channels have not been updated."
154 msgstr ""
155
156-#: ../qml/shorts-app.qml:464
157+#: ../qml/shorts-app.qml:473
158 msgid "Errors occurred during the update"
159 msgstr ""
160
161-#: ../qml/shorts-app.qml:482
162+#: ../qml/shorts-app.qml:491
163 msgid "+ Add feeds"
164 msgstr ""
165
166-#: ../qml/shorts-app.qml:494
167+#: ../qml/shorts-app.qml:503
168 msgid "Add online accounts"
169 msgstr ""
170
171-#: ../qml/shorts-app.qml:497
172+#: ../qml/shorts-app.qml:506
173 msgid "Online accounts are not available for now"
174 msgstr ""
175
176-#: ../qml/shorts-app.qml:498 ../qml/shorts-app.qml:507
177+#: ../qml/shorts-app.qml:507 ../qml/shorts-app.qml:516
178 msgid "We are sorry"
179 msgstr ""
180
181-#: ../qml/shorts-app.qml:503
182+#: ../qml/shorts-app.qml:512
183 msgid "Import subscriptions"
184 msgstr ""
185
186-#: ../qml/shorts-app.qml:506
187+#: ../qml/shorts-app.qml:515
188 msgid "Importing subscriptions is not available for now"
189 msgstr ""
190
191-#: ../qml/shorts-app.qml:521
192+#: ../qml/shorts-app.qml:530
193 msgid "Ok"
194 msgstr ""
195
196
197=== modified file 'shorts/qml/components/ArticleViewItem.qml'
198--- shorts/qml/components/ArticleViewItem.qml 2015-10-10 11:24:04 +0000
199+++ shorts/qml/components/ArticleViewItem.qml 2015-10-24 07:10:31 +0000
200@@ -8,9 +8,9 @@
201
202 import QtQuick 2.4
203 import QtQuick.XmlListModel 2.0
204-import Ubuntu.Components 1.2
205-import Ubuntu.Components.ListItems 1.0 as ListItem
206-import Ubuntu.Components.Popups 1.0
207+import Ubuntu.Components 1.3
208+import Ubuntu.Components.ListItems 1.3 as ListItem
209+import Ubuntu.Components.Popups 1.3
210
211 import "../utils/dateutils.js" as DateUtils
212 import "../utils/databasemodule_v2.js" as DB
213
214=== modified file 'shorts/qml/components/BottomEdgeTabs.qml'
215--- shorts/qml/components/BottomEdgeTabs.qml 2015-07-04 08:38:18 +0000
216+++ shorts/qml/components/BottomEdgeTabs.qml 2015-10-24 07:10:31 +0000
217@@ -73,7 +73,7 @@
218 */
219
220 import QtQuick 2.4
221-import Ubuntu.Components 1.2
222+import Ubuntu.Components 1.3
223
224 Tabs {
225 id: page
226
227=== modified file 'shorts/qml/components/FakeHeader.qml'
228--- shorts/qml/components/FakeHeader.qml 2015-07-04 08:38:18 +0000
229+++ shorts/qml/components/FakeHeader.qml 2015-10-24 07:10:31 +0000
230@@ -17,7 +17,7 @@
231 */
232
233 import QtQuick 2.4
234-import Ubuntu.Components 1.2
235+import Ubuntu.Components 1.3
236
237 Column {
238 id: fakeHeader
239
240=== modified file 'shorts/qml/components/GridModeItem.qml'
241--- shorts/qml/components/GridModeItem.qml 2015-07-04 08:38:18 +0000
242+++ shorts/qml/components/GridModeItem.qml 2015-10-24 07:10:31 +0000
243@@ -1,7 +1,7 @@
244 import QtQuick 2.4
245-import Ubuntu.Components 1.2
246-import Ubuntu.Components.ListItems 1.0 as ListItem
247-import Ubuntu.Components.Popups 1.0
248+import Ubuntu.Components 1.3
249+import Ubuntu.Components.ListItems 1.3 as ListItem
250+import Ubuntu.Components.Popups 1.3
251
252 Item {
253 id: gridPage
254
255=== modified file 'shorts/qml/components/ListModeItem.qml'
256--- shorts/qml/components/ListModeItem.qml 2015-10-10 11:24:04 +0000
257+++ shorts/qml/components/ListModeItem.qml 2015-10-24 07:10:31 +0000
258@@ -1,7 +1,7 @@
259 import QtQuick 2.4
260-import Ubuntu.Components 1.2
261-import Ubuntu.Components.ListItems 1.0 as ListItems
262-import Ubuntu.Components.Popups 1.0
263+import Ubuntu.Components 1.3
264+import Ubuntu.Components.ListItems 1.3 as ListItems
265+import Ubuntu.Components.Popups 1.3
266
267 import "../utils/dateutils.js" as DateUtils
268
269
270=== modified file 'shorts/qml/components/NetworkManager.qml'
271--- shorts/qml/components/NetworkManager.qml 2015-07-04 08:38:18 +0000
272+++ shorts/qml/components/NetworkManager.qml 2015-10-24 07:10:31 +0000
273@@ -1,9 +1,9 @@
274 import QtQuick 2.4
275 import QtQuick.XmlListModel 2.0
276
277-import Ubuntu.Components 1.2
278-import Ubuntu.Components.ListItems 1.0 as ListItems
279-import Ubuntu.Components.Popups 1.0
280+import Ubuntu.Components 1.3
281+import Ubuntu.Components.ListItems 1.3 as ListItems
282+import Ubuntu.Components.Popups 1.3
283
284 import "../utils/databasemodule_v2.js" as DB
285 import "../utils/imgSeparator.js" as ImageUtils
286
287=== modified file 'shorts/qml/components/OrganicGrid.qml'
288--- shorts/qml/components/OrganicGrid.qml 2015-10-10 11:24:04 +0000
289+++ shorts/qml/components/OrganicGrid.qml 2015-10-24 07:10:31 +0000
290@@ -1,6 +1,6 @@
291 import QtQuick 2.4
292 import QtGraphicalEffects 1.0
293-import Ubuntu.Components 1.2
294+import Ubuntu.Components 1.3
295
296 Item {
297 id: organicGridRoot
298
299=== modified file 'shorts/qml/components/ReadingOptions.qml'
300--- shorts/qml/components/ReadingOptions.qml 2015-10-10 11:24:04 +0000
301+++ shorts/qml/components/ReadingOptions.qml 2015-10-24 07:10:31 +0000
302@@ -8,9 +8,9 @@
303
304 import QtQuick 2.4
305 import QtQuick.XmlListModel 2.0
306-import Ubuntu.Components 1.2
307-import Ubuntu.Components.ListItems 1.0 as ListItem
308-import Ubuntu.Components.Popups 1.0
309+import Ubuntu.Components 1.3
310+import Ubuntu.Components.ListItems 1.3 as ListItem
311+import Ubuntu.Components.Popups 1.3
312
313 Popover {
314 id: readingOptionsPopover
315
316=== modified file 'shorts/qml/content/SharePage.qml'
317--- shorts/qml/content/SharePage.qml 2015-07-04 08:38:18 +0000
318+++ shorts/qml/content/SharePage.qml 2015-10-24 07:10:31 +0000
319@@ -1,5 +1,5 @@
320 import QtQuick 2.4
321-import Ubuntu.Components 1.2
322+import Ubuntu.Components 1.3
323 import Ubuntu.Content 1.1
324
325 Page {
326
327=== modified file 'shorts/qml/delegates/ArticleFullImg.qml'
328--- shorts/qml/delegates/ArticleFullImg.qml 2015-10-10 11:24:04 +0000
329+++ shorts/qml/delegates/ArticleFullImg.qml 2015-10-24 07:10:31 +0000
330@@ -1,6 +1,6 @@
331 import QtQuick 2.4
332-import Ubuntu.Components 1.2
333-import Ubuntu.Components.ListItems 1.0 as ListItem
334+import Ubuntu.Components 1.3
335+import Ubuntu.Components.ListItems 1.3 as ListItem
336
337 import "../utils/dateutils.js" as DateUtils
338
339
340=== modified file 'shorts/qml/delegates/ArticleOneImgA.qml'
341--- shorts/qml/delegates/ArticleOneImgA.qml 2015-10-10 11:24:04 +0000
342+++ shorts/qml/delegates/ArticleOneImgA.qml 2015-10-24 07:10:31 +0000
343@@ -1,6 +1,6 @@
344 import QtQuick 2.4
345-import Ubuntu.Components 1.2
346-import Ubuntu.Components.ListItems 1.0 as ListItem
347+import Ubuntu.Components 1.3
348+import Ubuntu.Components.ListItems 1.3 as ListItem
349
350 import "../utils/dateutils.js" as DateUtils
351
352
353=== modified file 'shorts/qml/delegates/ArticleTextA.qml'
354--- shorts/qml/delegates/ArticleTextA.qml 2015-10-10 11:24:04 +0000
355+++ shorts/qml/delegates/ArticleTextA.qml 2015-10-24 07:10:31 +0000
356@@ -1,6 +1,6 @@
357 import QtQuick 2.4
358-import Ubuntu.Components 1.2
359-import Ubuntu.Components.ListItems 1.0 as ListItem
360+import Ubuntu.Components 1.3
361+import Ubuntu.Components.ListItems 1.3 as ListItem
362
363 import "../utils/dateutils.js" as DateUtils
364
365
366=== modified file 'shorts/qml/delegates/ArticleTextB.qml'
367--- shorts/qml/delegates/ArticleTextB.qml 2015-10-10 11:24:04 +0000
368+++ shorts/qml/delegates/ArticleTextB.qml 2015-10-24 07:10:31 +0000
369@@ -1,6 +1,6 @@
370 import QtQuick 2.4
371-import Ubuntu.Components 1.2
372-import Ubuntu.Components.ListItems 1.0 as ListItem
373+import Ubuntu.Components 1.3
374+import Ubuntu.Components.ListItems 1.3 as ListItem
375
376 import "../utils/dateutils.js" as DateUtils
377
378
379=== modified file 'shorts/qml/pages/AppendFeedPage.qml'
380--- shorts/qml/pages/AppendFeedPage.qml 2015-10-10 11:24:04 +0000
381+++ shorts/qml/pages/AppendFeedPage.qml 2015-10-24 07:10:31 +0000
382@@ -16,9 +16,9 @@
383
384 import QtQuick 2.4
385 import QtQuick.XmlListModel 2.0
386-import Ubuntu.Components 1.2
387-import Ubuntu.Components.ListItems 1.0 as ListItem
388-import Ubuntu.Components.Popups 1.0
389+import Ubuntu.Components 1.3
390+import Ubuntu.Components.ListItems 1.3 as ListItem
391+import Ubuntu.Components.Popups 1.3
392
393 import "../components"
394 import "../utils/databasemodule_v2.js" as DB
395
396=== modified file 'shorts/qml/pages/ArticleViewPage.qml'
397--- shorts/qml/pages/ArticleViewPage.qml 2015-10-10 11:24:04 +0000
398+++ shorts/qml/pages/ArticleViewPage.qml 2015-10-24 07:10:31 +0000
399@@ -8,9 +8,9 @@
400
401 import QtQuick 2.4
402 import QtQuick.XmlListModel 2.0
403-import Ubuntu.Components 1.2
404-import Ubuntu.Components.ListItems 1.0 as ListItem
405-import Ubuntu.Components.Popups 1.0
406+import Ubuntu.Components 1.3
407+import Ubuntu.Components.ListItems 1.3 as ListItem
408+import Ubuntu.Components.Popups 1.3
409
410 import "../components"
411 import "../utils/dateutils.js" as DateUtils
412
413=== modified file 'shorts/qml/pages/ChooseTopicPage.qml'
414--- shorts/qml/pages/ChooseTopicPage.qml 2015-07-04 08:38:18 +0000
415+++ shorts/qml/pages/ChooseTopicPage.qml 2015-10-24 07:10:31 +0000
416@@ -1,8 +1,8 @@
417 import QtQuick 2.4
418 import QtQuick.XmlListModel 2.0
419-import Ubuntu.Components 1.2
420-import Ubuntu.Components.ListItems 1.0 as ListItem
421-import Ubuntu.Components.Popups 1.0
422+import Ubuntu.Components 1.3
423+import Ubuntu.Components.ListItems 1.3 as ListItem
424+import Ubuntu.Components.Popups 1.3
425
426 import "../utils/databasemodule_v2.js" as DB
427
428
429=== modified file 'shorts/qml/pages/CreateTopicPage.qml'
430--- shorts/qml/pages/CreateTopicPage.qml 2015-07-04 08:38:18 +0000
431+++ shorts/qml/pages/CreateTopicPage.qml 2015-10-24 07:10:31 +0000
432@@ -1,8 +1,8 @@
433 import QtQuick 2.4
434 import QtQuick.XmlListModel 2.0
435-import Ubuntu.Components 1.2
436-import Ubuntu.Components.ListItems 1.0 as ListItem
437-import Ubuntu.Components.Popups 1.0
438+import Ubuntu.Components 1.3
439+import Ubuntu.Components.ListItems 1.3 as ListItem
440+import Ubuntu.Components.Popups 1.3
441
442 import "../utils/databasemodule_v2.js" as DB
443
444
445=== modified file 'shorts/qml/pages/EditFeedPage.qml'
446--- shorts/qml/pages/EditFeedPage.qml 2015-07-04 08:38:18 +0000
447+++ shorts/qml/pages/EditFeedPage.qml 2015-10-24 07:10:31 +0000
448@@ -1,7 +1,7 @@
449 import QtQuick 2.4
450-import Ubuntu.Components 1.2
451-import Ubuntu.Components.ListItems 1.0 as ListItem
452-import Ubuntu.Components.Popups 1.0
453+import Ubuntu.Components 1.3
454+import Ubuntu.Components.ListItems 1.3 as ListItem
455+import Ubuntu.Components.Popups 1.3
456 import Ubuntu.Layouts 1.0
457
458 import "../utils/databasemodule_v2.js" as DB
459@@ -11,7 +11,7 @@
460 objectName: "editfeedpage"
461 title: i18n.tr("Edit Feed")
462 flickable: null/*content*/
463- tools: null
464+// tools: null
465
466 head.actions: [
467 Action {
468@@ -68,7 +68,7 @@
469 }
470
471 function reloadPageContent() {
472- editPage.tools = toolbar
473+// editPage.tools = toolbar
474 }
475
476 Flickable {
477
478=== modified file 'shorts/qml/pages/FeedComponent.qml'
479--- shorts/qml/pages/FeedComponent.qml 2015-07-21 19:42:29 +0000
480+++ shorts/qml/pages/FeedComponent.qml 2015-10-24 07:10:31 +0000
481@@ -1,5 +1,5 @@
482 import QtQuick 2.4
483-import Ubuntu.Components 1.2
484+import Ubuntu.Components 1.3
485 import "../utils/databasemodule_v2.js" as DB
486
487 ListItem {
488
489=== modified file 'shorts/qml/pages/TopicComponent.qml'
490--- shorts/qml/pages/TopicComponent.qml 2015-10-10 11:24:04 +0000
491+++ shorts/qml/pages/TopicComponent.qml 2015-10-24 07:10:31 +0000
492@@ -1,6 +1,6 @@
493 import QtQuick 2.4
494-import Ubuntu.Components 1.2
495-import Ubuntu.Components.ListItems 1.0 as ListItems
496+import Ubuntu.Components 1.3
497+import Ubuntu.Components.ListItems 1.3 as ListItems
498
499 import "../utils/databasemodule_v2.js" as DB
500
501
502=== modified file 'shorts/qml/pages/TopicManagement.qml'
503--- shorts/qml/pages/TopicManagement.qml 2015-07-21 19:42:29 +0000
504+++ shorts/qml/pages/TopicManagement.qml 2015-10-24 07:10:31 +0000
505@@ -1,7 +1,7 @@
506 import QtQuick 2.4
507-import Ubuntu.Components 1.2
508-import Ubuntu.Components.ListItems 1.0 as ListItem
509-import Ubuntu.Components.Popups 1.0
510+import Ubuntu.Components 1.3
511+import Ubuntu.Components.ListItems 1.3 as ListItem
512+import Ubuntu.Components.Popups 1.3
513 import Ubuntu.Layouts 1.0
514
515 import "../utils/databasemodule_v2.js" as DB
516
517=== modified file 'shorts/qml/shorts-app.qml'
518--- shorts/qml/shorts-app.qml 2015-10-10 11:24:04 +0000
519+++ shorts/qml/shorts-app.qml 2015-10-24 07:10:31 +0000
520@@ -1,7 +1,7 @@
521 import QtQuick 2.4
522-import Ubuntu.Components 1.2
523-import Ubuntu.Components.ListItems 1.0 as ListItem
524-import Ubuntu.Components.Popups 1.0
525+import Ubuntu.Components 1.3
526+import Ubuntu.Components.ListItems 1.3 as ListItem
527+import Ubuntu.Components.Popups 1.3
528
529 import "./pages"
530 import "./tabs"
531
532=== modified file 'shorts/qml/tabs/BaseTab.qml'
533--- shorts/qml/tabs/BaseTab.qml 2015-07-04 08:38:18 +0000
534+++ shorts/qml/tabs/BaseTab.qml 2015-10-24 07:10:31 +0000
535@@ -1,7 +1,7 @@
536 import QtQuick 2.4
537-import Ubuntu.Components 1.2
538-import Ubuntu.Components.ListItems 1.0 as ListItem
539-import Ubuntu.Components.Popups 1.0
540+import Ubuntu.Components 1.3
541+import Ubuntu.Components.ListItems 1.3 as ListItem
542+import Ubuntu.Components.Popups 1.3
543
544 import "../components"
545 import "../utils/databasemodule_v2.js" as DB
546
547=== modified file 'shorts/qml/tabs/SavedTab.qml'
548--- shorts/qml/tabs/SavedTab.qml 2015-07-04 08:38:18 +0000
549+++ shorts/qml/tabs/SavedTab.qml 2015-10-24 07:10:31 +0000
550@@ -1,7 +1,7 @@
551 import QtQuick 2.4
552-import Ubuntu.Components 1.2
553-import Ubuntu.Components.ListItems 1.0 as ListItem
554-import Ubuntu.Components.Popups 1.0
555+import Ubuntu.Components 1.3
556+import Ubuntu.Components.ListItems 1.3 as ListItem
557+import Ubuntu.Components.Popups 1.3
558
559 import "../utils/databasemodule_v2.js" as DB
560
561
562=== modified file 'shorts/qml/tabs/ShortsTab.qml'
563--- shorts/qml/tabs/ShortsTab.qml 2015-07-04 08:38:18 +0000
564+++ shorts/qml/tabs/ShortsTab.qml 2015-10-24 07:10:31 +0000
565@@ -1,7 +1,7 @@
566 import QtQuick 2.4
567-import Ubuntu.Components 1.2
568-import Ubuntu.Components.ListItems 1.0 as ListItem
569-import Ubuntu.Components.Popups 1.0
570+import Ubuntu.Components 1.3
571+import Ubuntu.Components.ListItems 1.3 as ListItem
572+import Ubuntu.Components.Popups 1.3
573
574 import "../utils/databasemodule_v2.js" as DB
575
576
577=== modified file 'shorts/qml/tabs/TopicTab.qml'
578--- shorts/qml/tabs/TopicTab.qml 2015-07-04 08:38:18 +0000
579+++ shorts/qml/tabs/TopicTab.qml 2015-10-24 07:10:31 +0000
580@@ -1,7 +1,7 @@
581 import QtQuick 2.4
582-import Ubuntu.Components 1.2
583-import Ubuntu.Components.ListItems 1.0 as ListItem
584-import Ubuntu.Components.Popups 1.0
585+import Ubuntu.Components 1.3
586+import Ubuntu.Components.ListItems 1.3 as ListItem
587+import Ubuntu.Components.Popups 1.3
588
589 import "../utils/databasemodule_v2.js" as DB
590

Subscribers

People subscribed via source and target branches