Ubuntu Clock App

Merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1218751 into lp:ubuntu-clock-app/saucy

  1. fix-for-1218751
  2. Merge into saucy
Proposed by Paolo Rotolo
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 174
Merged at revision: 175
Proposed branch: lp:~paolorotolo/ubuntu-clock-app/fix-for-1218751
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 261 lines (+216/-3)
4 files modified
images/lap_icon@8.svg (+58/-0)
images/reset_icon@8.svg (+155/-0)
stopwatch/StopwatchPage.qml (+2/-2)
timer/TimerPage.qml (+1/-1)
To merge this branch: bzr merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1218751
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+183335@code.launchpad.net

Commit message

Added original .svg files of the icons "lap" and "reset" (LP: #1218751).

Description of the change

Added original .svg files of the icons "lap" and "reset".
Please see: https://bugs.launchpad.net/ubuntu-clock-app/+bug/1218751

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

The icons looks much better now on the phone. Thanks for the fix.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/4/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/151
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/4
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/4
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/4
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/4

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/6/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/154
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/6
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/6
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/6
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/6

review: Needs Fixing (continuous-integration)
Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

I think Jenkins hates me...

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Jenkins hates everybody :P. I have asked nicholas skaags to take a look tomorrow. Btw it is not your fault. Jenkins is sometimes stupid :)

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

correction Jenkins might like nicholas skaags or the autopilot team.

Revision history for this message
Omer Akram (om26er) wrote :

Actually its a real autopilot test failure, which maybe only visible in slow environments like we have in the VM running these tests. This time it was not able to switch tabs, might be something that needs improving uitoolkit emulators.

http://91.189.93.70:8080/job/generic-mediumtests/154/testReport/ubuntu_clock_app.tests.test_stopwatch/TestStopwatch/test_start_stop_reset_stopwatch_with_mouse_/

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@Omer can you please follow this up with elopio, balloons later please since this is an upstream issue blocking 5 MP from being merged?

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/9/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/160
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/9

