Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/alarmday-selectall-shortcut into lp:ubuntu-clock-app

  1. alarmday-selectall-shortcut
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 79
Merged at revision: 81
Proposed branch: lp:~nik90/ubuntu-clock-app/alarmday-selectall-shortcut
Merge into: lp:ubuntu-clock-app
Diff against target: 573 lines (+512/-2)
6 files modified
app/alarm/AlarmRepeat.qml (+39/-1)
app/graphics/CMakeLists.txt (+1/-1)
app/graphics/select-none.svg (+153/-0)
app/graphics/select-undefined.svg (+160/-0)
app/graphics/select.svg (+158/-0)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/alarmday-selectall-shortcut
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+233134@code.launchpad.net

Commit message

Added header button to toggle all alarm repeat options.

Description of the change

Added header button to toggle all alarm repeat options.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/263/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/146/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/263

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/263/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/431/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/78

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/431/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/432/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/148/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/79

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/432/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/433/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/150
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/80

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/433/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/265/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/155
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/265

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/265/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/435/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/156
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/82

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/435/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

That works nicely!

review: Approve
lp:~nik90/ubuntu-clock-app/alarmday-selectall-shortcut updated
78. By Nekhelesh Ramananthan

Added a small margin to the switches in the alarm repeat page

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/266/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/159
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/266

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/266/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Approved by design. Just requires a code sign off.

lp:~nik90/ubuntu-clock-app/alarmday-selectall-shortcut updated
79. By Nekhelesh Ramananthan

