Quick Memo

Merge lp:~verzegnassi-stefano/quick-memo/ucs-empty-state into lp:quick-memo

  1. ucs-empty-state
  2. Merge into 0.4
Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 62
Merged at revision: 62
Proposed branch: lp:~verzegnassi-stefano/quick-memo/ucs-empty-state
Merge into: lp:quick-memo
Diff against target: 219 lines (+71/-44)
4 files modified
app/components/MainPage.qml (+7/-28)
app/ubuntucomponents/EmptyState.qml (+43/-0)
app/ubuntucomponents/README.components (+5/-0)
po/quick-memo.pot (+16/-16)
To merge this branch: bzr merge lp:~verzegnassi-stefano/quick-memo/ucs-empty-state
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Pending
Review via email: mp+254417@code.launchpad.net

Commit message

Use Empty State component from the Ubuntu Touch Component Store project

Description of the change

Use Empty State component from the Ubuntu Touch Component Store project

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/components/MainPage.qml'
--- app/components/MainPage.qml 2014-11-03 00:21:23 +0000
+++ app/components/MainPage.qml 2015-03-27 15:49:58 +0000
@@ -20,6 +20,8 @@
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.0
2222
23import "../ubuntucomponents"
24
23PageWithBottomEdge {25PageWithBottomEdge {
24 id: mainPage26 id: mainPage
25 title: i18n.tr("Overview")27 title: i18n.tr("Overview")
@@ -44,35 +46,12 @@
44 Item {46 Item {
45 anchors.fill: parent47 anchors.fill: parent
4648
47 Column {49 EmptyState {
48 anchors.centerIn: parent50 anchors.centerIn: parent
49 width: parent.width * 0.351
50 spacing: units.gu(1)52 iconName: "note"
5153 title: i18n.tr("No stored memos")
52 Icon {54 subTitle: i18n.tr("Swipe the bottom edge to add a new memo.")
53 width: parent.width
54 height: width
55
56 name: "note"
57 }
58
59 Column {
60 width: parent.width
61
62 Label {
63 anchors.horizontalCenter: parent.horizontalCenter
64 fontSize: "x-large"
65 font.weight: Font.DemiBold
66
67 text: i18n.tr("No stored memos")
68 }
69
70 Label {
71 anchors.horizontalCenter: parent.horizontalCenter
72
73 text: i18n.tr("Swipe the bottom edge to add a new memo.")
74 }
75 }
76 }55 }
77 }56 }
78 }57 }
7958
=== added file 'app/ubuntucomponents/EmptyState.qml'
--- app/ubuntucomponents/EmptyState.qml 1970-01-01 00:00:00 +0000
+++ app/ubuntucomponents/EmptyState.qml 2015-03-27 15:49:58 +0000
@@ -0,0 +1,43 @@
1import QtQuick 2.0
2import Ubuntu.Components 1.1
3
4/*
5 Component which displays an empty state (approved by design). It offers an
6 icon, title and subtitle to describe the empty state.
7*/
8
9Item {
10 id: emptyState
11
12 // Public APIs
13 property alias iconName: emptyIcon.name
14 property alias iconSource: emptyIcon.source
15 property alias iconColor: emptyIcon.color
16 property alias title: emptyLabel.text
17 property alias subTitle: emptySublabel.text
18
19 height: childrenRect.height
20
21 Icon {
22 id: emptyIcon
23 anchors.horizontalCenter: parent.horizontalCenter
24 height: units.gu(10)
25 width: height
26 color: "#BBBBBB"
27 }
28
29 Label {
30 id: emptyLabel
31 anchors.top: emptyIcon.bottom
32 anchors.topMargin: units.gu(5)
33 anchors.horizontalCenter: parent.horizontalCenter
34 fontSize: "large"
35 font.bold: true
36 }
37
38 Label {
39 id: emptySublabel
40 anchors.top: emptyLabel.bottom
41 anchors.horizontalCenter: parent.horizontalCenter
42 }
43}
044
=== modified file 'app/ubuntucomponents/README.components'
--- app/ubuntucomponents/README.components 2014-10-04 00:24:12 +0000
+++ app/ubuntucomponents/README.components 2015-03-27 15:49:58 +0000
@@ -7,6 +7,11 @@
77
8### Links8### Links
99
10EmptyState.qml (revision 21)
11 * No changes
12
13http://bazaar.launchpad.net/~ubuntu-touch-community-dev/component-store/trunk.14.10/view/head:/ComponentStore/EmptyState/EmptyState.qml
14
10TextField.qml (revision 1273)15TextField.qml (revision 1273)
11 * Added wrapMode property, which is currently not exposed from QML TextInput (lp:1376510)16 * Added wrapMode property, which is currently not exposed from QML TextInput (lp:1376510)
12 * Added editingFinished signal (lp:1376510)17 * Added editingFinished signal (lp:1376510)
1318
=== modified file 'po/quick-memo.pot'
--- po/quick-memo.pot 2015-01-19 16:15:30 +0000
+++ po/quick-memo.pot 2015-03-27 15:49:58 +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: 2015-01-19 17:14+0100\n"11"POT-Creation-Date: 2015-03-25 09:45+0100\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"
@@ -63,7 +63,7 @@
6363
64#: ../app/components/ColorDialog.qml:15164#: ../app/components/ColorDialog.qml:151
65#: ../app/components/EditMemoPage.qml:27065#: ../app/components/EditMemoPage.qml:270
66#: ../app/components/EditMemoPage.qml:298 ../app/components/MainPage.qml:28366#: ../app/components/EditMemoPage.qml:298 ../app/components/MainPage.qml:262
67#: ../app/components/MultiSelectionHandler.qml:3367#: ../app/components/MultiSelectionHandler.qml:33
68msgid "Cancel"68msgid "Cancel"
69msgstr ""69msgstr ""
@@ -104,18 +104,18 @@
104msgstr ""104msgstr ""
105105
106#: ../app/components/EditMemoPage.qml:206106#: ../app/components/EditMemoPage.qml:206
107#: ../app/components/EditMemoPage.qml:266 ../app/components/MainPage.qml:240107#: ../app/components/EditMemoPage.qml:266 ../app/components/MainPage.qml:219
108#: ../app/components/MainPage.qml:279108#: ../app/components/MainPage.qml:258
109msgid "Delete memo"109msgid "Delete memo"
110msgid_plural "Delete memos"110msgid_plural "Delete memos"
111msgstr[0] ""111msgstr[0] ""
112msgstr[1] ""112msgstr[1] ""
113113
114#: ../app/components/EditMemoPage.qml:213 ../app/components/MainPage.qml:233114#: ../app/components/EditMemoPage.qml:213 ../app/components/MainPage.qml:212
115msgid "Change memo color"115msgid "Change memo color"
116msgstr ""116msgstr ""
117117
118#: ../app/components/EditMemoPage.qml:240 ../app/components/MainPage.qml:268118#: ../app/components/EditMemoPage.qml:240 ../app/components/MainPage.qml:247
119msgid "Memo updated!"119msgid "Memo updated!"
120msgid_plural "Memos updated!"120msgid_plural "Memos updated!"
121msgstr[0] ""121msgstr[0] ""
@@ -133,15 +133,15 @@
133msgid "This memo has no content."133msgid "This memo has no content."
134msgstr ""134msgstr ""
135135
136#: ../app/components/EditMemoPage.qml:267 ../app/components/MainPage.qml:280136#: ../app/components/EditMemoPage.qml:267 ../app/components/MainPage.qml:259
137msgid "Are you sure?"137msgid "Are you sure?"
138msgstr ""138msgstr ""
139139
140#: ../app/components/EditMemoPage.qml:276 ../app/components/MainPage.qml:288140#: ../app/components/EditMemoPage.qml:276 ../app/components/MainPage.qml:267
141msgid "Delete"141msgid "Delete"
142msgstr ""142msgstr ""
143143
144#: ../app/components/EditMemoPage.qml:284 ../app/components/MainPage.qml:295144#: ../app/components/EditMemoPage.qml:284 ../app/components/MainPage.qml:274
145msgid "Memo deleted!"145msgid "Memo deleted!"
146msgid_plural "Memos deleted!"146msgid_plural "Memos deleted!"
147msgstr[0] ""147msgstr[0] ""
@@ -176,31 +176,31 @@
176msgid "Add"176msgid "Add"
177msgstr ""177msgstr ""
178178
179#: ../app/components/MainPage.qml:25179#: ../app/components/MainPage.qml:27
180msgid "Overview"180msgid "Overview"
181msgstr ""181msgstr ""
182182
183#: ../app/components/MainPage.qml:67183#: ../app/components/MainPage.qml:53
184msgid "No stored memos"184msgid "No stored memos"
185msgstr ""185msgstr ""
186186
187#: ../app/components/MainPage.qml:73187#: ../app/components/MainPage.qml:54
188msgid "Swipe the bottom edge to add a new memo."188msgid "Swipe the bottom edge to add a new memo."
189msgstr ""189msgstr ""
190190
191#: ../app/components/MainPage.qml:218191#: ../app/components/MainPage.qml:197
192msgid "About..."192msgid "About..."
193msgstr ""193msgstr ""
194194
195#: ../app/components/MainPage.qml:225195#: ../app/components/MainPage.qml:204
196msgid "Switch to one-column list"196msgid "Switch to one-column list"
197msgstr ""197msgstr ""
198198
199#: ../app/components/MainPage.qml:225199#: ../app/components/MainPage.qml:204
200msgid "Switch to grid"200msgid "Switch to grid"
201msgstr ""201msgstr ""
202202
203#: ../app/components/MainPage.qml:301203#: ../app/components/MainPage.qml:280
204msgid "New memo"204msgid "New memo"
205msgstr ""205msgstr ""
206206

Subscribers

People subscribed via source and target branches

to all changes: