Merge lp:~nik90/podbird/fix-vivid-crash into lp:podbird

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Michael Sheldon
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~nik90/podbird/fix-vivid-crash
Merge into: lp:podbird
Diff against target: 559 lines (+61/-61)
18 files modified
app/podbird.qml (+2/-2)
app/settings/About.qml (+1/-1)
app/settings/ThemeSetting.qml (+1/-1)
app/ui/ActionButton.qml (+2/-2)
app/ui/Card.qml (+3/-3)
app/ui/CustomProgressBar.qml (+1/-1)
app/ui/CustomScrollBar.qml (+1/-1)
app/ui/EmptyState.qml (+3/-3)
app/ui/EpisodesPage.qml (+15/-15)
app/ui/NowPlayingPage.qml (+9/-9)
app/ui/PlayerControls.qml (+2/-2)
app/ui/PodcastsTab.qml (+3/-3)
app/ui/SearchPage.qml (+4/-4)
app/ui/SettingsPage.qml (+2/-2)
app/ui/WhatsNewTab.qml (+8/-8)
app/welcomewizard/Slide4.qml (+1/-1)
app/welcomewizard/Slide5.qml (+1/-1)
po/com.mikeasoft.podbird.pot (+2/-2)
To merge this branch: bzr merge lp:~nik90/podbird/fix-vivid-crash
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+257046@code.launchpad.net

Description of the change

- Fixed vivid crash by renaming theme to appTheme (tested on N4 Vivid)
- Fixed a minor bug where the empty state text did not wrap (noticed while testing podbird in french)

