Merge lp:~mzanetti/reminders-app/suppress-warnings into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 271
Merged at revision: 271
Proposed branch: lp:~mzanetti/reminders-app/suppress-warnings
Merge into: lp:reminders-app
Diff against target: 69 lines (+10/-9)
2 files modified
po/com.ubuntu.reminders.pot (+2/-2)
src/app/qml/ui/NoteView.qml (+8/-7)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/suppress-warnings
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Notes app developers Pending
Review via email: mp+237939@code.launchpad.net

Commit message

suppress some warnings

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Doesn't suppress all warnings but it's definitely an improvement! Thanks

Some warnings I have:

file:///home/rpadovani/Documents/ubuntu/touch/core-apps/reminders-app/suppress-warnings/builddir/src/app/qml/ui/NotesPage.qml:122: TypeError: Cannot read property 'reminder' of null
file:///home/rpadovani/Documents/ubuntu/touch/core-apps/reminders-app/suppress-warnings/builddir/src/app/qml/ui/NotesPage.qml:118: TypeError: Cannot read property 'reminder' of null

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.reminders.pot'
2--- po/com.ubuntu.reminders.pot 2014-10-09 16:42:14 +0000
3+++ po/com.ubuntu.reminders.pot 2014-10-10 11:00:01 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-10-09 18:42+0200\n"
9+"POT-Creation-Date: 2014-10-10 12:50+0200\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -137,7 +137,7 @@
14 msgid "Add note"
15 msgstr ""
16
17-#: src/app/qml/ui/NotesPage.qml:207
18+#: src/app/qml/ui/NotesPage.qml:206
19 msgid ""
20 "No notes available. You can create new notes using the \"Add note\" button."
21 msgstr ""
22
23=== modified file 'src/app/qml/ui/NoteView.qml'
24--- src/app/qml/ui/NoteView.qml 2014-09-27 11:05:10 +0000
25+++ src/app/qml/ui/NoteView.qml 2014-10-10 11:00:01 +0000
26@@ -24,19 +24,20 @@
27
28 Item {
29 id: root
30- property string title: note.title
31- property var note
32+ property string title: note ? note.title : ""
33+ property var note: null
34
35 signal editNote(var note)
36
37 onNoteChanged: {
38- print("refreshing note:", root.note.guid)
39- NotesStore.refreshNoteContent(root.note.guid)
40+ if (root.note != null) {
41+ NotesStore.refreshNoteContent(root.note.guid)
42+ }
43 }
44
45 BouncingProgressBar {
46 anchors.top: parent.top
47- visible: root.note.loading
48+ visible: root.note == null || root.note.loading
49 z: 10
50 }
51
52@@ -55,7 +56,7 @@
53 id: noteTextArea
54 anchors { fill: parent}
55
56- property string html: note.htmlContent
57+ property string html: root.note ? note.htmlContent : ""
58
59 onHtmlChanged: {
60 loadHtml(html, "file:///")
61@@ -66,7 +67,7 @@
62 preferences.minimumFontSize: 14
63
64 Connections {
65- target: note
66+ target: note ? note : null
67 onResourcesChanged: {
68 noteTextArea.loadHtml(noteTextArea.html, "file:///")
69 }

Subscribers

People subscribed via source and target branches