Merge lp:~dobey/ubuntuone-installer/freezebreaker into lp:ubuntuone-installer
- freezebreaker
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 26 |
Merged at revision: | 29 |
Proposed branch: | lp:~dobey/ubuntuone-installer/freezebreaker |
Merge into: | lp:ubuntuone-installer |
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/freezebreaker |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Grant (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+97289@code.launchpad.net |
Commit message
Update the text labels, layout, and image for the installer
Description of the change
Roberto Alsina (ralsina) wrote : | # |
Robert Grant (rtgrant) wrote : | # |
+1
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~dobey/ubuntuone-installer/freezebreaker into lp:ubuntuone-installer 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/
return info.invoke(cls, *args, **kwargs)
gi._glib.GErro...
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~dobey/ubuntuone-installer/freezebreaker into lp:ubuntuone-installer 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/
return info.invoke(cls, *args, **kwargs)
gi._glib.GErro...
Preview Diff
1 | === removed file 'data/share.png' |
2 | 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 | 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 | 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-13 20:30:29 +0000 |
10 | @@ -0,0 +1,228 @@ |
11 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
12 | +<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
13 | + |
14 | +<svg |
15 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
16 | + xmlns:cc="http://creativecommons.org/ns#" |
17 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
18 | + xmlns:svg="http://www.w3.org/2000/svg" |
19 | + xmlns="http://www.w3.org/2000/svg" |
20 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
21 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
22 | + version="1.1" |
23 | + id="Layer_1" |
24 | + x="0px" |
25 | + y="0px" |
26 | + width="800" |
27 | + height="600" |
28 | + viewBox="0 0 800 600" |
29 | + enable-background="new 0 0 1024 768" |
30 | + xml:space="preserve" |
31 | + inkscape:version="0.48.3.1 r9886" |
32 | + sodipodi:docname="u1cloud.svg"><title |
33 | + id="title3046">Ubuntu One Your Cloud</title><metadata |
34 | + id="metadata69"><rdf:RDF><cc:Work |
35 | + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type |
36 | + 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 | + rdf:resource="http://www.gnu.org/licenses/gpl-3.0.html" /></cc:Work></rdf:RDF></metadata><defs |
38 | + id="defs67" /><sodipodi:namedview |
39 | + pagecolor="#ffffff" |
40 | + bordercolor="#666666" |
41 | + borderopacity="1" |
42 | + objecttolerance="10" |
43 | + gridtolerance="10" |
44 | + guidetolerance="10" |
45 | + inkscape:pageopacity="0" |
46 | + inkscape:pageshadow="2" |
47 | + inkscape:window-width="2048" |
48 | + inkscape:window-height="1105" |
49 | + id="namedview65" |
50 | + showgrid="true" |
51 | + inkscape:zoom="1.1106771" |
52 | + inkscape:cx="397.65534" |
53 | + inkscape:cy="384.00001" |
54 | + inkscape:window-x="0" |
55 | + inkscape:window-y="24" |
56 | + inkscape:window-maximized="1" |
57 | + inkscape:current-layer="Layer_1"><inkscape:grid |
58 | + type="xygrid" |
59 | + id="grid3013" |
60 | + empspacing="5" |
61 | + visible="true" |
62 | + enabled="true" |
63 | + snapvisiblegridlinesonly="true" /></sodipodi:namedview> |
64 | + |
65 | + |
66 | + |
67 | + |
68 | + |
69 | + |
70 | + |
71 | + |
72 | + |
73 | + |
74 | + |
75 | + |
76 | + |
77 | + |
78 | + |
79 | + |
80 | + |
81 | + |
82 | + |
83 | +<g |
84 | + id="g3015" |
85 | + transform="matrix(1.0650103,0,0,1.118185,-138.88955,48.010328)"><path |
86 | + style="fill:#dd4814" |
87 | + inkscape:connector-curvature="0" |
88 | + id="path3" |
89 | + 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 | + transform="translate(0,-168)" |
91 | + id="g5"> |
92 | + <path |
93 | + style="fill:#ffffff" |
94 | + inkscape:connector-curvature="0" |
95 | + id="path7" |
96 | + 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 | +</g><g |
98 | + transform="translate(0,-168)" |
99 | + id="g9"> |
100 | + <path |
101 | + style="fill:#ffffff" |
102 | + inkscape:connector-curvature="0" |
103 | + id="path11" |
104 | + 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 | +</g><path |
106 | + style="fill:#ffffff" |
107 | + inkscape:connector-curvature="0" |
108 | + id="path13" |
109 | + 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 | + style="fill:#333333" |
111 | + inkscape:connector-curvature="0" |
112 | + id="path15" |
113 | + 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 | + transform="translate(0,-168)" |
115 | + id="g17"> |
116 | + <path |
117 | + style="fill:#ffffff" |
118 | + inkscape:connector-curvature="0" |
119 | + id="path19" |
120 | + 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 | + <g |
122 | + id="g21"> |
123 | + <path |
124 | + style="fill:#333333" |
125 | + inkscape:connector-curvature="0" |
126 | + id="path23" |
127 | + 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 | + </g> |
129 | + <g |
130 | + id="g25"> |
131 | + <path |
132 | + style="fill:#dd4814" |
133 | + inkscape:connector-curvature="0" |
134 | + id="path27" |
135 | + 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 | + </g> |
137 | + <g |
138 | + id="g29"> |
139 | + <path |
140 | + style="fill:#ffffff" |
141 | + inkscape:connector-curvature="0" |
142 | + id="path31" |
143 | + 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 | + </g> |
145 | +</g><path |
146 | + style="fill:#ffffff" |
147 | + inkscape:connector-curvature="0" |
148 | + id="path33" |
149 | + 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 | + style="fill:#333333" |
151 | + inkscape:connector-curvature="0" |
152 | + id="path35" |
153 | + 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 | + style="fill:#333333" |
155 | + inkscape:connector-curvature="0" |
156 | + id="path37" |
157 | + 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 | + transform="translate(0,-168)" |
159 | + id="g39"> |
160 | + <path |
161 | + style="fill:#ffffff" |
162 | + inkscape:connector-curvature="0" |
163 | + id="path41" |
164 | + 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 | +</g><path |
166 | + style="fill:#333333" |
167 | + inkscape:connector-curvature="0" |
168 | + id="path43" |
169 | + 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 | + style="fill:#333333" |
171 | + inkscape:connector-curvature="0" |
172 | + id="path45" |
173 | + 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 | + style="fill:#333333" |
175 | + inkscape:connector-curvature="0" |
176 | + id="path47" |
177 | + 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 | + transform="translate(0,-168)" |
179 | + style="fill:#ffffff" |
180 | + sodipodi:ry="8.5039997" |
181 | + sodipodi:rx="8.5039997" |
182 | + sodipodi:cy="366.53799" |
183 | + sodipodi:cx="548.81598" |
184 | + id="circle49" |
185 | + r="8.5039997" |
186 | + cy="366.53799" |
187 | + cx="548.81598" |
188 | + 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 | + transform="translate(0,-168)" |
190 | + style="fill:#ffffff" |
191 | + sodipodi:ry="8.5039997" |
192 | + sodipodi:rx="8.5039997" |
193 | + sodipodi:cy="398.608" |
194 | + sodipodi:cx="516.74597" |
195 | + id="circle51" |
196 | + r="8.5039997" |
197 | + cy="398.608" |
198 | + cx="516.74597" |
199 | + 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 | + transform="translate(0,-168)" |
201 | + id="g53"> |
202 | + <path |
203 | + style="fill:none" |
204 | + inkscape:connector-curvature="0" |
205 | + id="path55" |
206 | + 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 | +</g><circle |
208 | + transform="translate(0,-168)" |
209 | + style="fill:#ffffff" |
210 | + sodipodi:ry="8.5039997" |
211 | + sodipodi:rx="8.5039997" |
212 | + sodipodi:cy="430.67801" |
213 | + sodipodi:cx="484.67499" |
214 | + id="circle57" |
215 | + r="8.5039997" |
216 | + cy="430.67801" |
217 | + cx="484.67499" |
218 | + 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 | + style="fill:#ffffff" |
220 | + inkscape:connector-curvature="0" |
221 | + id="path59" |
222 | + 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 | + style="fill:#dd4814" |
224 | + inkscape:connector-curvature="0" |
225 | + id="path61" |
226 | + 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 | + transform="translate(0,-168)" |
228 | + style="fill:#dd4814" |
229 | + sodipodi:ry="4.2519999" |
230 | + sodipodi:rx="4.2519999" |
231 | + sodipodi:cy="537.539" |
232 | + sodipodi:cx="738.271" |
233 | + id="circle63" |
234 | + r="4.2519999" |
235 | + cy="537.539" |
236 | + cx="738.271" |
237 | + 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 | +</svg> |
239 | \ No newline at end of file |
240 | |
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-13 20:30:29 +0000 |
244 | @@ -20,7 +20,7 @@ |
245 | import gettext |
246 | import os |
247 | |
248 | -from gi.repository import Gtk, GObject, GLib, Gdk, Pango |
249 | +from gi.repository import Gtk, GObject, GLib, Gdk, GdkPixbuf, Pango |
250 | from ubuntuone.installer import (CLIENT_SHELL_PACKAGE, |
251 | CONTROL_PANEL_COMMAND, |
252 | CONTROL_PANEL_PACKAGE, |
253 | @@ -69,6 +69,30 @@ |
254 | return True |
255 | |
256 | |
257 | +class HSeparator(Gtk.HSeparator): |
258 | + """A dotted line separator.""" |
259 | + |
260 | + def do_draw(self, cairo_context): |
261 | + """Draw some magic.""" |
262 | + sc = self.get_style_context() |
263 | + state = self.get_state_flags() |
264 | + width = self.get_allocated_width() |
265 | + height = self.get_allocated_height() |
266 | + |
267 | + sc.save() |
268 | + sc.set_state(state) |
269 | + |
270 | + x = 0 |
271 | + y = height / 2 |
272 | + while x <= width: |
273 | + Gtk.render_activity(sc, cairo_context, |
274 | + float(x), float(y), 1.0, 1.0) |
275 | + x += 3 |
276 | + |
277 | + sc.restore() |
278 | + return True |
279 | + |
280 | + |
281 | class Window(Gtk.Window): |
282 | """The main dialog to use.""" |
283 | |
284 | @@ -108,7 +132,7 @@ |
285 | self.__hlabel.show() |
286 | |
287 | self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format( |
288 | - _(u'Discover the freedom of your personal cloud'))) |
289 | + _(u'Discover your personal cloud'))) |
290 | self.__hlabel2.set_use_markup(True) |
291 | self.__hlabel2.set_alignment(0.0, 0.0) |
292 | self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0) |
293 | @@ -127,7 +151,6 @@ |
294 | self.__notebook.set_show_border(False) |
295 | self.__notebook.set_scrollable(False) |
296 | self.__notebook.popup_disable() |
297 | - #self.__notebook.set_size_request(734, 240) |
298 | |
299 | self.__info_page = self.__construct_info_page() |
300 | self.__notebook.append_page(self.__info_page, None) |
301 | @@ -223,7 +246,7 @@ |
302 | def __construct_info_page(self): |
303 | """Build the initial info page.""" |
304 | page = Gtk.HBox() |
305 | - page.set_border_width(12) |
306 | + page.set_border_width(6) |
307 | page.set_spacing(12) |
308 | page.show() |
309 | |
310 | @@ -233,90 +256,65 @@ |
311 | width = width / Pango.SCALE |
312 | height = height / Pango.SCALE |
313 | |
314 | - table = Gtk.Table(3, 5, False) |
315 | - table.set_row_spacings(12) |
316 | + table = Gtk.Table(5, 2, False) |
317 | + table.set_row_spacings(6) |
318 | table.set_col_spacings(12) |
319 | page.pack_start(table, True, True, 24) |
320 | table.show() |
321 | |
322 | - label = Gtk.Label(u'<big>{}</big>'.format(_(u'Sync'))) |
323 | - label.set_use_markup(True) |
324 | - table.attach_defaults(label, 0, 1, 0, 1) |
325 | - label.show() |
326 | - |
327 | - image = Gtk.Image() |
328 | - table.attach_defaults(image, 0, 1, 1, 2) |
329 | - image.show() |
330 | - path = self.__find_data_file('sync.png') |
331 | - if path: |
332 | - image.set_from_file(path) |
333 | - |
334 | - # Get the width in chars to set max for description labels |
335 | - width_chars = (image.get_pixbuf().get_width() / width) * 2.5 |
336 | - |
337 | - label = Gtk.Label(u'<small>{}</small>'.format( |
338 | - _(u'Sync files across your devices.'))) |
339 | - label.set_max_width_chars(width_chars) |
340 | - label.set_width_chars(width_chars) |
341 | - label.set_use_markup(True) |
342 | - label.set_line_wrap(True) |
343 | - label.set_alignment(0.5, 0.0) |
344 | - label.set_justify(Gtk.Justification.CENTER) |
345 | - table.attach_defaults(label, 0, 1, 2, 3) |
346 | - label.show() |
347 | - |
348 | - separator = VSeparator() |
349 | - table.attach_defaults(separator, 1, 2, 0, 3) |
350 | - separator.show() |
351 | - |
352 | - label = Gtk.Label(u'<big>{}</big>'.format(_(u'Stream'))) |
353 | - label.set_use_markup(True) |
354 | - table.attach_defaults(label, 2, 3, 0, 1) |
355 | - label.show() |
356 | - |
357 | - image = Gtk.Image() |
358 | - table.attach_defaults(image, 2, 3, 1, 2) |
359 | - image.show() |
360 | - path = self.__find_data_file('stream.png') |
361 | - if path: |
362 | - image.set_from_file(path) |
363 | - |
364 | - label = Gtk.Label(u'<small>{}</small>'.format( |
365 | - _(u'Stream your music on the move and offline.'))) |
366 | - label.set_max_width_chars(width_chars) |
367 | - label.set_width_chars(width_chars) |
368 | - label.set_use_markup(True) |
369 | - label.set_line_wrap(True) |
370 | - label.set_alignment(0.5, 0.0) |
371 | - label.set_justify(Gtk.Justification.CENTER) |
372 | - table.attach_defaults(label, 2, 3, 2, 3) |
373 | - label.show() |
374 | - |
375 | - separator = VSeparator() |
376 | - table.attach_defaults(separator, 3, 4, 0, 3) |
377 | - separator.show() |
378 | - |
379 | - label = Gtk.Label(u'<big>{}</big>'.format(_(u'Share'))) |
380 | - label.set_use_markup(True) |
381 | - table.attach_defaults(label, 4, 5, 0, 1) |
382 | - label.show() |
383 | - |
384 | - image = Gtk.Image() |
385 | - table.attach_defaults(image, 4, 5, 1, 2) |
386 | - image.show() |
387 | - path = self.__find_data_file('share.png') |
388 | - if path: |
389 | - image.set_from_file(path) |
390 | - |
391 | - label = Gtk.Label(u'<small>{}</small>'.format( |
392 | - _(u'Share with colleagues, friends, and family.'))) |
393 | - label.set_max_width_chars(width_chars) |
394 | - label.set_width_chars(width_chars) |
395 | - label.set_use_markup(True) |
396 | - label.set_line_wrap(True) |
397 | - label.set_alignment(0.5, 0.0) |
398 | - label.set_justify(Gtk.Justification.CENTER) |
399 | - table.attach_defaults(label, 4, 5, 2, 3) |
400 | + image = Gtk.Image() |
401 | + table.attach_defaults(image, 0, 1, 0, 5) |
402 | + image.show() |
403 | + path = self.__find_data_file('u1cloud.svg') |
404 | + if path: |
405 | + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( |
406 | + path, 320, 240, True) |
407 | + image.set_from_pixbuf(pixbuf) |
408 | + |
409 | + # Get the width in chars based on cloud width, for main labels |
410 | + width_chars = (image.get_pixbuf().get_width() / width) * 2.0 |
411 | + |
412 | + label = Gtk.Label(_(u'Store files, photos, and music safely in Ubuntu' |
413 | + ' One and access them on any of your devices.')) |
414 | + label.set_max_width_chars(width_chars) |
415 | + label.set_width_chars(width_chars) |
416 | + label.set_use_markup(True) |
417 | + label.set_line_wrap(True) |
418 | + label.set_alignment(0.0, 0.5) |
419 | + label.set_justify(Gtk.Justification.LEFT) |
420 | + table.attach_defaults(label, 1, 2, 0, 1) |
421 | + label.show() |
422 | + |
423 | + separator = HSeparator() |
424 | + table.attach_defaults(separator, 1, 2, 1, 2) |
425 | + separator.show() |
426 | + |
427 | + label = Gtk.Label(_(u'Upload photos from your mobile instantly, and' |
428 | + ' they\'re ready to share with friends or post' |
429 | + ' online.')) |
430 | + label.set_max_width_chars(width_chars) |
431 | + label.set_width_chars(width_chars) |
432 | + label.set_use_markup(True) |
433 | + label.set_line_wrap(True) |
434 | + label.set_alignment(0.0, 0.5) |
435 | + label.set_justify(Gtk.Justification.LEFT) |
436 | + table.attach_defaults(label, 1, 2, 2, 3) |
437 | + label.show() |
438 | + |
439 | + separator = HSeparator() |
440 | + table.attach_defaults(separator, 1, 2, 3, 4) |
441 | + separator.show() |
442 | + |
443 | + label = Gtk.Label(_(u'Stream your music collection to all of your' |
444 | + ' devices and listen to any song - online or' |
445 | + ' offline.')) |
446 | + label.set_max_width_chars(width_chars) |
447 | + label.set_width_chars(width_chars) |
448 | + label.set_use_markup(True) |
449 | + label.set_line_wrap(True) |
450 | + label.set_alignment(0.0, 0.5) |
451 | + label.set_justify(Gtk.Justification.LEFT) |
452 | + table.attach_defaults(label, 1, 2, 4, 5) |
453 | label.show() |
454 | |
455 | return page |
Here is a screenshot of the new layout: http:// ubuntuone. com/0qNuLP4Qc44 4Hk7jHLX9dq