No string change :)

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

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/podbird.qml'
2--- app/podbird.qml 2015-04-20 17:12:53 +0000
3+++ app/podbird.qml 2015-04-22 10:22:23 +0000
4@@ -40,7 +40,7 @@
5 width: units.gu(50)
6 height: units.gu(75)
7
8- backgroundColor: theme.background
9+ backgroundColor: appTheme.background
10
11 Component.onDestruction: {
12 console.log("[LOG]: Download cancelled");
13@@ -95,7 +95,7 @@
14 source: settings.themeName
15 }
16
17- property alias theme: themeManager.theme
18+ property alias appTheme: themeManager.theme
19 property var themeManager: themeManager
20
21 property var settings: Settings {
22
23=== modified file 'app/settings/About.qml'
24--- app/settings/About.qml 2015-04-20 00:55:03 +0000
25+++ app/settings/About.qml 2015-04-22 10:22:23 +0000
26@@ -79,7 +79,7 @@
27 wrapMode: Text.WordWrap
28 fontSize: "small"
29 horizontalAlignment: Text.AlignHCenter
30- linkColor: podbird.theme.linkText
31+ linkColor: podbird.appTheme.linkText
32 text: i18n.tr("Source code available on %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
33 onLinkActivated: Qt.openUrlExternally(link)
34 }
35
36=== modified file 'app/settings/ThemeSetting.qml'
37--- app/settings/ThemeSetting.qml 2015-03-30 20:51:35 +0000
38+++ app/settings/ThemeSetting.qml 2015-04-22 10:22:23 +0000
39@@ -46,7 +46,7 @@
40 onClicked: {
41 var themeElement = model.file
42 podbird.settings.themeName = themeElement
43- podbird.themeManager.source = themeElement
44+ podbird.appThemeManager.source = themeElement
45 }
46
47 Icon {
48
49=== modified file 'app/ui/ActionButton.qml'
50--- app/ui/ActionButton.qml 2015-04-03 21:20:44 +0000
51+++ app/ui/ActionButton.qml 2015-04-22 10:22:23 +0000
52@@ -28,7 +28,7 @@
53 Rectangle {
54 visible: abstractButton.pressed
55 anchors.fill: parent
56- color: podbird.theme.hightlightListView
57+ color: podbird.appTheme.hightlightListView
58 }
59
60 Icon {
61@@ -36,6 +36,6 @@
62 width: units.gu(2.5)
63 height: width
64 anchors.centerIn: parent
65- color: podbird.theme.baseIcon
66+ color: podbird.appTheme.baseIcon
67 }
68 }
69
70=== modified file 'app/ui/Card.qml'
71--- app/ui/Card.qml 2015-04-05 16:35:06 +0000
72+++ app/ui/Card.qml 2015-04-22 10:22:23 +0000
73@@ -40,7 +40,7 @@
74 id: bg
75 anchors.fill: parent
76 anchors.margins: units.gu(1)
77- color: podbird.theme.hightlightListView
78+ color: podbird.appTheme.hightlightListView
79 }
80
81 /* Column containing image and labels */
82@@ -70,7 +70,7 @@
83 right: parent.right
84 margins: units.gu(1)
85 }
86- color: podbird.theme.baseText
87+ color: podbird.appTheme.baseText
88 elide: Text.ElideRight
89 fontSize: "small"
90 opacity: 1.0
91@@ -86,7 +86,7 @@
92 right: parent.right
93 rightMargin: units.gu(1)
94 }
95- color: podbird.theme.baseSubText
96+ color: podbird.appTheme.baseSubText
97 elide: Text.ElideRight
98 fontSize: "small"
99 opacity: 1.0
100
101=== modified file 'app/ui/CustomProgressBar.qml'
102--- app/ui/CustomProgressBar.qml 2015-04-19 00:44:37 +0000
103+++ app/ui/CustomProgressBar.qml 2015-04-22 10:22:23 +0000
104@@ -35,7 +35,7 @@
105 radius: parent.radius
106 anchors.left: parent.left
107 anchors.top: parent.top
108- color: podbird.theme.focusText
109+ color: podbird.appTheme.focusText
110 width: progress >= 0 && progress <= 100 ? (progress / 100) * parent.width : parent.width / 6
111
112 SequentialAnimation {
113
114=== modified file 'app/ui/CustomScrollBar.qml'
115--- app/ui/CustomScrollBar.qml 2015-04-15 19:31:08 +0000
116+++ app/ui/CustomScrollBar.qml 2015-04-22 10:22:23 +0000
117@@ -26,7 +26,7 @@
118
119 anchors.right: parent.right
120 anchors.rightMargin: units.gu(0.5)
121- color: podbird.theme.focusText
122+ color: podbird.appTheme.focusText
123 radius: width
124 width: units.dp(4)
125 visible: listview.moving && listview.contentHeight > listview.height
126
127=== modified file 'app/ui/EmptyState.qml'
128--- app/ui/EmptyState.qml 2015-04-11 22:12:51 +0000
129+++ app/ui/EmptyState.qml 2015-04-22 10:22:23 +0000
130@@ -45,7 +45,7 @@
131 id: emptyIcon
132 width: parent.iconWidth
133 height: parent.iconHeight
134- color: podbird.theme.baseIcon
135+ color: podbird.appTheme.baseIcon
136 anchors.horizontalCenter: parent.horizontalCenter
137 }
138
139@@ -55,7 +55,7 @@
140 anchors.topMargin: units.gu(5)
141 width: parent.width
142 fontSize: "large"
143- color: podbird.theme.baseText
144+ color: podbird.appTheme.baseText
145 horizontalAlignment: Text.AlignHCenter
146 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
147 }
148@@ -64,7 +64,7 @@
149 id: emptySublabel
150 width: parent.width
151 anchors.top: emptyLabel.bottom
152- color: podbird.theme.baseSubText
153+ color: podbird.appTheme.baseSubText
154 horizontalAlignment: Text.AlignHCenter
155 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
156 }
157
158=== modified file 'app/ui/EpisodesPage.qml'
159--- app/ui/EpisodesPage.qml 2015-04-20 12:15:50 +0000
160+++ app/ui/EpisodesPage.qml 2015-04-22 10:22:23 +0000
161@@ -185,7 +185,7 @@
162 text: i18n.tr("Are you sure you want to unsubscribe from <b>%1</b>?").arg(episodesPage.episodeName)
163 Button {
164 text: i18n.tr("Unsubscribe")
165- color: podbird.theme.negativeActionButton
166+ color: podbird.appTheme.negativeActionButton
167 onClicked: {
168 var db = Podcasts.init();
169 db.transaction(function (tx) {
170@@ -202,7 +202,7 @@
171 }
172 Button {
173 text: i18n.tr("Cancel")
174- color: podbird.theme.neutralActionButton
175+ color: podbird.appTheme.neutralActionButton
176 onClicked: {
177 PopupUtils.close(dialogInternal)
178 }
179@@ -367,7 +367,7 @@
180
181 section.delegate: Rectangle {
182 width: parent.width
183- color: section === "0" ? podbird.theme.hightlightListView : "Transparent"
184+ color: section === "0" ? podbird.appTheme.hightlightListView : "Transparent"
185 height: header.implicitHeight + units.gu(2)
186 Label {
187 id: header
188@@ -421,7 +421,7 @@
189 wrapMode: Text.WordWrap
190 maximumLineCount: 2
191 elide: Text.ElideRight
192- color: podbird.theme.baseText
193+ color: podbird.appTheme.baseText
194 }
195
196 Label {
197@@ -429,7 +429,7 @@
198 width: parent.width
199 elide: Text.ElideRight
200 fontSize: "x-small"
201- color: podbird.theme.baseText
202+ color: podbird.appTheme.baseText
203 }
204 }
205 }
206@@ -456,7 +456,7 @@
207 visible: !model.listened
208 width: parent.width
209 height: dataColumn.height + units.gu(2)
210- color: podbird.theme.hightlightListView
211+ color: podbird.appTheme.hightlightListView
212 }
213
214 Column {
215@@ -485,8 +485,8 @@
216 maximumLineCount: 2
217 wrapMode: Text.WordWrap
218 elide: Text.ElideRight
219- color: listItem.expanded || currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.theme.focusText
220- : podbird.theme.baseText
221+ color: listItem.expanded || currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
222+ : podbird.appTheme.baseText
223 }
224
225 Row {
226@@ -507,7 +507,7 @@
227 text: model.duration === 0 || model.duration === undefined ? Qt.formatDate(new Date(model.published), "MMM d, yyyy") : Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
228 fontSize: "x-small"
229 elide: Text.ElideRight
230- color: podbird.theme.baseSubText
231+ color: podbird.appTheme.baseSubText
232 }
233 }
234 }
235@@ -519,8 +519,8 @@
236 height: units.gu(4)
237
238 iconName: "contextual-menu"
239- color: progressBar.visible || listItem.expanded ? podbird.theme.focusText
240- : podbird.theme.baseIcon
241+ color: progressBar.visible || listItem.expanded ? podbird.appTheme.focusText
242+ : podbird.appTheme.baseIcon
243 onClicked: {
244 var popover = PopupUtils.open(popoverComponent, contextualMenu)
245 popover.queued = Qt.binding(function() { return model.queued })
246@@ -538,8 +538,8 @@
247
248 iconName: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? "media-playback-pause"
249 : "media-playback-start"
250- color: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? podbird.theme.focusText
251- : podbird.theme.baseIcon
252+ color: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? podbird.appTheme.focusText
253+ : podbird.appTheme.baseIcon
254
255 onClicked: {
256 var db = Podcasts.init();
257@@ -582,8 +582,8 @@
258 wrapMode: Text.WordWrap
259 width: parent.width
260 fontSize: "small"
261- linkColor: podbird.theme.linkText
262- color: podbird.theme.baseSubText
263+ linkColor: podbird.appTheme.linkText
264+ color: podbird.appTheme.baseSubText
265 onLinkActivated: Qt.openUrlExternally(link)
266 Behavior on height {
267 UbuntuNumberAnimation {
268
269=== modified file 'app/ui/NowPlayingPage.qml'
270--- app/ui/NowPlayingPage.qml 2015-04-19 23:43:44 +0000
271+++ app/ui/NowPlayingPage.qml 2015-04-22 10:22:23 +0000
272@@ -60,7 +60,7 @@
273 fontSize: "large"
274 maximumLineCount: 2
275 wrapMode: Text.WordWrap
276- color: podbird.theme.baseText
277+ color: podbird.appTheme.baseText
278 }
279
280 Label {
281@@ -72,7 +72,7 @@
282 text: currentArtist
283 elide: Text.ElideRight
284 fontSize: "small"
285- color: podbird.theme.baseSubText
286+ color: podbird.appTheme.baseSubText
287 }
288
289 Slider {
290@@ -111,7 +111,7 @@
291 fontSize: "small"
292 anchors.left: scrubber.left
293 anchors.top: scrubber.bottom
294- color: podbird.theme.baseText
295+ color: podbird.appTheme.baseText
296 text: Podcasts.formatTime(player.position / 1000)
297 }
298
299@@ -120,7 +120,7 @@
300 fontSize: "small"
301 anchors.right: scrubber.right
302 anchors.top: scrubber.bottom
303- color: podbird.theme.baseText
304+ color: podbird.appTheme.baseText
305 text: Podcasts.formatTime(player.duration / 1000)
306 }
307
308@@ -149,7 +149,7 @@
309 Label {
310 text: i18n.tr("-15s")
311 fontSize: "xx-small"
312- color: podbird.theme.baseText
313+ color: podbird.appTheme.baseText
314 anchors.verticalCenter: skipBackwardIcon.verticalCenter
315 }
316
317@@ -158,7 +158,7 @@
318 width: units.gu(3)
319 height: width
320 name: "media-seek-backward"
321- color: podbird.theme.baseIcon
322+ color: podbird.appTheme.baseIcon
323 }
324 }
325 }
326@@ -175,7 +175,7 @@
327 width: units.gu(6)
328 height: width
329 anchors.centerIn: parent
330- color: podbird.theme.baseIcon
331+ color: podbird.appTheme.baseIcon
332 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
333 : "media-playback-start"
334 }
335@@ -202,13 +202,13 @@
336 width: units.gu(3)
337 height: width
338 name: "media-seek-forward"
339- color: podbird.theme.baseIcon
340+ color: podbird.appTheme.baseIcon
341 }
342
343 Label {
344 text: i18n.tr("+15s")
345 fontSize: "xx-small"
346- color: podbird.theme.baseText
347+ color: podbird.appTheme.baseText
348 anchors.verticalCenter: skipForwardIcon.verticalCenter
349 }
350 }
351
352=== modified file 'app/ui/PlayerControls.qml'
353--- app/ui/PlayerControls.qml 2015-04-05 13:40:20 +0000
354+++ app/ui/PlayerControls.qml 2015-04-22 10:22:23 +0000
355@@ -26,7 +26,7 @@
356
357 height: 0
358 width: parent.width
359- color: podbird.theme.bottomBarBackground
360+ color: podbird.appTheme.bottomBarBackground
361
362 MouseArea {
363 z: -1
364@@ -53,7 +53,7 @@
365 id: progressBarHint
366 anchors.left: parent.left
367 anchors.top: cover.bottom
368- color: podbird.theme.focusText
369+ color: podbird.appTheme.focusText
370 height: units.gu(0.25)
371 width: player.duration > 0 ? (player.position / player.duration) * parent.width : 0
372 }
373
374=== modified file 'app/ui/PodcastsTab.qml'
375--- app/ui/PodcastsTab.qml 2015-04-20 12:15:27 +0000
376+++ app/ui/PodcastsTab.qml 2015-04-22 10:22:23 +0000
377@@ -219,7 +219,7 @@
378 Rectangle {
379 anchors.fill: parent
380 opacity: 0.3
381- color: index % 2 === 0 ? podbird.theme.hightlightListView : "Transparent"
382+ color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
383 }
384
385 onClicked: {
386@@ -268,14 +268,14 @@
387 width: parent.width
388 fontSize: "small"
389 elide: Text.ElideRight
390- color: podbird.theme.baseText
391+ color: podbird.appTheme.baseText
392 }
393
394 Label {
395 id: episodeCount
396 width: parent.width
397 fontSize: "x-small"
398- color: podbird.theme.baseSubText
399+ color: podbird.appTheme.baseSubText
400 visible: model.episodeCount > 0
401 text: i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
402 }
403
404=== modified file 'app/ui/SearchPage.qml'
405--- app/ui/SearchPage.qml 2015-04-19 00:44:37 +0000
406+++ app/ui/SearchPage.qml 2015-04-22 10:22:23 +0000
407@@ -147,7 +147,7 @@
408 text: i18n.tr("Please check the URL and try again")
409 Button {
410 text: i18n.tr("Close")
411- color: podbird.theme.neutralActionButton
412+ color: podbird.appTheme.neutralActionButton
413 onClicked: {
414 PopupUtils.close(dialogInternal)
415 }
416@@ -207,7 +207,7 @@
417 Rectangle {
418 anchors.fill: parent
419 opacity: 0.3
420- color: index % 2 === 0 ? podbird.theme.hightlightListView : "Transparent"
421+ color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
422 }
423
424 Column {
425@@ -300,8 +300,8 @@
426 wrapMode: Text.WordWrap
427 width: parent.width
428 fontSize: "small"
429- color: podbird.theme.baseSubText
430- linkColor: podbird.theme.linkText
431+ color: podbird.appTheme.baseSubText
432+ linkColor: podbird.appTheme.linkText
433 onLinkActivated: Qt.openUrlExternally(link)
434 Behavior on height {
435 UbuntuNumberAnimation {
436
437=== modified file 'app/ui/SettingsPage.qml'
438--- app/ui/SettingsPage.qml 2015-04-16 19:07:02 +0000
439+++ app/ui/SettingsPage.qml 2015-04-22 10:22:23 +0000
440@@ -81,7 +81,7 @@
441
442 Label {
443 fontSize: "small"
444- color: podbird.theme.baseSubText
445+ color: podbird.appTheme.baseSubText
446 width: parent.width
447 wrapMode: Text.WordWrap
448 text: i18n.tr("Delete episodes that are older than a given number of days for each podcast")
449@@ -106,7 +106,7 @@
450
451 Label {
452 fontSize: "small"
453- color: podbird.theme.baseSubText
454+ color: podbird.appTheme.baseSubText
455 width: parent.width
456 wrapMode: Text.WordWrap
457 text: i18n.tr("Default number of new episodes to download for each podcast")
458
459=== modified file 'app/ui/WhatsNewTab.qml'
460--- app/ui/WhatsNewTab.qml 2015-04-19 13:17:57 +0000
461+++ app/ui/WhatsNewTab.qml 2015-04-22 10:22:23 +0000
462@@ -94,7 +94,7 @@
463 ]
464
465 EmptyState {
466- anchors.centerIn: parent
467+ anchors.verticalCenter: parent.verticalCenter
468 anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
469 iconHeight: units.gu(12)
470 iconWidth: iconHeight + units.gu(10)
471@@ -437,8 +437,8 @@
472 maximumLineCount: 2
473 wrapMode: Text.WordWrap
474 elide: Text.ElideRight
475- color: listItem.expanded || currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.theme.focusText
476- : podbird.theme.baseText
477+ color: listItem.expanded || currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
478+ : podbird.appTheme.baseText
479 }
480
481 Row {
482@@ -459,7 +459,7 @@
483 text: model.duration === 0 || model.duration === undefined ? model.artist : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
484 fontSize: "x-small"
485 elide: Text.ElideRight
486- color: podbird.theme.baseSubText
487+ color: podbird.appTheme.baseSubText
488 }
489 }
490 }
491@@ -471,8 +471,8 @@
492 height: units.gu(4)
493
494 iconName: "contextual-menu"
495- color: progressBar.visible || listItem.expanded ? podbird.theme.focusText
496- : podbird.theme.baseIcon
497+ color: progressBar.visible || listItem.expanded ? podbird.appTheme.focusText
498+ : podbird.appTheme.baseIcon
499 onClicked: {
500 var popover = PopupUtils.open(popoverComponent, contextualMenu)
501 popover.queued = Qt.binding(function() { return model.queued })
502@@ -503,8 +503,8 @@
503 wrapMode: Text.WordWrap
504 width: parent.width
505 fontSize: "small"
506- color: podbird.theme.baseSubText
507- linkColor: podbird.theme.linkText
508+ color: podbird.appTheme.baseSubText
509+ linkColor: podbird.appTheme.linkText
510 onLinkActivated: Qt.openUrlExternally(link)
511 Behavior on height {
512 UbuntuNumberAnimation {
513
514=== modified file 'app/welcomewizard/Slide4.qml'
515--- app/welcomewizard/Slide4.qml 2015-04-18 23:08:44 +0000
516+++ app/welcomewizard/Slide4.qml 2015-04-22 10:22:23 +0000
517@@ -63,7 +63,7 @@
518 }
519 wrapMode: Text.WordWrap
520 horizontalAlignment: Text.AlignHCenter
521- linkColor: podbird.theme.linkText
522+ linkColor: podbird.appTheme.linkText
523 text: i18n.tr("Podbird is available in over 15 languages and is translated by the %1 community").arg("<a href=\"http://community.ubuntu.com/contribute/translations\">Ubuntu Translators</a>")
524 onLinkActivated: Qt.openUrlExternally(link)
525 }
526
527=== modified file 'app/welcomewizard/Slide5.qml'
528--- app/welcomewizard/Slide5.qml 2015-04-18 23:08:44 +0000
529+++ app/welcomewizard/Slide5.qml 2015-04-22 10:22:23 +0000
530@@ -60,7 +60,7 @@
531 }
532 wrapMode: Text.WordWrap
533 horizontalAlignment: Text.AlignHCenter
534- linkColor: podbird.theme.linkText
535+ linkColor: podbird.appTheme.linkText
536 // TRANSLATORS: The %1 points to a url defined in html format <a href=\link\>Link</a>.
537 text: i18n.tr("If you find any bugs or have any feature requests, let us know on our project page at %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
538 onLinkActivated: Qt.openUrlExternally(link)
539
540=== modified file 'po/com.mikeasoft.podbird.pot'
541--- po/com.mikeasoft.podbird.pot 2015-04-21 15:29:50 +0000
542+++ po/com.mikeasoft.podbird.pot 2015-04-22 10:22:23 +0000
543@@ -8,7 +8,7 @@
544 msgstr ""
545 "Project-Id-Version: \n"
546 "Report-Msgid-Bugs-To: \n"
547-"POT-Creation-Date: 2015-04-21 16:27+0100\n"
548+"POT-Creation-Date: 2015-04-22 09:52+0000\n"
549 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
550 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
551 "Language-Team: LANGUAGE <LL@li.org>\n"
552@@ -493,6 +493,6 @@
553 msgid "Finish"
554 msgstr ""
555
556-#: /home/mike/src/podbird/debian-packaging/obj-x86_64-linux-gnu/po/Podbird.desktop.in.h:1
557+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-fix-vivid-crash-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
558 msgid "Podbird"
559 msgstr ""

Subscribers

People subscribed via source and target branches