Merge lp:~dobey/ubuntuone-installer/update-from-trunk into lp:ubuntuone-installer/stable-3-0
- update-from-trunk
- Merge into stable-3-0
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 31 |
Merged at revision: | 35 |
Proposed branch: | lp:~dobey/ubuntuone-installer/update-from-trunk |
Merge into: | lp:ubuntuone-installer/stable-3-0 |
Diff against target: |
455 lines (+310/-84) 2 files modified
data/u1cloud.svg (+228/-0) ubuntuone/installer/gui.py (+82/-84) |
To merge this branch: | bzr merge lp:~dobey/ubuntuone-installer/update-from-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Review via email: mp+98497@code.launchpad.net |
Commit message
Update the text labels, layout, and image for the installer
Description of the change
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~dobey/ubuntuone-installer/update-from-trunk into lp:ubuntuone-installer/stable-3-0 failed. Below is the output from the failed tests.
ubuntuone.
BaseTestCase
runTest ... [OK]
ubuntuone.
InstallerTestCase
test_
test_
test_
test_
ubuntuone.
DBusTestCase
runTest ... [OK]
ubuntuone.
GUITestCase
test_
File "/usr/lib/
result = g.send(result)
File "/mnt/tarmac/
self.dlg = gui.Window()
File "/mnt/tarmac/
self.
File "/mnt/tarmac/
path, 320, 240, True)
File "/usr/lib/
return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
test_
File "/usr/lib/
result = g.send(result)
File "/mnt/tarmac/
self.dlg = gui.Window()
File "/mnt/tarmac/
self.
File "/mnt/tarmac/
path, 320, 240, True)
File "/usr/lib/
return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
test_
File "/usr/lib/
result = g.send(result)
File "/mnt/tarmac/
self.dlg = gui.Window()
File "/mnt/tarmac/
self.
File "/mnt/tarmac/
path, 320, 240, True)
File "/usr/lib/
Preview Diff
1 | === removed file 'data/share.png' | |||
2 | 0 | Binary files data/share.png 2011-08-24 17:27:17 +0000 and data/share.png 1970-01-01 00:00:00 +0000 differ | 0 | Binary files data/share.png 2011-08-24 17:27:17 +0000 and data/share.png 1970-01-01 00:00:00 +0000 differ |
3 | === removed file 'data/stream.png' | |||
4 | 1 | Binary files data/stream.png 2011-08-24 17:27:17 +0000 and data/stream.png 1970-01-01 00:00:00 +0000 differ | 1 | Binary files data/stream.png 2011-08-24 17:27:17 +0000 and data/stream.png 1970-01-01 00:00:00 +0000 differ |
5 | === removed file 'data/sync.png' | |||
6 | 2 | Binary files data/sync.png 2011-08-24 17:27:17 +0000 and data/sync.png 1970-01-01 00:00:00 +0000 differ | 2 | Binary files data/sync.png 2011-08-24 17:27:17 +0000 and data/sync.png 1970-01-01 00:00:00 +0000 differ |
7 | === added file 'data/u1cloud.svg' | |||
8 | --- data/u1cloud.svg 1970-01-01 00:00:00 +0000 | |||
9 | +++ data/u1cloud.svg 2012-03-20 19:47:22 +0000 | |||
10 | @@ -0,0 +1,228 @@ | |||
11 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
12 | 2 | <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
13 | 3 | |||
14 | 4 | <svg | ||
15 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
16 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
17 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
18 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
19 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
20 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
21 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
22 | 12 | version="1.1" | ||
23 | 13 | id="Layer_1" | ||
24 | 14 | x="0px" | ||
25 | 15 | y="0px" | ||
26 | 16 | width="800" | ||
27 | 17 | height="600" | ||
28 | 18 | viewBox="0 0 800 600" | ||
29 | 19 | enable-background="new 0 0 1024 768" | ||
30 | 20 | xml:space="preserve" | ||
31 | 21 | inkscape:version="0.48.3.1 r9886" | ||
32 | 22 | sodipodi:docname="u1cloud.svg"><title | ||
33 | 23 | id="title3046">Ubuntu One Your Cloud</title><metadata | ||
34 | 24 | id="metadata69"><rdf:RDF><cc:Work | ||
35 | 25 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type | ||
36 | 26 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Ubuntu One Your Cloud</dc:title><dc:date>2012-03-13</dc:date><dc:creator><cc:Agent><dc:title>Peter Grundy</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title /></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>Canonical Ltd.</dc:title></cc:Agent></dc:publisher><cc:license | ||
37 | 27 | rdf:resource="http://www.gnu.org/licenses/gpl-3.0.html" /></cc:Work></rdf:RDF></metadata><defs | ||
38 | 28 | id="defs67" /><sodipodi:namedview | ||
39 | 29 | pagecolor="#ffffff" | ||
40 | 30 | bordercolor="#666666" | ||
41 | 31 | borderopacity="1" | ||
42 | 32 | objecttolerance="10" | ||
43 | 33 | gridtolerance="10" | ||
44 | 34 | guidetolerance="10" | ||
45 | 35 | inkscape:pageopacity="0" | ||
46 | 36 | inkscape:pageshadow="2" | ||
47 | 37 | inkscape:window-width="2048" | ||
48 | 38 | inkscape:window-height="1105" | ||
49 | 39 | id="namedview65" | ||
50 | 40 | showgrid="true" | ||
51 | 41 | inkscape:zoom="1.1106771" | ||
52 | 42 | inkscape:cx="397.65534" | ||
53 | 43 | inkscape:cy="384.00001" | ||
54 | 44 | inkscape:window-x="0" | ||
55 | 45 | inkscape:window-y="24" | ||
56 | 46 | inkscape:window-maximized="1" | ||
57 | 47 | inkscape:current-layer="Layer_1"><inkscape:grid | ||
58 | 48 | type="xygrid" | ||
59 | 49 | id="grid3013" | ||
60 | 50 | empspacing="5" | ||
61 | 51 | visible="true" | ||
62 | 52 | enabled="true" | ||
63 | 53 | snapvisiblegridlinesonly="true" /></sodipodi:namedview> | ||
64 | 54 | |||
65 | 55 | |||
66 | 56 | |||
67 | 57 | |||
68 | 58 | |||
69 | 59 | |||
70 | 60 | |||
71 | 61 | |||
72 | 62 | |||
73 | 63 | |||
74 | 64 | |||
75 | 65 | |||
76 | 66 | |||
77 | 67 | |||
78 | 68 | |||
79 | 69 | |||
80 | 70 | |||
81 | 71 | |||
82 | 72 | |||
83 | 73 | <g | ||
84 | 74 | id="g3015" | ||
85 | 75 | transform="matrix(1.0650103,0,0,1.118185,-138.88955,48.010328)"><path | ||
86 | 76 | style="fill:#dd4814" | ||
87 | 77 | inkscape:connector-curvature="0" | ||
88 | 78 | id="path3" | ||
89 | 79 | d="M 834.63,230.602 C 809.666,205.64 776.712,191.574 741.537,190.788 776.971,126.117 754.402,44.689 690.224,7.635 626.051,-29.415 544.259,-8.262 505.961,54.733 467.67,-8.242 385.865,-29.409 321.704,7.637 257.54,44.685 234.985,126.109 270.379,190.758 c -73.703,1.668 -132.918,61.925 -132.918,136.024 0,75.151 60.903,136.068 136.056,136.068 0.016,0 0.031,-0.001 0.047,-0.001 v 0.016 h 464.37 c 0.16,10e-4 0.319,0.006 0.479,0.006 0.004,0 0.003,0 0.008,0 36.338,0 70.508,-14.154 96.209,-39.854 53.051,-53.051 53.051,-139.363 0,-192.415 z" /><g | ||
90 | 80 | transform="translate(0,-168)" | ||
91 | 81 | id="g5"> | ||
92 | 82 | <path | ||
93 | 83 | style="fill:#ffffff" | ||
94 | 84 | inkscape:connector-curvature="0" | ||
95 | 85 | id="path7" | ||
96 | 86 | d="m 741.257,293.568 h -11.338 c 0,-59.395 -48.321,-107.716 -107.717,-107.716 v -11.339 c 65.648,0 119.055,53.408 119.055,119.055 z" /> | ||
97 | 87 | </g><g | ||
98 | 88 | transform="translate(0,-168)" | ||
99 | 89 | id="g9"> | ||
100 | 90 | <path | ||
101 | 91 | style="fill:#ffffff" | ||
102 | 92 | inkscape:connector-curvature="0" | ||
103 | 93 | id="path11" | ||
104 | 94 | d="m 712.91,293.568 h -11.338 c 0,-43.765 -35.605,-79.37 -79.37,-79.37 v -11.339 c 50.017,0 90.708,40.692 90.708,90.709 z" /> | ||
105 | 95 | </g><path | ||
106 | 96 | style="fill:#ffffff" | ||
107 | 97 | inkscape:connector-curvature="0" | ||
108 | 98 | id="path13" | ||
109 | 99 | d="m 870.21,292.762 c -5.853,-22.79 -17.673,-44.35 -35.482,-62.16 -2.032,-2.032 -4.124,-3.983 -6.259,-5.87 H 738.55 c -56.27,0 -102.05,45.78 -102.05,102.04 0,9.4 7.61,17.01 17.01,17.01 9.391,0 17.01,-7.609 17.01,-17.01 0,-37.51 30.511,-68.02 68.03,-68.02 -9.399,0 -17.01,7.609 -17.01,17.01 0,9.39 7.61,17 17.01,17 h 131.66 z" /><path | ||
110 | 100 | style="fill:#333333" | ||
111 | 101 | inkscape:connector-curvature="0" | ||
112 | 102 | id="path15" | ||
113 | 103 | d="m 670.825,173.808 c 10.946,-10.945 15.825,-27.03 13.386,-44.131 -2.217,-15.542 -10.165,-30.83 -22.383,-43.051 -14.634,-14.631 -33.494,-23.022 -51.747,-23.022 -13.827,0 -26.417,4.975 -35.451,14.009 -10.942,10.944 -15.814,27.028 -13.367,44.128 2.224,15.539 10.18,30.828 22.401,43.05 8.572,8.572 18.602,14.981 29.105,18.835 l -90.695,90.696 c -4.186,4.186 -5.894,10.245 -4.511,16 1.384,5.756 5.659,10.377 11.289,12.204 l 74.368,24.124 c 1.744,0.564 3.512,0.834 5.252,0.834 7.172,0 13.842,-4.574 16.174,-11.765 2.898,-8.935 -1.995,-18.528 -10.93,-21.427 L 565.762,278.737 668.796,175.703 c 0.693,-0.611 1.374,-1.239 2.029,-1.895 z" /><g | ||
114 | 104 | transform="translate(0,-168)" | ||
115 | 105 | id="g17"> | ||
116 | 106 | <path | ||
117 | 107 | style="fill:#ffffff" | ||
118 | 108 | inkscape:connector-curvature="0" | ||
119 | 109 | id="path19" | ||
120 | 110 | d="M 521.701,316.401 401.438,196.138 c -3.189,-3.189 -7.516,-4.981 -12.026,-4.981 -4.51,0 -8.837,1.792 -12.026,4.981 l -84.184,84.185 c -6.642,6.642 -6.642,17.411 0,24.053 l 120.263,120.263 c 3.321,3.32 7.674,4.98 12.026,4.98 4.352,0 8.705,-1.66 12.026,-4.98 l 84.185,-84.185 c 3.189,-3.189 4.981,-7.516 4.981,-12.026 0,-4.51 -1.792,-8.838 -4.982,-12.027 z" /> | ||
121 | 111 | <g | ||
122 | 112 | id="g21"> | ||
123 | 113 | <path | ||
124 | 114 | style="fill:#333333" | ||
125 | 115 | inkscape:connector-curvature="0" | ||
126 | 116 | id="path23" | ||
127 | 117 | d="m 390.182,344.559 c -13.628,0 -26.441,-5.308 -36.079,-14.946 -19.895,-19.894 -19.895,-52.264 -0.001,-72.157 9.636,-9.636 22.448,-14.943 36.076,-14.943 13.629,0 26.442,5.308 36.08,14.945 19.895,19.894 19.895,52.263 0.002,72.156 -9.638,9.637 -22.45,14.945 -36.078,14.945 z m -0.004,-68.031 c -4.542,0 -8.812,1.769 -12.023,4.98 -6.631,6.631 -6.63,17.42 0.001,24.052 3.214,3.213 7.484,4.983 12.026,4.983 4.542,0 8.812,-1.77 12.025,-4.982 6.63,-6.63 6.629,-17.419 -0.002,-24.051 -3.213,-3.212 -7.484,-4.982 -12.027,-4.982 z" /> | ||
128 | 118 | </g> | ||
129 | 119 | <g | ||
130 | 120 | id="g25"> | ||
131 | 121 | <path | ||
132 | 122 | style="fill:#dd4814" | ||
133 | 123 | inkscape:connector-curvature="0" | ||
134 | 124 | id="path27" | ||
135 | 125 | d="m 486.067,342.849 c -2.177,0 -4.353,-0.83 -6.014,-2.491 l -6.014,-6.014 c -3.32,-3.321 -3.32,-8.706 0,-12.026 l 6.012,-6.012 c 3.322,-3.321 8.705,-3.321 12.027,0 l 6.014,6.014 c 3.32,3.321 3.32,8.706 0,12.026 l -6.012,6.012 c -1.66,1.661 -3.836,2.491 -6.013,2.491 z" /> | ||
136 | 126 | </g> | ||
137 | 127 | <g | ||
138 | 128 | id="g29"> | ||
139 | 129 | <path | ||
140 | 130 | style="fill:#ffffff" | ||
141 | 131 | inkscape:connector-curvature="0" | ||
142 | 132 | id="path31" | ||
143 | 133 | d="m 453.746,311.529 c -2.177,0 -4.353,-0.83 -6.014,-2.491 -3.32,-3.321 -3.32,-8.706 0,-12.026 L 480.3,264.444 c 3.322,-3.321 8.705,-3.321 12.027,0 3.32,3.321 3.32,8.706 0,12.026 l -32.568,32.568 c -1.66,1.661 -3.836,2.491 -6.013,2.491 z" /> | ||
144 | 134 | </g> | ||
145 | 135 | </g><path | ||
146 | 136 | style="fill:#ffffff" | ||
147 | 137 | inkscape:connector-curvature="0" | ||
148 | 138 | id="path33" | ||
149 | 139 | d="M 358.545,258.727 H 256.498 v -8.504 c 0,-4.697 -3.808,-8.504 -8.504,-8.504 h -59.536 c -4.697,0 -8.504,3.807 -8.504,8.504 v 17.008 119.059 c 0,4.696 3.807,8.504 8.504,8.504 h 170.087 c 4.696,0 8.504,-3.808 8.504,-8.504 V 267.23 c 0,-4.697 -3.808,-8.503 -8.504,-8.503 z" /><path | ||
150 | 140 | style="fill:#333333" | ||
151 | 141 | inkscape:connector-curvature="0" | ||
152 | 142 | id="path35" | ||
153 | 143 | d="m 307.244,318.307 c -4.696,0 -8.504,3.807 -8.504,8.504 0,14.069 -11.443,25.516 -25.51,25.516 -14.068,0 -25.514,-11.446 -25.514,-25.516 0,-12.604 9.188,-23.094 21.215,-25.145 V 313.6 c 0,1.72 1.036,3.27 2.625,3.928 0.526,0.219 1.078,0.324 1.626,0.324 1.106,0 2.194,-0.432 3.008,-1.245 l 20.812,-20.812 c 1.66,-1.661 1.66,-4.353 0,-6.014 L 276.19,268.969 c -1.216,-1.216 -3.048,-1.579 -4.634,-0.921 -1.589,0.658 -2.625,2.208 -2.625,3.928 v 12.531 c -21.435,2.162 -38.223,20.31 -38.223,42.305 0,23.447 19.075,42.523 42.521,42.523 23.444,0 42.518,-19.076 42.518,-42.523 10e-4,-4.699 -3.807,-8.505 -8.503,-8.505 z" /><path | ||
154 | 144 | style="fill:#333333" | ||
155 | 145 | inkscape:connector-curvature="0" | ||
156 | 146 | id="path37" | ||
157 | 147 | d="m 738.449,343.785 c 9.395,0 17.01,-7.615 17.01,-17.008 0,-9.394 -7.615,-17.008 -17.01,-17.008 -9.39,0 -17.006,7.614 -17.006,17.008 0,9.393 7.617,17.008 17.006,17.008 z" /><g | ||
158 | 148 | transform="translate(0,-168)" | ||
159 | 149 | id="g39"> | ||
160 | 150 | <path | ||
161 | 151 | style="fill:#ffffff" | ||
162 | 152 | inkscape:connector-curvature="0" | ||
163 | 153 | id="path41" | ||
164 | 154 | d="m 789.292,511.852 c 0,28.13 -22.89,51.02 -51.02,51.02 h -63.351 c -0.149,0 -0.289,0 -0.439,-0.01 h -128.77 v -0.05 c -9.369,-0.03 -16.949,-7.64 -16.949,-17.01 0,-9.391 7.609,-17.01 17,-17.01 0.46,0 0.92,0.02 1.37,0.06 h 191.14 c 4.7,0 8.5,3.81 8.5,8.51 0,4.54 -3.57,8.26 -8.061,8.49 18.561,-0.23 33.58,-15.4 33.58,-34 0,-4.7 3.801,-8.5 8.5,-8.5 4.7,0 8.5,3.799 8.5,8.5 z" /> | ||
165 | 155 | </g><path | ||
166 | 156 | style="fill:#333333" | ||
167 | 157 | inkscape:connector-curvature="0" | ||
168 | 158 | id="path43" | ||
169 | 159 | d="m 500.28,394.807 c 9.395,0 17.01,-7.615 17.01,-17.008 0,-9.394 -7.615,-17.008 -17.01,-17.008 -9.39,0 -17.006,7.614 -17.006,17.008 0,9.392 7.617,17.008 17.006,17.008 z" /><path | ||
170 | 160 | style="fill:#333333" | ||
171 | 161 | inkscape:connector-curvature="0" | ||
172 | 162 | id="path45" | ||
173 | 163 | d="m 454.926,394.807 c 9.395,0 17.01,-7.615 17.01,-17.008 0,-9.394 -7.615,-17.008 -17.01,-17.008 -9.39,0 -17.006,7.614 -17.006,17.008 0,9.392 7.616,17.008 17.006,17.008 z" /><path | ||
174 | 164 | style="fill:#333333" | ||
175 | 165 | inkscape:connector-curvature="0" | ||
176 | 166 | id="path47" | ||
177 | 167 | d="m 409.571,394.807 c 9.395,0 17.01,-7.615 17.01,-17.008 0,-9.394 -7.615,-17.008 -17.01,-17.008 -9.39,0 -17.006,7.614 -17.006,17.008 0,9.392 7.617,17.008 17.006,17.008 z" /><circle | ||
178 | 168 | transform="translate(0,-168)" | ||
179 | 169 | style="fill:#ffffff" | ||
180 | 170 | sodipodi:ry="8.5039997" | ||
181 | 171 | sodipodi:rx="8.5039997" | ||
182 | 172 | sodipodi:cy="366.53799" | ||
183 | 173 | sodipodi:cx="548.81598" | ||
184 | 174 | id="circle49" | ||
185 | 175 | r="8.5039997" | ||
186 | 176 | cy="366.53799" | ||
187 | 177 | cx="548.81598" | ||
188 | 178 | d="m 557.31998,366.53799 c 0,4.69663 -3.80737,8.504 -8.504,8.504 -4.69663,0 -8.504,-3.80737 -8.504,-8.504 0,-4.69662 3.80737,-8.504 8.504,-8.504 4.69663,0 8.504,3.80738 8.504,8.504 z" /><circle | ||
189 | 179 | transform="translate(0,-168)" | ||
190 | 180 | style="fill:#ffffff" | ||
191 | 181 | sodipodi:ry="8.5039997" | ||
192 | 182 | sodipodi:rx="8.5039997" | ||
193 | 183 | sodipodi:cy="398.608" | ||
194 | 184 | sodipodi:cx="516.74597" | ||
195 | 185 | id="circle51" | ||
196 | 186 | r="8.5039997" | ||
197 | 187 | cy="398.608" | ||
198 | 188 | cx="516.74597" | ||
199 | 189 | d="m 525.24997,398.608 c 0,4.69663 -3.80737,8.504 -8.504,8.504 -4.69663,0 -8.504,-3.80737 -8.504,-8.504 0,-4.69663 3.80737,-8.504 8.504,-8.504 4.69663,0 8.504,3.80737 8.504,8.504 z" /><g | ||
200 | 190 | transform="translate(0,-168)" | ||
201 | 191 | id="g53"> | ||
202 | 192 | <path | ||
203 | 193 | style="fill:none" | ||
204 | 194 | inkscape:connector-curvature="0" | ||
205 | 195 | id="path55" | ||
206 | 196 | d="m 738.421,630.87 c -0.005,0 -0.004,0 -0.008,0 -36.345,-0.002 -70.511,-14.154 -96.208,-39.852 -53.051,-53.052 -53.051,-139.364 0,-192.417 25.7,-25.699 59.869,-39.853 96.212,-39.853 36.343,0 70.512,14.153 96.213,39.853 53.051,53.053 53.051,139.364 0,192.415 -25.701,25.7 -59.871,39.854 -96.209,39.854 l 0,0 z" /> | ||
207 | 197 | </g><circle | ||
208 | 198 | transform="translate(0,-168)" | ||
209 | 199 | style="fill:#ffffff" | ||
210 | 200 | sodipodi:ry="8.5039997" | ||
211 | 201 | sodipodi:rx="8.5039997" | ||
212 | 202 | sodipodi:cy="430.67801" | ||
213 | 203 | sodipodi:cx="484.67499" | ||
214 | 204 | id="circle57" | ||
215 | 205 | r="8.5039997" | ||
216 | 206 | cy="430.67801" | ||
217 | 207 | cx="484.67499" | ||
218 | 208 | d="m 493.17899,430.67801 c 0,4.69663 -3.80737,8.504 -8.504,8.504 -4.69663,0 -8.504,-3.80737 -8.504,-8.504 0,-4.69663 3.80737,-8.504 8.504,-8.504 4.69663,0 8.504,3.80737 8.504,8.504 z" /><path | ||
219 | 209 | style="fill:#ffffff" | ||
220 | 210 | inkscape:connector-curvature="0" | ||
221 | 211 | id="path59" | ||
222 | 212 | d="m 458.617,300.762 c 3.322,-3.321 3.322,-8.706 0.002,-12.027 -3.322,-3.32 -8.706,-3.32 -12.027,0.002 -3.32,3.318 -3.32,8.703 0,12.025 3.321,3.32 8.707,3.32 12.025,0 z" /><path | ||
223 | 213 | style="fill:#dd4814" | ||
224 | 214 | inkscape:connector-curvature="0" | ||
225 | 215 | id="path61" | ||
226 | 216 | d="m 738.449,283.899 c 4.699,0 8.508,-3.809 8.508,-8.504 0,-4.695 -3.809,-8.504 -8.508,-8.504 -4.695,0 -8.5,3.809 -8.5,8.504 0,4.695 3.805,8.504 8.5,8.504 z" /><circle | ||
227 | 217 | transform="translate(0,-168)" | ||
228 | 218 | style="fill:#dd4814" | ||
229 | 219 | sodipodi:ry="4.2519999" | ||
230 | 220 | sodipodi:rx="4.2519999" | ||
231 | 221 | sodipodi:cy="537.539" | ||
232 | 222 | sodipodi:cx="738.271" | ||
233 | 223 | id="circle63" | ||
234 | 224 | r="4.2519999" | ||
235 | 225 | cy="537.539" | ||
236 | 226 | cx="738.271" | ||
237 | 227 | d="m 742.523,537.539 c 0,2.34832 -1.90369,4.252 -4.252,4.252 -2.34832,0 -4.252,-1.90368 -4.252,-4.252 0,-2.34831 1.90368,-4.252 4.252,-4.252 2.34831,0 4.252,1.90369 4.252,4.252 z" /></g> | ||
238 | 228 | </svg> | ||
239 | 0 | \ No newline at end of file | 229 | \ No newline at end of file |
240 | 1 | 230 | ||
241 | === modified file 'ubuntuone/installer/gui.py' | |||
242 | --- ubuntuone/installer/gui.py 2012-02-24 18:06:28 +0000 | |||
243 | +++ ubuntuone/installer/gui.py 2012-03-20 19:47:22 +0000 | |||
244 | @@ -20,7 +20,7 @@ | |||
245 | 20 | import gettext | 20 | import gettext |
246 | 21 | import os | 21 | import os |
247 | 22 | 22 | ||
249 | 23 | from gi.repository import Gtk, GObject, GLib, Gdk, Pango | 23 | from gi.repository import Gtk, GObject, GLib, Gdk, GdkPixbuf, Pango |
250 | 24 | from ubuntuone.installer import (CLIENT_SHELL_PACKAGE, | 24 | from ubuntuone.installer import (CLIENT_SHELL_PACKAGE, |
251 | 25 | CONTROL_PANEL_COMMAND, | 25 | CONTROL_PANEL_COMMAND, |
252 | 26 | CONTROL_PANEL_PACKAGE, | 26 | CONTROL_PANEL_PACKAGE, |
253 | @@ -69,6 +69,30 @@ | |||
254 | 69 | return True | 69 | return True |
255 | 70 | 70 | ||
256 | 71 | 71 | ||
257 | 72 | class HSeparator(Gtk.HSeparator): | ||
258 | 73 | """A dotted line separator.""" | ||
259 | 74 | |||
260 | 75 | def do_draw(self, cairo_context): | ||
261 | 76 | """Draw some magic.""" | ||
262 | 77 | sc = self.get_style_context() | ||
263 | 78 | state = self.get_state_flags() | ||
264 | 79 | width = self.get_allocated_width() | ||
265 | 80 | height = self.get_allocated_height() | ||
266 | 81 | |||
267 | 82 | sc.save() | ||
268 | 83 | sc.set_state(state) | ||
269 | 84 | |||
270 | 85 | x = 0 | ||
271 | 86 | y = height / 2 | ||
272 | 87 | while x <= width: | ||
273 | 88 | Gtk.render_activity(sc, cairo_context, | ||
274 | 89 | float(x), float(y), 1.0, 1.0) | ||
275 | 90 | x += 3 | ||
276 | 91 | |||
277 | 92 | sc.restore() | ||
278 | 93 | return True | ||
279 | 94 | |||
280 | 95 | |||
281 | 72 | class Window(Gtk.Window): | 96 | class Window(Gtk.Window): |
282 | 73 | """The main dialog to use.""" | 97 | """The main dialog to use.""" |
283 | 74 | 98 | ||
284 | @@ -108,7 +132,7 @@ | |||
285 | 108 | self.__hlabel.show() | 132 | self.__hlabel.show() |
286 | 109 | 133 | ||
287 | 110 | self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format( | 134 | self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format( |
289 | 111 | _(u'Discover the freedom of your personal cloud'))) | 135 | _(u'Discover your personal cloud'))) |
290 | 112 | self.__hlabel2.set_use_markup(True) | 136 | self.__hlabel2.set_use_markup(True) |
291 | 113 | self.__hlabel2.set_alignment(0.0, 0.0) | 137 | self.__hlabel2.set_alignment(0.0, 0.0) |
292 | 114 | self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0) | 138 | self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0) |
293 | @@ -127,7 +151,6 @@ | |||
294 | 127 | self.__notebook.set_show_border(False) | 151 | self.__notebook.set_show_border(False) |
295 | 128 | self.__notebook.set_scrollable(False) | 152 | self.__notebook.set_scrollable(False) |
296 | 129 | self.__notebook.popup_disable() | 153 | self.__notebook.popup_disable() |
297 | 130 | #self.__notebook.set_size_request(734, 240) | ||
298 | 131 | 154 | ||
299 | 132 | self.__info_page = self.__construct_info_page() | 155 | self.__info_page = self.__construct_info_page() |
300 | 133 | self.__notebook.append_page(self.__info_page, None) | 156 | self.__notebook.append_page(self.__info_page, None) |
301 | @@ -223,7 +246,7 @@ | |||
302 | 223 | def __construct_info_page(self): | 246 | def __construct_info_page(self): |
303 | 224 | """Build the initial info page.""" | 247 | """Build the initial info page.""" |
304 | 225 | page = Gtk.HBox() | 248 | page = Gtk.HBox() |
306 | 226 | page.set_border_width(12) | 249 | page.set_border_width(6) |
307 | 227 | page.set_spacing(12) | 250 | page.set_spacing(12) |
308 | 228 | page.show() | 251 | page.show() |
309 | 229 | 252 | ||
310 | @@ -233,90 +256,65 @@ | |||
311 | 233 | width = width / Pango.SCALE | 256 | width = width / Pango.SCALE |
312 | 234 | height = height / Pango.SCALE | 257 | height = height / Pango.SCALE |
313 | 235 | 258 | ||
316 | 236 | table = Gtk.Table(3, 5, False) | 259 | table = Gtk.Table(5, 2, False) |
317 | 237 | table.set_row_spacings(12) | 260 | table.set_row_spacings(6) |
318 | 238 | table.set_col_spacings(12) | 261 | table.set_col_spacings(12) |
319 | 239 | page.pack_start(table, True, True, 24) | 262 | page.pack_start(table, True, True, 24) |
320 | 240 | table.show() | 263 | table.show() |
321 | 241 | 264 | ||
400 | 242 | label = Gtk.Label(u'<big>{}</big>'.format(_(u'Sync'))) | 265 | image = Gtk.Image() |
401 | 243 | label.set_use_markup(True) | 266 | table.attach_defaults(image, 0, 1, 0, 5) |
402 | 244 | table.attach_defaults(label, 0, 1, 0, 1) | 267 | image.show() |
403 | 245 | label.show() | 268 | path = self.__find_data_file('u1cloud.svg') |
404 | 246 | 269 | if path: | |
405 | 247 | image = Gtk.Image() | 270 | pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( |
406 | 248 | table.attach_defaults(image, 0, 1, 1, 2) | 271 | path, 320, 240, True) |
407 | 249 | image.show() | 272 | image.set_from_pixbuf(pixbuf) |
408 | 250 | path = self.__find_data_file('sync.png') | 273 | |
409 | 251 | if path: | 274 | # Get the width in chars based on cloud width, for main labels |
410 | 252 | image.set_from_file(path) | 275 | width_chars = (image.get_pixbuf().get_width() / width) * 2.0 |
411 | 253 | 276 | ||
412 | 254 | # Get the width in chars to set max for description labels | 277 | label = Gtk.Label(_(u'Store files, photos, and music safely in Ubuntu' |
413 | 255 | width_chars = (image.get_pixbuf().get_width() / width) * 2.5 | 278 | ' One and access them on any of your devices.')) |
414 | 256 | 279 | label.set_max_width_chars(width_chars) | |
415 | 257 | label = Gtk.Label(u'<small>{}</small>'.format( | 280 | label.set_width_chars(width_chars) |
416 | 258 | _(u'Sync files across your devices.'))) | 281 | label.set_use_markup(True) |
417 | 259 | label.set_max_width_chars(width_chars) | 282 | label.set_line_wrap(True) |
418 | 260 | label.set_width_chars(width_chars) | 283 | label.set_alignment(0.0, 0.5) |
419 | 261 | label.set_use_markup(True) | 284 | label.set_justify(Gtk.Justification.LEFT) |
420 | 262 | label.set_line_wrap(True) | 285 | table.attach_defaults(label, 1, 2, 0, 1) |
421 | 263 | label.set_alignment(0.5, 0.0) | 286 | label.show() |
422 | 264 | label.set_justify(Gtk.Justification.CENTER) | 287 | |
423 | 265 | table.attach_defaults(label, 0, 1, 2, 3) | 288 | separator = HSeparator() |
424 | 266 | label.show() | 289 | table.attach_defaults(separator, 1, 2, 1, 2) |
425 | 267 | 290 | separator.show() | |
426 | 268 | separator = VSeparator() | 291 | |
427 | 269 | table.attach_defaults(separator, 1, 2, 0, 3) | 292 | label = Gtk.Label(_(u'Upload photos from your mobile instantly, and' |
428 | 270 | separator.show() | 293 | ' they\'re ready to share with friends or post' |
429 | 271 | 294 | ' online.')) | |
430 | 272 | label = Gtk.Label(u'<big>{}</big>'.format(_(u'Stream'))) | 295 | label.set_max_width_chars(width_chars) |
431 | 273 | label.set_use_markup(True) | 296 | label.set_width_chars(width_chars) |
432 | 274 | table.attach_defaults(label, 2, 3, 0, 1) | 297 | label.set_use_markup(True) |
433 | 275 | label.show() | 298 | label.set_line_wrap(True) |
434 | 276 | 299 | label.set_alignment(0.0, 0.5) | |
435 | 277 | image = Gtk.Image() | 300 | label.set_justify(Gtk.Justification.LEFT) |
436 | 278 | table.attach_defaults(image, 2, 3, 1, 2) | 301 | table.attach_defaults(label, 1, 2, 2, 3) |
437 | 279 | image.show() | 302 | label.show() |
438 | 280 | path = self.__find_data_file('stream.png') | 303 | |
439 | 281 | if path: | 304 | separator = HSeparator() |
440 | 282 | image.set_from_file(path) | 305 | table.attach_defaults(separator, 1, 2, 3, 4) |
441 | 283 | 306 | separator.show() | |
442 | 284 | label = Gtk.Label(u'<small>{}</small>'.format( | 307 | |
443 | 285 | _(u'Stream your music on the move and offline.'))) | 308 | label = Gtk.Label(_(u'Stream your music collection to all of your' |
444 | 286 | label.set_max_width_chars(width_chars) | 309 | ' devices and listen to any song - online or' |
445 | 287 | label.set_width_chars(width_chars) | 310 | ' offline.')) |
446 | 288 | label.set_use_markup(True) | 311 | label.set_max_width_chars(width_chars) |
447 | 289 | label.set_line_wrap(True) | 312 | label.set_width_chars(width_chars) |
448 | 290 | label.set_alignment(0.5, 0.0) | 313 | label.set_use_markup(True) |
449 | 291 | label.set_justify(Gtk.Justification.CENTER) | 314 | label.set_line_wrap(True) |
450 | 292 | table.attach_defaults(label, 2, 3, 2, 3) | 315 | label.set_alignment(0.0, 0.5) |
451 | 293 | label.show() | 316 | label.set_justify(Gtk.Justification.LEFT) |
452 | 294 | 317 | table.attach_defaults(label, 1, 2, 4, 5) | |
375 | 295 | separator = VSeparator() | ||
376 | 296 | table.attach_defaults(separator, 3, 4, 0, 3) | ||
377 | 297 | separator.show() | ||
378 | 298 | |||
379 | 299 | label = Gtk.Label(u'<big>{}</big>'.format(_(u'Share'))) | ||
380 | 300 | label.set_use_markup(True) | ||
381 | 301 | table.attach_defaults(label, 4, 5, 0, 1) | ||
382 | 302 | label.show() | ||
383 | 303 | |||
384 | 304 | image = Gtk.Image() | ||
385 | 305 | table.attach_defaults(image, 4, 5, 1, 2) | ||
386 | 306 | image.show() | ||
387 | 307 | path = self.__find_data_file('share.png') | ||
388 | 308 | if path: | ||
389 | 309 | image.set_from_file(path) | ||
390 | 310 | |||
391 | 311 | label = Gtk.Label(u'<small>{}</small>'.format( | ||
392 | 312 | _(u'Share with colleagues, friends, and family.'))) | ||
393 | 313 | label.set_max_width_chars(width_chars) | ||
394 | 314 | label.set_width_chars(width_chars) | ||
395 | 315 | label.set_use_markup(True) | ||
396 | 316 | label.set_line_wrap(True) | ||
397 | 317 | label.set_alignment(0.5, 0.0) | ||
398 | 318 | label.set_justify(Gtk.Justification.CENTER) | ||
399 | 319 | table.attach_defaults(label, 4, 5, 2, 3) | ||
453 | 320 | label.show() | 318 | label.show() |
454 | 321 | 319 | ||
455 | 322 | return page | 320 | return page |
+1 since it's exactly trunk and I have tested that