Quick Memo

Merge lp:~verzegnassi-stefano/quick-memo/make-about-page-better into lp:quick-memo/trunk

  1. make-about-page-better
  2. Merge into 0.3
Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 60
Merged at revision: 60
Proposed branch: lp:~verzegnassi-stefano/quick-memo/make-about-page-better
Merge into: lp:quick-memo/trunk
Diff against target: 445 lines (+177/-160) (has conflicts)
4 files modified
app/components/AboutPage.qml (+157/-146)
app/components/EditMemoPage.qml (+1/-1)
copyright (+1/-1)
po/quick-memo.pot (+18/-12)
Text conflict in po/quick-memo.pot
To merge this branch: bzr merge lp:~verzegnassi-stefano/quick-memo/make-about-page-better
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Pending
Review via email: mp+246832@code.launchpad.net

Commit message

Improvements to AboutPage

Description of the change

Improvements to AboutPage

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=== modified file 'app/components/AboutPage.qml'
2--- app/components/AboutPage.qml 2015-01-14 19:51:10 +0000
3+++ app/components/AboutPage.qml 2015-01-17 20:27:33 +0000
4@@ -1,6 +1,6 @@
5 /*
6 This file is part of quick-memo
7- Copyright (C) 2014 Stefano Verzegnassi
8+ Copyright (C) 2014-2015 Stefano Verzegnassi
9
10 This program is free software: you can redistribute it and/or modify
11 it under the terms of the GNU General Public License 3 as published by
12@@ -23,172 +23,183 @@
13 Page {
14 id: aboutPage
15
16+ title: i18n.tr("About")
17+ head.sections.model: [i18n.tr("About"), i18n.tr("Credits"), i18n.tr("Copyright")]
18+
19 property string version
20
21- title: i18n.tr("About")
22-
23- head {
24- sections.model: [i18n.tr("About"), i18n.tr("Credits")]
25+ Loader {
26+ id: view
27+
28+ anchors {
29+ fill: parent
30+ margins: units.gu(2)
31+ }
32+
33+ sourceComponent: {
34+ if (aboutPage.head.sections.selectedIndex == 0)
35+ return aboutSection
36+
37+ if (aboutPage.head.sections.selectedIndex == 1)
38+ return creditSection
39+
40+ if (aboutPage.head.sections.selectedIndex == 2)
41+ return copyrightSection
42+ }
43 }
44
45- Column {
46- visible: aboutPage.head.sections.selectedIndex == 0
47- anchors.centerIn: parent
48- width: root.width > units.gu(50) ? units.gu(50) : parent.width
49- spacing: units.gu(4)
50-
51- UbuntuShape {
52- id: logo
53- x: (parent.width - width) / 2
54- width: parent.width / 2
55- height: width
56- radius: "medium"
57-
58- image: Image {
59- source: "../../graphics/quick-memo.png"
60- }
61- }
62-
63+ // ABOUT SECTION
64+ Component {
65+ id: aboutSection
66 Column {
67- width: parent.width
68-
69- Label {
70- x: (parent.width - width) / 2
71- fontSize: "x-large"
72- font.weight: Font.DemiBold
73- text: "Quick Memo"
74- }
75-
76- Label {
77- x: (parent.width - width) / 2
78-
79- // TRANSLATORS: Version of the software (e.g. "Version 0.3.51")
80- text: i18n.tr("Version ") + aboutPage.version
81-
82- Component.onCompleted: {
83- // Extract version info from manifest.json
84- var doc = new XMLHttpRequest();
85- var json_string;
86- doc.onreadystatechange = function() {
87- if (doc.readyState == XMLHttpRequest.DONE) {
88- json_string = doc.responseText;
89-
90- if (json_string) {
91- var obj = JSON.parse(json_string)
92- aboutPage.version = obj.version
93- } else {
94- /* TRANSLATORS: This is shown where it's impossible to get
95- the version number (e.g. "Version UNKNOWN") */
96- aboutPage.version = i18n.tr("UNKNOWN")
97- }
98- }
99- }
100- doc.open("get", Qt.resolvedUrl("../../app_info.json"));
101-
102- doc.setRequestHeader("Content-Encoding", "UTF-8");
103- doc.send();
104+ anchors.centerIn: parent
105+ width: root.width > units.gu(50) ? units.gu(50) : parent.width
106+ spacing: units.gu(4)
107+
108+ UbuntuShape {
109+ id: logo
110+
111+ width: root.width > units.gu(50) ? units.gu(25) : parent.width / 2
112+ height: width
113+ radius: "medium"
114+
115+ image: Image {
116+ source: "../../graphics/quick-memo.png"
117 }
118- }
119- }
120-
121- Column {
122- width: parent.width
123-
124- Label {
125- x: (parent.width - width) / 2
126- text: "(C) 2014 Stefano Verzegnassi"
127- }
128-
129- Label {
130- x: (parent.width - width) / 2
131- fontSize: "small"
132- text: i18n.tr("Released under the terms of the GNU GPL v3")
133- }
134- }
135-
136- Column {
137- width: parent.width
138- spacing: units.gu(2)
139-
140- Label {
141- x: (parent.width - width) / 2
142- fontSize: "small"
143- text: i18n.tr("Source code available on ") + "<a href=\"https://launchpad.net/quick-memo\">launchpad.net</a>"
144- onLinkActivated: Qt.openUrlExternally(link)
145- }
146-
147- Button {
148+
149 anchors.horizontalCenter: parent.horizontalCenter
150- width: parent.width * 0.5
151- height: units.gu(4)
152-
153- // TRANSLATORS: This is the text of a button. Please be brief.
154- text: i18n.tr("See full copyright")
155- onClicked: PopupUtils.open(dialog)
156 }
157- }
158- }
159-
160- Column {
161- visible: aboutPage.head.sections.selectedIndex == 1
162- anchors.fill: parent
163- width: root.width > units.gu(50) ? units.gu(50) : parent.width
164-
165- ListItem.Header {
166- text: i18n.tr("A big thanks to:")
167- }
168-
169- ListItem.Subtitled {
170- text: "Nekhelesh Ramananthan"
171- subText: "Code contribution"
172- }
173-
174- ListItem.Subtitled {
175- text: "Renato Araujo Oliveira Filho"
176- subText: "Code contribution"
177- }
178- }
179-
180- Component {
181- id: dialog
182-
183- Dialog {
184- id: dialogue
185-
186- title: i18n.tr("Copyright")
187-
188- Flickable {
189- height: units.gu(20)
190- clip: true
191- contentHeight: copyrightText.height
192-
193- // Indipendent GU flickable speed workaround
194- flickDeceleration: 1500 * units.gridUnit / 8
195- maximumFlickVelocity: 2500 * units.gridUnit / 8
196-
197- Label {
198- id: copyrightText
199- wrapMode: Text.WordWrap
200- width: parent.width
201- fontSize: "x-small"
202+
203+ Column {
204+ width: parent.width
205+
206+ Label {
207+ fontSize: "x-large"
208+ font.weight: Font.DemiBold
209+ text: "Quick Memo"
210+
211+ anchors.horizontalCenter: parent.horizontalCenter
212+ }
213+
214+ Label {
215+ // TRANSLATORS: Version of the software (e.g. "Version 0.3.51")
216+ text: i18n.tr("Version ") + aboutPage.version
217+
218+ anchors.horizontalCenter: parent.horizontalCenter
219
220 Component.onCompleted: {
221+ // Extract version info from manifest.json
222 var doc = new XMLHttpRequest();
223+ var json_string;
224 doc.onreadystatechange = function() {
225 if (doc.readyState == XMLHttpRequest.DONE) {
226- text = doc.responseText;
227+ json_string = doc.responseText;
228+
229+ if (json_string) {
230+ var obj = JSON.parse(json_string)
231+ aboutPage.version = obj.version
232+ } else {
233+ /* TRANSLATORS: This is shown where it's impossible to get
234+ the version number (e.g. "Version UNKNOWN") */
235+ aboutPage.version = i18n.tr("UNKNOWN")
236+ }
237 }
238 }
239- doc.open("get", Qt.resolvedUrl("../../copyright"));
240+ doc.open("get", Qt.resolvedUrl("../../app_info.json"));
241+
242 doc.setRequestHeader("Content-Encoding", "UTF-8");
243 doc.send();
244 }
245 }
246 }
247
248- Button {
249- text: i18n.tr("Close")
250- onClicked: PopupUtils.close(dialogue)
251+ Column {
252+ width: parent.width
253+
254+ Label {
255+ text: "(C) 2014-2015 Stefano Verzegnassi"
256+ anchors.horizontalCenter: parent.horizontalCenter
257+ }
258+
259+ Label {
260+ fontSize: "small"
261+ text: i18n.tr("Released under the terms of the GNU GPL v3")
262+
263+ anchors.horizontalCenter: parent.horizontalCenter
264+ }
265+ }
266+
267+ Column {
268+ width: parent.width
269+ spacing: units.gu(2)
270+
271+ Label {
272+ fontSize: "small"
273+ text: i18n.tr("Source code available on ") + "<a href=\"https://launchpad.net/quick-memo\">launchpad.net</a>"
274+
275+ anchors.horizontalCenter: parent.horizontalCenter
276+
277+ onLinkActivated: Qt.openUrlExternally(link)
278+ }
279+ }
280+ }
281+ } // END ABOUT SECTION
282+
283+ // CREDITS SECTION
284+ Component {
285+ id: creditSection
286+
287+ Column {
288+ anchors.fill: parent
289+ width: root.width > units.gu(50) ? units.gu(50) : parent.width
290+
291+ ListItem.Header {
292+ text: i18n.tr("A big thanks to:")
293+ }
294+
295+ ListItem.Subtitled {
296+ text: "Nekhelesh Ramananthan"
297+ subText: "Code contribution"
298+ }
299+
300+ ListItem.Subtitled {
301+ text: "Renato Araujo Oliveira Filho"
302+ subText: "Code contribution"
303+ }
304+ }
305+ } // END CREDIT SECTION
306+
307+ // COPYRIGHT SECTION
308+ Component {
309+ id: copyrightSection
310+
311+ Flickable {
312+ anchors.fill: parent
313+
314+ clip: true
315+ contentHeight: copyrightText.height
316+
317+ // Indipendent GU flickable speed workaround
318+ flickDeceleration: 1500 * units.gridUnit / 8
319+ maximumFlickVelocity: 2500 * units.gridUnit / 8
320+
321+ Label {
322+ id: copyrightText
323+ wrapMode: Text.WordWrap
324+ width: parent.width
325+ fontSize: "x-small"
326+
327+ Component.onCompleted: {
328+ var doc = new XMLHttpRequest();
329+ doc.onreadystatechange = function() {
330+ if (doc.readyState == XMLHttpRequest.DONE) {
331+ text = doc.responseText;
332+ }
333+ }
334+ doc.open("get", Qt.resolvedUrl("../../copyright"));
335+ doc.setRequestHeader("Content-Encoding", "UTF-8");
336+ doc.send();
337+ }
338 }
339 }
340 }
341
342=== modified file 'app/components/EditMemoPage.qml'
343--- app/components/EditMemoPage.qml 2015-01-17 19:44:47 +0000
344+++ app/components/EditMemoPage.qml 2015-01-17 20:27:33 +0000
345@@ -1,6 +1,6 @@
346 /*
347 This file is part of quick-memo
348- Copyright (C) 2014 Stefano Verzegnassi
349+ Copyright (C) 2014-2015 Stefano Verzegnassi
350
351 This program is free software: you can redistribute it and/or modify
352 it under the terms of the GNU General Public License 3 as published by
353
354=== modified file 'copyright'
355--- copyright 2014-10-04 17:44:08 +0000
356+++ copyright 2015-01-17 20:27:33 +0000
357@@ -4,7 +4,7 @@
358 Source: http://launchpad.net/quick-memo
359
360 Files: *
361-Copyright: 2014, Stefano Verzegnassi
362+Copyright: 2014-2015, Stefano Verzegnassi
363 License: GPL-3
364
365 Files: components/PageWithBottomEdge.qml
366
367=== modified file 'po/quick-memo.pot'
368--- po/quick-memo.pot 2015-01-17 19:44:47 +0000
369+++ po/quick-memo.pot 2015-01-17 20:27:33 +0000
370@@ -8,7 +8,11 @@
371 msgstr ""
372 "Project-Id-Version: \n"
373 "Report-Msgid-Bugs-To: \n"
374+<<<<<<< TREE
375 "POT-Creation-Date: 2015-01-17 20:43+0100\n"
376+=======
377+"POT-Creation-Date: 2015-01-17 21:23+0100\n"
378+>>>>>>> MERGE-SOURCE
379 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
380 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
381 "Language-Team: LANGUAGE <LL@li.org>\n"
382@@ -18,42 +22,42 @@
383 "Content-Transfer-Encoding: 8bit\n"
384 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
385
386-#: ../app/components/AboutPage.qml:28 ../app/components/AboutPage.qml:31
387+#: ../app/components/AboutPage.qml:26 ../app/components/AboutPage.qml:27
388 msgid "About"
389 msgstr ""
390
391-#: ../app/components/AboutPage.qml:31
392+#: ../app/components/AboutPage.qml:27
393 msgid "Credits"
394 msgstr ""
395
396+#: ../app/components/AboutPage.qml:27
397+msgid "Copyright"
398+msgstr ""
399+
400 #. TRANSLATORS: Version of the software (e.g. "Version 0.3.51")
401-#: ../app/components/AboutPage.qml:66
402+#: ../app/components/AboutPage.qml:86
403 msgid "Version "
404 msgstr ""
405
406 #. TRANSLATORS: This is shown where it's impossible to get
407 #. the version number (e.g. "Version UNKNOWN")
408-#: ../app/components/AboutPage.qml:82
409+#: ../app/components/AboutPage.qml:104
410 msgid "UNKNOWN"
411 msgstr ""
412
413-#: ../app/components/AboutPage.qml:105
414+#: ../app/components/AboutPage.qml:126
415 msgid "Released under the terms of the GNU GPL v3"
416 msgstr ""
417
418-#: ../app/components/AboutPage.qml:116
419+#: ../app/components/AboutPage.qml:138
420 msgid "Source code available on "
421 msgstr ""
422
423-#. TRANSLATORS: This is the text of a button. Please be brief.
424-#: ../app/components/AboutPage.qml:126
425-msgid "See full copyright"
426-msgstr ""
427-
428-#: ../app/components/AboutPage.qml:138
429+#: ../app/components/AboutPage.qml:157
430 msgid "A big thanks to:"
431 msgstr ""
432
433+<<<<<<< TREE
434 #: ../app/components/AboutPage.qml:158
435 msgid "Copyright"
436 msgstr ""
437@@ -62,6 +66,8 @@
438 msgid "Close"
439 msgstr ""
440
441+=======
442+>>>>>>> MERGE-SOURCE
443 #: ../app/components/ColorDialog.qml:25
444 msgid "Pick a color"
445 msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: