Merge lp:~nataliabidart/ubuntuone-control-panel/fix-739538 into lp:ubuntuone-control-panel
- fix-739538
- Merge into trunk
Proposed by
Natalia Bidart
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 107 | ||||
Merged at revision: | 107 | ||||
Proposed branch: | lp:~nataliabidart/ubuntuone-control-panel/fix-739538 | ||||
Merge into: | lp:ubuntuone-control-panel | ||||
Diff against target: |
636 lines (+277/-307) 1 file modified
data/overview.ui (+277/-307) |
||||
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-control-panel/fix-739538 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
dobey (community) | Approve | ||
Review via email: mp+54378@code.launchpad.net |
Commit message
- Added border to the overview panel (LP: #739538).
- Removed the event box behing the banner image to avoid different background colors.
Description of the change
Screenshot located at http://
To post a comment you must log in.
Revision history for this message
dobey (dobey) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/overview.ui' |
2 | --- data/overview.ui 2011-03-04 13:15:01 +0000 |
3 | +++ data/overview.ui 2011-03-22 16:32:13 +0000 |
4 | @@ -5,17 +5,13 @@ |
5 | <object class="GtkVBox" id="itself"> |
6 | <property name="visible">True</property> |
7 | <property name="can_focus">False</property> |
8 | + <property name="border_width">12</property> |
9 | + <property name="spacing">12</property> |
10 | <child> |
11 | - <object class="GtkEventBox" id="banner"> |
12 | + <object class="GtkImage" id="banner"> |
13 | <property name="visible">True</property> |
14 | <property name="can_focus">False</property> |
15 | - <child> |
16 | - <object class="GtkImage" id="image"> |
17 | - <property name="visible">True</property> |
18 | - <property name="can_focus">False</property> |
19 | - <property name="pixbuf">overview.png</property> |
20 | - </object> |
21 | - </child> |
22 | + <property name="pixbuf">overview.png</property> |
23 | </object> |
24 | <packing> |
25 | <property name="expand">False</property> |
26 | @@ -24,162 +20,220 @@ |
27 | </packing> |
28 | </child> |
29 | <child> |
30 | - <object class="GtkScrolledWindow" id="scrolledwindow1"> |
31 | - <property name="visible">True</property> |
32 | - <property name="can_focus">True</property> |
33 | - <property name="hscrollbar_policy">automatic</property> |
34 | - <property name="vscrollbar_policy">automatic</property> |
35 | + <object class="GtkLabel" id="label7"> |
36 | + <property name="visible">True</property> |
37 | + <property name="can_focus">False</property> |
38 | + <property name="label" translatable="yes"><span font="24" foreground="#4d4d4d">The Power of Your Personal Cloud</span></property> |
39 | + <property name="use_markup">True</property> |
40 | + </object> |
41 | + <packing> |
42 | + <property name="expand">True</property> |
43 | + <property name="fill">True</property> |
44 | + <property name="padding">12</property> |
45 | + <property name="position">1</property> |
46 | + </packing> |
47 | + </child> |
48 | + <child> |
49 | + <object class="GtkHBox" id="hbox1"> |
50 | + <property name="visible">True</property> |
51 | + <property name="can_focus">False</property> |
52 | + <property name="spacing">5</property> |
53 | <child> |
54 | - <object class="GtkViewport" id="viewport1"> |
55 | + <object class="GtkTable" id="table1"> |
56 | <property name="visible">True</property> |
57 | <property name="can_focus">False</property> |
58 | - <property name="shadow_type">none</property> |
59 | - <child> |
60 | - <object class="GtkVBox" id="vbox1"> |
61 | - <property name="visible">True</property> |
62 | - <property name="can_focus">False</property> |
63 | - <child> |
64 | - <object class="GtkLabel" id="label7"> |
65 | - <property name="visible">True</property> |
66 | - <property name="can_focus">False</property> |
67 | - <property name="label" translatable="yes"><span font_size="xx-large" foreground="#4d4d4d">The Power of Your Personal Cloud</span></property> |
68 | - <property name="use_markup">True</property> |
69 | - </object> |
70 | - <packing> |
71 | - <property name="expand">False</property> |
72 | - <property name="fill">True</property> |
73 | - <property name="padding">12</property> |
74 | - <property name="position">0</property> |
75 | - </packing> |
76 | - </child> |
77 | - <child> |
78 | - <object class="GtkHBox" id="hbox1"> |
79 | - <property name="visible">True</property> |
80 | - <property name="can_focus">False</property> |
81 | - <property name="border_width">20</property> |
82 | - <property name="spacing">5</property> |
83 | - <child> |
84 | - <object class="GtkTable" id="table1"> |
85 | - <property name="visible">True</property> |
86 | - <property name="can_focus">False</property> |
87 | - <property name="n_rows">4</property> |
88 | - <property name="n_columns">2</property> |
89 | - <property name="column_spacing">10</property> |
90 | - <child> |
91 | - <object class="GtkImage" id="image1"> |
92 | - <property name="visible">True</property> |
93 | - <property name="can_focus">False</property> |
94 | - <property name="pixbuf">files.png</property> |
95 | - </object> |
96 | - <packing> |
97 | - <property name="x_options">GTK_FILL</property> |
98 | - <property name="y_options">GTK_FILL</property> |
99 | - </packing> |
100 | - </child> |
101 | - <child> |
102 | - <object class="GtkImage" id="image2"> |
103 | - <property name="visible">True</property> |
104 | - <property name="can_focus">False</property> |
105 | - <property name="pixbuf">music-stream.png</property> |
106 | - </object> |
107 | - <packing> |
108 | - <property name="top_attach">1</property> |
109 | - <property name="bottom_attach">2</property> |
110 | - <property name="x_options">GTK_FILL</property> |
111 | - <property name="y_options">GTK_FILL</property> |
112 | - </packing> |
113 | - </child> |
114 | - <child> |
115 | - <object class="GtkImage" id="image3"> |
116 | - <property name="visible">True</property> |
117 | - <property name="can_focus">False</property> |
118 | - <property name="pixbuf">contacts.png</property> |
119 | - </object> |
120 | - <packing> |
121 | - <property name="top_attach">2</property> |
122 | - <property name="bottom_attach">3</property> |
123 | - <property name="x_options">GTK_FILL</property> |
124 | - <property name="y_options">GTK_FILL</property> |
125 | - </packing> |
126 | - </child> |
127 | - <child> |
128 | - <object class="GtkImage" id="image4"> |
129 | - <property name="visible">True</property> |
130 | - <property name="can_focus">False</property> |
131 | - <property name="pixbuf">notes.png</property> |
132 | - </object> |
133 | - <packing> |
134 | - <property name="top_attach">3</property> |
135 | - <property name="bottom_attach">4</property> |
136 | - <property name="x_options">GTK_FILL</property> |
137 | - <property name="y_options">GTK_FILL</property> |
138 | - </packing> |
139 | - </child> |
140 | - <child> |
141 | - <object class="GtkLabel" id="label3"> |
142 | - <property name="visible">True</property> |
143 | - <property name="can_focus">False</property> |
144 | - <property name="xalign">0</property> |
145 | - <property name="label" translatable="yes">Files Anywhere |
146 | -<span foreground="#909090">Backup and access your files from Ubuntu, Windows or Mobile</span></property> |
147 | - <property name="use_markup">True</property> |
148 | - <property name="wrap">True</property> |
149 | - </object> |
150 | - <packing> |
151 | - <property name="left_attach">1</property> |
152 | - <property name="right_attach">2</property> |
153 | - </packing> |
154 | - </child> |
155 | - <child> |
156 | - <object class="GtkLabel" id="label4"> |
157 | - <property name="visible">True</property> |
158 | - <property name="can_focus">False</property> |
159 | - <property name="xalign">0</property> |
160 | - <property name="label" translatable="yes">Keep Connected |
161 | + <property name="n_rows">4</property> |
162 | + <property name="n_columns">2</property> |
163 | + <property name="column_spacing">10</property> |
164 | + <child> |
165 | + <object class="GtkImage" id="image1"> |
166 | + <property name="visible">True</property> |
167 | + <property name="can_focus">False</property> |
168 | + <property name="pixbuf">files.png</property> |
169 | + </object> |
170 | + <packing> |
171 | + <property name="x_options">GTK_FILL</property> |
172 | + <property name="y_options">GTK_FILL</property> |
173 | + </packing> |
174 | + </child> |
175 | + <child> |
176 | + <object class="GtkImage" id="image2"> |
177 | + <property name="visible">True</property> |
178 | + <property name="can_focus">False</property> |
179 | + <property name="pixbuf">music-stream.png</property> |
180 | + </object> |
181 | + <packing> |
182 | + <property name="top_attach">1</property> |
183 | + <property name="bottom_attach">2</property> |
184 | + <property name="x_options">GTK_FILL</property> |
185 | + <property name="y_options">GTK_FILL</property> |
186 | + </packing> |
187 | + </child> |
188 | + <child> |
189 | + <object class="GtkImage" id="image3"> |
190 | + <property name="visible">True</property> |
191 | + <property name="can_focus">False</property> |
192 | + <property name="pixbuf">contacts.png</property> |
193 | + </object> |
194 | + <packing> |
195 | + <property name="top_attach">2</property> |
196 | + <property name="bottom_attach">3</property> |
197 | + <property name="x_options">GTK_FILL</property> |
198 | + <property name="y_options">GTK_FILL</property> |
199 | + </packing> |
200 | + </child> |
201 | + <child> |
202 | + <object class="GtkImage" id="image4"> |
203 | + <property name="visible">True</property> |
204 | + <property name="can_focus">False</property> |
205 | + <property name="pixbuf">notes.png</property> |
206 | + </object> |
207 | + <packing> |
208 | + <property name="top_attach">3</property> |
209 | + <property name="bottom_attach">4</property> |
210 | + <property name="x_options">GTK_FILL</property> |
211 | + <property name="y_options">GTK_FILL</property> |
212 | + </packing> |
213 | + </child> |
214 | + <child> |
215 | + <object class="GtkLabel" id="label3"> |
216 | + <property name="visible">True</property> |
217 | + <property name="can_focus">False</property> |
218 | + <property name="xalign">0</property> |
219 | + <property name="label" translatable="yes">Files Anywhere |
220 | +<span foreground="#909090">Backup and access your files from Ubuntu, Windows, Web or Mobile</span></property> |
221 | + <property name="use_markup">True</property> |
222 | + <property name="wrap">True</property> |
223 | + </object> |
224 | + <packing> |
225 | + <property name="left_attach">1</property> |
226 | + <property name="right_attach">2</property> |
227 | + </packing> |
228 | + </child> |
229 | + <child> |
230 | + <object class="GtkLabel" id="label4"> |
231 | + <property name="visible">True</property> |
232 | + <property name="can_focus">False</property> |
233 | + <property name="xalign">0</property> |
234 | + <property name="label" translatable="yes">Keep Connected |
235 | <span foreground="#909090">Unify your contacts across Desktop, Mobile and Web</span></property> |
236 | - <property name="use_markup">True</property> |
237 | - <property name="wrap">True</property> |
238 | - </object> |
239 | - <packing> |
240 | - <property name="left_attach">1</property> |
241 | - <property name="right_attach">2</property> |
242 | - <property name="top_attach">2</property> |
243 | - <property name="bottom_attach">3</property> |
244 | - </packing> |
245 | - </child> |
246 | - <child> |
247 | - <object class="GtkLabel" id="label5"> |
248 | - <property name="visible">True</property> |
249 | - <property name="can_focus">False</property> |
250 | - <property name="xalign">0</property> |
251 | - <property name="label" translatable="yes">Rock Out |
252 | + <property name="use_markup">True</property> |
253 | + <property name="wrap">True</property> |
254 | + </object> |
255 | + <packing> |
256 | + <property name="left_attach">1</property> |
257 | + <property name="right_attach">2</property> |
258 | + <property name="top_attach">2</property> |
259 | + <property name="bottom_attach">3</property> |
260 | + </packing> |
261 | + </child> |
262 | + <child> |
263 | + <object class="GtkLabel" id="label5"> |
264 | + <property name="visible">True</property> |
265 | + <property name="can_focus">False</property> |
266 | + <property name="xalign">0</property> |
267 | + <property name="label" translatable="yes">Rock Out |
268 | <span foreground="#909090">Your entire collection follows you around with music streaming to Android and iPhone</span></property> |
269 | - <property name="use_markup">True</property> |
270 | - <property name="wrap">True</property> |
271 | - </object> |
272 | - <packing> |
273 | - <property name="left_attach">1</property> |
274 | - <property name="right_attach">2</property> |
275 | - <property name="top_attach">1</property> |
276 | - <property name="bottom_attach">2</property> |
277 | - </packing> |
278 | - </child> |
279 | - <child> |
280 | - <object class="GtkLabel" id="label6"> |
281 | - <property name="visible">True</property> |
282 | - <property name="can_focus">False</property> |
283 | - <property name="xalign">0</property> |
284 | - <property name="label" translatable="yes">Stay Productive |
285 | + <property name="use_markup">True</property> |
286 | + <property name="wrap">True</property> |
287 | + </object> |
288 | + <packing> |
289 | + <property name="left_attach">1</property> |
290 | + <property name="right_attach">2</property> |
291 | + <property name="top_attach">1</property> |
292 | + <property name="bottom_attach">2</property> |
293 | + </packing> |
294 | + </child> |
295 | + <child> |
296 | + <object class="GtkLabel" id="label6"> |
297 | + <property name="visible">True</property> |
298 | + <property name="can_focus">False</property> |
299 | + <property name="xalign">0</property> |
300 | + <property name="label" translatable="yes">Stay Productive |
301 | <span foreground="#909090">Keep your Firefox bookmarks and Tomboy notes synced</span></property> |
302 | - <property name="use_markup">True</property> |
303 | - <property name="wrap">True</property> |
304 | + <property name="use_markup">True</property> |
305 | + <property name="wrap">True</property> |
306 | + </object> |
307 | + <packing> |
308 | + <property name="left_attach">1</property> |
309 | + <property name="right_attach">2</property> |
310 | + <property name="top_attach">3</property> |
311 | + <property name="bottom_attach">4</property> |
312 | + </packing> |
313 | + </child> |
314 | + </object> |
315 | + <packing> |
316 | + <property name="expand">True</property> |
317 | + <property name="fill">True</property> |
318 | + <property name="position">0</property> |
319 | + </packing> |
320 | + </child> |
321 | + <child> |
322 | + <object class="GtkVBox" id="vbox2"> |
323 | + <property name="visible">True</property> |
324 | + <property name="can_focus">False</property> |
325 | + <child> |
326 | + <object class="GtkLabel" id="warning_label"> |
327 | + <property name="visible">True</property> |
328 | + <property name="can_focus">False</property> |
329 | + <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property> |
330 | + <property name="wrap">True</property> |
331 | + </object> |
332 | + <packing> |
333 | + <property name="expand">False</property> |
334 | + <property name="fill">True</property> |
335 | + <property name="position">0</property> |
336 | + </packing> |
337 | + </child> |
338 | + <child> |
339 | + <object class="GtkAlignment" id="alignment2"> |
340 | + <property name="visible">True</property> |
341 | + <property name="can_focus">False</property> |
342 | + <property name="xscale">0</property> |
343 | + <property name="yscale">0</property> |
344 | + <child> |
345 | + <object class="GtkVBox" id="vbox3"> |
346 | + <property name="visible">True</property> |
347 | + <property name="can_focus">False</property> |
348 | + <property name="spacing">10</property> |
349 | + <child> |
350 | + <object class="GtkButton" id="learn_more_button"> |
351 | + <property name="visible">True</property> |
352 | + <property name="can_focus">True</property> |
353 | + <property name="receives_default">True</property> |
354 | + <property name="use_action_appearance">False</property> |
355 | + <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/> |
356 | + <child> |
357 | + <object class="GtkVBox" id="vbox5"> |
358 | + <property name="visible">True</property> |
359 | + <property name="can_focus">False</property> |
360 | + <child> |
361 | + <object class="GtkImage" id="image5"> |
362 | + <property name="visible">True</property> |
363 | + <property name="can_focus">False</property> |
364 | + <property name="pixel_size">55</property> |
365 | + <property name="icon_name">ubuntuone</property> |
366 | + </object> |
367 | + <packing> |
368 | + <property name="expand">True</property> |
369 | + <property name="fill">True</property> |
370 | + <property name="position">0</property> |
371 | + </packing> |
372 | + </child> |
373 | + <child> |
374 | + <object class="GtkLabel" id="label8"> |
375 | + <property name="visible">True</property> |
376 | + <property name="can_focus">False</property> |
377 | + <property name="label" translatable="yes"><span foreground="#909090">Learn More</span></property> |
378 | + <property name="use_markup">True</property> |
379 | + </object> |
380 | + <packing> |
381 | + <property name="expand">True</property> |
382 | + <property name="fill">True</property> |
383 | + <property name="position">1</property> |
384 | + </packing> |
385 | + </child> |
386 | </object> |
387 | - <packing> |
388 | - <property name="left_attach">1</property> |
389 | - <property name="right_attach">2</property> |
390 | - <property name="top_attach">3</property> |
391 | - <property name="bottom_attach">4</property> |
392 | - </packing> |
393 | </child> |
394 | </object> |
395 | <packing> |
396 | @@ -189,151 +243,45 @@ |
397 | </packing> |
398 | </child> |
399 | <child> |
400 | - <object class="GtkVBox" id="vbox2"> |
401 | + <object class="GtkButton" id="join_now_button"> |
402 | <property name="visible">True</property> |
403 | - <property name="can_focus">False</property> |
404 | - <child> |
405 | - <object class="GtkLabel" id="warning_label"> |
406 | - <property name="visible">True</property> |
407 | - <property name="can_focus">False</property> |
408 | - <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property> |
409 | - <property name="wrap">True</property> |
410 | - </object> |
411 | - <packing> |
412 | - <property name="expand">False</property> |
413 | - <property name="fill">True</property> |
414 | - <property name="position">0</property> |
415 | - </packing> |
416 | - </child> |
417 | - <child> |
418 | - <object class="GtkAlignment" id="alignment2"> |
419 | - <property name="visible">True</property> |
420 | - <property name="can_focus">False</property> |
421 | - <property name="xscale">0</property> |
422 | - <property name="yscale">0</property> |
423 | - <child> |
424 | - <object class="GtkVBox" id="vbox3"> |
425 | - <property name="visible">True</property> |
426 | - <property name="can_focus">False</property> |
427 | - <property name="spacing">10</property> |
428 | - <child> |
429 | - <object class="GtkButton" id="learn_more_button"> |
430 | - <property name="visible">True</property> |
431 | - <property name="can_focus">True</property> |
432 | - <property name="receives_default">True</property> |
433 | - <property name="use_action_appearance">False</property> |
434 | - <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/> |
435 | - <child> |
436 | - <object class="GtkVBox" id="vbox5"> |
437 | - <property name="visible">True</property> |
438 | - <property name="can_focus">False</property> |
439 | - <child> |
440 | - <object class="GtkImage" id="image5"> |
441 | - <property name="visible">True</property> |
442 | - <property name="can_focus">False</property> |
443 | - <property name="pixel_size">45</property> |
444 | - <property name="icon_name">ubuntuone</property> |
445 | - </object> |
446 | - <packing> |
447 | - <property name="expand">True</property> |
448 | - <property name="fill">True</property> |
449 | - <property name="position">0</property> |
450 | - </packing> |
451 | - </child> |
452 | - <child> |
453 | - <object class="GtkLabel" id="label8"> |
454 | - <property name="visible">True</property> |
455 | - <property name="can_focus">False</property> |
456 | - <property name="label" translatable="yes"><span foreground="#909090">Learn More</span></property> |
457 | - <property name="use_markup">True</property> |
458 | - </object> |
459 | - <packing> |
460 | - <property name="expand">True</property> |
461 | - <property name="fill">True</property> |
462 | - <property name="position">1</property> |
463 | - </packing> |
464 | - </child> |
465 | - </object> |
466 | - </child> |
467 | - </object> |
468 | - <packing> |
469 | - <property name="expand">True</property> |
470 | - <property name="fill">True</property> |
471 | - <property name="position">0</property> |
472 | - </packing> |
473 | - </child> |
474 | - <child> |
475 | - <object class="GtkButton" id="join_now_button"> |
476 | - <property name="visible">True</property> |
477 | - <property name="can_focus">True</property> |
478 | - <property name="can_default">True</property> |
479 | - <property name="receives_default">True</property> |
480 | - <property name="use_action_appearance">False</property> |
481 | - <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/> |
482 | - <child> |
483 | - <object class="GtkVBox" id="vbox4"> |
484 | - <property name="visible">True</property> |
485 | - <property name="can_focus">False</property> |
486 | - <property name="spacing">5</property> |
487 | - <child> |
488 | - <object class="GtkLabel" id="label1"> |
489 | - <property name="visible">True</property> |
490 | - <property name="can_focus">False</property> |
491 | - <property name="label" translatable="yes"><span font_size="xx-large" foreground="#4d4d4d">Join now</span></property> |
492 | - <property name="use_markup">True</property> |
493 | - </object> |
494 | - <packing> |
495 | - <property name="expand">True</property> |
496 | - <property name="fill">True</property> |
497 | - <property name="position">0</property> |
498 | - </packing> |
499 | - </child> |
500 | - <child> |
501 | - <object class="GtkLabel" id="label2"> |
502 | - <property name="visible">True</property> |
503 | - <property name="can_focus">False</property> |
504 | - <property name="label" translatable="yes"><span foreground="#909090">2GB of free storage</span></property> |
505 | - <property name="use_markup">True</property> |
506 | - </object> |
507 | - <packing> |
508 | - <property name="expand">True</property> |
509 | - <property name="fill">True</property> |
510 | - <property name="position">1</property> |
511 | - </packing> |
512 | - </child> |
513 | - </object> |
514 | - </child> |
515 | - </object> |
516 | - <packing> |
517 | - <property name="expand">False</property> |
518 | - <property name="fill">True</property> |
519 | - <property name="position">1</property> |
520 | - </packing> |
521 | - </child> |
522 | - <child> |
523 | - <object class="GtkLinkButton" id="connect_button"> |
524 | - <property name="label" translatable="yes">I already have an account!</property> |
525 | - <property name="visible">True</property> |
526 | - <property name="can_focus">True</property> |
527 | - <property name="receives_default">True</property> |
528 | - <property name="use_action_appearance">False</property> |
529 | - <property name="relief">none</property> |
530 | - <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/> |
531 | - </object> |
532 | - <packing> |
533 | - <property name="expand">False</property> |
534 | - <property name="fill">False</property> |
535 | - <property name="position">2</property> |
536 | - </packing> |
537 | - </child> |
538 | - </object> |
539 | - </child> |
540 | - </object> |
541 | - <packing> |
542 | - <property name="expand">True</property> |
543 | - <property name="fill">True</property> |
544 | - <property name="position">1</property> |
545 | - </packing> |
546 | + <property name="can_focus">True</property> |
547 | + <property name="can_default">True</property> |
548 | + <property name="receives_default">True</property> |
549 | + <property name="use_action_appearance">False</property> |
550 | + <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/> |
551 | + <child> |
552 | + <object class="GtkVBox" id="vbox4"> |
553 | + <property name="visible">True</property> |
554 | + <property name="can_focus">False</property> |
555 | + <property name="spacing">5</property> |
556 | + <child> |
557 | + <object class="GtkLabel" id="label1"> |
558 | + <property name="visible">True</property> |
559 | + <property name="can_focus">False</property> |
560 | + <property name="label" translatable="yes"><span font_size="xx-large" foreground="#4d4d4d">Join now</span></property> |
561 | + <property name="use_markup">True</property> |
562 | + </object> |
563 | + <packing> |
564 | + <property name="expand">True</property> |
565 | + <property name="fill">True</property> |
566 | + <property name="position">0</property> |
567 | + </packing> |
568 | + </child> |
569 | + <child> |
570 | + <object class="GtkLabel" id="label2"> |
571 | + <property name="visible">True</property> |
572 | + <property name="can_focus">False</property> |
573 | + <property name="label" translatable="yes"><span foreground="#909090">2GB of free storage</span></property> |
574 | + <property name="use_markup">True</property> |
575 | + </object> |
576 | + <packing> |
577 | + <property name="expand">True</property> |
578 | + <property name="fill">True</property> |
579 | + <property name="position">1</property> |
580 | + </packing> |
581 | + </child> |
582 | + </object> |
583 | </child> |
584 | </object> |
585 | <packing> |
586 | @@ -342,22 +290,44 @@ |
587 | <property name="position">1</property> |
588 | </packing> |
589 | </child> |
590 | + <child> |
591 | + <object class="GtkLinkButton" id="connect_button"> |
592 | + <property name="label" translatable="yes">I already have an account!</property> |
593 | + <property name="visible">True</property> |
594 | + <property name="can_focus">True</property> |
595 | + <property name="receives_default">True</property> |
596 | + <property name="use_action_appearance">False</property> |
597 | + <property name="relief">none</property> |
598 | + <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/> |
599 | + </object> |
600 | + <packing> |
601 | + <property name="expand">False</property> |
602 | + <property name="fill">False</property> |
603 | + <property name="position">2</property> |
604 | + </packing> |
605 | + </child> |
606 | </object> |
607 | - <packing> |
608 | - <property name="expand">True</property> |
609 | - <property name="fill">True</property> |
610 | - <property name="position">1</property> |
611 | - </packing> |
612 | </child> |
613 | </object> |
614 | + <packing> |
615 | + <property name="expand">True</property> |
616 | + <property name="fill">True</property> |
617 | + <property name="position">1</property> |
618 | + </packing> |
619 | </child> |
620 | </object> |
621 | + <packing> |
622 | + <property name="expand">True</property> |
623 | + <property name="fill">True</property> |
624 | + <property name="position">1</property> |
625 | + </packing> |
626 | </child> |
627 | </object> |
628 | <packing> |
629 | <property name="expand">True</property> |
630 | <property name="fill">True</property> |
631 | - <property name="position">1</property> |
632 | + <property name="padding">12</property> |
633 | + <property name="position">2</property> |
634 | </packing> |
635 | </child> |
636 | </object> |
+1