podbird

Merge lp:~nik90/podbird/16-update-framework into lp:podbird

  1. 16-update-framework
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Michael Sheldon
Approved revision: 103
Merged at revision: 92
Proposed branch: lp:~nik90/podbird/16-update-framework
Merge into: lp:podbird
Prerequisite: lp:~nik90/podbird/15-optimize-startup
Diff against target: 669 lines (+123/-85)
36 files modified
Podbird.apparmor (+2/-2)
app/components/ActionButton.qml (+2/-2)
app/components/BlurredBackground.qml (+2/-2)
app/components/Card.qml (+2/-2)
app/components/CardView.qml (+2/-2)
app/components/ColumnFlow.qml (+1/-1)
app/components/CustomProgressBar.qml (+2/-2)
app/components/CustomScrollBar.qml (+2/-2)
app/components/EmptyState.qml (+2/-2)
app/components/ListDelegate.qml (+2/-2)
app/components/Walkthrough.qml (+2/-2)
app/podbird.qml (+2/-3)
app/settings/About.qml (+2/-2)
app/settings/CleanSetting.qml (+2/-2)
app/settings/Credits.qml (+2/-2)
app/settings/DownloadSetting.qml (+2/-2)
app/settings/ThemeSetting.qml (+27/-5)
app/themes/Dark.qml (+2/-2)
app/themes/Light.qml (+2/-2)
app/themes/ThemeManager.qml (+2/-2)
app/ui/EpisodesPage.qml (+2/-2)
app/ui/NowPlayingPage.qml (+2/-2)
app/ui/PlayerControls.qml (+2/-2)
app/ui/PodcastsTab.qml (+2/-2)
app/ui/SearchPage.qml (+2/-2)
app/ui/SettingsPage.qml (+2/-2)
app/ui/WhatsNewTab.qml (+2/-2)
app/welcomewizard/Slide1.qml (+2/-2)
app/welcomewizard/Slide2.qml (+2/-2)
app/welcomewizard/Slide3.qml (+2/-2)
app/welcomewizard/Slide4.qml (+2/-2)
app/welcomewizard/Slide5.qml (+2/-2)
app/welcomewizard/Slide6.qml (+2/-2)
app/welcomewizard/WelcomeWizard.qml (+2/-2)
manifest.json.in (+1/-1)
po/com.mikeasoft.podbird.pot (+30/-13)
To merge this branch: bzr merge lp:~nik90/podbird/16-update-framework
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+261727@code.launchpad.net

Commit message

Updateed Podbird to the ubuntu-sdk-15.04 framework, QtQuick 2.4 and Ubuntu.Components 1.2.

Description of the change

This MP updates Podbird to the ubuntu-sdk-15.04 framework, QtQuick 2.4 and Ubuntu.Components 1.2 which will be available to all users as part of OTA-4.

Note: Dynamic Application Theme switching breaks with this MP. However the workaround is a simple app restart. Considering that the app theme switching is done rarely and the workaround is not that bad, I think it is acceptable drawback when compared to all the benefits of upgrading to Ubuntu.Components 1.2.

