Merge lp:~mzanetti/reminders-app/scrollbars into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 301
Merged at revision: 305
Proposed branch: lp:~mzanetti/reminders-app/scrollbars
Merge into: lp:reminders-app
Diff against target: 56 lines (+14/-0)
4 files modified
src/app/qml/ui/NotebooksPage.qml (+3/-0)
src/app/qml/ui/NotesPage.qml (+4/-0)
src/app/qml/ui/RemindersPage.qml (+4/-0)
src/app/qml/ui/TagsPage.qml (+3/-0)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/scrollbars
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+241151@code.launchpad.net

Commit message

add scrollbars to listviews

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: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Tested, works as expected, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml 2014-09-26 14:43:32 +0000
+++ src/app/qml/ui/NotebooksPage.qml 2014-11-07 22:24:58 +0000
@@ -156,6 +156,9 @@
156 text: notebooks.error156 text: notebooks.error
157 }157 }
158158
159 Scrollbar {
160 flickableItem: parent
161 }
159 }162 }
160163
161 Item {164 Item {
162165
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml 2014-11-06 11:26:30 +0000
+++ src/app/qml/ui/NotesPage.qml 2014-11-07 22:24:58 +0000
@@ -214,5 +214,9 @@
214 horizontalAlignment: Text.AlignHCenter214 horizontalAlignment: Text.AlignHCenter
215 text: notes.error ? notes.error : i18n.tr("No notes available. You can create new notes using the \"Add note\" button.")215 text: notes.error ? notes.error : i18n.tr("No notes available. You can create new notes using the \"Add note\" button.")
216 }216 }
217
218 Scrollbar {
219 flickableItem: parent
220 }
217 }221 }
218}222}
219223
=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml 2014-11-06 18:40:07 +0000
+++ src/app/qml/ui/RemindersPage.qml 2014-11-07 22:24:58 +0000
@@ -111,6 +111,10 @@
111 text: notes.error ? notes.error :111 text: notes.error ? notes.error :
112 i18n.tr("No reminders available. You can create new reminders by setting a reminder when viewing a note.")112 i18n.tr("No reminders available. You can create new reminders by setting a reminder when viewing a note.")
113 }113 }
114
115 Scrollbar {
116 flickableItem: parent
117 }
114 }118 }
115 }119 }
116}120}
117121
=== modified file 'src/app/qml/ui/TagsPage.qml'
--- src/app/qml/ui/TagsPage.qml 2014-10-10 14:11:44 +0000
+++ src/app/qml/ui/TagsPage.qml 2014-11-07 22:24:58 +0000
@@ -164,6 +164,9 @@
164 text: tags.error164 text: tags.error
165 }165 }
166166
167 Scrollbar {
168 flickableItem: parent
169 }
167 }170 }
168171
169 Label {172 Label {

Subscribers

People subscribed via source and target branches