review: Needs Fixing (continuous-integration)
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=== removed file 'images/lap_icon@8.png'
2Binary files images/lap_icon@8.png 2013-07-19 19:15:58 +0000 and images/lap_icon@8.png 1970-01-01 00:00:00 +0000 differ
3=== added file 'images/lap_icon@8.svg'
4--- images/lap_icon@8.svg 1970-01-01 00:00:00 +0000
5+++ images/lap_icon@8.svg 2013-08-31 16:37:36 +0000
6@@ -0,0 +1,58 @@
7+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
8+<svg
9+ xmlns:dc="http://purl.org/dc/elements/1.1/"
10+ xmlns:cc="http://creativecommons.org/ns#"
11+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
12+ xmlns:svg="http://www.w3.org/2000/svg"
13+ xmlns="http://www.w3.org/2000/svg"
14+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
15+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16+ version="1.0"
17+ width="32"
18+ height="32"
19+ viewBox="0 0 25.6 25.6"
20+ preserveAspectRatio="xMidYMid meet"
21+ id="svg2"
22+ inkscape:version="0.48.4 r9939"
23+ sodipodi:docname="ss (2).svg">
24+ <defs
25+ id="defs22" />
26+ <sodipodi:namedview
27+ pagecolor="#ffffff"
28+ bordercolor="#666666"
29+ borderopacity="1"
30+ objecttolerance="10"
31+ gridtolerance="10"
32+ guidetolerance="10"
33+ inkscape:pageopacity="0"
34+ inkscape:pageshadow="2"
35+ inkscape:window-width="1855"
36+ inkscape:window-height="1056"
37+ id="namedview20"
38+ showgrid="false"
39+ inkscape:zoom="12.0832"
40+ inkscape:cx="54.805449"
41+ inkscape:cy="28.439717"
42+ inkscape:window-x="65"
43+ inkscape:window-y="24"
44+ inkscape:window-maximized="1"
45+ inkscape:current-layer="svg2" />
46+ <metadata
47+ id="metadata4">
48+Created by potrace 1.11, written by Peter Selinger 2001-2013
49+<rdf:RDF>
50+ <cc:Work
51+ rdf:about="">
52+ <dc:format>image/svg+xml</dc:format>
53+ <dc:type
54+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
55+ <dc:title></dc:title>
56+ </cc:Work>
57+</rdf:RDF>
58+</metadata>
59+ <path
60+ id="rect3939-4-7-1"
61+ style="fill:#ffffff;fill-opacity:1;stroke-width:1.5406878;stroke-miterlimit:4;stroke-dasharray:1.5406878, 6.1627512;stroke-dashoffset:0.7703439"
62+ d="m 3.165341,15.122648 -2.81191993,1.16821 1.17770993,2.86754 2.79301,-1.16006 c -0.52493,-0.88037 -0.92039,-1.84747 -1.1588,-2.87569 z m -2.87404993,-5.4796898 -0.32819,3.0848698 2.95912993,0.31786 c -10e-4,-0.0675 -0.003,-0.13459 -0.003,-0.20239 0,-0.9984 0.14565,-1.96241 0.41463,-2.8729699 L 0.29099107,9.6429582 z M 3.590771,3.9309779 l -1.75441,2.38395 2.23792,1.66537 c 0.47848,-0.87382 1.08221,-1.66838 1.78682,-2.3595 l -2.27033,-1.68982 z m 5.6994701,-3.52907 -2.7214301,1.1424 1.1115301,2.67464 c 0.83357,-0.51032 1.74723,-0.90304 2.7173709,-1.1519 l -1.1074709,-2.66514 z m 3.5260409,-0.37695998 0,2.80912998 c 0.0203,-1.1e-4 0.0405,-10e-4 0.0608,-10e-4 5.48668,0 9.9349,4.47389 9.9349,9.9922301 0,5.51834 -4.44822,9.99087 -9.9349,9.99087 -2.78894,0 -5.3092509,-1.15565 -7.113531,-3.01695 l -2.02857,1.97236 c 2.31077,2.37781 5.5345801,3.85372 9.101581,3.85372 7.02876,0 12.72656,-5.73068 12.72656,-12.8 0,-7.0693101 -5.6978,-12.80000008 -12.72656,-12.80000008 -0.007,0 -0.0135,-10e-6 -0.0203,0 z M 10.777802,16.581688 c 0,1.13644 -0.9159809,2.05771 -2.0459009,2.05771 -1.12993,0 -2.0459101,-0.92127 -2.0459101,-2.05771 0,-1.13644 0.9159801,-2.05771 2.0459101,-2.05771 1.12992,0 2.0459009,0.92127 2.0459009,2.05771 z"
63+ inkscape:connector-curvature="0" />
64+</svg>
65
66=== removed file 'images/reset_icon@8.png'
67Binary files images/reset_icon@8.png 2013-07-19 19:15:58 +0000 and images/reset_icon@8.png 1970-01-01 00:00:00 +0000 differ
68=== added file 'images/reset_icon@8.svg'
69--- images/reset_icon@8.svg 1970-01-01 00:00:00 +0000
70+++ images/reset_icon@8.svg 2013-08-31 16:37:36 +0000
71@@ -0,0 +1,155 @@
72+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
73+<!-- Created with Inkscape (http://www.inkscape.org/) -->
74+
75+<svg
76+ xmlns:dc="http://purl.org/dc/elements/1.1/"
77+ xmlns:cc="http://creativecommons.org/ns#"
78+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
79+ xmlns:svg="http://www.w3.org/2000/svg"
80+ xmlns="http://www.w3.org/2000/svg"
81+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
82+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
83+ width="32"
84+ height="32"
85+ id="svg3140"
86+ version="1.1"
87+ inkscape:version="0.48.4 r9939"
88+ sodipodi:docname="reset_icon@8.svg">
89+ <defs
90+ id="defs3142">
91+ <clipPath
92+ clipPathUnits="userSpaceOnUse"
93+ id="clipPath2998">
94+ <path
95+ sodipodi:end="8.115781"
96+ sodipodi:start="2.8797933"
97+ d="M 4.5451866,22.141104 A 16,16 0 1 1 15.858896,33.454813 L 20,18 z"
98+ sodipodi:ry="16"
99+ sodipodi:rx="16"
100+ sodipodi:cy="18"
101+ sodipodi:cx="20"
102+ id="path3000"
103+ style="opacity:0.53153154;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
104+ sodipodi:type="arc"
105+ transform="matrix(0.78567419,0.78567419,-0.78567419,0.78567419,20.390658,-9.8556221)" />
106+ </clipPath>
107+ </defs>
108+ <sodipodi:namedview
109+ id="base"
110+ pagecolor="#ffffff"
111+ bordercolor="#666666"
112+ borderopacity="1.0"
113+ inkscape:pageopacity="0.0"
114+ inkscape:pageshadow="2"
115+ inkscape:zoom="25.465852"
116+ inkscape:cx="8.1491044"
117+ inkscape:cy="11.002992"
118+ inkscape:document-units="px"
119+ inkscape:current-layer="g3800"
120+ showgrid="true"
121+ inkscape:window-width="1855"
122+ inkscape:window-height="1056"
123+ inkscape:window-x="65"
124+ inkscape:window-y="24"
125+ inkscape:window-maximized="1"
126+ inkscape:snap-global="true"
127+ fit-margin-top="0"
128+ fit-margin-left="0"
129+ fit-margin-right="0"
130+ fit-margin-bottom="0"
131+ inkscape:snap-bbox="true"
132+ inkscape:bbox-paths="true"
133+ inkscape:bbox-nodes="true"
134+ inkscape:snap-bbox-edge-midpoints="true"
135+ inkscape:snap-bbox-midpoints="true"
136+ inkscape:object-paths="true"
137+ inkscape:snap-intersection-paths="true"
138+ inkscape:object-nodes="true"
139+ inkscape:snap-smooth-nodes="true"
140+ inkscape:snap-midpoints="true"
141+ inkscape:snap-object-midpoints="true"
142+ inkscape:snap-center="true">
143+ <inkscape:grid
144+ type="xygrid"
145+ id="grid3178"
146+ empspacing="6"
147+ visible="true"
148+ enabled="true"
149+ snapvisiblegridlinesonly="true"
150+ originx="0px"
151+ originy="-1.7382813e-05px" />
152+ </sodipodi:namedview>
153+ <metadata
154+ id="metadata3145">
155+ <rdf:RDF>
156+ <cc:Work
157+ rdf:about="">
158+ <dc:format>image/svg+xml</dc:format>
159+ <dc:type
160+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
161+ <dc:title></dc:title>
162+ </cc:Work>
163+ </rdf:RDF>
164+ </metadata>
165+ <g
166+ inkscape:label="Layer 1"
167+ inkscape:groupmode="layer"
168+ id="layer1"
169+ transform="translate(0,-1020.3622)">
170+ <rect
171+ style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
172+ id="rect4198"
173+ width="31.999998"
174+ height="31.999983"
175+ x="-1.1920929e-07"
176+ y="1020.3622" />
177+ <g
178+ id="g4978"
179+ transform="translate(-60,548.00002)">
180+ <g
181+ id="g3800"
182+ transform="matrix(1.1111111,0,0,1.1111111,-7.0764279,-57.611595)">
183+ <path
184+ inkscape:transform-center-x="-5.1567564"
185+ inkscape:transform-center-y="-5.1567641"
186+ transform="matrix(0.65937777,-0.65937744,0.68524546,0.68524512,-128.22233,440.41263)"
187+ d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 0.52478,0.30299 0.52478,9.79652 0,10.0995 z"
188+ inkscape:randomized="0"
189+ inkscape:rounded="0.06"
190+ inkscape:flatsided="true"
191+ sodipodi:arg2="2.0943951"
192+ sodipodi:arg1="1.0471976"
193+ sodipodi:r2="2.9154758"
194+ sodipodi:r1="5.8309517"
195+ sodipodi:cy="174.09448"
196+ sodipodi:cx="111"
197+ sodipodi:sides="3"
198+ id="path4984"
199+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
200+ sodipodi:type="star" />
201+ <path
202+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.17391396;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
203+ d="m 73.90186,478.92987 c -3.998787,0.28504 -7.794494,2.48855 -9.943074,6.20999 l 2.494615,1.43308 c 2.659495,-4.60638 8.512466,-6.17141 13.118844,-3.51192 4.606379,2.65949 6.171417,8.51246 3.511922,13.11884 -2.659492,4.60637 -8.512465,6.17141 -13.118844,3.51192 -0.726559,-0.41948 -1.388305,-0.93716 -1.981538,-1.53038 l -2.04346,2.04345 c 0.771199,0.7712 1.647399,1.43623 2.591922,1.98154 5.954321,3.43773 13.608809,1.38086 17.046537,-4.57345 3.437728,-5.95432 1.38086,-13.60881 -4.573461,-17.04653 -2.232871,-1.28915 -4.704189,-1.80757 -7.103463,-1.63654 z"
204+ id="path2992"
205+ inkscape:connector-curvature="0" />
206+ <rect
207+ style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
208+ id="rect3049"
209+ width="28.799999"
210+ height="28.799986"
211+ x="60.368786"
212+ y="476.97641" />
213+ <path
214+ sodipodi:type="arc"
215+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
216+ id="path830"
217+ sodipodi:cx="45"
218+ sodipodi:cy="45.000019"
219+ sodipodi:rx="8"
220+ sodipodi:ry="8"
221+ d="m 53,45.000019 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
222+ transform="matrix(0.47999996,0,0,0.47999972,53.168786,469.77641)" />
223+ </g>
224+ </g>
225+ </g>
226+</svg>
227
228=== modified file 'stopwatch/StopwatchPage.qml'
229--- stopwatch/StopwatchPage.qml 2013-07-25 18:21:02 +0000
230+++ stopwatch/StopwatchPage.qml 2013-08-31 16:37:36 +0000
231@@ -119,7 +119,7 @@
232 objectName: "resetButton"
233
234 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); left: parent.left; leftMargin: units.gu(4) }
235- buttonImage: Qt.resolvedUrl("../images/reset_icon.png");
236+ buttonImage: Qt.resolvedUrl("../images/reset_icon.svg");
237 buttonLabel: i18n.tr("Reset");
238
239 onClicked: {
240@@ -136,7 +136,7 @@
241 objectName: "lapButton"
242
243 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); right: parent.right; rightMargin: units.gu(4) }
244- buttonImage: Qt.resolvedUrl("../images/lap_icon.png");
245+ buttonImage: Qt.resolvedUrl("../images/lap_icon.svg");
246 buttonLabel: i18n.tr("Lap");
247 mirrorLayout: true;
248
249
250=== modified file 'timer/TimerPage.qml'
251--- timer/TimerPage.qml 2013-08-04 01:07:16 +0000
252+++ timer/TimerPage.qml 2013-08-31 16:37:36 +0000
253@@ -178,7 +178,7 @@
254 objectName: "resetButtonTimer"
255
256 anchors { top: analogTimer.bottom; topMargin: units.gu(4); horizontalCenter: analogTimer.horizontalCenter; leftMargin: units.gu(4) }
257- buttonImage: Qt.resolvedUrl("../images/reset_icon.png");
258+ buttonImage: Qt.resolvedUrl("../images/reset_icon.svg");
259 buttonLabel: i18n.tr("Reset");
260
261 enabled: true

Subscribers

People subscribed via source and target branches