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
=== removed file 'images/lap_icon@8.png'
0Binary 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 differ0Binary 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
=== added file 'images/lap_icon@8.svg'
--- images/lap_icon@8.svg 1970-01-01 00:00:00 +0000
+++ images/lap_icon@8.svg 2013-08-31 16:37:36 +0000
@@ -0,0 +1,58 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<svg
3 xmlns:dc="http://purl.org/dc/elements/1.1/"
4 xmlns:cc="http://creativecommons.org/ns#"
5 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6 xmlns:svg="http://www.w3.org/2000/svg"
7 xmlns="http://www.w3.org/2000/svg"
8 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10 version="1.0"
11 width="32"
12 height="32"
13 viewBox="0 0 25.6 25.6"
14 preserveAspectRatio="xMidYMid meet"
15 id="svg2"
16 inkscape:version="0.48.4 r9939"
17 sodipodi:docname="ss (2).svg">
18 <defs
19 id="defs22" />
20 <sodipodi:namedview
21 pagecolor="#ffffff"
22 bordercolor="#666666"
23 borderopacity="1"
24 objecttolerance="10"
25 gridtolerance="10"
26 guidetolerance="10"
27 inkscape:pageopacity="0"
28 inkscape:pageshadow="2"
29 inkscape:window-width="1855"
30 inkscape:window-height="1056"
31 id="namedview20"
32 showgrid="false"
33 inkscape:zoom="12.0832"
34 inkscape:cx="54.805449"
35 inkscape:cy="28.439717"
36 inkscape:window-x="65"
37 inkscape:window-y="24"
38 inkscape:window-maximized="1"
39 inkscape:current-layer="svg2" />
40 <metadata
41 id="metadata4">
42Created by potrace 1.11, written by Peter Selinger 2001-2013
43<rdf:RDF>
44 <cc:Work
45 rdf:about="">
46 <dc:format>image/svg+xml</dc:format>
47 <dc:type
48 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
49 <dc:title></dc:title>
50 </cc:Work>
51</rdf:RDF>
52</metadata>
53 <path
54 id="rect3939-4-7-1"
55 style="fill:#ffffff;fill-opacity:1;stroke-width:1.5406878;stroke-miterlimit:4;stroke-dasharray:1.5406878, 6.1627512;stroke-dashoffset:0.7703439"
56 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"
57 inkscape:connector-curvature="0" />
58</svg>
059
=== removed file 'images/reset_icon@8.png'
1Binary 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 differ60Binary 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
=== added file 'images/reset_icon@8.svg'
--- images/reset_icon@8.svg 1970-01-01 00:00:00 +0000
+++ images/reset_icon@8.svg 2013-08-31 16:37:36 +0000
@@ -0,0 +1,155 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="32"
13 height="32"
14 id="svg3140"
15 version="1.1"
16 inkscape:version="0.48.4 r9939"
17 sodipodi:docname="reset_icon@8.svg">
18 <defs
19 id="defs3142">
20 <clipPath
21 clipPathUnits="userSpaceOnUse"
22 id="clipPath2998">
23 <path
24 sodipodi:end="8.115781"
25 sodipodi:start="2.8797933"
26 d="M 4.5451866,22.141104 A 16,16 0 1 1 15.858896,33.454813 L 20,18 z"
27 sodipodi:ry="16"
28 sodipodi:rx="16"
29 sodipodi:cy="18"
30 sodipodi:cx="20"
31 id="path3000"
32 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"
33 sodipodi:type="arc"
34 transform="matrix(0.78567419,0.78567419,-0.78567419,0.78567419,20.390658,-9.8556221)" />
35 </clipPath>
36 </defs>
37 <sodipodi:namedview
38 id="base"
39 pagecolor="#ffffff"
40 bordercolor="#666666"
41 borderopacity="1.0"
42 inkscape:pageopacity="0.0"
43 inkscape:pageshadow="2"
44 inkscape:zoom="25.465852"
45 inkscape:cx="8.1491044"
46 inkscape:cy="11.002992"
47 inkscape:document-units="px"
48 inkscape:current-layer="g3800"
49 showgrid="true"
50 inkscape:window-width="1855"
51 inkscape:window-height="1056"
52 inkscape:window-x="65"
53 inkscape:window-y="24"
54 inkscape:window-maximized="1"
55 inkscape:snap-global="true"
56 fit-margin-top="0"
57 fit-margin-left="0"
58 fit-margin-right="0"
59 fit-margin-bottom="0"
60 inkscape:snap-bbox="true"
61 inkscape:bbox-paths="true"
62 inkscape:bbox-nodes="true"
63 inkscape:snap-bbox-edge-midpoints="true"
64 inkscape:snap-bbox-midpoints="true"
65 inkscape:object-paths="true"
66 inkscape:snap-intersection-paths="true"
67 inkscape:object-nodes="true"
68 inkscape:snap-smooth-nodes="true"
69 inkscape:snap-midpoints="true"
70 inkscape:snap-object-midpoints="true"
71 inkscape:snap-center="true">
72 <inkscape:grid
73 type="xygrid"
74 id="grid3178"
75 empspacing="6"
76 visible="true"
77 enabled="true"
78 snapvisiblegridlinesonly="true"
79 originx="0px"
80 originy="-1.7382813e-05px" />
81 </sodipodi:namedview>
82 <metadata
83 id="metadata3145">
84 <rdf:RDF>
85 <cc:Work
86 rdf:about="">
87 <dc:format>image/svg+xml</dc:format>
88 <dc:type
89 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
90 <dc:title></dc:title>
91 </cc:Work>
92 </rdf:RDF>
93 </metadata>
94 <g
95 inkscape:label="Layer 1"
96 inkscape:groupmode="layer"
97 id="layer1"
98 transform="translate(0,-1020.3622)">
99 <rect
100 style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
101 id="rect4198"
102 width="31.999998"
103 height="31.999983"
104 x="-1.1920929e-07"
105 y="1020.3622" />
106 <g
107 id="g4978"
108 transform="translate(-60,548.00002)">
109 <g
110 id="g3800"
111 transform="matrix(1.1111111,0,0,1.1111111,-7.0764279,-57.611595)">
112 <path
113 inkscape:transform-center-x="-5.1567564"
114 inkscape:transform-center-y="-5.1567641"
115 transform="matrix(0.65937777,-0.65937744,0.68524546,0.68524512,-128.22233,440.41263)"
116 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"
117 inkscape:randomized="0"
118 inkscape:rounded="0.06"
119 inkscape:flatsided="true"
120 sodipodi:arg2="2.0943951"
121 sodipodi:arg1="1.0471976"
122 sodipodi:r2="2.9154758"
123 sodipodi:r1="5.8309517"
124 sodipodi:cy="174.09448"
125 sodipodi:cx="111"
126 sodipodi:sides="3"
127 id="path4984"
128 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"
129 sodipodi:type="star" />
130 <path
131 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"
132 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"
133 id="path2992"
134 inkscape:connector-curvature="0" />
135 <rect
136 style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
137 id="rect3049"
138 width="28.799999"
139 height="28.799986"
140 x="60.368786"
141 y="476.97641" />
142 <path
143 sodipodi:type="arc"
144 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"
145 id="path830"
146 sodipodi:cx="45"
147 sodipodi:cy="45.000019"
148 sodipodi:rx="8"
149 sodipodi:ry="8"
150 d="m 53,45.000019 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
151 transform="matrix(0.47999996,0,0,0.47999972,53.168786,469.77641)" />
152 </g>
153 </g>
154 </g>
155</svg>
0156
=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml 2013-07-25 18:21:02 +0000
+++ stopwatch/StopwatchPage.qml 2013-08-31 16:37:36 +0000
@@ -119,7 +119,7 @@
119 objectName: "resetButton"119 objectName: "resetButton"
120120
121 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); left: parent.left; leftMargin: units.gu(4) }121 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); left: parent.left; leftMargin: units.gu(4) }
122 buttonImage: Qt.resolvedUrl("../images/reset_icon.png");122 buttonImage: Qt.resolvedUrl("../images/reset_icon.svg");
123 buttonLabel: i18n.tr("Reset");123 buttonLabel: i18n.tr("Reset");
124124
125 onClicked: {125 onClicked: {
@@ -136,7 +136,7 @@
136 objectName: "lapButton"136 objectName: "lapButton"
137137
138 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); right: parent.right; rightMargin: units.gu(4) }138 anchors { top: analogStopwatch.bottom; topMargin: units.gu(4); right: parent.right; rightMargin: units.gu(4) }
139 buttonImage: Qt.resolvedUrl("../images/lap_icon.png");139 buttonImage: Qt.resolvedUrl("../images/lap_icon.svg");
140 buttonLabel: i18n.tr("Lap");140 buttonLabel: i18n.tr("Lap");
141 mirrorLayout: true;141 mirrorLayout: true;
142142
143143
=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml 2013-08-04 01:07:16 +0000
+++ timer/TimerPage.qml 2013-08-31 16:37:36 +0000
@@ -178,7 +178,7 @@
178 objectName: "resetButtonTimer"178 objectName: "resetButtonTimer"
179179
180 anchors { top: analogTimer.bottom; topMargin: units.gu(4); horizontalCenter: analogTimer.horizontalCenter; leftMargin: units.gu(4) }180 anchors { top: analogTimer.bottom; topMargin: units.gu(4); horizontalCenter: analogTimer.horizontalCenter; leftMargin: units.gu(4) }
181 buttonImage: Qt.resolvedUrl("../images/reset_icon.png");181 buttonImage: Qt.resolvedUrl("../images/reset_icon.svg");
182 buttonLabel: i18n.tr("Reset");182 buttonLabel: i18n.tr("Reset");
183183
184 enabled: true184 enabled: true

Subscribers

People subscribed via source and target branches