merged trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmRepeat.qml'
2--- app/alarm/AlarmRepeat.qml 2014-08-28 09:19:04 +0000
3+++ app/alarm/AlarmRepeat.qml 2014-09-04 20:52:20 +0000
4@@ -30,6 +30,35 @@
5 visible: false
6 title: i18n.tr("Repeat")
7
8+ head.actions: [
9+ Action {
10+ text: i18n.tr("Select All")
11+
12+ iconSource: {
13+ if(alarm.daysOfWeek === 0)
14+ return Qt.resolvedUrl("../graphics/select-none.svg")
15+ else if(alarm.daysOfWeek === 127)
16+ return Qt.resolvedUrl("../graphics/select.svg")
17+ else
18+ return Qt.resolvedUrl("../graphics/select-undefined.svg")
19+ }
20+
21+ onTriggered: {
22+ if (alarm.daysOfWeek === 0) {
23+ for (var i=0; i<_alarmDays.count; i++) {
24+ _alarmDays.itemAt(i).isChecked = true
25+ }
26+ }
27+
28+ else {
29+ for (var i=0; i<_alarmDays.count; i++) {
30+ _alarmDays.itemAt(i).isChecked = false
31+ }
32+ }
33+ }
34+ }
35+ ]
36+
37 /*
38 By Default, the alarm is set to Today. However if it is a one-time alarm,
39 this should be set to none, since this page shows the days the alarm
40@@ -101,6 +130,8 @@
41 id: _alarmDayHolder
42 objectName: "alarmDayHolder" + index
43
44+ property alias isChecked: daySwitch.checked
45+
46 Label {
47 id: _alarmDay
48 objectName: 'alarmDay' + index
49@@ -115,8 +146,15 @@
50 text: Qt.locale().standaloneDayName(day, Locale.LongFormat)
51 }
52
53- control: Switch {
54+ control: CheckBox {
55+ id: daySwitch
56 objectName: 'daySwitch' + index
57+
58+ anchors {
59+ right: parent.right
60+ rightMargin: units.gu(-0.2)
61+ }
62+
63 checked: (alarm.daysOfWeek & flag) == flag
64 && alarm.type === Alarm.Repeating
65 onCheckedChanged: {
66
67=== modified file 'app/graphics/CMakeLists.txt'
68--- app/graphics/CMakeLists.txt 2014-08-07 20:47:53 +0000
69+++ app/graphics/CMakeLists.txt 2014-09-04 20:52:20 +0000
70@@ -1,4 +1,4 @@
71-file(GLOB GRAPHICS_FILES *.png *.jpg)
72+file(GLOB GRAPHICS_FILES *.png *.jpg *.svg)
73
74 # make the files visible in the qtcreator tree
75 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
76
77=== added file 'app/graphics/select-none.svg'
78--- app/graphics/select-none.svg 1970-01-01 00:00:00 +0000
79+++ app/graphics/select-none.svg 2014-09-04 20:52:20 +0000
80@@ -0,0 +1,153 @@
81+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
82+<!-- Created with Inkscape (http://www.inkscape.org/) -->
83+
84+<svg
85+ xmlns:dc="http://purl.org/dc/elements/1.1/"
86+ xmlns:cc="http://creativecommons.org/ns#"
87+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
88+ xmlns:svg="http://www.w3.org/2000/svg"
89+ xmlns="http://www.w3.org/2000/svg"
90+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
91+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
92+ width="90"
93+ height="90"
94+ id="svg4874"
95+ version="1.1"
96+ inkscape:version="0.48+devel r"
97+ viewBox="0 0 90 90.000001"
98+ sodipodi:docname="select-none.svg">
99+ <defs
100+ id="defs4876" />
101+ <sodipodi:namedview
102+ id="base"
103+ pagecolor="#ffffff"
104+ bordercolor="#666666"
105+ borderopacity="1.0"
106+ inkscape:pageopacity="0.0"
107+ inkscape:pageshadow="2"
108+ inkscape:zoom="12.434498"
109+ inkscape:cx="10.237647"
110+ inkscape:cy="53.078139"
111+ inkscape:document-units="px"
112+ inkscape:current-layer="g1311"
113+ showgrid="true"
114+ showborder="true"
115+ fit-margin-top="0"
116+ fit-margin-left="0"
117+ fit-margin-right="0"
118+ fit-margin-bottom="0"
119+ inkscape:snap-bbox="true"
120+ inkscape:bbox-paths="true"
121+ inkscape:bbox-nodes="true"
122+ inkscape:snap-bbox-edge-midpoints="true"
123+ inkscape:snap-bbox-midpoints="true"
124+ inkscape:object-paths="true"
125+ inkscape:snap-intersection-paths="true"
126+ inkscape:object-nodes="true"
127+ inkscape:snap-smooth-nodes="true"
128+ inkscape:snap-midpoints="true"
129+ inkscape:snap-object-midpoints="true"
130+ inkscape:snap-center="true"
131+ showguides="true"
132+ inkscape:guide-bbox="true">
133+ <inkscape:grid
134+ type="xygrid"
135+ id="grid5451"
136+ empspacing="6" />
137+ <sodipodi:guide
138+ orientation="1,0"
139+ position="6,77"
140+ id="guide4063" />
141+ <sodipodi:guide
142+ orientation="1,0"
143+ position="3,78"
144+ id="guide4065" />
145+ <sodipodi:guide
146+ orientation="0,1"
147+ position="55,84"
148+ id="guide4067" />
149+ <sodipodi:guide
150+ orientation="0,1"
151+ position="53,87"
152+ id="guide4069" />
153+ <sodipodi:guide
154+ orientation="0,1"
155+ position="20,3"
156+ id="guide4071" />
157+ <sodipodi:guide
158+ orientation="0,1"
159+ position="20,6"
160+ id="guide4073" />
161+ <sodipodi:guide
162+ orientation="1,0"
163+ position="87,7"
164+ id="guide4075" />
165+ <sodipodi:guide
166+ orientation="1,0"
167+ position="84,7"
168+ id="guide4077" />
169+ <sodipodi:guide
170+ orientation="0,1"
171+ position="58,81"
172+ id="guide4074" />
173+ <sodipodi:guide
174+ orientation="1,0"
175+ position="9,74"
176+ id="guide4076" />
177+ <sodipodi:guide
178+ orientation="0,1"
179+ position="21,9"
180+ id="guide4078" />
181+ <sodipodi:guide
182+ orientation="1,0"
183+ position="81,4"
184+ id="guide4080" />
185+ </sodipodi:namedview>
186+ <metadata
187+ id="metadata4879">
188+ <rdf:RDF>
189+ <cc:Work
190+ rdf:about="">
191+ <dc:format>image/svg+xml</dc:format>
192+ <dc:type
193+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
194+ <dc:title></dc:title>
195+ </cc:Work>
196+ </rdf:RDF>
197+ </metadata>
198+ <g
199+ inkscape:label="Layer 1"
200+ inkscape:groupmode="layer"
201+ id="layer1"
202+ transform="translate(67.857146,-84.50504)">
203+ <g
204+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
205+ id="g4845"
206+ style="display:inline">
207+ <g
208+ transform="matrix(0,-1,-1,0,567.36222,615.36221)"
209+ id="g1311"
210+ inkscape:export-filename="envelope02.png"
211+ inkscape:export-xdpi="90"
212+ inkscape:export-ydpi="90">
213+ <g
214+ id="g1313"
215+ transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
216+ <rect
217+ transform="translate(0,804.3622)"
218+ y="152"
219+ x="288"
220+ height="48"
221+ width="48"
222+ id="rect1315"
223+ style="opacity:0.21171169;fill:none;stroke:none" />
224+ </g>
225+ <path
226+ style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
227+ d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
228+ transform="translate(174,135.36222)"
229+ id="path4098" />
230+ </g>
231+ </g>
232+ </g>
233+</svg>
234
235=== added file 'app/graphics/select-undefined.svg'
236--- app/graphics/select-undefined.svg 1970-01-01 00:00:00 +0000
237+++ app/graphics/select-undefined.svg 2014-09-04 20:52:20 +0000
238@@ -0,0 +1,160 @@
239+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
240+<!-- Created with Inkscape (http://www.inkscape.org/) -->
241+
242+<svg
243+ xmlns:dc="http://purl.org/dc/elements/1.1/"
244+ xmlns:cc="http://creativecommons.org/ns#"
245+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
246+ xmlns:svg="http://www.w3.org/2000/svg"
247+ xmlns="http://www.w3.org/2000/svg"
248+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
249+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
250+ width="90"
251+ height="90"
252+ id="svg4874"
253+ version="1.1"
254+ inkscape:version="0.48+devel r"
255+ viewBox="0 0 90 90.000001"
256+ sodipodi:docname="select-some.svg">
257+ <defs
258+ id="defs4876" />
259+ <sodipodi:namedview
260+ id="base"
261+ pagecolor="#ffffff"
262+ bordercolor="#666666"
263+ borderopacity="1.0"
264+ inkscape:pageopacity="0.0"
265+ inkscape:pageshadow="2"
266+ inkscape:zoom="4.0745363"
267+ inkscape:cx="15.609138"
268+ inkscape:cy="44.55722"
269+ inkscape:document-units="px"
270+ inkscape:current-layer="g1311"
271+ showgrid="true"
272+ showborder="true"
273+ fit-margin-top="0"
274+ fit-margin-left="0"
275+ fit-margin-right="0"
276+ fit-margin-bottom="0"
277+ inkscape:snap-bbox="true"
278+ inkscape:bbox-paths="true"
279+ inkscape:bbox-nodes="true"
280+ inkscape:snap-bbox-edge-midpoints="true"
281+ inkscape:snap-bbox-midpoints="true"
282+ inkscape:object-paths="true"
283+ inkscape:snap-intersection-paths="true"
284+ inkscape:object-nodes="true"
285+ inkscape:snap-smooth-nodes="true"
286+ inkscape:snap-midpoints="true"
287+ inkscape:snap-object-midpoints="true"
288+ inkscape:snap-center="true"
289+ showguides="true"
290+ inkscape:guide-bbox="true">
291+ <inkscape:grid
292+ type="xygrid"
293+ id="grid5451"
294+ empspacing="6" />
295+ <sodipodi:guide
296+ orientation="1,0"
297+ position="6,77"
298+ id="guide4063" />
299+ <sodipodi:guide
300+ orientation="1,0"
301+ position="3,78"
302+ id="guide4065" />
303+ <sodipodi:guide
304+ orientation="0,1"
305+ position="55,84"
306+ id="guide4067" />
307+ <sodipodi:guide
308+ orientation="0,1"
309+ position="53,87"
310+ id="guide4069" />
311+ <sodipodi:guide
312+ orientation="0,1"
313+ position="20,3"
314+ id="guide4071" />
315+ <sodipodi:guide
316+ orientation="0,1"
317+ position="20,6"
318+ id="guide4073" />
319+ <sodipodi:guide
320+ orientation="1,0"
321+ position="87,7"
322+ id="guide4075" />
323+ <sodipodi:guide
324+ orientation="1,0"
325+ position="84,7"
326+ id="guide4077" />
327+ <sodipodi:guide
328+ orientation="0,1"
329+ position="58,81"
330+ id="guide4074" />
331+ <sodipodi:guide
332+ orientation="1,0"
333+ position="9,74"
334+ id="guide4076" />
335+ <sodipodi:guide
336+ orientation="0,1"
337+ position="21,9"
338+ id="guide4078" />
339+ <sodipodi:guide
340+ orientation="1,0"
341+ position="81,4"
342+ id="guide4080" />
343+ </sodipodi:namedview>
344+ <metadata
345+ id="metadata4879">
346+ <rdf:RDF>
347+ <cc:Work
348+ rdf:about="">
349+ <dc:format>image/svg+xml</dc:format>
350+ <dc:type
351+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
352+ <dc:title></dc:title>
353+ </cc:Work>
354+ </rdf:RDF>
355+ </metadata>
356+ <g
357+ inkscape:label="Layer 1"
358+ inkscape:groupmode="layer"
359+ id="layer1"
360+ transform="translate(67.857146,-84.50504)">
361+ <g
362+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
363+ id="g4845"
364+ style="display:inline">
365+ <g
366+ transform="matrix(0,-1,-1,0,567.36222,615.36221)"
367+ id="g1311"
368+ inkscape:export-filename="envelope02.png"
369+ inkscape:export-xdpi="90"
370+ inkscape:export-ydpi="90">
371+ <g
372+ id="g1313"
373+ transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
374+ <rect
375+ transform="translate(0,804.3622)"
376+ y="152"
377+ x="288"
378+ height="48"
379+ width="48"
380+ id="rect1315"
381+ style="opacity:0.21171169;fill:none;stroke:none" />
382+ </g>
383+ <path
384+ style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
385+ d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
386+ transform="translate(174,135.36222)"
387+ id="path4098" />
388+ <rect
389+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
390+ id="rect4153"
391+ width="42"
392+ height="9"
393+ x="198"
394+ y="175.86221" />
395+ </g>
396+ </g>
397+ </g>
398+</svg>
399
400=== added file 'app/graphics/select.svg'
401--- app/graphics/select.svg 1970-01-01 00:00:00 +0000
402+++ app/graphics/select.svg 2014-09-04 20:52:20 +0000
403@@ -0,0 +1,158 @@
404+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
405+<!-- Created with Inkscape (http://www.inkscape.org/) -->
406+
407+<svg
408+ xmlns:dc="http://purl.org/dc/elements/1.1/"
409+ xmlns:cc="http://creativecommons.org/ns#"
410+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
411+ xmlns:svg="http://www.w3.org/2000/svg"
412+ xmlns="http://www.w3.org/2000/svg"
413+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
414+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
415+ width="90"
416+ height="90"
417+ id="svg4874"
418+ version="1.1"
419+ inkscape:version="0.48+devel r12833"
420+ viewBox="0 0 90 90.000001"
421+ sodipodi:docname="select.svg">
422+ <defs
423+ id="defs4876" />
424+ <sodipodi:namedview
425+ id="base"
426+ pagecolor="#ffffff"
427+ bordercolor="#666666"
428+ borderopacity="1.0"
429+ inkscape:pageopacity="0.0"
430+ inkscape:pageshadow="2"
431+ inkscape:zoom="12.434498"
432+ inkscape:cx="30.343002"
433+ inkscape:cy="53.600878"
434+ inkscape:document-units="px"
435+ inkscape:current-layer="g1311"
436+ showgrid="true"
437+ showborder="true"
438+ fit-margin-top="0"
439+ fit-margin-left="0"
440+ fit-margin-right="0"
441+ fit-margin-bottom="0"
442+ inkscape:snap-bbox="true"
443+ inkscape:bbox-paths="true"
444+ inkscape:bbox-nodes="true"
445+ inkscape:snap-bbox-edge-midpoints="true"
446+ inkscape:snap-bbox-midpoints="true"
447+ inkscape:object-paths="true"
448+ inkscape:snap-intersection-paths="true"
449+ inkscape:object-nodes="true"
450+ inkscape:snap-smooth-nodes="true"
451+ inkscape:snap-midpoints="true"
452+ inkscape:snap-object-midpoints="true"
453+ inkscape:snap-center="true"
454+ showguides="true"
455+ inkscape:guide-bbox="true">
456+ <inkscape:grid
457+ type="xygrid"
458+ id="grid5451"
459+ empspacing="6" />
460+ <sodipodi:guide
461+ orientation="1,0"
462+ position="6,77"
463+ id="guide4063" />
464+ <sodipodi:guide
465+ orientation="1,0"
466+ position="3,78"
467+ id="guide4065" />
468+ <sodipodi:guide
469+ orientation="0,1"
470+ position="55,84"
471+ id="guide4067" />
472+ <sodipodi:guide
473+ orientation="0,1"
474+ position="53,87"
475+ id="guide4069" />
476+ <sodipodi:guide
477+ orientation="0,1"
478+ position="20,3"
479+ id="guide4071" />
480+ <sodipodi:guide
481+ orientation="0,1"
482+ position="20,6"
483+ id="guide4073" />
484+ <sodipodi:guide
485+ orientation="1,0"
486+ position="87,7"
487+ id="guide4075" />
488+ <sodipodi:guide
489+ orientation="1,0"
490+ position="84,7"
491+ id="guide4077" />
492+ <sodipodi:guide
493+ orientation="0,1"
494+ position="58,81"
495+ id="guide4074" />
496+ <sodipodi:guide
497+ orientation="1,0"
498+ position="9,74"
499+ id="guide4076" />
500+ <sodipodi:guide
501+ orientation="0,1"
502+ position="21,9"
503+ id="guide4078" />
504+ <sodipodi:guide
505+ orientation="1,0"
506+ position="81,4"
507+ id="guide4080" />
508+ </sodipodi:namedview>
509+ <metadata
510+ id="metadata4879">
511+ <rdf:RDF>
512+ <cc:Work
513+ rdf:about="">
514+ <dc:format>image/svg+xml</dc:format>
515+ <dc:type
516+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
517+ <dc:title></dc:title>
518+ </cc:Work>
519+ </rdf:RDF>
520+ </metadata>
521+ <g
522+ inkscape:label="Layer 1"
523+ inkscape:groupmode="layer"
524+ id="layer1"
525+ transform="translate(67.857146,-84.50504)">
526+ <g
527+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
528+ id="g4845"
529+ style="display:inline">
530+ <g
531+ transform="matrix(0,-1,-1,0,567.36222,615.36221)"
532+ id="g1311"
533+ inkscape:export-filename="envelope02.png"
534+ inkscape:export-xdpi="90"
535+ inkscape:export-ydpi="90">
536+ <g
537+ id="g1313"
538+ transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
539+ <rect
540+ transform="translate(0,804.3622)"
541+ y="152"
542+ x="288"
543+ height="48"
544+ width="48"
545+ id="rect1315"
546+ style="opacity:0.21171169;fill:none;stroke:none" />
547+ </g>
548+ <path
549+ style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
550+ d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
551+ transform="translate(174,135.36222)"
552+ id="path4098" />
553+ <path
554+ style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
555+ d="m 242.00422,161.6591 -0.375,0.32812 -26.94727,23.60352 -15.79687,-13.55079 -4.77539,5.4004 20.57617,21.64843 31.30078,-32.9375 -3.98242,-4.49218 z"
556+ id="path4041-9"
557+ inkscape:connector-curvature="0" />
558+ </g>
559+ </g>
560+ </g>
561+</svg>
562
563=== modified file 'debian/changelog'
564--- debian/changelog 2014-09-04 20:21:00 +0000
565+++ debian/changelog 2014-09-04 20:52:20 +0000
566@@ -19,6 +19,7 @@
567 * Updated QtQuick library imports to v2.3
568 * Switched bzr branch to lp:ubuntu-clock-app
569 * Updated pot file name
570+ * Added header shortcut to select/deselect all alarm repeat options (LP: #1362089)
571 * Added visual tweaks (80% opacity for disabled alarms) and show time to
572 next alarm when enabling an alarm.
573 * Enabled one-time alarms in the UI (LP: #1358320)

Subscribers

People subscribed via source and target branches