Merge lp:~nik90/podbird/add-touch-gesture-welcome-wizard into lp:podbird/devel

Proposed by Nekhelesh Ramananthan
Status: Merged
Merged at revision: 139
Proposed branch: lp:~nik90/podbird/add-touch-gesture-welcome-wizard
Merge into: lp:podbird/devel
Diff against target: 152 lines (+87/-8)
3 files modified
app/welcomewizard/Slide5.qml (+68/-0)
app/welcomewizard/WelcomeWizard.qml (+2/-1)
po/podbird.nik90.pot (+17/-7)
To merge this branch: bzr merge lp:~nik90/podbird/add-touch-gesture-welcome-wizard
Reviewer Review Type Date Requested Status
Podbird Developers Pending
Review via email: mp+289493@code.launchpad.net

Description of the change

Added Touch Gestures slide to the welcome wizard to teach new users about the swipe left to reveal listitem actions and multiselect mode.

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
1=== added file 'app/graphics/listitemactions.png'
2Binary files app/graphics/listitemactions.png 1970-01-01 00:00:00 +0000 and app/graphics/listitemactions.png 2016-03-18 12:47:50 +0000 differ
3=== added file 'app/welcomewizard/Slide5.qml'
4--- app/welcomewizard/Slide5.qml 1970-01-01 00:00:00 +0000
5+++ app/welcomewizard/Slide5.qml 2016-03-18 12:47:50 +0000
6@@ -0,0 +1,68 @@
7+/*
8+ * Copyright 2016 Podbird Team
9+ *
10+ * This file is part of Podbird.
11+ *
12+ * Podbird is free software; you can redistribute it and/or modify
13+ * it under the terms of the GNU General Public License as published by
14+ * the Free Software Foundation; version 3.
15+ *
16+ * Podbird is distributed in the hope that it will be useful,
17+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
18+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+ * GNU General Public License for more details.
20+ *
21+ * You should have received a copy of the GNU General Public License
22+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
23+ */
24+
25+import QtQuick 2.4
26+import Ubuntu.Components 1.3
27+
28+// Slide 5
29+Component {
30+ id: slide5
31+ Item {
32+ id: slide1Container
33+
34+ Image {
35+ anchors {
36+ top: parent.top
37+ bottom: introductionText.top
38+ bottomMargin: units.gu(6)
39+ horizontalCenter: parent.horizontalCenter
40+ }
41+ fillMode: Image.PreserveAspectFit
42+ source: Qt.resolvedUrl("../graphics/listitemactions.png")
43+ }
44+
45+ Label {
46+ id: introductionText
47+ anchors.centerIn: parent
48+ elide: Text.ElideRight
49+ textSize: Label.XLarge
50+ maximumLineCount: 2
51+ text: i18n.tr("Touch Gestures")
52+ horizontalAlignment: Text.AlignHCenter
53+ width: parent.width
54+ wrapMode: Text.WordWrap
55+ }
56+
57+ Label {
58+ id: finalMessage
59+ anchors {
60+ top: introductionText.bottom
61+ bottom: parent.bottom
62+ left: parent.left
63+ right: parent.right
64+ margins: units.gu(1)
65+ topMargin: units.gu(4)
66+ }
67+ wrapMode: Text.WordWrap
68+ horizontalAlignment: Text.AlignHCenter
69+ linkColor: podbird.appTheme.linkText
70+ text: i18n.tr("Episodes can be swiped left to reveal more actions. You can also multi-select them by long-pressing on an episode.")
71+ onLinkActivated: Qt.openUrlExternally(link)
72+ }
73+ }
74+}
75
76=== renamed file 'app/welcomewizard/Slide5.qml' => 'app/welcomewizard/Slide6.qml'
77=== renamed file 'app/welcomewizard/Slide6.qml' => 'app/welcomewizard/Slide7.qml'
78=== modified file 'app/welcomewizard/WelcomeWizard.qml'
79--- app/welcomewizard/WelcomeWizard.qml 2016-03-04 10:40:54 +0000
80+++ app/welcomewizard/WelcomeWizard.qml 2016-03-18 12:47:50 +0000
81@@ -36,6 +36,7 @@
82 Slide3{},
83 Slide4{},
84 Slide5{},
85- Slide6{}
86+ Slide6{},
87+ Slide7{}
88 ]
89 }
90
91=== modified file 'po/podbird.nik90.pot'
92--- po/podbird.nik90.pot 2016-03-17 15:06:28 +0000
93+++ po/podbird.nik90.pot 2016-03-18 12:47:50 +0000
94@@ -8,7 +8,7 @@
95 msgstr ""
96 "Project-Id-Version: \n"
97 "Report-Msgid-Bugs-To: \n"
98-"POT-Creation-Date: 2016-03-17 20:36+0530\n"
99+"POT-Creation-Date: 2016-03-18 18:03+0530\n"
100 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
101 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
102 "Language-Team: LANGUAGE <LL@li.org>\n"
103@@ -547,33 +547,43 @@
104 msgstr ""
105
106 #: ../app/welcomewizard/Slide5.qml:45
107+msgid "Touch Gestures"
108+msgstr ""
109+
110+#: ../app/welcomewizard/Slide5.qml:64
111+msgid ""
112+"Episodes can be swiped left to reveal more actions. You can also multi-"
113+"select them by long-pressing on an episode."
114+msgstr ""
115+
116+#: ../app/welcomewizard/Slide6.qml:45
117 msgid "Support"
118 msgstr ""
119
120 #. TRANSLATORS: The %1 points to a url defined in html format <a href=\link\>Link</a>.
121-#: ../app/welcomewizard/Slide5.qml:65
122+#: ../app/welcomewizard/Slide6.qml:65
123 #, qt-format
124 msgid ""
125 "If you find any bugs or have any feature requests, let us know on our "
126 "project page at %1"
127 msgstr ""
128
129-#: ../app/welcomewizard/Slide6.qml:45
130+#: ../app/welcomewizard/Slide7.qml:45
131 msgid "Enjoy"
132 msgstr ""
133
134-#: ../app/welcomewizard/Slide6.qml:62
135+#: ../app/welcomewizard/Slide7.qml:62
136 msgid "We hope you enjoy using Podbird!"
137 msgstr ""
138
139-#: ../app/welcomewizard/Slide6.qml:76
140+#: ../app/welcomewizard/Slide7.qml:76
141 msgid "Finish"
142 msgstr ""
143
144-#: /home/krnekhelesh/Development/fix-minor-episodes-page-build/po/Podbird.desktop.in.h:1
145+#: /home/krnekhelesh/Development/add-listitemactions-welcome-wizard-build/po/Podbird.desktop.in.h:1
146 msgid "The chirpiest podcast manager for Ubuntu"
147 msgstr ""
148
149-#: /home/krnekhelesh/Development/fix-minor-episodes-page-build/po/Podbird.desktop.in.h:2
150+#: /home/krnekhelesh/Development/add-listitemactions-welcome-wizard-build/po/Podbird.desktop.in.h:2
151 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
152 msgstr ""

Subscribers

People subscribed via source and target branches