Merge lp:~nik90/podbird/add-empty-state into lp:podbird

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Michael Sheldon
Approved revision: 9
Merged at revision: 8
Proposed branch: lp:~nik90/podbird/add-empty-state
Merge into: lp:podbird
Diff against target: 142 lines (+74/-11)
4 files modified
.bzrignore (+1/-0)
app/ui/EmptyState.qml (+63/-0)
app/ui/PodcastsTab.qml (+4/-5)
po/com.mikeasoft.podbird.pot (+6/-6)
To merge this branch: bzr merge lp:~nik90/podbird/add-empty-state
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+247515@code.launchpad.net

Commit message

Added new empty state design and .bzrignore file

Description of the change

This MP adds the following,
- .bzrignore file to ignore CMakelist.txt.user while committing to bzr
- New Empty State that was approved by canonical design team to show empty states.(https://imgur.com/uw1Frwu)

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=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2015-01-24 16:50:35 +0000
4@@ -0,0 +1,1 @@
5+*.user
6
7=== added file 'app/ui/EmptyState.qml'
8--- app/ui/EmptyState.qml 1970-01-01 00:00:00 +0000
9+++ app/ui/EmptyState.qml 2015-01-24 16:50:35 +0000
10@@ -0,0 +1,63 @@
11+/*
12+ * Copyright (C) 2014-2015 Canonical Ltd
13+ *
14+ * This file is part of Ubuntu Clock App
15+ *
16+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
17+ * it under the terms of the GNU General Public License version 3 as
18+ * published by the Free Software Foundation.
19+ *
20+ * Ubuntu Clock App is distributed in the hope that it will be useful,
21+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
22+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+ * GNU General Public License for more details.
24+ *
25+ * You should have received a copy of the GNU General Public License
26+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
27+ */
28+
29+import QtQuick 2.3
30+import Ubuntu.Components 1.1
31+
32+/*
33+ Component which displays an empty state (approved by design). It offers an
34+ icon, title and subtitle to describe the empty state.
35+*/
36+
37+Item {
38+ id: emptyState
39+
40+ // Public APIs
41+ property alias iconName: emptyIcon.name
42+ property alias title: emptyLabel.text
43+ property alias subTitle: emptySublabel.text
44+
45+ height: childrenRect.height
46+ width: parent.width
47+
48+ Icon {
49+ id: emptyIcon
50+ anchors.horizontalCenter: parent.horizontalCenter
51+ height: units.gu(10)
52+ width: height
53+ color: "#BBBBBB"
54+ }
55+
56+ Label {
57+ id: emptyLabel
58+ anchors.top: emptyIcon.bottom
59+ anchors.topMargin: units.gu(5)
60+ anchors.horizontalCenter: parent.horizontalCenter
61+ fontSize: "large"
62+ font.bold: true
63+ }
64+
65+ Label {
66+ id: emptySublabel
67+ anchors.top: emptyLabel.bottom
68+ anchors.left: parent.left
69+ anchors.right: parent.right
70+ horizontalAlignment: Text.AlignHCenter
71+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
72+ }
73+}
74
75=== modified file 'app/ui/PodcastsTab.qml'
76--- app/ui/PodcastsTab.qml 2015-01-10 10:10:43 +0000
77+++ app/ui/PodcastsTab.qml 2015-01-24 16:50:35 +0000
78@@ -129,13 +129,12 @@
79 }
80 }
81
82- Label {
83+ EmptyState {
84 anchors.centerIn: parent
85- width: parent.width - units.gu(4)
86- horizontalAlignment: Text.AlignHCenter
87- text: "<b>" + i18n.tr("No Podcast Subscriptions") + "</b><br /><br />" + i18n.tr("You haven't subscribed to any podcasts yet, visit the 'Search' page to add some.")
88- wrapMode: Text.WordWrap
89 visible: view.model === podcastModel && podcastModel.count === 0
90+ iconName: "music-app-symbolic"
91+ title: i18n.tr("No Podcast Subscriptions")
92+ subTitle: i18n.tr("You haven't subscribed to any podcasts yet, visit the 'Search' page to add some.")
93 }
94
95 ListModel {
96
97=== modified file 'po/com.mikeasoft.podbird.pot'
98--- po/com.mikeasoft.podbird.pot 2015-01-10 10:10:43 +0000
99+++ po/com.mikeasoft.podbird.pot 2015-01-24 16:50:35 +0000
100@@ -8,7 +8,7 @@
101 msgstr ""
102 "Project-Id-Version: \n"
103 "Report-Msgid-Bugs-To: \n"
104-"POT-Creation-Date: 2015-01-10 10:09+0000\n"
105+"POT-Creation-Date: 2015-01-24 17:43+0100\n"
106 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
107 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
108 "Language-Team: LANGUAGE <LL@li.org>\n"
109@@ -50,21 +50,21 @@
110 msgid "No Podcast Subscriptions"
111 msgstr ""
112
113-#: ../app/ui/PodcastsTab.qml:136
114+#: ../app/ui/PodcastsTab.qml:137
115 msgid ""
116 "You haven't subscribed to any podcasts yet, visit the 'Search' page to add "
117 "some."
118 msgstr ""
119
120-#: ../app/ui/PodcastsTab.qml:393
121+#: ../app/ui/PodcastsTab.qml:401
122 msgid "Feed URL..."
123 msgstr ""
124
125-#: ../app/ui/PodcastsTab.qml:407
126+#: ../app/ui/PodcastsTab.qml:415
127 msgid "Cancel"
128 msgstr ""
129
130-#: ../app/ui/PodcastsTab.qml:417
131+#: ../app/ui/PodcastsTab.qml:425
132 msgid "Add"
133 msgstr ""
134
135@@ -80,6 +80,6 @@
136 msgid "Subscribe"
137 msgstr ""
138
139-#: /home/mike/src/build-podbird-Ubuntu_Device2_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
140+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-podbird-rtm_stable_GCC_i386_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
141 msgid "Podbird"
142 msgstr ""

Subscribers

People subscribed via source and target branches