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
=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot 2014-10-09 16:42:14 +0000
+++ po/com.ubuntu.reminders.pot 2014-10-10 11:00:01 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-10-09 18:42+0200\n"11"POT-Creation-Date: 2014-10-10 12:50+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -137,7 +137,7 @@
137msgid "Add note"137msgid "Add note"
138msgstr ""138msgstr ""
139139
140#: src/app/qml/ui/NotesPage.qml:207140#: src/app/qml/ui/NotesPage.qml:206
141msgid ""141msgid ""
142"No notes available. You can create new notes using the \"Add note\" button."142"No notes available. You can create new notes using the \"Add note\" button."
143msgstr ""143msgstr ""
144144
=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml 2014-09-27 11:05:10 +0000
+++ src/app/qml/ui/NoteView.qml 2014-10-10 11:00:01 +0000
@@ -24,19 +24,20 @@
2424
25Item {25Item {
26 id: root26 id: root
27 property string title: note.title27 property string title: note ? note.title : ""
28 property var note28 property var note: null
2929
30 signal editNote(var note)30 signal editNote(var note)
3131
32 onNoteChanged: {32 onNoteChanged: {
33 print("refreshing note:", root.note.guid)33 if (root.note != null) {
34 NotesStore.refreshNoteContent(root.note.guid)34 NotesStore.refreshNoteContent(root.note.guid)
35 }
35 }36 }
3637
37 BouncingProgressBar {38 BouncingProgressBar {
38 anchors.top: parent.top39 anchors.top: parent.top
39 visible: root.note.loading40 visible: root.note == null || root.note.loading
40 z: 1041 z: 10
41 }42 }
4243
@@ -55,7 +56,7 @@
55 id: noteTextArea56 id: noteTextArea
56 anchors { fill: parent}57 anchors { fill: parent}
5758
58 property string html: note.htmlContent59 property string html: root.note ? note.htmlContent : ""
5960
60 onHtmlChanged: {61 onHtmlChanged: {
61 loadHtml(html, "file:///")62 loadHtml(html, "file:///")
@@ -66,7 +67,7 @@
66 preferences.minimumFontSize: 1467 preferences.minimumFontSize: 14
6768
68 Connections {69 Connections {
69 target: note70 target: note ? note : null
70 onResourcesChanged: {71 onResourcesChanged: {
71 noteTextArea.loadHtml(noteTextArea.html, "file:///")72 noteTextArea.loadHtml(noteTextArea.html, "file:///")
72 }73 }

Subscribers

People subscribed via source and target branches