Upstream Bug reported at http://pad.lv/1462690

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Yeah, with the pop-up warning the user that they need to restart to apply the changes that seems an acceptable compromise.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good, I just made one slight alteration to provide a comment for translators to explain the argument used in that string.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Podbird.apparmor'
2--- Podbird.apparmor 2015-04-11 14:31:09 +0000
3+++ Podbird.apparmor 2015-06-11 13:36:15 +0000
4@@ -5,5 +5,5 @@
5 "connectivity",
6 "usermetrics"
7 ],
8- "policy_version": 1.2
9-}
10+ "policy_version": 1.3
11+}
12\ No newline at end of file
13
14=== modified file 'app/components/ActionButton.qml'
15--- app/components/ActionButton.qml 2015-04-22 23:06:03 +0000
16+++ app/components/ActionButton.qml 2015-06-11 13:36:15 +0000
17@@ -16,8 +16,8 @@
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import QtQuick 2.3
22-import Ubuntu.Components 1.1
23+import QtQuick 2.4
24+import Ubuntu.Components 1.2
25
26 AbstractButton {
27 id: abstractButton
28
29=== modified file 'app/components/BlurredBackground.qml'
30--- app/components/BlurredBackground.qml 2015-06-11 13:36:15 +0000
31+++ app/components/BlurredBackground.qml 2015-06-11 13:36:15 +0000
32@@ -17,8 +17,8 @@
33 * along with this program. If not, see <http://www.gnu.org/licenses/>.
34 */
35
36-import QtQuick 2.3
37-import Ubuntu.Components 1.1
38+import QtQuick 2.4
39+import Ubuntu.Components 1.2
40 import QtGraphicalEffects 1.0
41
42 // Blurred background
43
44=== modified file 'app/components/Card.qml'
45--- app/components/Card.qml 2015-04-22 23:06:03 +0000
46+++ app/components/Card.qml 2015-06-11 13:36:15 +0000
47@@ -15,8 +15,8 @@
48 * along with this program. If not, see <http://www.gnu.org/licenses/>.
49 */
50
51-import QtQuick 2.3
52-import Ubuntu.Components 1.1
53+import QtQuick 2.4
54+import Ubuntu.Components 1.2
55
56 Item {
57 id: card
58
59=== modified file 'app/components/CardView.qml'
60--- app/components/CardView.qml 2015-04-20 20:52:20 +0000
61+++ app/components/CardView.qml 2015-06-11 13:36:15 +0000
62@@ -15,8 +15,8 @@
63 * along with this program. If not, see <http://www.gnu.org/licenses/>.
64 */
65
66-import QtQuick 2.3
67-import Ubuntu.Components 1.1
68+import QtQuick 2.4
69+import Ubuntu.Components 1.2
70
71 Flickable {
72 id: cardViewFlickable
73
74=== modified file 'app/components/ColumnFlow.qml'
75--- app/components/ColumnFlow.qml 2015-04-20 20:52:20 +0000
76+++ app/components/ColumnFlow.qml 2015-06-11 13:36:15 +0000
77@@ -15,7 +15,7 @@
78 * along with this program. If not, see <http://www.gnu.org/licenses/>.
79 */
80
81-import QtQuick 2.3
82+import QtQuick 2.4
83
84 Item {
85 id: columnFlow
86
87=== modified file 'app/components/CustomProgressBar.qml'
88--- app/components/CustomProgressBar.qml 2015-06-11 13:36:15 +0000
89+++ app/components/CustomProgressBar.qml 2015-06-11 13:36:15 +0000
90@@ -16,8 +16,8 @@
91 * along with this program. If not, see <http://www.gnu.org/licenses/>.
92 */
93
94-import QtQuick 2.3
95-import Ubuntu.Components 1.1
96+import QtQuick 2.4
97+import Ubuntu.Components 1.2
98
99 Rectangle {
100 id: progressBar
101
102=== modified file 'app/components/CustomScrollBar.qml'
103--- app/components/CustomScrollBar.qml 2015-04-22 23:06:03 +0000
104+++ app/components/CustomScrollBar.qml 2015-06-11 13:36:15 +0000
105@@ -16,8 +16,8 @@
106 * along with this program. If not, see <http://www.gnu.org/licenses/>.
107 */
108
109-import QtQuick 2.3
110-import Ubuntu.Components 1.1
111+import QtQuick 2.4
112+import Ubuntu.Components 1.2
113
114 Rectangle {
115 id: scrollBar
116
117=== modified file 'app/components/EmptyState.qml'
118--- app/components/EmptyState.qml 2015-06-11 13:36:15 +0000
119+++ app/components/EmptyState.qml 2015-06-11 13:36:15 +0000
120@@ -16,8 +16,8 @@
121 * along with this program. If not, see <http://www.gnu.org/licenses/>.
122 */
123
124-import QtQuick 2.3
125-import Ubuntu.Components 1.1
126+import QtQuick 2.4
127+import Ubuntu.Components 1.2
128
129 /*
130 Component which displays an empty state (approved by design). It offers an
131
132=== modified file 'app/components/ListDelegate.qml'
133--- app/components/ListDelegate.qml 2015-06-11 13:36:15 +0000
134+++ app/components/ListDelegate.qml 2015-06-11 13:36:15 +0000
135@@ -16,9 +16,9 @@
136 * along with this program. If not, see <http://www.gnu.org/licenses/>.
137 */
138
139-import QtQuick 2.3
140+import QtQuick 2.4
141 import QtQuick.Layouts 1.1
142-import Ubuntu.Components 1.1
143+import Ubuntu.Components 1.2
144 import Ubuntu.Components.ListItems 1.0 as ListItem
145
146 ListItem.Empty {
147
148=== modified file 'app/components/Walkthrough.qml'
149--- app/components/Walkthrough.qml 2015-06-11 13:36:15 +0000
150+++ app/components/Walkthrough.qml 2015-06-11 13:36:15 +0000
151@@ -16,8 +16,8 @@
152 * along with this program. If not, see <http://www.gnu.org/licenses/>.
153 */
154
155-import QtQuick 2.3
156-import Ubuntu.Components 1.1
157+import QtQuick 2.4
158+import Ubuntu.Components 1.2
159 import Ubuntu.Components.ListItems 1.0 as ListItem
160
161 Page {
162
163=== modified file 'app/podbird.qml'
164--- app/podbird.qml 2015-06-11 13:36:15 +0000
165+++ app/podbird.qml 2015-06-11 13:36:15 +0000
166@@ -16,13 +16,13 @@
167 * along with this program. If not, see <http://www.gnu.org/licenses/>.
168 */
169
170-import QtQuick 2.3
171+import QtQuick 2.4
172 import Podbird 1.0
173 import UserMetrics 0.1
174 import QtMultimedia 5.0
175 import Ubuntu.Connectivity 1.0
176 import Qt.labs.settings 1.0
177-import Ubuntu.Components 1.1
178+import Ubuntu.Components 1.2
179 import QtQuick.LocalStorage 2.0
180 import Ubuntu.DownloadManager 0.1
181 import "ui"
182@@ -34,7 +34,6 @@
183
184 objectName: "mainView"
185 applicationName: "com.mikeasoft.podbird"
186- useDeprecatedToolbar: false
187 anchorToKeyboard: true
188 automaticOrientation: true
189
190
191=== modified file 'app/settings/About.qml'
192--- app/settings/About.qml 2015-06-11 13:36:15 +0000
193+++ app/settings/About.qml 2015-06-11 13:36:15 +0000
194@@ -16,8 +16,8 @@
195 * along with this program. If not, see <http://www.gnu.org/licenses/>.
196 */
197
198-import QtQuick 2.3
199-import Ubuntu.Components 1.1
200+import QtQuick 2.4
201+import Ubuntu.Components 1.2
202
203 Page {
204 id: aboutPage
205
206=== modified file 'app/settings/CleanSetting.qml'
207--- app/settings/CleanSetting.qml 2015-06-11 13:36:15 +0000
208+++ app/settings/CleanSetting.qml 2015-06-11 13:36:15 +0000
209@@ -16,8 +16,8 @@
210 * along with this program. If not, see <http://www.gnu.org/licenses/>.
211 */
212
213-import QtQuick 2.3
214-import Ubuntu.Components 1.1
215+import QtQuick 2.4
216+import Ubuntu.Components 1.2
217 import Ubuntu.Components.ListItems 1.0 as ListItem
218
219 Page {
220
221=== modified file 'app/settings/Credits.qml'
222--- app/settings/Credits.qml 2015-06-11 13:36:15 +0000
223+++ app/settings/Credits.qml 2015-06-11 13:36:15 +0000
224@@ -16,8 +16,8 @@
225 * along with this program. If not, see <http://www.gnu.org/licenses/>.
226 */
227
228-import QtQuick 2.3
229-import Ubuntu.Components 1.1
230+import QtQuick 2.4
231+import Ubuntu.Components 1.2
232 import Ubuntu.Components.ListItems 1.0 as ListItem
233
234 Page {
235
236=== modified file 'app/settings/DownloadSetting.qml'
237--- app/settings/DownloadSetting.qml 2015-06-11 13:36:15 +0000
238+++ app/settings/DownloadSetting.qml 2015-06-11 13:36:15 +0000
239@@ -16,8 +16,8 @@
240 * along with this program. If not, see <http://www.gnu.org/licenses/>.
241 */
242
243-import QtQuick 2.3
244-import Ubuntu.Components 1.1
245+import QtQuick 2.4
246+import Ubuntu.Components 1.2
247 import Ubuntu.Components.ListItems 1.0 as ListItem
248
249 Page {
250
251=== modified file 'app/settings/ThemeSetting.qml'
252--- app/settings/ThemeSetting.qml 2015-06-11 13:36:15 +0000
253+++ app/settings/ThemeSetting.qml 2015-06-11 13:36:15 +0000
254@@ -16,8 +16,9 @@
255 * along with this program. If not, see <http://www.gnu.org/licenses/>.
256 */
257
258-import QtQuick 2.3
259-import Ubuntu.Components 1.1
260+import QtQuick 2.4
261+import Ubuntu.Components 1.2
262+import Ubuntu.Components.Popups 1.0
263 import Ubuntu.Components.ListItems 1.0 as ListItem
264
265 Page {
266@@ -26,6 +27,28 @@
267 visible: false
268 title: i18n.tr("Theme")
269
270+ /*
271+ Note (nik90): After the upgrade to Ubuntu.Components 1.2, dynamic application theme switching is broken. This
272+ has been reported upstream at http://pad.lv/1462690. Until this is fixed, users will have to restart the app
273+ when switching application theme. This dialog explains that to the user.
274+ */
275+ Component {
276+ id: rebootAppDialog
277+ Dialog {
278+ id: dialogInternal
279+ title: i18n.tr("Restart %1").arg("Podbird")
280+ text: i18n.tr("You will need to restart %1 to change the application theme. \
281+This is necessary to avoid any strange behaviour in the app. We apologize for the inconvenience").arg("Podbird")
282+ Button {
283+ text: i18n.tr("Exit App")
284+ color: podbird.appTheme.positiveActionButton
285+ onClicked: {
286+ Qt.quit()
287+ }
288+ }
289+ }
290+ }
291+
292 ListModel {
293 id: themeModel
294 Component.onCompleted: initialize()
295@@ -53,9 +76,8 @@
296 delegate: ListItem.Standard {
297 text: model.name
298 onClicked: {
299- var themeElement = model.file
300- podbird.settings.themeName = themeElement
301- podbird.appThemeManager.source = themeElement
302+ podbird.settings.themeName = model.file
303+ PopupUtils.open(rebootAppDialog, themeSettingPage);
304 }
305
306 Icon {
307
308=== modified file 'app/themes/Dark.qml'
309--- app/themes/Dark.qml 2015-04-18 23:08:44 +0000
310+++ app/themes/Dark.qml 2015-06-11 13:36:15 +0000
311@@ -16,8 +16,8 @@
312 * along with this program. If not, see <http://www.gnu.org/licenses/>.
313 */
314
315-import QtQuick 2.3
316-import Ubuntu.Components 1.1
317+import QtQuick 2.4
318+import Ubuntu.Components 1.2
319
320 QtObject {
321 // MainView
322
323=== modified file 'app/themes/Light.qml'
324--- app/themes/Light.qml 2015-04-18 23:08:44 +0000
325+++ app/themes/Light.qml 2015-06-11 13:36:15 +0000
326@@ -16,8 +16,8 @@
327 * along with this program. If not, see <http://www.gnu.org/licenses/>.
328 */
329
330-import QtQuick 2.3
331-import Ubuntu.Components 1.1
332+import QtQuick 2.4
333+import Ubuntu.Components 1.2
334
335 QtObject {
336 // MainView
337
338=== modified file 'app/themes/ThemeManager.qml'
339--- app/themes/ThemeManager.qml 2015-03-27 15:28:13 +0000
340+++ app/themes/ThemeManager.qml 2015-06-11 13:36:15 +0000
341@@ -16,8 +16,8 @@
342 * along with this program. If not, see <http://www.gnu.org/licenses/>.
343 */
344
345-import QtQuick 2.3
346-import Ubuntu.Components 1.1
347+import QtQuick 2.4
348+import Ubuntu.Components 1.2
349
350 QtObject {
351 id: themeManager
352
353=== modified file 'app/ui/EpisodesPage.qml'
354--- app/ui/EpisodesPage.qml 2015-06-11 13:36:15 +0000
355+++ app/ui/EpisodesPage.qml 2015-06-11 13:36:15 +0000
356@@ -16,9 +16,9 @@
357 * along with this program. If not, see <http://www.gnu.org/licenses/>.
358 */
359
360-import QtQuick 2.3
361+import QtQuick 2.4
362 import QtMultimedia 5.0
363-import Ubuntu.Components 1.1
364+import Ubuntu.Components 1.2
365 import QtQuick.Layouts 1.1
366 import QtQuick.LocalStorage 2.0
367 import Ubuntu.DownloadManager 0.1
368
369=== modified file 'app/ui/NowPlayingPage.qml'
370--- app/ui/NowPlayingPage.qml 2015-06-11 13:36:15 +0000
371+++ app/ui/NowPlayingPage.qml 2015-06-11 13:36:15 +0000
372@@ -16,9 +16,9 @@
373 * along with this program. If not, see <http://www.gnu.org/licenses/>.
374 */
375
376-import QtQuick 2.3
377+import QtQuick 2.4
378 import QtMultimedia 5.0
379-import Ubuntu.Components 1.1
380+import Ubuntu.Components 1.2
381 import "../podcasts.js" as Podcasts
382 import "../components"
383
384
385=== modified file 'app/ui/PlayerControls.qml'
386--- app/ui/PlayerControls.qml 2015-06-11 13:36:15 +0000
387+++ app/ui/PlayerControls.qml 2015-06-11 13:36:15 +0000
388@@ -16,9 +16,9 @@
389 * along with this program. If not, see <http://www.gnu.org/licenses/>.
390 */
391
392-import QtQuick 2.3
393+import QtQuick 2.4
394 import QtMultimedia 5.0
395-import Ubuntu.Components 1.1
396+import Ubuntu.Components 1.2
397 import "../podcasts.js" as Podcasts
398
399 Rectangle {
400
401=== modified file 'app/ui/PodcastsTab.qml'
402--- app/ui/PodcastsTab.qml 2015-06-11 13:36:15 +0000
403+++ app/ui/PodcastsTab.qml 2015-06-11 13:36:15 +0000
404@@ -16,11 +16,11 @@
405 * along with this program. If not, see <http://www.gnu.org/licenses/>.
406 */
407
408-import QtQuick 2.3
409+import QtQuick 2.4
410 import QtMultimedia 5.0
411 import QtQuick.Layouts 1.1
412 import QtQuick.LocalStorage 2.0
413-import Ubuntu.Components 1.1
414+import Ubuntu.Components 1.2
415 import Ubuntu.DownloadManager 0.1
416 import Ubuntu.Components.ListItems 1.0 as ListItem
417 import Ubuntu.Components.Popups 1.0
418
419=== modified file 'app/ui/SearchPage.qml'
420--- app/ui/SearchPage.qml 2015-06-11 13:36:15 +0000
421+++ app/ui/SearchPage.qml 2015-06-11 13:36:15 +0000
422@@ -16,9 +16,9 @@
423 * along with this program. If not, see <http://www.gnu.org/licenses/>.
424 */
425
426-import QtQuick 2.3
427+import QtQuick 2.4
428 import QtQuick.Layouts 1.1
429-import Ubuntu.Components 1.1
430+import Ubuntu.Components 1.2
431 import QtQuick.LocalStorage 2.0
432 import Ubuntu.Components.Popups 1.0
433 import Ubuntu.Components.ListItems 1.0 as ListItem
434
435=== modified file 'app/ui/SettingsPage.qml'
436--- app/ui/SettingsPage.qml 2015-04-23 23:45:18 +0000
437+++ app/ui/SettingsPage.qml 2015-06-11 13:36:15 +0000
438@@ -16,8 +16,8 @@
439 * along with this program. If not, see <http://www.gnu.org/licenses/>.
440 */
441
442-import QtQuick 2.3
443-import Ubuntu.Components 1.1
444+import QtQuick 2.4
445+import Ubuntu.Components 1.2
446 import Ubuntu.Components.ListItems 1.0 as ListItem
447
448 Page {
449
450=== modified file 'app/ui/WhatsNewTab.qml'
451--- app/ui/WhatsNewTab.qml 2015-06-11 13:36:15 +0000
452+++ app/ui/WhatsNewTab.qml 2015-06-11 13:36:15 +0000
453@@ -1,6 +1,6 @@
454-import QtQuick 2.3
455+import QtQuick 2.4
456 import QtMultimedia 5.0
457-import Ubuntu.Components 1.1
458+import Ubuntu.Components 1.2
459 import QtQuick.Layouts 1.1
460 import QtQuick.LocalStorage 2.0
461 import Ubuntu.DownloadManager 0.1
462
463=== modified file 'app/welcomewizard/Slide1.qml'
464--- app/welcomewizard/Slide1.qml 2015-04-15 21:29:13 +0000
465+++ app/welcomewizard/Slide1.qml 2015-06-11 13:36:15 +0000
466@@ -16,8 +16,8 @@
467 * along with this program. If not, see <http://www.gnu.org/licenses/>.
468 */
469
470-import QtQuick 2.3
471-import Ubuntu.Components 1.1
472+import QtQuick 2.4
473+import Ubuntu.Components 1.2
474
475 // Slide 1
476 Component {
477
478=== modified file 'app/welcomewizard/Slide2.qml'
479--- app/welcomewizard/Slide2.qml 2015-04-15 21:29:13 +0000
480+++ app/welcomewizard/Slide2.qml 2015-06-11 13:36:15 +0000
481@@ -16,8 +16,8 @@
482 * along with this program. If not, see <http://www.gnu.org/licenses/>.
483 */
484
485-import QtQuick 2.3
486-import Ubuntu.Components 1.1
487+import QtQuick 2.4
488+import Ubuntu.Components 1.2
489
490 // Slide 2
491 Component {
492
493=== modified file 'app/welcomewizard/Slide3.qml'
494--- app/welcomewizard/Slide3.qml 2015-04-15 21:29:13 +0000
495+++ app/welcomewizard/Slide3.qml 2015-06-11 13:36:15 +0000
496@@ -16,8 +16,8 @@
497 * along with this program. If not, see <http://www.gnu.org/licenses/>.
498 */
499
500-import QtQuick 2.3
501-import Ubuntu.Components 1.1
502+import QtQuick 2.4
503+import Ubuntu.Components 1.2
504
505 // Slide 3
506 Component {
507
508=== modified file 'app/welcomewizard/Slide4.qml'
509--- app/welcomewizard/Slide4.qml 2015-04-22 10:15:34 +0000
510+++ app/welcomewizard/Slide4.qml 2015-06-11 13:36:15 +0000
511@@ -16,8 +16,8 @@
512 * along with this program. If not, see <http://www.gnu.org/licenses/>.
513 */
514
515-import QtQuick 2.3
516-import Ubuntu.Components 1.1
517+import QtQuick 2.4
518+import Ubuntu.Components 1.2
519
520 // Slide 4
521 Component {
522
523=== modified file 'app/welcomewizard/Slide5.qml'
524--- app/welcomewizard/Slide5.qml 2015-04-22 10:15:34 +0000
525+++ app/welcomewizard/Slide5.qml 2015-06-11 13:36:15 +0000
526@@ -16,8 +16,8 @@
527 * along with this program. If not, see <http://www.gnu.org/licenses/>.
528 */
529
530-import QtQuick 2.3
531-import Ubuntu.Components 1.1
532+import QtQuick 2.4
533+import Ubuntu.Components 1.2
534
535 // Slide 5
536 Component {
537
538=== modified file 'app/welcomewizard/Slide6.qml'
539--- app/welcomewizard/Slide6.qml 2015-04-15 21:29:13 +0000
540+++ app/welcomewizard/Slide6.qml 2015-06-11 13:36:15 +0000
541@@ -16,8 +16,8 @@
542 * along with this program. If not, see <http://www.gnu.org/licenses/>.
543 */
544
545-import QtQuick 2.3
546-import Ubuntu.Components 1.1
547+import QtQuick 2.4
548+import Ubuntu.Components 1.2
549
550 // Slide 6
551 Component {
552
553=== modified file 'app/welcomewizard/WelcomeWizard.qml'
554--- app/welcomewizard/WelcomeWizard.qml 2015-04-20 20:52:20 +0000
555+++ app/welcomewizard/WelcomeWizard.qml 2015-06-11 13:36:15 +0000
556@@ -16,8 +16,8 @@
557 * along with this program. If not, see <http://www.gnu.org/licenses/>.
558 */
559
560-import QtQuick 2.3
561-import Ubuntu.Components 1.1
562+import QtQuick 2.4
563+import Ubuntu.Components 1.2
564 import "../components"
565
566 // Initial Walkthrough tutorial
567
568=== modified file 'manifest.json.in'
569--- manifest.json.in 2015-04-15 19:00:34 +0000
570+++ manifest.json.in 2015-06-11 13:36:15 +0000
571@@ -11,5 +11,5 @@
572 },
573 "version": "0.6",
574 "maintainer": "Michael Sheldon <mike@mikeasoft.com>",
575- "framework": "ubuntu-sdk-14.10"
576+ "framework": "ubuntu-sdk-15.04"
577 }
578
579=== modified file 'po/com.mikeasoft.podbird.pot'
580--- po/com.mikeasoft.podbird.pot 2015-06-11 13:36:15 +0000
581+++ po/com.mikeasoft.podbird.pot 2015-06-11 13:36:15 +0000
582@@ -8,7 +8,7 @@
583 msgstr ""
584 "Project-Id-Version: \n"
585 "Report-Msgid-Bugs-To: \n"
586-"POT-Creation-Date: 2015-05-01 00:24+0000\n"
587+"POT-Creation-Date: 2015-06-11 13:19+0000\n"
588 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
589 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
590 "Language-Team: LANGUAGE <LL@li.org>\n"
591@@ -23,24 +23,24 @@
592 msgstr ""
593
594 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
595+#: ../app/podbird.qml:166
596+#, qt-format
597+msgid "Podcasts listened to today: <b>%1</b>"
598+msgstr ""
599+
600 #: ../app/podbird.qml:167
601-#, qt-format
602-msgid "Podcasts listened to today: <b>%1</b>"
603-msgstr ""
604-
605-#: ../app/podbird.qml:168
606 msgid "No podcasts listened to today"
607 msgstr ""
608
609-#: ../app/podbird.qml:249
610+#: ../app/podbird.qml:248
611 msgid "Podcasts"
612 msgstr ""
613
614-#: ../app/podbird.qml:263
615+#: ../app/podbird.qml:262
616 msgid "Add New Podcasts"
617 msgstr ""
618
619-#: ../app/podbird.qml:278
620+#: ../app/podbird.qml:277
621 msgid "Settings"
622 msgstr ""
623
624@@ -145,17 +145,34 @@
625 msgstr[0] ""
626 msgstr[1] ""
627
628-#: ../app/settings/ThemeSetting.qml:27 ../app/ui/SettingsPage.qml:49
629+#: ../app/settings/ThemeSetting.qml:28 ../app/ui/SettingsPage.qml:49
630 msgid "Theme"
631 msgstr ""
632
633+#: ../app/settings/ThemeSetting.qml:34
634+#, qt-format
635+msgid "Restart %1"
636+msgstr ""
637+
638+#: ../app/settings/ThemeSetting.qml:35
639+#, qt-format
640+msgid ""
641+"You will need to restart %1 to change the application theme. This is "
642+"necessary to avoid any strange behaviour in the app. We apologize for the "
643+"inconvenience"
644+msgstr ""
645+
646+#: ../app/settings/ThemeSetting.qml:38
647+msgid "Exit App"
648+msgstr ""
649+
650 #. TRANSLATORS: Light Theme
651-#: ../app/settings/ThemeSetting.qml:34 ../app/ui/SettingsPage.qml:50
652+#: ../app/settings/ThemeSetting.qml:52 ../app/ui/SettingsPage.qml:50
653 msgid "Light"
654 msgstr ""
655
656 #. TRANSLATORS: Dark Theme
657-#: ../app/settings/ThemeSetting.qml:36 ../app/ui/SettingsPage.qml:50
658+#: ../app/settings/ThemeSetting.qml:54 ../app/ui/SettingsPage.qml:50
659 msgid "Dark"
660 msgstr ""
661
662@@ -512,6 +529,6 @@
663 msgid "Finish"
664 msgstr ""
665
666-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-15-optimize-startup-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
667+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-16-update-framework-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
668 msgid "The chirpiest podcast manager for Ubuntu"
669 msgstr ""

Subscribers

People subscribed via source and target branches