Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/fix-1351057 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. fix-1351057
  2. Merge into trunk
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 278
Merged at revision: 278
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/fix-1351057
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 257 lines (+59/-43)
3 files modified
OrganicGrid.qml (+1/-0)
po/po.pro (+1/-2)
po/rssreader-app.pot (+57/-41)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/fix-1351057
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+229564@code.launchpad.net

Commit message

fix bug 1351057 and update the po file.

Description of the change

fix bug 1351057 and update the po file.

Actually this is not a bug of Shorts, the startup changes the app's size a lot that makes one of app's slot function execute too many times. So I add a workaround to force other useless grid "invisible".

To post a comment you must log in.
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
1=== modified file 'OrganicGrid.qml'
2--- OrganicGrid.qml 2014-08-02 18:40:48 +0000
3+++ OrganicGrid.qml 2014-08-05 07:52:51 +0000
4@@ -87,6 +87,7 @@
5 function clear() {
6 var len = rectangleList.length
7 for(var i = 0; i < len; i++) {
8+ rectangleList[i].visible = false
9 rectangleList[i].destroy()
10 }
11
12
13=== modified file 'po/po.pro'
14--- po/po.pro 2014-03-11 00:20:14 +0000
15+++ po/po.pro 2014-08-05 07:52:51 +0000
16@@ -15,8 +15,7 @@
17 SOURCECODE = ../*.qml \
18 ../*.js \
19 ../article_items/*.qml \
20- ../feeds/*.qml \
21- ../listview/*.qml
22+ ../feeds/*.qml
23
24 BUILDDIR = ../.build
25 DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.shorts_shorts.desktop.in
26
27=== modified file 'po/rssreader-app.pot'
28--- po/rssreader-app.pot 2014-03-11 00:20:14 +0000
29+++ po/rssreader-app.pot 2014-08-05 07:52:51 +0000
30@@ -8,7 +8,7 @@
31 msgstr ""
32 "Project-Id-Version: rssreader-app\n"
33 "Report-Msgid-Bugs-To: \n"
34-"POT-Creation-Date: 2014-03-10 19:19-0500\n"
35+"POT-Creation-Date: 2014-08-05 15:01+0800\n"
36 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
37 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38 "Language-Team: LANGUAGE <LL@li.org>\n"
39@@ -18,110 +18,126 @@
40 "Content-Transfer-Encoding: 8bit\n"
41 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
42
43-#: ../RssFeedPage.qml:75
44+#: ../ArticleViewItem.qml:120
45+msgid "Select article"
46+msgstr ""
47+
48+#: ../ArticleViewItem.qml:232
49+msgid "Show media"
50+msgstr ""
51+
52+#: ../ListModePage.qml:267 ../shorts-app.qml:242
53+msgid "Add reads"
54+msgstr ""
55+
56+#: ../ListModePage.qml:285 ../RssFeedPage.qml:42
57 msgid "Options"
58 msgstr ""
59
60-#: ../RssFeedPage.qml:86
61+#: ../ListModePage.qml:301 ../RssFeedPage.qml:52
62 msgid "Save"
63 msgstr ""
64
65-#: ../RssFeedPage.qml:86 ../feeds/SwipeDelete.qml:57
66+#: ../ListModePage.qml:301 ../RssFeedPage.qml:52 ../feeds/SwipeDelete.qml:57
67 #: ../feeds/SwipeDelete.qml:76
68 msgid "Remove"
69 msgstr ""
70
71-#: ../RssFeedPage.qml:104
72+#: ../ListModePage.qml:323 ../RssFeedPage.qml:70
73 msgid "Open site"
74 msgstr ""
75
76-#: ../RssFeedPage.qml:212
77+#: ../ReadingOptions.qml:111
78 msgid "Small"
79 msgstr ""
80
81-#: ../RssFeedPage.qml:214
82+#: ../ReadingOptions.qml:113
83 msgid "Mid"
84 msgstr ""
85
86-#: ../RssFeedPage.qml:215
87+#: ../ReadingOptions.qml:114
88 msgid "Large"
89 msgstr ""
90
91-#: ../RssFeedPage.qml:385
92-msgid "Show media"
93-msgstr ""
94-
95-#: ../SavedTab.qml:187
96+#: ../SavedTab.qml:190
97 msgid "You have no saved articles"
98 msgstr ""
99
100-#: ../ShortsTab.qml:180 ../TopicTab.qml:134
101+#: ../ShortsTab.qml:184 ../TopicTab.qml:136
102 msgid "There are no articles to show"
103 msgstr ""
104
105-#: ../shorts-app.qml:188
106+#: ../shorts-app.qml:196
107 msgid "Refresh"
108 msgstr ""
109
110-#: ../shorts-app.qml:203
111+#: ../shorts-app.qml:208
112 msgid "Grid View"
113 msgstr ""
114
115-#: ../shorts-app.qml:203
116+#: ../shorts-app.qml:208
117 msgid "List view"
118 msgstr ""
119
120-#: ../shorts-app.qml:236
121-msgid "Add reads"
122-msgstr ""
123-
124-#: ../shorts-app.qml:247 ../feeds/TopicManagement.qml:13
125+#: ../shorts-app.qml:251 ../feeds/TopicManagement.qml:13
126 msgid "Edit topics"
127 msgstr ""
128
129-#: ../shorts-app.qml:324
130+#: ../shorts-app.qml:360
131 msgid "Saved"
132 msgstr ""
133
134-#: ../shorts-app.qml:332 ../.build/com.ubuntu.shorts_shorts.desktop.in:1
135+#: ../shorts-app.qml:368 ../.build/com.ubuntu.shorts_shorts.desktop.in:1
136 msgid "Shorts"
137 msgstr ""
138
139-#: ../shorts-app.qml:397 ../feeds/AppendFeedPage.qml:30
140+#: ../shorts-app.qml:433 ../feeds/AppendFeedPage.qml:30
141 msgid "Add feeds"
142 msgstr ""
143
144-#: ../shorts-app.qml:444
145+#: ../shorts-app.qml:484
146 msgid "Checking for new articles"
147 msgstr ""
148
149-#: ../shorts-app.qml:452 ../feeds/AppendFeedPage.qml:53
150+#: ../shorts-app.qml:492 ../feeds/AppendFeedPage.qml:53
151 #: ../feeds/CreateTopicPage.qml:31 ../feeds/EditFeed.qml:24
152 #: ../feeds/TopicManagement.qml:77
153 msgid "Cancel"
154 msgstr ""
155
156-#: ../shorts-app.qml:468
157+#: ../shorts-app.qml:508
158 msgid "Perhaps some of the channels have not been updated."
159 msgstr ""
160
161-#: ../shorts-app.qml:469
162+#: ../shorts-app.qml:509
163 msgid "Errors occurred during the update"
164 msgstr ""
165
166-#: ../shorts-app.qml:487
167+#: ../shorts-app.qml:527
168 msgid "+ Add feeds"
169 msgstr ""
170
171-#: ../shorts-app.qml:507
172+#: ../shorts-app.qml:547
173 msgid "Add online accounts"
174 msgstr ""
175
176-#: ../shorts-app.qml:514
177+#: ../shorts-app.qml:550
178+msgid "Online accounts are not available for now"
179+msgstr ""
180+
181+#: ../shorts-app.qml:551 ../shorts-app.qml:560
182+msgid "We are sorry"
183+msgstr ""
184+
185+#: ../shorts-app.qml:556
186 msgid "Import subscriptions"
187 msgstr ""
188
189-#: ../shorts-app.qml:530
190+#: ../shorts-app.qml:559
191+msgid "Importing subscriptions is not available for now"
192+msgstr ""
193+
194+#: ../shorts-app.qml:574
195 msgid "Ok"
196 msgstr ""
197
198@@ -193,11 +209,11 @@
199 msgid "Type a keyword or URL"
200 msgstr ""
201
202-#: ../feeds/AppendFeedPage.qml:247
203+#: ../feeds/AppendFeedPage.qml:246
204 msgid "Search results"
205 msgstr ""
206
207-#: ../feeds/AppendFeedPage.qml:291 ../feeds/CreateTopicPage.qml:172
208+#: ../feeds/AppendFeedPage.qml:290 ../feeds/CreateTopicPage.qml:171
209 msgid "No feeds"
210 msgstr ""
211
212@@ -217,16 +233,16 @@
213 msgid " + New topic"
214 msgstr ""
215
216-#: ../feeds/ChooseTopicPage.qml:148 ../feeds/CreateTopicPage.qml:67
217+#: ../feeds/ChooseTopicPage.qml:159 ../feeds/CreateTopicPage.qml:67
218 msgid "A topic with this name already exists"
219 msgstr ""
220
221-#: ../feeds/ChooseTopicPage.qml:149 ../feeds/ChooseTopicPage.qml:162
222+#: ../feeds/ChooseTopicPage.qml:160 ../feeds/ChooseTopicPage.qml:173
223 #: ../feeds/CreateTopicPage.qml:56 ../feeds/CreateTopicPage.qml:68
224 msgid "Warning"
225 msgstr ""
226
227-#: ../feeds/ChooseTopicPage.qml:161 ../feeds/CreateTopicPage.qml:55
228+#: ../feeds/ChooseTopicPage.qml:172 ../feeds/CreateTopicPage.qml:55
229 msgid "Topic name can't contain only whitespaces"
230 msgstr ""
231
232@@ -234,7 +250,7 @@
233 msgid "Create new topic"
234 msgstr ""
235
236-#: ../feeds/CreateTopicPage.qml:45 ../feeds/TopicManagement.qml:152
237+#: ../feeds/CreateTopicPage.qml:45 ../feeds/TopicManagement.qml:151
238 msgid "Add topic"
239 msgstr ""
240
241@@ -242,7 +258,7 @@
242 msgid "Type topic name"
243 msgstr ""
244
245-#: ../feeds/CreateTopicPage.qml:133
246+#: ../feeds/CreateTopicPage.qml:132
247 msgid "Select feeds (optional)"
248 msgstr ""
249
250@@ -274,6 +290,6 @@
251 msgid "Add Feed"
252 msgstr ""
253
254-#: ../feeds/TopicManagement.qml:90
255+#: ../feeds/TopicManagement.qml:92
256 msgid "Confirm"
257 msgstr ""

Subscribers

People subscribed via source and target branches