1
=== removed file 'bin/ubuntuone-control-panel-gtk'
2
--- bin/ubuntuone-control-panel-gtk	2012-01-18 14:09:16 +0000
3
+++ bin/ubuntuone-control-panel-gtk	1970-01-01 00:00:00 +0000
4
@@ -1,54 +0,0 @@
5
1
#!/usr/bin/python
6
2
# -*- coding: utf-8 -*-
7
3
8
4
# Authors: Natalia B Bidart <natalia.bidart@canonical.com>
9
5
#          Eric Casteleijn <eric.casteleijn@canonical.com>
10
6
#
11
7
# Copyright 2010 Canonical Ltd.
12
8
#
13
9
# This program is free software: you can redistribute it and/or modify it
14
10
# under the terms of the GNU General Public License version 3, as published
15
11
# by the Free Software Foundation.
16
12
#
17
13
# This program is distributed in the hope that it will be useful, but
18
14
# WITHOUT ANY WARRANTY; without even the implied warranties of
19
15
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
20
16
# PURPOSE.  See the GNU General Public License for more details.
21
17
#
22
18
# You should have received a copy of the GNU General Public License along
23
19
# with this program.  If not, see <http://www.gnu.org/licenses/>.
24
20
"""Execute the graphical interface for the Ubuntu One control panel."""
25
21
26
22
# Invalid name "ubuntuone-control-panel-gtk", pylint: disable=C0103
27
23
28
24
import gettext
29
25
import sys
30
26
31
27
from optparse import OptionParser
32
28
33
29
from ubuntuone.controlpanel import TRANSLATION_DOMAIN
34
30
35
31
gettext.textdomain(TRANSLATION_DOMAIN)
36
32
# import the GUI after the translation domain has been set
37
33
from ubuntuone.controlpanel.gui.gtk import main
38
34
39
35
40
36
def parser_options():
41
37
    """Parse command line parameters."""
42
38
    usage = "Usage: %prog [option]"
43
39
    result = OptionParser(usage=usage)
44
40
    result.add_option("", "--switch-to", dest="switch_to", type="string",
45
41
                      metavar="PANEL_NAME", default="",
46
42
                      help="Start Ubuntu One in the "
47
43
                           "PANEL_NAME tab. Possible values are: "
48
44
                           "dashboard, volumes, devices, applications")
49
45
    result.add_option("-a", "--alert", dest="alert", action="store_true",
50
46
                      default=False, help="Start Ubuntu One "
51
47
                      "alerting the user to its presence.")
52
48
    return result
53
49
54
50
55
51
if __name__ == "__main__":
56
52
    parser = parser_options()
57
53
    (options, args) = parser.parse_args(sys.argv)
58
54
    main(switch_to=options.switch_to, alert=options.alert)
59
55
0
60
=== modified file 'bin/ubuntuone-control-panel-qt'
61
--- bin/ubuntuone-control-panel-qt	2012-01-18 14:09:16 +0000
62
+++ bin/ubuntuone-control-panel-qt	2012-03-06 15:41:39 +0000
63
@@ -1,8 +1,5 @@
64
1
#!/usr/bin/python
1
#!/usr/bin/python
65
2
# -*- coding: utf-8 -*-
2
# -*- coding: utf-8 -*-
66
3
67
4
# Authors: Natalia B Bidart <natalia.bidart@canonical.com>
68
5
#          Eric Casteleijn <eric.casteleijn@canonical.com>
69
6
#
3
#
70
7
# Copyright 2010 Canonical Ltd.
4
# Copyright 2010 Canonical Ltd.
71
8
#
5
#
72
@@ -17,47 +14,21 @@
73
17
#
14
#
74
18
# You should have received a copy of the GNU General Public License along
15
# You should have received a copy of the GNU General Public License along
75
19
# with this program.  If not, see <http://www.gnu.org/licenses/>.
16
# with this program.  If not, see <http://www.gnu.org/licenses/>.
76
17
77
20
"""Execute the graphical interface for the Ubuntu One control panel."""
18
"""Execute the graphical interface for the Ubuntu One control panel."""
78
21
19
79
22
# Invalid name "ubuntuone-control-panel-qt", pylint: disable=C0103
20
# Invalid name "ubuntuone-control-panel-qt", pylint: disable=C0103
80
23
21
82
24
import gettext
22
import signal
83
25
import sys
23
import sys
84
26
24
91
27
from optparse import OptionParser
25
if sys.platform == 'win32':
92
28
26
    import qt4reactor
93
29
from ubuntuone.controlpanel import TRANSLATION_DOMAIN
27
    qt4reactor.install()
94
30
28
89
31
gettext.textdomain(TRANSLATION_DOMAIN)
90
32
# import the GUI after the translation domain has been set
95
33
from ubuntuone.controlpanel.gui.qt import main
29
from ubuntuone.controlpanel.gui.qt import main
96
34
30
97
35
31
98
36
def parser_options():
99
37
    """Parse command line parameters."""
100
38
    usage = "Usage: %prog [option]"
101
39
    result = OptionParser(usage=usage)
102
40
    result.add_option("", "--switch-to", dest="switch_to", type="string",
103
41
                      metavar="PANEL_NAME", default="",
104
42
                      help="Start Ubuntu One in the "
105
43
                           "PANEL_NAME tab. Possible values are: "
106
44
                           "dashboard, volumes, devices, applications")
107
45
    result.add_option("-a", "--alert", dest="alert", action="store_true",
108
46
                      default=False, help="Start Ubuntu One "
109
47
                      "alerting the user to its presence.")
110
48
    result.add_option("--minimized", dest="minimized", action="store_true",
111
49
                      default=False, help="Start Ubuntu One "
112
50
                      "only in the notification area, with no visible window. "
113
51
                      "Implies --with-icon")
114
52
    result.add_option("--with-icon", dest="with_icon", action="store_true",
115
53
                      default=False, help="Start Ubuntu One "
116
54
                      "with an icon in the notification area.")
117
55
    return result
118
56
119
57
120
58
if __name__ == "__main__":
32
if __name__ == "__main__":
126
59
    parser = parser_options()
33
    signal.signal(signal.SIGINT, signal.SIG_DFL)
127
60
    (options, args) = parser.parse_args(sys.argv)
34
    main.main(sys.argv)
123
61
    main.main(switch_to=options.switch_to,
124
62
        alert=options.alert, minimized=options.minimized,
125
63
        with_icon=options.with_icon)
128
64
35
129
=== removed file 'com.ubuntuone.controlpanel.gui.service.in'
130
--- com.ubuntuone.controlpanel.gui.service.in	2011-03-22 13:04:38 +0000
131
+++ com.ubuntuone.controlpanel.gui.service.in	1970-01-01 00:00:00 +0000
132
@@ -1,3 +0,0 @@
133
1
[D-BUS Service]
134
2
Name=com.ubuntuone.controlpanel.gui
135
3
Exec=@prefix@/bin/ubuntuone-control-panel-gtk
136
4
0
137
=== added file 'data/banner.png'
138
5
Binary files data/banner.png	1970-01-01 00:00:00 +0000 and data/banner.png	2012-03-06 15:41:39 +0000 differ
1
Binary files data/banner.png	1970-01-01 00:00:00 +0000 and data/banner.png	2012-03-06 15:41:39 +0000 differ
139
=== removed directory 'data/gtk'
140
=== removed file 'data/gtk/dashboard.ui'
141
--- data/gtk/dashboard.ui	2011-07-11 11:19:09 +0000
142
+++ data/gtk/dashboard.ui	1970-01-01 00:00:00 +0000
143
@@ -1,198 +0,0 @@
144
1
<?xml version="1.0" encoding="UTF-8"?>
145
2
<interface>
146
3
  <requires lib="gtk+" version="2.22"/>
147
4
  <!-- interface-naming-policy project-wide -->
148
5
  <object class="GtkAlignment" id="itself">
149
6
    <property name="visible">True</property>
150
7
    <property name="can_focus">False</property>
151
8
    <property name="yalign">0</property>
152
9
    <property name="yscale">0</property>
153
10
    <child>
154
11
      <object class="GtkHBox" id="account">
155
12
        <property name="visible">True</property>
156
13
        <property name="can_focus">False</property>
157
14
        <property name="border_width">12</property>
158
15
        <property name="spacing">12</property>
159
16
        <child>
160
17
          <object class="GtkFrame" id="frame2">
161
18
            <property name="visible">True</property>
162
19
            <property name="can_focus">False</property>
163
20
            <property name="label_xalign">0</property>
164
21
            <property name="shadow_type">out</property>
165
22
            <child>
166
23
              <object class="GtkAlignment" id="alignment2">
167
24
                <property name="visible">True</property>
168
25
                <property name="can_focus">False</property>
169
26
                <property name="top_padding">12</property>
170
27
                <property name="bottom_padding">12</property>
171
28
                <property name="left_padding">12</property>
172
29
                <property name="right_padding">12</property>
173
30
                <child>
174
31
                  <object class="GtkVBox" id="vbox5">
175
32
                    <property name="visible">True</property>
176
33
                    <property name="can_focus">False</property>
177
34
                    <property name="spacing">12</property>
178
35
                    <child>
179
36
                      <object class="GtkLabel" id="name_label">
180
37
                        <property name="visible">True</property>
181
38
                        <property name="can_focus">False</property>
182
39
                        <property name="xalign">0</property>
183
40
                        <property name="label">tester name</property>
184
41
                        <property name="use_markup">True</property>
185
42
                      </object>
186
43
                      <packing>
187
44
                        <property name="expand">False</property>
188
45
                        <property name="fill">True</property>
189
46
                        <property name="position">0</property>
190
47
                      </packing>
191
48
                    </child>
192
49
                    <child>
193
50
                      <object class="GtkLabel" id="email_label">
194
51
                        <property name="visible">True</property>
195
52
                        <property name="can_focus">False</property>
196
53
                        <property name="xalign">0</property>
197
54
                        <property name="label">a@example.com</property>
198
55
                      </object>
199
56
                      <packing>
200
57
                        <property name="expand">False</property>
201
58
                        <property name="fill">True</property>
202
59
                        <property name="position">1</property>
203
60
                      </packing>
204
61
                    </child>
205
62
                    <child>
206
63
                      <object class="GtkHButtonBox" id="hbuttonbox1">
207
64
                        <property name="visible">True</property>
208
65
                        <property name="can_focus">False</property>
209
66
                        <child>
210
67
                          <object class="GtkLinkButton" id="linkbutton3">
211
68
                            <property name="label" translatable="yes">Edit account details</property>
212
69
                            <property name="visible">True</property>
213
70
                            <property name="can_focus">True</property>
214
71
                            <property name="receives_default">True</property>
215
72
                            <property name="use_action_appearance">False</property>
216
73
                            <property name="relief">half</property>
217
74
                            <property name="uri">http://login.ubuntu.com</property>
218
75
                          </object>
219
76
                          <packing>
220
77
                            <property name="expand">False</property>
221
78
                            <property name="fill">False</property>
222
79
                            <property name="pack_type">end</property>
223
80
                            <property name="position">0</property>
224
81
                          </packing>
225
82
                        </child>
226
83
                      </object>
227
84
                      <packing>
228
85
                        <property name="expand">False</property>
229
86
                        <property name="fill">True</property>
230
87
                        <property name="pack_type">end</property>
231
88
                        <property name="position">2</property>
232
89
                      </packing>
233
90
                    </child>
234
91
                  </object>
235
92
                </child>
236
93
              </object>
237
94
            </child>
238
95
            <child type="label">
239
96
              <object class="GtkLabel" id="label1">
240
97
                <property name="visible">True</property>
241
98
                <property name="can_focus">False</property>
242
99
                <property name="label" translatable="yes">&lt;b&gt;Personal details&lt;/b&gt;</property>
243
100
                <property name="use_markup">True</property>
244
101
              </object>
245
102
            </child>
246
103
          </object>
247
104
          <packing>
248
105
            <property name="expand">True</property>
249
106
            <property name="fill">True</property>
250
107
            <property name="position">0</property>
251
108
          </packing>
252
109
        </child>
253
110
        <child>
254
111
          <object class="GtkFrame" id="frame1">
255
112
            <property name="visible">True</property>
256
113
            <property name="can_focus">False</property>
257
114
            <property name="label_xalign">0</property>
258
115
            <property name="shadow_type">out</property>
259
116
            <child>
260
117
              <object class="GtkAlignment" id="alignment3">
261
118
                <property name="visible">True</property>
262
119
                <property name="can_focus">False</property>
263
120
                <property name="top_padding">12</property>
264
121
                <property name="bottom_padding">12</property>
265
122
                <property name="left_padding">12</property>
266
123
                <property name="right_padding">12</property>
267
124
                <child>
268
125
                  <object class="GtkVBox" id="vbox4">
269
126
                    <property name="visible">True</property>
270
127
                    <property name="can_focus">False</property>
271
128
                    <property name="spacing">12</property>
272
129
                    <child>
273
130
                      <object class="GtkLabel" id="type_label">
274
131
                        <property name="visible">True</property>
275
132
                        <property name="can_focus">False</property>
276
133
                        <property name="xalign">0</property>
277
134
                        <property name="label">Ubuntu One Basic (2 GB)
278
135
22GB of awesomeness
279
136
Total storage 22GB
280
137
You also have a mobile plan!
281
138
This is great!</property>
282
139
                      </object>
283
140
                      <packing>
284
141
                        <property name="expand">False</property>
285
142
                        <property name="fill">True</property>
286
143
                        <property name="position">0</property>
287
144
                      </packing>
288
145
                    </child>
289
146
                    <child>
290
147
                      <object class="GtkHButtonBox" id="hbuttonbox2">
291
148
                        <property name="visible">True</property>
292
149
                        <property name="can_focus">False</property>
293
150
                        <child>
294
151
                          <object class="GtkLinkButton" id="linkbutton1">
295
152
                            <property name="label" translatable="yes">Buy storage and plans</property>
296
153
                            <property name="visible">True</property>
297
154
                            <property name="can_focus">True</property>
298
155
                            <property name="receives_default">True</property>
299
156
                            <property name="use_action_appearance">False</property>
300
157
                            <property name="relief">half</property>
301
158
                            <property name="uri">https://one.ubuntu.com/plans/</property>
302
159
                          </object>
303
160
                          <packing>
304
161
                            <property name="expand">False</property>
305
162
                            <property name="fill">False</property>
306
163
                            <property name="pack_type">end</property>
307
164
                            <property name="position">0</property>
308
165
                          </packing>
309
166
                        </child>
310
167
                      </object>
311
168
                      <packing>
312
169
                        <property name="expand">False</property>
313
170
                        <property name="fill">True</property>
314
171
                        <property name="pack_type">end</property>
315
172
                        <property name="position">1</property>
316
173
                      </packing>
317
174
                    </child>
318
175
                  </object>
319
176
                </child>
320
177
              </object>
321
178
            </child>
322
179
            <child type="label">
323
180
              <object class="GtkLabel" id="label3">
324
181
                <property name="visible">True</property>
325
182
                <property name="can_focus">False</property>
326
183
                <property name="label" translatable="yes">&lt;b&gt;Your services&lt;/b&gt;</property>
327
184
                <property name="use_markup">True</property>
328
185
              </object>
329
186
            </child>
330
187
          </object>
331
188
          <packing>
332
189
            <property name="expand">True</property>
333
190
            <property name="fill">True</property>
334
191
            <property name="pack_type">end</property>
335
192
            <property name="position">1</property>
336
193
          </packing>
337
194
        </child>
338
195
      </object>
339
196
    </child>
340
197
  </object>
341
198
</interface>
342
199
0
343
=== removed file 'data/gtk/device.ui'
344
--- data/gtk/device.ui	2011-07-11 11:19:09 +0000
345
+++ data/gtk/device.ui	1970-01-01 00:00:00 +0000
346
@@ -1,279 +0,0 @@
347
1
<?xml version="1.0" encoding="UTF-8"?>
348
2
<interface>
349
3
  <requires lib="gtk+" version="2.22"/>
350
4
  <!-- interface-naming-policy project-wide -->
351
5
  <object class="GtkAdjustment" id="adjustment1">
352
6
    <property name="upper">10000</property>
353
7
    <property name="step_increment">1</property>
354
8
  </object>
355
9
  <object class="GtkAdjustment" id="adjustment2">
356
10
    <property name="upper">10000</property>
357
11
    <property name="step_increment">1</property>
358
12
  </object>
359
13
  <object class="GtkVBox" id="itself">
360
14
    <property name="visible">True</property>
361
15
    <property name="can_focus">False</property>
362
16
    <property name="border_width">10</property>
363
17
    <property name="spacing">5</property>
364
18
    <child>
365
19
      <object class="GtkHBox" id="hbox1">
366
20
        <property name="visible">True</property>
367
21
        <property name="can_focus">False</property>
368
22
        <property name="spacing">10</property>
369
23
        <child>
370
24
          <object class="GtkVBox" id="vbox1">
371
25
            <property name="visible">True</property>
372
26
            <property name="can_focus">False</property>
373
27
            <property name="spacing">5</property>
374
28
            <child>
375
29
              <object class="GtkHBox" id="hbox2">
376
30
                <property name="visible">True</property>
377
31
                <property name="can_focus">False</property>
378
32
                <child>
379
33
                  <object class="GtkImage" id="device_type">
380
34
                    <property name="visible">True</property>
381
35
                    <property name="can_focus">False</property>
382
36
                    <property name="icon_name">computer</property>
383
37
                  </object>
384
38
                  <packing>
385
39
                    <property name="expand">False</property>
386
40
                    <property name="fill">True</property>
387
41
                    <property name="position">0</property>
388
42
                  </packing>
389
43
                </child>
390
44
                <child>
391
45
                  <object class="GtkLabel" id="device_name">
392
46
                    <property name="visible">True</property>
393
47
                    <property name="can_focus">False</property>
394
48
                    <property name="xalign">0</property>
395
49
                    <property name="xpad">5</property>
396
50
                    <property name="label">My Laptop</property>
397
51
                    <property name="wrap">True</property>
398
52
                  </object>
399
53
                  <packing>
400
54
                    <property name="expand">True</property>
401
55
                    <property name="fill">True</property>
402
56
                    <property name="position">1</property>
403
57
                  </packing>
404
58
                </child>
405
59
              </object>
406
60
              <packing>
407
61
                <property name="expand">True</property>
408
62
                <property name="fill">True</property>
409
63
                <property name="position">0</property>
410
64
              </packing>
411
65
            </child>
412
66
            <child>
413
67
              <object class="GtkAlignment" id="alignment1">
414
68
                <property name="visible">True</property>
415
69
                <property name="can_focus">False</property>
416
70
                <property name="left_padding">25</property>
417
71
                <child>
418
72
                  <object class="GtkVBox" id="config_settings">
419
73
                    <property name="visible">True</property>
420
74
                    <property name="can_focus">False</property>
421
75
                    <child>
422
76
                      <object class="GtkCheckButton" id="show_all_notifications">
423
77
                        <property name="label" translatable="yes">Show activity notifications</property>
424
78
                        <property name="visible">True</property>
425
79
                        <property name="can_focus">True</property>
426
80
                        <property name="receives_default">False</property>
427
81
                        <property name="use_action_appearance">False</property>
428
82
                        <property name="draw_indicator">True</property>
429
83
                        <signal name="toggled" handler="on_show_all_notifications_toggled" swapped="no"/>
430
84
                      </object>
431
85
                      <packing>
432
86
                        <property name="expand">True</property>
433
87
                        <property name="fill">True</property>
434
88
                        <property name="position">0</property>
435
89
                      </packing>
436
90
                    </child>
437
91
                    <child>
438
92
                      <object class="GtkVBox" id="throttling">
439
93
                        <property name="visible">True</property>
440
94
                        <property name="can_focus">False</property>
441
95
                        <child>
442
96
                          <object class="GtkCheckButton" id="limit_bandwidth">
443
97
                            <property name="label" translatable="yes">Limit file sync bandwidth usage</property>
444
98
                            <property name="visible">True</property>
445
99
                            <property name="can_focus">True</property>
446
100
                            <property name="receives_default">False</property>
447
101
                            <property name="use_action_appearance">False</property>
448
102
                            <property name="draw_indicator">True</property>
449
103
                            <signal name="toggled" handler="on_limit_bandwidth_toggled" swapped="no"/>
450
104
                          </object>
451
105
                          <packing>
452
106
                            <property name="expand">True</property>
453
107
                            <property name="fill">True</property>
454
108
                            <property name="position">0</property>
455
109
                          </packing>
456
110
                        </child>
457
111
                        <child>
458
112
                          <object class="GtkTable" id="throttling_limits">
459
113
                            <property name="visible">True</property>
460
114
                            <property name="can_focus">False</property>
461
115
                            <property name="n_rows">2</property>
462
116
                            <property name="n_columns">3</property>
463
117
                            <property name="column_spacing">3</property>
464
118
                            <property name="row_spacing">3</property>
465
119
                            <child>
466
120
                              <object class="GtkLabel" id="max_upload_speed_label">
467
121
                                <property name="visible">True</property>
468
122
                                <property name="can_focus">False</property>
469
123
                                <property name="xalign">0</property>
470
124
                                <property name="xpad">22</property>
471
125
                                <property name="label" translatable="yes">Max upload speed:</property>
472
126
                                <property name="track_visited_links">False</property>
473
127
                              </object>
474
128
                            </child>
475
129
                            <child>
476
130
                              <object class="GtkLabel" id="max_download_speed_label">
477
131
                                <property name="visible">True</property>
478
132
                                <property name="can_focus">False</property>
479
133
                                <property name="xalign">0</property>
480
134
                                <property name="xpad">22</property>
481
135
                                <property name="label" translatable="yes">Max download speed:</property>
482
136
                              </object>
483
137
                              <packing>
484
138
                                <property name="top_attach">1</property>
485
139
                                <property name="bottom_attach">2</property>
486
140
                              </packing>
487
141
                            </child>
488
142
                            <child>
489
143
                              <object class="GtkSpinButton" id="max_upload_speed">
490
144
                                <property name="visible">True</property>
491
145
                                <property name="can_focus">True</property>
492
146
                                <property name="invisible_char">•</property>
493
147
                                <property name="activates_default">True</property>
494
148
                                <property name="invisible_char_set">True</property>
495
149
                                <property name="adjustment">adjustment1</property>
496
150
                                <signal name="value-changed" handler="on_max_upload_speed_value_changed" swapped="no"/>
497
151
                              </object>
498
152
                              <packing>
499
153
                                <property name="left_attach">1</property>
500
154
                                <property name="right_attach">2</property>
501
155
                                <property name="x_options">GTK_FILL</property>
502
156
                                <property name="y_options">GTK_FILL</property>
503
157
                              </packing>
504
158
                            </child>
505
159
                            <child>
506
160
                              <object class="GtkSpinButton" id="max_download_speed">
507
161
                                <property name="visible">True</property>
508
162
                                <property name="can_focus">True</property>
509
163
                                <property name="invisible_char">•</property>
510
164
                                <property name="activates_default">True</property>
511
165
                                <property name="invisible_char_set">True</property>
512
166
                                <property name="adjustment">adjustment2</property>
513
167
                                <signal name="value-changed" handler="on_max_download_speed_value_changed" swapped="no"/>
514
168
                              </object>
515
169
                              <packing>
516
170
                                <property name="left_attach">1</property>
517
171
                                <property name="right_attach">2</property>
518
172
                                <property name="top_attach">1</property>
519
173
                                <property name="bottom_attach">2</property>
520
174
                              </packing>
521
175
                            </child>
522
176
                            <child>
523
177
                              <object class="GtkLabel" id="label1">
524
178
                                <property name="visible">True</property>
525
179
                                <property name="can_focus">False</property>
526
180
                                <property name="label" translatable="yes">KiB/s</property>
527
181
                              </object>
528
182
                              <packing>
529
183
                                <property name="left_attach">2</property>
530
184
                                <property name="right_attach">3</property>
531
185
                              </packing>
532
186
                            </child>
533
187
                            <child>
534
188
                              <object class="GtkLabel" id="label2">
535
189
                                <property name="visible">True</property>
536
190
                                <property name="can_focus">False</property>
537
191
                                <property name="label" translatable="yes">KiB/s</property>
538
192
                              </object>
539
193
                              <packing>
540
194
                                <property name="left_attach">2</property>
541
195
                                <property name="right_attach">3</property>
542
196
                                <property name="top_attach">1</property>
543
197
                                <property name="bottom_attach">2</property>
544
198
                              </packing>
545
199
                            </child>
546
200
                          </object>
547
201
                          <packing>
548
202
                            <property name="expand">True</property>
549
203
                            <property name="fill">True</property>
550
204
                            <property name="position">1</property>
551
205
                          </packing>
552
206
                        </child>
553
207
                      </object>
554
208
                      <packing>
555
209
                        <property name="expand">True</property>
556
210
                        <property name="fill">True</property>
557
211
                        <property name="position">1</property>
558
212
                      </packing>
559
213
                    </child>
560
214
                  </object>
561
215
                </child>
562
216
              </object>
563
217
              <packing>
564
218
                <property name="expand">False</property>
565
219
                <property name="fill">True</property>
566
220
                <property name="position">1</property>
567
221
              </packing>
568
222
            </child>
569
223
          </object>
570
224
          <packing>
571
225
            <property name="expand">False</property>
572
226
            <property name="fill">True</property>
573
227
            <property name="position">0</property>
574
228
          </packing>
575
229
        </child>
576
230
        <child>
577
231
          <object class="GtkVButtonBox" id="vbuttonbox1">
578
232
            <property name="visible">True</property>
579
233
            <property name="can_focus">False</property>
580
234
            <property name="layout_style">start</property>
581
235
            <child>
582
236
              <object class="GtkButton" id="remove">
583
237
                <property name="label">gtk-remove</property>
584
238
                <property name="visible">True</property>
585
239
                <property name="can_focus">True</property>
586
240
                <property name="receives_default">True</property>
587
241
                <property name="use_action_appearance">False</property>
588
242
                <property name="use_stock">True</property>
589
243
                <signal name="activate" handler="on_remove_clicked" swapped="no"/>
590
244
                <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
591
245
              </object>
592
246
              <packing>
593
247
                <property name="expand">False</property>
594
248
                <property name="fill">False</property>
595
249
                <property name="position">0</property>
596
250
              </packing>
597
251
            </child>
598
252
          </object>
599
253
          <packing>
600
254
            <property name="expand">False</property>
601
255
            <property name="fill">True</property>
602
256
            <property name="pack_type">end</property>
603
257
            <property name="position">1</property>
604
258
          </packing>
605
259
        </child>
606
260
      </object>
607
261
      <packing>
608
262
        <property name="expand">False</property>
609
263
        <property name="fill">True</property>
610
264
        <property name="position">0</property>
611
265
      </packing>
612
266
    </child>
613
267
    <child>
614
268
      <object class="GtkLabel" id="warning_label">
615
269
        <property name="visible">True</property>
616
270
        <property name="can_focus">False</property>
617
271
      </object>
618
272
      <packing>
619
273
        <property name="expand">True</property>
620
274
        <property name="fill">True</property>
621
275
        <property name="position">1</property>
622
276
      </packing>
623
277
    </child>
624
278
  </object>
625
279
</interface>
626
280
0
627
=== removed file 'data/gtk/devices.ui'
628
--- data/gtk/devices.ui	2011-07-11 11:19:09 +0000
629
+++ data/gtk/devices.ui	1970-01-01 00:00:00 +0000
630
@@ -1,44 +0,0 @@
631
1
<?xml version="1.0" encoding="UTF-8"?>
632
2
<interface>
633
3
  <requires lib="gtk+" version="2.22"/>
634
4
  <!-- interface-naming-policy project-wide -->
635
5
  <object class="GtkVBox" id="itself">
636
6
    <property name="visible">True</property>
637
7
    <property name="can_focus">False</property>
638
8
    <child>
639
9
      <object class="GtkScrolledWindow" id="scrolledwindow1">
640
10
        <property name="visible">True</property>
641
11
        <property name="can_focus">True</property>
642
12
        <property name="hscrollbar_policy">automatic</property>
643
13
        <property name="vscrollbar_policy">automatic</property>
644
14
        <child>
645
15
          <object class="GtkViewport" id="viewport1">
646
16
            <property name="visible">True</property>
647
17
            <property name="can_focus">False</property>
648
18
            <property name="resize_mode">queue</property>
649
19
            <child>
650
20
              <object class="GtkAlignment" id="alignment1">
651
21
                <property name="visible">True</property>
652
22
                <property name="can_focus">False</property>
653
23
                <child>
654
24
                  <object class="GtkVBox" id="devices">
655
25
                    <property name="visible">True</property>
656
26
                    <property name="can_focus">False</property>
657
27
                    <child>
658
28
                      <placeholder/>
659
29
                    </child>
660
30
                  </object>
661
31
                </child>
662
32
              </object>
663
33
            </child>
664
34
          </object>
665
35
        </child>
666
36
      </object>
667
37
      <packing>
668
38
        <property name="expand">True</property>
669
39
        <property name="fill">True</property>
670
40
        <property name="position">0</property>
671
41
      </packing>
672
42
    </child>
673
43
  </object>
674
44
</interface>
675
45
0
676
=== removed file 'data/gtk/install.ui'
677
--- data/gtk/install.ui	2011-07-11 11:19:09 +0000
678
+++ data/gtk/install.ui	1970-01-01 00:00:00 +0000
679
@@ -1,57 +0,0 @@
680
1
<?xml version="1.0" encoding="UTF-8"?>
681
2
<interface>
682
3
  <requires lib="gtk+" version="2.22"/>
683
4
  <!-- interface-naming-policy project-wide -->
684
5
  <object class="GtkImage" id="image1">
685
6
    <property name="visible">True</property>
686
7
    <property name="can_focus">False</property>
687
8
    <property name="stock">gtk-ok</property>
688
9
  </object>
689
10
  <object class="GtkVBox" id="itself">
690
11
    <property name="visible">True</property>
691
12
    <property name="can_focus">False</property>
692
13
    <property name="border_width">10</property>
693
14
    <property name="spacing">10</property>
694
15
    <child>
695
16
      <object class="GtkLabel" id="install_label">
696
17
        <property name="visible">True</property>
697
18
        <property name="can_focus">False</property>
698
19
        <property name="label">label</property>
699
20
        <property name="wrap">True</property>
700
21
      </object>
701
22
      <packing>
702
23
        <property name="expand">True</property>
703
24
        <property name="fill">True</property>
704
25
        <property name="position">0</property>
705
26
      </packing>
706
27
    </child>
707
28
    <child>
708
29
      <object class="GtkHButtonBox" id="install_button_box">
709
30
        <property name="visible">True</property>
710
31
        <property name="can_focus">False</property>
711
32
        <child>
712
33
          <object class="GtkButton" id="install_button">
713
34
            <property name="label" translatable="yes">_Install now</property>
714
35
            <property name="visible">True</property>
715
36
            <property name="can_focus">True</property>
716
37
            <property name="receives_default">True</property>
717
38
            <property name="use_action_appearance">False</property>
718
39
            <property name="image">image1</property>
719
40
            <property name="use_underline">True</property>
720
41
            <signal name="clicked" handler="on_install_button_clicked" swapped="no"/>
721
42
          </object>
722
43
          <packing>
723
44
            <property name="expand">False</property>
724
45
            <property name="fill">False</property>
725
46
            <property name="position">0</property>
726
47
          </packing>
727
48
        </child>
728
49
      </object>
729
50
      <packing>
730
51
        <property name="expand">False</property>
731
52
        <property name="fill">True</property>
732
53
        <property name="position">1</property>
733
54
      </packing>
734
55
    </child>
735
56
  </object>
736
57
</interface>
737
58
0
738
=== removed file 'data/gtk/management.ui'
739
--- data/gtk/management.ui	2011-07-11 11:19:09 +0000
740
+++ data/gtk/management.ui	1970-01-01 00:00:00 +0000
741
@@ -1,334 +0,0 @@
742
1
<?xml version="1.0" encoding="UTF-8"?>
743
2
<interface>
744
3
  <requires lib="gtk+" version="2.22"/>
745
4
  <!-- interface-naming-policy project-wide -->
746
5
  <object class="GtkVBox" id="itself">
747
6
    <property name="visible">True</property>
748
7
    <property name="can_focus">False</property>
749
8
    <child>
750
9
      <object class="GtkEventBox" id="header">
751
10
        <property name="visible">True</property>
752
11
        <property name="can_focus">False</property>
753
12
        <child>
754
13
          <object class="GtkVBox" id="vbox2">
755
14
            <property name="visible">True</property>
756
15
            <property name="can_focus">False</property>
757
16
            <child>
758
17
              <object class="GtkHBox" id="status_box">
759
18
                <property name="visible">True</property>
760
19
                <property name="can_focus">False</property>
761
20
                <property name="border_width">10</property>
762
21
                <property name="spacing">10</property>
763
22
                <child>
764
23
                  <object class="GtkVBox" id="quota_box">
765
24
                    <property name="visible">True</property>
766
25
                    <property name="can_focus">False</property>
767
26
                    <property name="spacing">5</property>
768
27
                    <child>
769
28
                      <object class="GtkProgressBar" id="quota_progressbar">
770
29
                        <property name="visible">True</property>
771
30
                        <property name="can_focus">False</property>
772
31
                      </object>
773
32
                      <packing>
774
33
                        <property name="expand">True</property>
775
34
                        <property name="fill">True</property>
776
35
                        <property name="position">0</property>
777
36
                      </packing>
778
37
                    </child>
779
38
                  </object>
780
39
                  <packing>
781
40
                    <property name="expand">False</property>
782
41
                    <property name="fill">True</property>
783
42
                    <property name="position">0</property>
784
43
                  </packing>
785
44
                </child>
786
45
              </object>
787
46
              <packing>
788
47
                <property name="expand">False</property>
789
48
                <property name="fill">True</property>
790
49
                <property name="position">0</property>
791
50
              </packing>
792
51
            </child>
793
52
            <child>
794
53
              <object class="GtkHBox" id="hbox2">
795
54
                <property name="visible">True</property>
796
55
                <property name="can_focus">False</property>
797
56
                <child>
798
57
                  <object class="GtkHSeparator" id="hseparator1">
799
58
                    <property name="visible">True</property>
800
59
                    <property name="can_focus">False</property>
801
60
                  </object>
802
61
                  <packing>
803
62
                    <property name="expand">True</property>
804
63
                    <property name="fill">True</property>
805
64
                    <property name="position">0</property>
806
65
                  </packing>
807
66
                </child>
808
67
                <child>
809
68
                  <object class="GtkHButtonBox" id="hbuttonbox1">
810
69
                    <property name="visible">True</property>
811
70
                    <property name="can_focus">False</property>
812
71
                    <property name="layout_style">center</property>
813
72
                    <child>
814
73
                      <object class="GtkRadioButton" id="dashboard_button">
815
74
                        <property name="label" translatable="yes">Account</property>
816
75
                        <property name="visible">True</property>
817
76
                        <property name="can_focus">True</property>
818
77
                        <property name="receives_default">False</property>
819
78
                        <property name="use_action_appearance">False</property>
820
79
                        <property name="active">True</property>
821
80
                        <property name="draw_indicator">False</property>
822
81
                      </object>
823
82
                      <packing>
824
83
                        <property name="expand">False</property>
825
84
                        <property name="fill">False</property>
826
85
                        <property name="position">0</property>
827
86
                      </packing>
828
87
                    </child>
829
88
                    <child>
830
89
                      <object class="GtkRadioButton" id="volumes_button">
831
90
                        <property name="label" translatable="yes">Cloud Folders</property>
832
91
                        <property name="visible">True</property>
833
92
                        <property name="can_focus">True</property>
834
93
                        <property name="receives_default">False</property>
835
94
                        <property name="use_action_appearance">False</property>
836
95
                        <property name="draw_indicator">False</property>
837
96
                        <property name="group">dashboard_button</property>
838
97
                      </object>
839
98
                      <packing>
840
99
                        <property name="expand">False</property>
841
100
                        <property name="fill">False</property>
842
101
                        <property name="position">1</property>
843
102
                      </packing>
844
103
                    </child>
845
104
                    <child>
846
105
                      <object class="GtkRadioButton" id="shares_button">
847
106
                        <property name="label" translatable="yes">Shares</property>
848
107
                        <property name="can_focus">True</property>
849
108
                        <property name="receives_default">False</property>
850
109
                        <property name="use_action_appearance">False</property>
851
110
                        <property name="draw_indicator">False</property>
852
111
                        <property name="group">dashboard_button</property>
853
112
                      </object>
854
113
                      <packing>
855
114
                        <property name="expand">False</property>
856
115
                        <property name="fill">False</property>
857
116
                        <property name="position">2</property>
858
117
                      </packing>
859
118
                    </child>
860
119
                    <child>
861
120
                      <object class="GtkRadioButton" id="devices_button">
862
121
                        <property name="label" translatable="yes">Devices</property>
863
122
                        <property name="visible">True</property>
864
123
                        <property name="can_focus">True</property>
865
124
                        <property name="receives_default">False</property>
866
125
                        <property name="use_action_appearance">False</property>
867
126
                        <property name="draw_indicator">False</property>
868
127
                        <property name="group">dashboard_button</property>
869
128
                      </object>
870
129
                      <packing>
871
130
                        <property name="expand">False</property>
872
131
                        <property name="fill">False</property>
873
132
                        <property name="position">3</property>
874
133
                      </packing>
875
134
                    </child>
876
135
                    <child>
877
136
                      <object class="GtkRadioButton" id="services_button">
878
137
                        <property name="label" translatable="yes">Services</property>
879
138
                        <property name="visible">True</property>
880
139
                        <property name="can_focus">True</property>
881
140
                        <property name="receives_default">False</property>
882
141
                        <property name="use_action_appearance">False</property>
883
142
                        <property name="draw_indicator">False</property>
884
143
                        <property name="group">dashboard_button</property>
885
144
                      </object>
886
145
                      <packing>
887
146
                        <property name="expand">False</property>
888
147
                        <property name="fill">False</property>
889
148
                        <property name="position">4</property>
890
149
                      </packing>
891
150
                    </child>
892
151
                  </object>
893
152
                  <packing>
894
153
                    <property name="expand">False</property>
895
154
                    <property name="fill">True</property>
896
155
                    <property name="position">1</property>
897
156
                  </packing>
898
157
                </child>
899
158
                <child>
900
159
                  <object class="GtkHSeparator" id="hseparator2">
901
160
                    <property name="visible">True</property>
902
161
                    <property name="can_focus">False</property>
903
162
                  </object>
904
163
                  <packing>
905
164
                    <property name="expand">True</property>
906
165
                    <property name="fill">True</property>
907
166
                    <property name="position">2</property>
908
167
                  </packing>
909
168
                </child>
910
169
              </object>
911
170
              <packing>
912
171
                <property name="expand">False</property>
913
172
                <property name="fill">True</property>
914
173
                <property name="position">1</property>
915
174
              </packing>
916
175
            </child>
917
176
          </object>
918
177
        </child>
919
178
      </object>
920
179
      <packing>
921
180
        <property name="expand">False</property>
922
181
        <property name="fill">True</property>
923
182
        <property name="position">0</property>
924
183
      </packing>
925
184
    </child>
926
185
    <child>
927
186
      <object class="GtkNotebook" id="notebook">
928
187
        <property name="visible">True</property>
929
188
        <property name="can_focus">False</property>
930
189
        <property name="show_tabs">False</property>
931
190
        <property name="show_border">False</property>
932
191
        <property name="homogeneous">True</property>
933
192
      </object>
934
193
      <packing>
935
194
        <property name="expand">True</property>
936
195
        <property name="fill">True</property>
937
196
        <property name="position">1</property>
938
197
      </packing>
939
198
    </child>
940
199
    <child>
941
200
      <object class="GtkHBox" id="hbox1">
942
201
        <property name="visible">True</property>
943
202
        <property name="can_focus">False</property>
944
203
        <property name="border_width">12</property>
945
204
        <child>
946
205
          <object class="GtkAlignment" id="alignment3">
947
206
            <property name="visible">True</property>
948
207
            <property name="can_focus">False</property>
949
208
            <property name="yalign">1</property>
950
209
            <property name="yscale">0</property>
951
210
            <child>
952
211
              <object class="GtkHButtonBox" id="hbuttonbox3">
953
212
                <property name="visible">True</property>
954
213
                <property name="can_focus">False</property>
955
214
                <property name="spacing">5</property>
956
215
                <property name="layout_style">start</property>
957
216
                <child>
958
217
                  <object class="GtkLinkButton" id="linkbutton2">
959
218
                    <property name="label" translatable="yes">Official Support</property>
960
219
                    <property name="visible">True</property>
961
220
                    <property name="can_focus">True</property>
962
221
                    <property name="receives_default">True</property>
963
222
                    <property name="use_action_appearance">False</property>
964
223
                    <property name="relief">half</property>
965
224
                    <property name="uri">https://one.ubuntu.com/support/</property>
966
225
                  </object>
967
226
                  <packing>
968
227
                    <property name="expand">False</property>
969
228
                    <property name="fill">False</property>
970
229
                    <property name="position">0</property>
971
230
                  </packing>
972
231
                </child>
973
232
                <child>
974
233
                  <object class="GtkLinkButton" id="linkbutton4">
975
234
                    <property name="label" translatable="yes">Community Support</property>
976
235
                    <property name="visible">True</property>
977
236
                    <property name="can_focus">True</property>
978
237
                    <property name="receives_default">True</property>
979
238
                    <property name="use_action_appearance">False</property>
980
239
                    <property name="relief">half</property>
981
240
                    <property name="uri">http://askubuntu.com/questions/tagged/ubuntu-one</property>
982
241
                  </object>
983
242
                  <packing>
984
243
                    <property name="expand">False</property>
985
244
                    <property name="fill">False</property>
986
245
                    <property name="position">1</property>
987
246
                  </packing>
988
247
                </child>
989
248
              </object>
990
249
            </child>
991
250
          </object>
992
251
          <packing>
993
252
            <property name="expand">False</property>
994
253
            <property name="fill">True</property>
995
254
            <property name="position">0</property>
996
255
          </packing>
997
256
        </child>
998
257
        <child>
999
258
          <object class="GtkHBox" id="hbox3">
1000
259
            <property name="visible">True</property>
1001
260
            <property name="can_focus">False</property>
1002
261
            <child>
1003
262
              <object class="GtkLabel" id="label4">
1004
263
                <property name="visible">True</property>
1005
264
                <property name="can_focus">False</property>
1006
265
                <property name="label" translatable="yes">Talk to us on:</property>
1007
266
              </object>
1008
267
              <packing>
1009
268
                <property name="expand">True</property>
1010
269
                <property name="fill">True</property>
1011
270
                <property name="position">0</property>
1012
271
              </packing>
1013
272
            </child>
1014
273
            <child>
1015
274
              <object class="GtkLinkButton" id="linkbutton5">
1016
275
                <property name="visible">True</property>
1017
276
                <property name="can_focus">True</property>
1018
277
                <property name="receives_default">True</property>
1019
278
                <property name="use_action_appearance">False</property>
1020
279
                <property name="relief">none</property>
1021
280
                <property name="uri">http://twitter.com/ubuntuone</property>
1022
281
                <child>
1023
282
                  <object class="GtkImage" id="twitter_logo">
1024
283
                    <property name="visible">True</property>
1025
284
                    <property name="can_focus">False</property>
1026
285
                    <property name="tooltip_text" translatable="yes">http://twitter.com/ubuntuone</property>
1027
286
                  </object>
1028
287
                </child>
1029
288
              </object>
1030
289
              <packing>
1031
290
                <property name="expand">False</property>
1032
291
                <property name="fill">False</property>
1033
292
                <property name="position">1</property>
1034
293
              </packing>
1035
294
            </child>
1036
295
            <child>
1037
296
              <object class="GtkLinkButton" id="linkbutton6">
1038
297
                <property name="visible">True</property>
1039
298
                <property name="can_focus">True</property>
1040
299
                <property name="receives_default">True</property>
1041
300
                <property name="use_action_appearance">False</property>
1042
301
                <property name="relief">none</property>
1043
302
                <property name="uri">http://www.facebook.com/ubuntuone</property>
1044
303
                <child>
1045
304
                  <object class="GtkImage" id="facebook_logo">
1046
305
                    <property name="visible">True</property>
1047
306
                    <property name="can_focus">False</property>
1048
307
                    <property name="tooltip_text" translatable="yes">http://www.facebook.com/ubuntuone</property>
1049
308
                  </object>
1050
309
                </child>
1051
310
              </object>
1052
311
              <packing>
1053
312
                <property name="expand">True</property>
1054
313
                <property name="fill">True</property>
1055
314
                <property name="position">2</property>
1056
315
              </packing>
1057
316
            </child>
1058
317
          </object>
1059
318
          <packing>
1060
319
            <property name="expand">False</property>
1061
320
            <property name="fill">True</property>
1062
321
            <property name="pack_type">end</property>
1063
322
            <property name="position">1</property>
1064
323
          </packing>
1065
324
        </child>
1066
325
      </object>
1067
326
      <packing>
1068
327
        <property name="expand">False</property>
1069
328
        <property name="fill">True</property>
1070
329
        <property name="pack_type">end</property>
1071
330
        <property name="position">1</property>
1072
331
      </packing>
1073
332
    </child>
1074
333
  </object>
1075
334
</interface>
1076
335
0
1077
=== removed file 'data/gtk/overview.ui'
1078
--- data/gtk/overview.ui	2011-09-14 19:08:52 +0000
1079
+++ data/gtk/overview.ui	1970-01-01 00:00:00 +0000
1080
@@ -1,308 +0,0 @@
1081
1
<?xml version="1.0" encoding="UTF-8"?>
1082
2
<interface>
1083
3
  <requires lib="gtk+" version="2.22"/>
1084
4
  <!-- interface-naming-policy project-wide -->
1085
5
  <object class="GtkVBox" id="itself">
1086
6
    <property name="visible">True</property>
1087
7
    <property name="can_focus">False</property>
1088
8
    <child>
1089
9
      <object class="GtkEventBox" id="eventbox1">
1090
10
        <property name="visible">True</property>
1091
11
        <property name="can_focus">False</property>
1092
12
        <child>
1093
13
          <object class="GtkImage" id="banner">
1094
14
            <property name="visible">True</property>
1095
15
            <property name="can_focus">False</property>
1096
16
            <property name="xpad">12</property>
1097
17
            <property name="ypad">12</property>
1098
18
          </object>
1099
19
        </child>
1100
20
      </object>
1101
21
      <packing>
1102
22
        <property name="expand">True</property>
1103
23
        <property name="fill">True</property>
1104
24
        <property name="position">0</property>
1105
25
      </packing>
1106
26
    </child>
1107
27
    <child>
1108
28
      <object class="GtkLabel" id="label7">
1109
29
        <property name="visible">True</property>
1110
30
        <property name="can_focus">False</property>
1111
31
        <property name="label" translatable="yes">&lt;span font="24" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
1112
32
        <property name="use_markup">True</property>
1113
33
      </object>
1114
34
      <packing>
1115
35
        <property name="expand">True</property>
1116
36
        <property name="fill">True</property>
1117
37
        <property name="position">1</property>
1118
38
      </packing>
1119
39
    </child>
1120
40
    <child>
1121
41
      <object class="GtkHBox" id="hbox1">
1122
42
        <property name="visible">True</property>
1123
43
        <property name="can_focus">False</property>
1124
44
        <property name="border_width">12</property>
1125
45
        <child>
1126
46
          <object class="GtkTable" id="table1">
1127
47
            <property name="visible">True</property>
1128
48
            <property name="can_focus">False</property>
1129
49
            <property name="n_rows">4</property>
1130
50
            <property name="n_columns">2</property>
1131
51
            <property name="column_spacing">10</property>
1132
52
            <child>
1133
53
              <object class="GtkImage" id="files_icon">
1134
54
                <property name="visible">True</property>
1135
55
                <property name="can_focus">False</property>
1136
56
              </object>
1137
57
              <packing>
1138
58
                <property name="x_options">GTK_FILL</property>
1139
59
                <property name="y_options">GTK_FILL</property>
1140
60
              </packing>
1141
61
            </child>
1142
62
            <child>
1143
63
              <object class="GtkImage" id="music_stream_icon">
1144
64
                <property name="visible">True</property>
1145
65
                <property name="can_focus">False</property>
1146
66
              </object>
1147
67
              <packing>
1148
68
                <property name="top_attach">1</property>
1149
69
                <property name="bottom_attach">2</property>
1150
70
                <property name="x_options">GTK_FILL</property>
1151
71
                <property name="y_options">GTK_FILL</property>
1152
72
              </packing>
1153
73
            </child>
1154
74
            <child>
1155
75
              <object class="GtkImage" id="contacts_icon">
1156
76
                <property name="visible">True</property>
1157
77
                <property name="can_focus">False</property>
1158
78
              </object>
1159
79
              <packing>
1160
80
                <property name="top_attach">2</property>
1161
81
                <property name="bottom_attach">3</property>
1162
82
                <property name="x_options">GTK_FILL</property>
1163
83
                <property name="y_options">GTK_FILL</property>
1164
84
              </packing>
1165
85
            </child>
1166
86
            <child>
1167
87
              <object class="GtkImage" id="notes_icon">
1168
88
                <property name="visible">True</property>
1169
89
                <property name="can_focus">False</property>
1170
90
              </object>
1171
91
              <packing>
1172
92
                <property name="top_attach">3</property>
1173
93
                <property name="bottom_attach">4</property>
1174
94
                <property name="x_options">GTK_FILL</property>
1175
95
                <property name="y_options">GTK_FILL</property>
1176
96
              </packing>
1177
97
            </child>
1178
98
            <child>
1179
99
              <object class="GtkLabel" id="label3">
1180
100
                <property name="visible">True</property>
1181
101
                <property name="can_focus">False</property>
1182
102
                <property name="xalign">0</property>
1183
103
                <property name="label" translatable="yes">Files Anywhere
1184
104
&lt;span foreground="#909090"&gt;Back up and access your files from Ubuntu, Windows, Web or Mobile&lt;/span&gt;</property>
1185
105
                <property name="use_markup">True</property>
1186
106
                <property name="wrap">True</property>
1187
107
              </object>
1188
108
              <packing>
1189
109
                <property name="left_attach">1</property>
1190
110
                <property name="right_attach">2</property>
1191
111
              </packing>
1192
112
            </child>
1193
113
            <child>
1194
114
              <object class="GtkLabel" id="label4">
1195
115
                <property name="visible">True</property>
1196
116
                <property name="can_focus">False</property>
1197
117
                <property name="xalign">0</property>
1198
118
                <property name="label" translatable="yes">Keep Connected
1199
119
&lt;span foreground="#909090"&gt;Unify your contacts across Desktop, Mobile and Web&lt;/span&gt;</property>
1200
120
                <property name="use_markup">True</property>
1201
121
                <property name="wrap">True</property>
1202
122
              </object>
1203
123
              <packing>
1204
124
                <property name="left_attach">1</property>
1205
125
                <property name="right_attach">2</property>
1206
126
                <property name="top_attach">2</property>
1207
127
                <property name="bottom_attach">3</property>
1208
128
              </packing>
1209
129
            </child>
1210
130
            <child>
1211
131
              <object class="GtkLabel" id="label5">
1212
132
                <property name="visible">True</property>
1213
133
                <property name="can_focus">False</property>
1214
134
                <property name="xalign">0</property>
1215
135
                <property name="label" translatable="yes">Rock Out
1216
136
&lt;span foreground="#909090"&gt;Your entire collection follows you around with music streaming to Android and iPhone&lt;/span&gt;</property>
1217
137
                <property name="use_markup">True</property>
1218
138
                <property name="wrap">True</property>
1219
139
              </object>
1220
140
              <packing>
1221
141
                <property name="left_attach">1</property>
1222
142
                <property name="right_attach">2</property>
1223
143
                <property name="top_attach">1</property>
1224
144
                <property name="bottom_attach">2</property>
1225
145
              </packing>
1226
146
            </child>
1227
147
            <child>
1228
148
              <object class="GtkLabel" id="label6">
1229
149
                <property name="visible">True</property>
1230
150
                <property name="can_focus">False</property>
1231
151
                <property name="xalign">0</property>
1232
152
                <property name="label" translatable="yes">Stay Productive
1233
153
&lt;span foreground="#909090"&gt;Keep your Tomboy notes synced&lt;/span&gt;</property>
1234
154
                <property name="use_markup">True</property>
1235
155
                <property name="wrap">True</property>
1236
156
              </object>
1237
157
              <packing>
1238
158
                <property name="left_attach">1</property>
1239
159
                <property name="right_attach">2</property>
1240
160
                <property name="top_attach">3</property>
1241
161
                <property name="bottom_attach">4</property>
1242
162
              </packing>
1243
163
            </child>
1244
164
          </object>
1245
165
          <packing>
1246
166
            <property name="expand">True</property>
1247
167
            <property name="fill">True</property>
1248
168
            <property name="position">0</property>
1249
169
          </packing>
1250
170
        </child>
1251
171
        <child>
1252
172
          <object class="GtkVBox" id="vbox2">
1253
173
            <property name="visible">True</property>
1254
174
            <property name="can_focus">False</property>
1255
175
            <child>
1256
176
              <object class="GtkLabel" id="warning_label">
1257
177
                <property name="visible">True</property>
1258
178
                <property name="can_focus">False</property>
1259
179
                <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
1260
180
                <property name="wrap">True</property>
1261
181
              </object>
1262
182
              <packing>
1263
183
                <property name="expand">False</property>
1264
184
                <property name="fill">True</property>
1265
185
                <property name="position">0</property>
1266
186
              </packing>
1267
187
            </child>
1268
188
            <child>
1269
189
              <object class="GtkAlignment" id="alignment2">
1270
190
                <property name="visible">True</property>
1271
191
                <property name="can_focus">False</property>
1272
192
                <property name="xscale">0</property>
1273
193
                <property name="yscale">0</property>
1274
194
                <child>
1275
195
                  <object class="GtkVBox" id="vbox3">
1276
196
                    <property name="visible">True</property>
1277
197
                    <property name="can_focus">False</property>
1278
198
                    <property name="spacing">10</property>
1279
199
                    <child>
1280
200
                      <object class="GtkButton" id="learn_more_button">
1281
201
                        <property name="visible">True</property>
1282
202
                        <property name="can_focus">True</property>
1283
203
                        <property name="receives_default">True</property>
1284
204
                        <property name="use_action_appearance">False</property>
1285
205
                        <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
1286
206
                        <child>
1287
207
                          <object class="GtkVBox" id="vbox5">
1288
208
                            <property name="visible">True</property>
1289
209
                            <property name="can_focus">False</property>
1290
210
                            <child>
1291
211
                              <object class="GtkImage" id="image5">
1292
212
                                <property name="visible">True</property>
1293
213
                                <property name="can_focus">False</property>
1294
214
                                <property name="pixel_size">55</property>
1295
215
                                <property name="icon_name">ubuntuone</property>
1296
216
                              </object>
1297
217
                              <packing>
1298
218
                                <property name="expand">True</property>
1299
219
                                <property name="fill">True</property>
1300
220
                                <property name="position">0</property>
1301
221
                              </packing>
1302
222
                            </child>
1303
223
                            <child>
1304
224
                              <object class="GtkLabel" id="label8">
1305
225
                                <property name="visible">True</property>
1306
226
                                <property name="can_focus">False</property>
1307
227
                                <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
1308
228
                                <property name="use_markup">True</property>
1309
229
                              </object>
1310
230
                              <packing>
1311
231
                                <property name="expand">True</property>
1312
232
                                <property name="fill">True</property>
1313
233
                                <property name="position">1</property>
1314
234
                              </packing>
1315
235
                            </child>
1316
236
                          </object>
1317
237
                        </child>
1318
238
                      </object>
1319
239
                      <packing>
1320
240
                        <property name="expand">True</property>
1321
241
                        <property name="fill">True</property>
1322
242
                        <property name="position">0</property>
1323
243
                      </packing>
1324
244
                    </child>
1325
245
                    <child>
1326
246
                      <object class="GtkButton" id="join_now_button">
1327
247
                        <property name="visible">True</property>
1328
248
                        <property name="can_focus">True</property>
1329
249
                        <property name="can_default">True</property>
1330
250
                        <property name="receives_default">True</property>
1331
251
                        <property name="use_action_appearance">False</property>
1332
252
                        <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
1333
253
                        <child>
1334
254
                          <object class="GtkLabel" id="label1">
1335
255
                            <property name="visible">True</property>
1336
256
                            <property name="can_focus">False</property>
1337
257
                            <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
1338
258
                            <property name="use_markup">True</property>
1339
259
                          </object>
1340
260
                        </child>
1341
261
                      </object>
1342
262
                      <packing>
1343
263
                        <property name="expand">False</property>
1344
264
                        <property name="fill">True</property>
1345
265
                        <property name="position">1</property>
1346
266
                      </packing>
1347
267
                    </child>
1348
268
                    <child>
1349
269
                      <object class="GtkLinkButton" id="connect_button">
1350
270
                        <property name="label" translatable="yes">I already have an account!</property>
1351
271
                        <property name="visible">True</property>
1352
272
                        <property name="can_focus">True</property>
1353
273
                        <property name="receives_default">True</property>
1354
274
                        <property name="use_action_appearance">False</property>
1355
275
                        <property name="relief">none</property>
1356
276
                        <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
1357
277
                      </object>
1358
278
                      <packing>
1359
279
                        <property name="expand">False</property>
1360
280
                        <property name="fill">False</property>
1361
281
                        <property name="position">2</property>
1362
282
                      </packing>
1363
283
                    </child>
1364
284
                  </object>
1365
285
                </child>
1366
286
              </object>
1367
287
              <packing>
1368
288
                <property name="expand">True</property>
1369
289
                <property name="fill">True</property>
1370
290
                <property name="position">1</property>
1371
291
              </packing>
1372
292
            </child>
1373
293
          </object>
1374
294
          <packing>
1375
295
            <property name="expand">True</property>
1376
296
            <property name="fill">True</property>
1377
297
            <property name="position">1</property>
1378
298
          </packing>
1379
299
        </child>
1380
300
      </object>
1381
301
      <packing>
1382
302
        <property name="expand">True</property>
1383
303
        <property name="fill">True</property>
1384
304
        <property name="position">2</property>
1385
305
      </packing>
1386
306
    </child>
1387
307
  </object>
1388
308
</interface>
1389
309
0
1390
=== removed file 'data/gtk/services.ui'
1391
--- data/gtk/services.ui	2011-09-14 19:08:52 +0000
1392
+++ data/gtk/services.ui	1970-01-01 00:00:00 +0000
1393
@@ -1,317 +0,0 @@
1394
1
<?xml version="1.0" encoding="UTF-8"?>
1395
2
<interface>
1396
3
  <requires lib="gtk+" version="2.22"/>
1397
4
  <!-- interface-naming-policy project-wide -->
1398
5
  <object class="GtkVBox" id="itself">
1399
6
    <property name="visible">True</property>
1400
7
    <property name="can_focus">False</property>
1401
8
    <child>
1402
9
      <object class="GtkScrolledWindow" id="scrolledwindow1">
1403
10
        <property name="visible">True</property>
1404
11
        <property name="can_focus">True</property>
1405
12
        <property name="hscrollbar_policy">automatic</property>
1406
13
        <property name="vscrollbar_policy">automatic</property>
1407
14
        <child>
1408
15
          <object class="GtkViewport" id="viewport1">
1409
16
            <property name="visible">True</property>
1410
17
            <property name="can_focus">False</property>
1411
18
            <property name="resize_mode">queue</property>
1412
19
            <property name="shadow_type">none</property>
1413
20
            <child>
1414
21
              <object class="GtkAlignment" id="alignment1">
1415
22
                <property name="visible">True</property>
1416
23
                <property name="can_focus">False</property>
1417
24
                <property name="left_padding">5</property>
1418
25
                <property name="right_padding">5</property>
1419
26
                <child>
1420
27
                  <object class="GtkVBox" id="vbox1">
1421
28
                    <property name="visible">True</property>
1422
29
                    <property name="can_focus">False</property>
1423
30
                    <property name="spacing">5</property>
1424
31
                    <child>
1425
32
                      <object class="GtkFrame" id="files">
1426
33
                        <property name="visible">True</property>
1427
34
                        <property name="can_focus">False</property>
1428
35
                        <property name="label_xalign">0</property>
1429
36
                        <property name="shadow_type">out</property>
1430
37
                        <child>
1431
38
                          <object class="GtkAlignment" id="alignment2">
1432
39
                            <property name="visible">True</property>
1433
40
                            <property name="can_focus">False</property>
1434
41
                            <child>
1435
42
                              <object class="GtkHBox" id="hbox2">
1436
43
                                <property name="visible">True</property>
1437
44
                                <property name="can_focus">False</property>
1438
45
                                <property name="border_width">5</property>
1439
46
                                <child>
1440
47
                                  <object class="GtkTable" id="table1">
1441
48
                                    <property name="visible">True</property>
1442
49
                                    <property name="can_focus">False</property>
1443
50
                                    <property name="n_rows">3</property>
1444
51
                                    <property name="n_columns">3</property>
1445
52
                                    <property name="column_spacing">5</property>
1446
53
                                    <property name="row_spacing">5</property>
1447
54
                                    <child>
1448
55
                                      <object class="GtkCheckButton" id="file_sync_check">
1449
56
                                        <property name="visible">True</property>
1450
57
                                        <property name="can_focus">True</property>
1451
58
                                        <property name="receives_default">False</property>
1452
59
                                        <property name="use_action_appearance">False</property>
1453
60
                                        <property name="draw_indicator">True</property>
1454
61
                                      </object>
1455
62
                                      <packing>
1456
63
                                        <property name="x_options"></property>
1457
64
                                        <property name="y_options"></property>
1458
65
                                      </packing>
1459
66
                                    </child>
1460
67
                                    <child>
1461
68
                                      <object class="GtkImage" id="files_icon">
1462
69
                                        <property name="visible">True</property>
1463
70
                                        <property name="can_focus">False</property>
1464
71
                                      </object>
1465
72
                                      <packing>
1466
73
                                        <property name="left_attach">1</property>
1467
74
                                        <property name="right_attach">2</property>
1468
75
                                        <property name="x_options"></property>
1469
76
                                        <property name="y_options"></property>
1470
77
                                      </packing>
1471
78
                                    </child>
1472
79
                                    <child>
1473
80
                                      <object class="GtkLabel" id="label1">
1474
81
                                        <property name="visible">True</property>
1475
82
                                        <property name="can_focus">False</property>
1476
83
                                        <property name="xalign">0</property>
1477
84
                                        <property name="label" translatable="yes">Enable File Sync</property>
1478
85
                                      </object>
1479
86
                                      <packing>
1480
87
                                        <property name="left_attach">2</property>
1481
88
                                        <property name="right_attach">3</property>
1482
89
                                      </packing>
1483
90
                                    </child>
1484
91
                                    <child>
1485
92
                                      <object class="GtkLabel" id="label2">
1486
93
                                        <property name="visible">True</property>
1487
94
                                        <property name="can_focus">False</property>
1488
95
                                        <property name="xalign">0</property>
1489
96
                                        <property name="yalign">0</property>
1490
97
                                        <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One
1491
98
1492
99
Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>
1493
100
                                        <property name="use_markup">True</property>
1494
101
                                        <property name="wrap">True</property>
1495
102
                                        <property name="width_chars">35</property>
1496
103
                                      </object>
1497
104
                                      <packing>
1498
105
                                        <property name="left_attach">2</property>
1499
106
                                        <property name="right_attach">3</property>
1500
107
                                        <property name="top_attach">1</property>
1501
108
                                        <property name="bottom_attach">2</property>
1502
109
                                      </packing>
1503
110
                                    </child>
1504
111
                                    <child>
1505
112
                                      <object class="GtkHButtonBox" id="hbuttonbox1">
1506
113
                                        <property name="visible">True</property>
1507
114
                                        <property name="can_focus">False</property>
1508
115
                                        <child>
1509
116
                                          <object class="GtkButton" id="file_sync_button">
1510
117
                                            <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
1511
118
                                            <property name="visible">True</property>
1512
119
                                            <property name="can_focus">True</property>
1513
120
                                            <property name="receives_default">True</property>
1514
121
                                            <property name="use_action_appearance">False</property>
1515
122
                                            <property name="use_underline">True</property>
1516
123
                                            <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
1517
124
                                          </object>
1518
125
                                          <packing>
1519
126
                                            <property name="expand">False</property>
1520
127
                                            <property name="fill">False</property>
1521
128
                                            <property name="position">0</property>
1522
129
                                          </packing>
1523
130
                                        </child>
1524
131
                                      </object>
1525
132
                                      <packing>
1526
133
                                        <property name="left_attach">2</property>
1527
134
                                        <property name="right_attach">3</property>
1528
135
                                        <property name="top_attach">2</property>
1529
136
                                        <property name="bottom_attach">3</property>
1530
137
                                      </packing>
1531
138
                                    </child>
1532
139
                                    <child>
1533
140
                                      <placeholder/>
1534
141
                                    </child>
1535
142
                                    <child>
1536
143
                                      <placeholder/>
1537
144
                                    </child>
1538
145
                                    <child>
1539
146
                                      <placeholder/>
1540
147
                                    </child>
1541
148
                                    <child>
1542
149
                                      <placeholder/>
1543
150
                                    </child>
1544
151
                                  </object>
1545
152
                                  <packing>
1546
153
                                    <property name="expand">False</property>
1547
154
                                    <property name="fill">True</property>
1548
155
                                    <property name="position">0</property>
1549
156
                                  </packing>
1550
157
                                </child>
1551
158
                                <child>
1552
159
                                  <object class="GtkImage" id="files_example">
1553
160
                                    <property name="visible">True</property>
1554
161
                                    <property name="can_focus">False</property>
1555
162
                                  </object>
1556
163
                                  <packing>
1557
164
                                    <property name="expand">False</property>
1558
165
                                    <property name="fill">True</property>
1559
166
                                    <property name="pack_type">end</property>
1560
167
                                    <property name="position">1</property>
1561
168
                                  </packing>
1562
169
                                </child>
1563
170
                              </object>
1564
171
                            </child>
1565
172
                          </object>
1566
173
                        </child>
1567
174
                        <child type="label_item">
1568
175
                          <placeholder/>
1569
176
                        </child>
1570
177
                      </object>
1571
178
                      <packing>
1572
179
                        <property name="expand">False</property>
1573
180
                        <property name="fill">True</property>
1574
181
                        <property name="position">0</property>
1575
182
                      </packing>
1576
183
                    </child>
1577
184
                    <child>
1578
185
                      <object class="GtkFrame" id="replications">
1579
186
                        <property name="visible">True</property>
1580
187
                        <property name="can_focus">False</property>
1581
188
                        <property name="label_xalign">0</property>
1582
189
                        <property name="shadow_type">out</property>
1583
190
                        <child>
1584
191
                          <object class="GtkAlignment" id="alignment3">
1585
192
                            <property name="visible">True</property>
1586
193
                            <property name="can_focus">False</property>
1587
194
                            <property name="top_padding">6</property>
1588
195
                            <child>
1589
196
                              <object class="GtkHBox" id="hbox3">
1590
197
                                <property name="visible">True</property>
1591
198
                                <property name="can_focus">False</property>
1592
199
                                <property name="border_width">5</property>
1593
200
                                <child>
1594
201
                                  <object class="GtkVBox" id="contacts">
1595
202
                                    <property name="visible">True</property>
1596
203
                                    <property name="can_focus">False</property>
1597
204
                                    <child>
1598
205
                                      <object class="GtkTable" id="contacts_sync">
1599
206
                                        <property name="visible">True</property>
1600
207
                                        <property name="can_focus">False</property>
1601
208
                                        <property name="n_rows">2</property>
1602
209
                                        <property name="n_columns">3</property>
1603
210
                                        <property name="column_spacing">5</property>
1604
211
                                        <property name="row_spacing">5</property>
1605
212
                                        <child>
1606
213
                                          <object class="GtkCheckButton" id="contacts_check">
1607
214
                                            <property name="visible">True</property>
1608
215
                                            <property name="can_focus">True</property>
1609
216
                                            <property name="receives_default">False</property>
1610
217
                                            <property name="use_action_appearance">False</property>
1611
218
                                            <property name="draw_indicator">True</property>
1612
219
                                          </object>
1613
220
                                          <packing>
1614
221
                                            <property name="x_options"></property>
1615
222
                                            <property name="y_options"></property>
1616
223
                                          </packing>
1617
224
                                        </child>
1618
225
                                        <child>
1619
226
                                          <object class="GtkImage" id="contacts_icon">
1620
227
                                            <property name="visible">True</property>
1621
228
                                            <property name="can_focus">False</property>
1622
229
                                          </object>
1623
230
                                          <packing>
1624
231
                                            <property name="left_attach">1</property>
1625
232
                                            <property name="right_attach">2</property>
1626
233
                                            <property name="x_options"></property>
1627
234
                                            <property name="y_options"></property>
1628
235
                                          </packing>
1629
236
                                        </child>
1630
237
                                        <child>
1631
238
                                          <object class="GtkLabel" id="label4">
1632
239
                                            <property name="visible">True</property>
1633
240
                                            <property name="can_focus">False</property>
1634
241
                                            <property name="xalign">0</property>
1635
242
                                            <property name="label" translatable="yes">Enable Contacts Sync</property>
1636
243
                                          </object>
1637
244
                                          <packing>
1638
245
                                            <property name="left_attach">2</property>
1639
246
                                            <property name="right_attach">3</property>
1640
247
                                          </packing>
1641
248
                                        </child>
1642
249
                                        <child>
1643
250
                                          <object class="GtkLabel" id="label5">
1644
251
                                            <property name="visible">True</property>
1645
252
                                            <property name="can_focus">True</property>
1646
253
                                            <property name="xalign">0</property>
1647
254
                                            <property name="yalign">0</property>
1648
255
                                            <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
1649
256
                                            <property name="use_markup">True</property>
1650
257
                                            <property name="wrap">True</property>
1651
258
                                          </object>
1652
259
                                          <packing>
1653
260
                                            <property name="left_attach">2</property>
1654
261
                                            <property name="right_attach">3</property>
1655
262
                                            <property name="top_attach">1</property>
1656
263
                                            <property name="bottom_attach">2</property>
1657
264
                                          </packing>
1658
265
                                        </child>
1659
266
                                        <child>
1660
267
                                          <placeholder/>
1661
268
                                        </child>
1662
269
                                        <child>
1663
270
                                          <placeholder/>
1664
271
                                        </child>
1665
272
                                      </object>
1666
273
                                      <packing>
1667
274
                                        <property name="expand">False</property>
1668
275
                                        <property name="fill">True</property>
1669
276
                                        <property name="position">0</property>
1670
277
                                      </packing>
1671
278
                                    </child>
1672
279
                                  </object>
1673
280
                                  <packing>
1674
281
                                    <property name="expand">True</property>
1675
282
                                    <property name="fill">True</property>
1676
283
                                    <property name="position">0</property>
1677
284
                                  </packing>
1678
285
                                </child>
1679
286
                                <child>
1680
287
                                  <placeholder/>
1681
288
                                </child>
1682
289
                              </object>
1683
290
                            </child>
1684
291
                          </object>
1685
292
                        </child>
1686
293
                        <child type="label_item">
1687
294
                          <placeholder/>
1688
295
                        </child>
1689
296
                      </object>
1690
297
                      <packing>
1691
298
                        <property name="expand">False</property>
1692
299
                        <property name="fill">True</property>
1693
300
                        <property name="position">1</property>
1694
301
                      </packing>
1695
302
                    </child>
1696
303
                  </object>
1697
304
                </child>
1698
305
              </object>
1699
306
            </child>
1700
307
          </object>
1701
308
        </child>
1702
309
      </object>
1703
310
      <packing>
1704
311
        <property name="expand">True</property>
1705
312
        <property name="fill">True</property>
1706
313
        <property name="position">0</property>
1707
314
      </packing>
1708
315
    </child>
1709
316
  </object>
1710
317
</interface>
1711
318
0
1712
=== removed file 'data/gtk/volumes.ui'
1713
--- data/gtk/volumes.ui	2011-07-11 11:19:09 +0000
1714
+++ data/gtk/volumes.ui	1970-01-01 00:00:00 +0000
1715
@@ -1,98 +0,0 @@
1716
1
<?xml version="1.0" encoding="UTF-8"?>
1717
2
<interface>
1718
3
  <requires lib="gtk+" version="2.22"/>
1719
4
  <!-- interface-naming-policy project-wide -->
1720
5
  <object class="GtkAlignment" id="itself">
1721
6
    <property name="visible">True</property>
1722
7
    <property name="can_focus">False</property>
1723
8
    <child>
1724
9
      <object class="GtkScrolledWindow" id="scrolledwindow1">
1725
10
        <property name="visible">True</property>
1726
11
        <property name="can_focus">True</property>
1727
12
        <property name="hscrollbar_policy">automatic</property>
1728
13
        <property name="vscrollbar_policy">automatic</property>
1729
14
        <property name="shadow_type">in</property>
1730
15
        <child>
1731
16
          <object class="GtkTreeView" id="volumes_view">
1732
17
            <property name="visible">True</property>
1733
18
            <property name="can_focus">True</property>
1734
19
            <property name="model">volumes_store</property>
1735
20
            <property name="rules_hint">True</property>
1736
21
            <property name="tooltip_column">0</property>
1737
22
            <signal name="row-activated" handler="on_volumes_view_row_activated" swapped="no"/>
1738
23
            <child>
1739
24
              <object class="GtkTreeViewColumn" id="treeviewcolumn2">
1740
25
                <property name="resizable">True</property>
1741
26
                <property name="sizing">autosize</property>
1742
27
                <property name="expand">True</property>
1743
28
                <child>
1744
29
                  <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
1745
30
                  <attributes>
1746
31
                    <attribute name="sensitive">1</attribute>
1747
32
                    <attribute name="icon-name">2</attribute>
1748
33
                    <attribute name="stock-size">5</attribute>
1749
34
                  </attributes>
1750
35
                </child>
1751
36
                <child>
1752
37
                  <object class="GtkCellRendererText" id="text_renderer">
1753
38
                    <property name="ellipsize">end</property>
1754
39
                    <property name="width_chars">80</property>
1755
40
                  </object>
1756
41
                  <attributes>
1757
42
                    <attribute name="markup">0</attribute>
1758
43
                    <attribute name="text">0</attribute>
1759
44
                  </attributes>
1760
45
                </child>
1761
46
              </object>
1762
47
            </child>
1763
48
            <child>
1764
49
              <object class="GtkTreeViewColumn" id="treeviewcolumn3">
1765
50
                <property name="sizing">autosize</property>
1766
51
                <property name="title" translatable="yes">Sync locally?</property>
1767
52
                <child>
1768
53
                  <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
1769
54
                    <property name="indicator_size">15</property>
1770
55
                    <signal name="toggled" handler="on_subscribed_toggled" swapped="no"/>
1771
56
                  </object>
1772
57
                  <attributes>
1773
58
                    <attribute name="sensitive">4</attribute>
1774
59
                    <attribute name="visible">3</attribute>
1775
60
                    <attribute name="active">1</attribute>
1776
61
                  </attributes>
1777
62
                </child>
1778
63
                <child>
1779
64
                  <object class="GtkCellRendererText" id="cellrenderertext1">
1780
65
                    <property name="visible">False</property>
1781
66
                  </object>
1782
67
                  <attributes>
1783
68
                    <attribute name="text">6</attribute>
1784
69
                  </attributes>
1785
70
                </child>
1786
71
              </object>
1787
72
            </child>
1788
73
          </object>
1789
74
        </child>
1790
75
      </object>
1791
76
    </child>
1792
77
  </object>
1793
78
  <object class="GtkTreeStore" id="volumes_store">
1794
79
    <columns>
1795
80
      <!-- column-name description -->
1796
81
      <column type="gchararray"/>
1797
82
      <!-- column-name subscribed -->
1798
83
      <column type="gboolean"/>
1799
84
      <!-- column-name icon-name -->
1800
85
      <column type="gchararray"/>
1801
86
      <!-- column-name subscribed-visible -->
1802
87
      <column type="gboolean"/>
1803
88
      <!-- column-name subscribed-sensitive -->
1804
89
      <column type="gboolean"/>
1805
90
      <!-- column-name icon-size -->
1806
91
      <column type="gint"/>
1807
92
      <!-- column-name identifier -->
1808
93
      <column type="gchararray"/>
1809
94
      <!-- column-name path -->
1810
95
      <column type="gchararray"/>
1811
96
    </columns>
1812
97
  </object>
1813
98
</interface>
1814
99
0
1815
=== renamed file 'data/u1icon.png' => 'data/icon.png'
1816
=== added file 'data/logo.png'
1817
100
Binary files data/logo.png	1970-01-01 00:00:00 +0000 and data/logo.png	2012-03-06 15:41:39 +0000 differ
1
Binary files data/logo.png	1970-01-01 00:00:00 +0000 and data/logo.png	2012-03-06 15:41:39 +0000 differ
1818
=== added file 'data/progress_arrow_grey.png'
1819
101
Binary files data/progress_arrow_grey.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_grey.png	2012-03-06 15:41:39 +0000 differ
2
Binary files data/progress_arrow_grey.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_grey.png	2012-03-06 15:41:39 +0000 differ
1820
=== added file 'data/progress_arrow_orange.png'
1821
102
Binary files data/progress_arrow_orange.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_orange.png	2012-03-06 15:41:39 +0000 differ
3
Binary files data/progress_arrow_orange.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_orange.png	2012-03-06 15:41:39 +0000 differ
1822
=== added file 'data/progress_finish_grey.png'
1823
103
Binary files data/progress_finish_grey.png	1970-01-01 00:00:00 +0000 and data/progress_finish_grey.png	2012-03-06 15:41:39 +0000 differ
4
Binary files data/progress_finish_grey.png	1970-01-01 00:00:00 +0000 and data/progress_finish_grey.png	2012-03-06 15:41:39 +0000 differ
1824
=== added file 'data/progress_finish_orange.png'
1825
104
Binary files data/progress_finish_orange.png	1970-01-01 00:00:00 +0000 and data/progress_finish_orange.png	2012-03-06 15:41:39 +0000 differ
5
Binary files data/progress_finish_orange.png	1970-01-01 00:00:00 +0000 and data/progress_finish_orange.png	2012-03-06 15:41:39 +0000 differ
1826
=== added file 'data/progress_tick.png'
1827
105
Binary files data/progress_tick.png	1970-01-01 00:00:00 +0000 and data/progress_tick.png	2012-03-06 15:41:39 +0000 differ
6
Binary files data/progress_tick.png	1970-01-01 00:00:00 +0000 and data/progress_tick.png	2012-03-06 15:41:39 +0000 differ
1828
=== modified file 'data/qt/account.ui'
1829
--- data/qt/account.ui	2011-09-06 13:43:25 +0000
1830
+++ data/qt/account.ui	2012-03-06 15:41:39 +0000
1831
@@ -11,7 +11,7 @@
1832
11
   </rect>
11
   </rect>
1833
12
  </property>
12
  </property>
1834
13
  <property name="windowTitle">
13
  <property name="windowTitle">
1836
14
   <string>Form</string>
14
   <string notr="true">Form</string>
1837
15
  </property>
15
  </property>
1838
16
  <layout class="QVBoxLayout" name="verticalLayout">
16
  <layout class="QVBoxLayout" name="verticalLayout">
1839
17
   <property name="margin">
17
   <property name="margin">
1840
@@ -25,14 +25,17 @@
1841
25
     <item row="0" column="2">
25
     <item row="0" column="2">
1842
26
      <widget class="GoToWebButton" name="edit_profile_button">
26
      <widget class="GoToWebButton" name="edit_profile_button">
1843
27
       <property name="text">
27
       <property name="text">
1845
28
        <string>Edit personal details online</string>
28
        <string notr="true">Edit personal details online</string>
1846
29
       </property>
1847
30
       <property name="default">
1848
31
        <bool>true</bool>
1849
29
       </property>
32
       </property>
1850
30
      </widget>
33
      </widget>
1851
31
     </item>
34
     </item>
1852
32
     <item row="2" column="0">
35
     <item row="2" column="0">
1853
33
      <widget class="QGroupBox" name="services">
36
      <widget class="QGroupBox" name="services">
1854
34
       <property name="title">
37
       <property name="title">
1856
35
        <string>Your services</string>
38
        <string notr="true">Your services</string>
1857
36
       </property>
39
       </property>
1858
37
       <layout class="QVBoxLayout" name="verticalLayout_3">
40
       <layout class="QVBoxLayout" name="verticalLayout_3">
1859
38
        <property name="leftMargin">
41
        <property name="leftMargin">
1860
@@ -67,7 +70,7 @@
1861
67
     <item row="0" column="0">
70
     <item row="0" column="0">
1862
68
      <widget class="QGroupBox" name="profile_info">
71
      <widget class="QGroupBox" name="profile_info">
1863
69
       <property name="title">
72
       <property name="title">
1865
70
        <string>Personal details</string>
73
        <string notr="true">Personal details</string>
1866
71
       </property>
74
       </property>
1867
72
       <layout class="QVBoxLayout" name="verticalLayout_4">
75
       <layout class="QVBoxLayout" name="verticalLayout_4">
1868
73
        <property name="leftMargin">
76
        <property name="leftMargin">
1869
@@ -109,7 +112,10 @@
1870
109
     <item row="2" column="2">
112
     <item row="2" column="2">
1871
110
      <widget class="GoToWebButton" name="edit_services_button">
113
      <widget class="GoToWebButton" name="edit_services_button">
1872
111
       <property name="text">
114
       <property name="text">
1874
112
        <string>Edit your services  online</string>
115
        <string notr="true">Edit your services online</string>
1875
116
       </property>
1876
117
       <property name="default">
1877
118
        <bool>true</bool>
1878
113
       </property>
119
       </property>
1879
114
      </widget>
120
      </widget>
1880
115
     </item>
121
     </item>
1881
116
122
1882
=== modified file 'data/qt/controlpanel.ui'
1883
--- data/qt/controlpanel.ui	2011-09-09 17:16:20 +0000
1884
+++ data/qt/controlpanel.ui	2012-03-06 15:41:39 +0000
1885
@@ -160,7 +160,10 @@
1886
160
               <item>
160
               <item>
1887
161
                <widget class="GoToWebButton" name="get_more_space_button">
161
                <widget class="GoToWebButton" name="get_more_space_button">
1888
162
                 <property name="text">
162
                 <property name="text">
1890
163
                  <string>Get more storage</string>
163
                  <string notr="true">Get more storage</string>
1891
164
                 </property>
1892
165
                 <property name="default">
1893
166
                  <bool>true</bool>
1894
164
                 </property>
167
                 </property>
1895
165
                </widget>
168
                </widget>
1896
166
               </item>
169
               </item>
1897
@@ -235,22 +238,22 @@
1898
235
           </property>
238
           </property>
1899
236
           <widget class="FoldersPanel" name="folders_tab">
239
           <widget class="FoldersPanel" name="folders_tab">
1900
237
            <attribute name="title">
240
            <attribute name="title">
1902
238
             <string>Folders</string>
241
             <string notr="true">Folders</string>
1903
239
            </attribute>
242
            </attribute>
1904
240
           </widget>
243
           </widget>
1905
241
           <widget class="DevicesPanel" name="devices_tab">
244
           <widget class="DevicesPanel" name="devices_tab">
1906
242
            <attribute name="title">
245
            <attribute name="title">
1908
243
             <string>Devices</string>
246
             <string notr="true">Devices</string>
1909
244
            </attribute>
247
            </attribute>
1910
245
           </widget>
248
           </widget>
1911
246
           <widget class="PreferencesPanel" name="preferences_tab">
249
           <widget class="PreferencesPanel" name="preferences_tab">
1912
247
            <attribute name="title">
250
            <attribute name="title">
1914
248
             <string>Settings</string>
251
             <string notr="true">Settings</string>
1915
249
            </attribute>
252
            </attribute>
1916
250
           </widget>
253
           </widget>
1917
251
           <widget class="AccountPanel" name="account_tab">
254
           <widget class="AccountPanel" name="account_tab">
1918
252
            <attribute name="title">
255
            <attribute name="title">
1920
253
             <string>Account information</string>
256
             <string notr="true">Account information</string>
1921
254
            </attribute>
257
            </attribute>
1922
255
           </widget>
258
           </widget>
1923
256
          </widget>
259
          </widget>
1924
@@ -260,7 +263,7 @@
1925
260
      </layout>
263
      </layout>
1926
261
     </widget>
264
     </widget>
1927
262
     <widget class="QWidget" name="empty"/>
265
     <widget class="QWidget" name="empty"/>
1929
263
     <widget class="SignInPanel" name="signin"/>
266
     <widget class="UbuntuOneWizard" name="wizard"/>
1930
264
    </widget>
267
    </widget>
1931
265
   </item>
268
   </item>
1932
266
   <item>
269
   <item>
1933
@@ -287,7 +290,7 @@
1934
287
      <item>
290
      <item>
1935
288
       <widget class="GoToWebButton" name="help_button">
291
       <widget class="GoToWebButton" name="help_button">
1936
289
        <property name="text">
292
        <property name="text">
1938
290
         <string>Get help online</string>
293
         <string notr="true">Get help online</string>
1939
291
        </property>
294
        </property>
1940
292
       </widget>
295
       </widget>
1941
293
      </item>
296
      </item>
1942
@@ -312,7 +315,7 @@
1943
312
         </font>
315
         </font>
1944
313
        </property>
316
        </property>
1945
314
        <property name="text">
317
        <property name="text">
1947
315
         <string>Talk to us</string>
318
         <string notr="true">Talk to us</string>
1948
316
        </property>
319
        </property>
1949
317
       </widget>
320
       </widget>
1950
318
      </item>
321
      </item>
1951
@@ -404,9 +407,9 @@
1952
404
   <container>1</container>
407
   <container>1</container>
1953
405
  </customwidget>
408
  </customwidget>
1954
406
  <customwidget>
409
  <customwidget>
1958
407
   <class>SignInPanel</class>
410
   <class>UbuntuOneWizard</class>
1959
408
   <extends>QWidget</extends>
411
   <extends>QWizard</extends>
1960
409
   <header>ubuntuone.controlpanel.gui.qt.signin</header>
412
   <header>ubuntuone.controlpanel.gui.qt.wizard</header>
1961
410
   <container>1</container>
413
   <container>1</container>
1962
411
  </customwidget>
414
  </customwidget>
1963
412
 </customwidgets>
415
 </customwidgets>
1964
413
416
1965
=== modified file 'data/qt/device.ui'
1966
--- data/qt/device.ui	2011-08-23 16:03:31 +0000
1967
+++ data/qt/device.ui	2012-03-06 15:41:39 +0000
1968
@@ -24,7 +24,7 @@
1969
24
   <item>
24
   <item>
1970
25
    <widget class="QLabel" name="device_name_label">
25
    <widget class="QLabel" name="device_name_label">
1971
26
     <property name="text">
26
     <property name="text">
1973
27
      <string>Local device</string>
27
      <string notr="true">Local device</string>
1974
28
     </property>
28
     </property>
1975
29
    </widget>
29
    </widget>
1976
30
   </item>
30
   </item>
1977
@@ -44,7 +44,7 @@
1978
44
   <item>
44
   <item>
1979
45
    <widget class="QPushButton" name="remove_device_button">
45
    <widget class="QPushButton" name="remove_device_button">
1980
46
     <property name="text">
46
     <property name="text">
1982
47
      <string>Remove</string>
47
      <string notr="true">Remove</string>
1983
48
     </property>
48
     </property>
1984
49
     <property name="secondary" stdset="0">
49
     <property name="secondary" stdset="0">
1985
50
      <bool>true</bool>
50
      <bool>true</bool>
1986
51
51
1987
=== modified file 'data/qt/device_remote.ui'
1988
--- data/qt/device_remote.ui	2011-11-28 15:06:18 +0000
1989
+++ data/qt/device_remote.ui	2012-03-06 15:41:39 +0000
1990
@@ -24,7 +24,7 @@
1991
24
   <item>
24
   <item>
1992
25
    <widget class="QLabel" name="device_name_label">
25
    <widget class="QLabel" name="device_name_label">
1993
26
     <property name="text">
26
     <property name="text">
1995
27
      <string>Local device</string>
27
      <string notr="true">Non local device</string>
1996
28
     </property>
28
     </property>
1997
29
    </widget>
29
    </widget>
1998
30
   </item>
30
   </item>
1999
31
31
2000
=== modified file 'data/qt/devices.ui'
2001
--- data/qt/devices.ui	2011-08-05 18:07:09 +0000
2002
+++ data/qt/devices.ui	2012-03-06 15:41:39 +0000
2003
@@ -23,7 +23,7 @@
2004
23
   <item>
23
   <item>
2005
24
    <widget class="QGroupBox" name="local_device">
24
    <widget class="QGroupBox" name="local_device">
2006
25
     <property name="title">
25
     <property name="title">
2008
26
      <string>This device</string>
26
      <string notr="true">This device</string>
2009
27
     </property>
27
     </property>
2010
28
     <layout class="QVBoxLayout" name="verticalLayout">
28
     <layout class="QVBoxLayout" name="verticalLayout">
2011
29
      <property name="margin">
29
      <property name="margin">
2012
@@ -36,9 +36,9 @@
2013
36
    </widget>
36
    </widget>
2014
37
   </item>
37
   </item>
2015
38
   <item>
38
   <item>
2017
39
    <widget class="QGroupBox" name="oher_devices">
39
    <widget class="QGroupBox" name="other_devices">
2018
40
     <property name="title">
40
     <property name="title">
2020
41
      <string>Other devices</string>
41
      <string notr="true">Other devices</string>
2021
42
     </property>
42
     </property>
2022
43
     <layout class="QVBoxLayout" name="verticalLayout_2">
43
     <layout class="QVBoxLayout" name="verticalLayout_2">
2023
44
      <property name="margin">
44
      <property name="margin">
2024
@@ -90,7 +90,10 @@
2025
90
     <item>
90
     <item>
2026
91
      <widget class="GoToWebButton" name="manage_devices_button">
91
      <widget class="GoToWebButton" name="manage_devices_button">
2027
92
       <property name="text">
92
       <property name="text">
2029
93
        <string>Go to the web page to manage your other devices</string>
93
        <string notr="true">Go to the web page to manage your other devices</string>
2030
94
       </property>
2031
95
       <property name="default">
2032
96
        <bool>true</bool>
2033
94
       </property>
97
       </property>
2034
95
      </widget>
98
      </widget>
2035
96
     </item>
99
     </item>
2036
97
100
2037
=== modified file 'data/qt/folders.ui'
2038
--- data/qt/folders.ui	2011-08-23 16:03:31 +0000
2039
+++ data/qt/folders.ui	2012-03-06 15:41:39 +0000
2040
@@ -41,7 +41,7 @@
2041
41
         </sizepolicy>
41
         </sizepolicy>
2042
42
        </property>
42
        </property>
2043
43
        <property name="text">
43
        <property name="text">
2045
44
         <string>Go to the web for public and private sharing options</string>
44
         <string notr="true">Go to the web for public and private sharing options</string>
2046
45
        </property>
45
        </property>
2047
46
       </widget>
46
       </widget>
2048
47
      </item>
47
      </item>
2049
@@ -101,17 +101,17 @@
2050
101
     </attribute>
101
     </attribute>
2051
102
     <column>
102
     <column>
2052
103
      <property name="text">
103
      <property name="text">
2064
104
       <string>Name</string>
104
       <string notr="true">Name</string>
2065
105
      </property>
105
      </property>
2066
106
     </column>
106
     </column>
2067
107
     <column>
107
     <column>
2068
108
      <property name="text">
108
      <property name="text">
2069
109
       <string>Sync Locally?</string>
109
       <string notr="true">Sync Locally?</string>
2070
110
      </property>
110
      </property>
2071
111
     </column>
111
     </column>
2072
112
     <column>
112
     <column>
2073
113
      <property name="text">
113
      <property name="text">
2074
114
       <string>Explore</string>
114
       <string notr="true">Explore</string>
2075
115
      </property>
115
      </property>
2076
116
     </column>
116
     </column>
2077
117
    </widget>
117
    </widget>
2078
@@ -153,7 +153,10 @@
2079
153
         </sizepolicy>
153
         </sizepolicy>
2080
154
        </property>
154
        </property>
2081
155
        <property name="text">
155
        <property name="text">
2083
156
         <string>Add a folder from this computer</string>
156
         <string notr="true">Add a folder from this computer</string>
2084
157
        </property>
2085
158
        <property name="default">
2086
159
         <bool>true</bool>
2087
157
        </property>
160
        </property>
2088
158
       </widget>
161
       </widget>
2089
159
      </item>
162
      </item>
2090
160
163
2091
=== modified file 'data/qt/images.qrc'
2092
--- data/qt/images.qrc	2012-01-30 18:49:50 +0000
2093
+++ data/qt/images.qrc	2012-03-06 15:41:39 +0000
2094
@@ -1,20 +1,25 @@
2095
1
<RCC>
1
<RCC>
2096
2
  <qresource prefix="/">
2
  <qresource prefix="/">
2098
3
    <file>../u1icon.png</file>
3
    <file>../banner.png</file>
2099
4
    <file>../computer.png</file>
2100
4
    <file>../external_icon_orange.png</file>
5
    <file>../external_icon_orange.png</file>
2101
6
    <file>../external_icon_white.png</file>
2102
7
    <file>../icon.png</file>
2103
8
    <file>../folder.png</file>
2104
9
    <file>../logo.png</file>
2105
10
    <file>../phone.png</file>
2106
11
    <file>../progress_arrow_grey.png</file>
2107
12
    <file>../progress_arrow_orange.png</file>
2108
13
    <file>../progress_finish_grey.png</file>
2109
14
    <file>../progress_finish_orange.png</file>
2110
15
    <file>../progress_tick.png</file>
2111
16
    <file>../sync_status_alert.png</file>
2112
5
    <file>../sync_status_disconnected.png</file>
17
    <file>../sync_status_disconnected.png</file>
2114
6
    <file>../sync_status_alert.png</file>
18
    <file>../sync_status_loading.png</file>
2115
7
    <file>../sync_status_sync_done.png</file>
19
    <file>../sync_status_sync_done.png</file>
2116
8
    <file>../sync_status_syncing.png</file>
20
    <file>../sync_status_syncing.png</file>
2126
9
    <file>../sync_status_loading.png</file>
21
    <file>../twitter.png</file>
2127
10
    <file>../folder.png</file>
22
    <file>../facebook.png</file>
2119
11
    <file>../computer.png</file>
2120
12
    <file>../phone.png</file>
2121
13
    <file>../twitter.png</file>
2122
14
    <file>../twitter.png</file>
2123
15
    <file>../facebook.png</file>
2124
16
    <file>../facebook.png</file>
2125
17
    <file>../external_icon_white.png</file>
2128
18
    <file>../Ubuntu-R.ttf</file>
23
    <file>../Ubuntu-R.ttf</file>
2129
19
    <file>../Ubuntu-B.ttf</file>
24
    <file>../Ubuntu-B.ttf</file>
2130
20
    <file>ubuntuone.qss</file>
25
    <file>ubuntuone.qss</file>
2131
21
26
2132
=== modified file 'data/qt/loadingoverlay.ui'
2133
--- data/qt/loadingoverlay.ui	2011-08-05 15:19:12 +0000
2134
+++ data/qt/loadingoverlay.ui	2012-03-06 15:41:39 +0000
2135
@@ -10,9 +10,6 @@
2136
10
    <height>230</height>
10
    <height>230</height>
2137
11
   </rect>
11
   </rect>
2138
12
  </property>
12
  </property>
2139
13
  <property name="windowTitle">
2140
14
   <string>Frame</string>
2141
15
  </property>
2142
16
  <layout class="QVBoxLayout" name="verticalLayout">
13
  <layout class="QVBoxLayout" name="verticalLayout">
2143
17
   <property name="topMargin">
14
   <property name="topMargin">
2144
18
    <number>30</number>
15
    <number>30</number>
2145
@@ -61,7 +58,7 @@
2146
61
           </font>
58
           </font>
2147
62
          </property>
59
          </property>
2148
63
          <property name="text">
60
          <property name="text">
2150
64
           <string>Getting information, please wait...</string>
61
           <string notr="true">Getting information, please wait...</string>
2151
65
          </property>
62
          </property>
2152
66
         </widget>
63
         </widget>
2153
67
        </item>
64
        </item>
2154
68
65
2155
=== modified file 'data/qt/mainwindow.ui'
2156
--- data/qt/mainwindow.ui	2011-08-18 22:01:02 +0000
2157
+++ data/qt/mainwindow.ui	2012-03-06 15:41:39 +0000
2158
@@ -23,11 +23,11 @@
2159
23
   </size>
23
   </size>
2160
24
  </property>
24
  </property>
2161
25
  <property name="windowTitle">
25
  <property name="windowTitle">
2163
26
   <string>Ubuntu One</string>
26
   <string notr="true">Ubuntu One</string>
2164
27
  </property>
27
  </property>
2165
28
  <property name="windowIcon">
28
  <property name="windowIcon">
2166
29
   <iconset resource="images.qrc">
29
   <iconset resource="images.qrc">
2168
30
    <normaloff>:/u1icon.png</normaloff>:/u1icon.png</iconset>
30
    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
2169
31
  </property>
31
  </property>
2170
32
  <widget class="QWidget" name="centralwidget">
32
  <widget class="QWidget" name="centralwidget">
2171
33
   <property name="sizePolicy">
33
   <property name="sizePolicy">
2172
34
34
2173
=== modified file 'data/qt/preferences.ui'
2174
--- data/qt/preferences.ui	2011-09-08 22:22:46 +0000
2175
+++ data/qt/preferences.ui	2012-03-06 15:41:39 +0000
2176
@@ -23,7 +23,7 @@
2177
23
   <item>
23
   <item>
2178
24
    <widget class="QGroupBox" name="bandwidth_settings">
24
    <widget class="QGroupBox" name="bandwidth_settings">
2179
25
     <property name="title">
25
     <property name="title">
2181
26
      <string>Bandwidth Settings</string>
26
      <string notr="true">Bandwidth Settings</string>
2182
27
     </property>
27
     </property>
2183
28
     <layout class="QGridLayout" name="gridLayout">
28
     <layout class="QGridLayout" name="gridLayout">
2184
29
      <property name="margin">
29
      <property name="margin">
2185
@@ -32,7 +32,7 @@
2186
32
      <item row="0" column="0">
32
      <item row="0" column="0">
2187
33
       <widget class="QCheckBox" name="limit_uploads_checkbox">
33
       <widget class="QCheckBox" name="limit_uploads_checkbox">
2188
34
        <property name="text">
34
        <property name="text">
2190
35
         <string>Limit upload speed to</string>
35
         <string notr="true">Limit upload speed to</string>
2191
36
        </property>
36
        </property>
2192
37
       </widget>
37
       </widget>
2193
38
      </item>
38
      </item>
2194
@@ -49,14 +49,14 @@
2195
49
      <item row="0" column="2">
49
      <item row="0" column="2">
2196
50
       <widget class="QLabel" name="kbps_label_1">
50
       <widget class="QLabel" name="kbps_label_1">
2197
51
        <property name="text">
51
        <property name="text">
2199
52
         <string>Kilobits per second</string>
52
         <string notr="true">Kilobits per second</string>
2200
53
        </property>
53
        </property>
2201
54
       </widget>
54
       </widget>
2202
55
      </item>
55
      </item>
2203
56
      <item row="2" column="0">
56
      <item row="2" column="0">
2204
57
       <widget class="QCheckBox" name="limit_downloads_checkbox">
57
       <widget class="QCheckBox" name="limit_downloads_checkbox">
2205
58
        <property name="text">
58
        <property name="text">
2207
59
         <string>Limit download speed to</string>
59
         <string notr="true">Limit download speed to</string>
2208
60
        </property>
60
        </property>
2209
61
       </widget>
61
       </widget>
2210
62
      </item>
62
      </item>
2211
@@ -73,7 +73,7 @@
2212
73
      <item row="2" column="2">
73
      <item row="2" column="2">
2213
74
       <widget class="QLabel" name="kbps_label_2">
74
       <widget class="QLabel" name="kbps_label_2">
2214
75
        <property name="text">
75
        <property name="text">
2216
76
         <string>Kilobits per second</string>
76
         <string notr="true">Kilobits per second</string>
2217
77
        </property>
77
        </property>
2218
78
       </widget>
78
       </widget>
2219
79
      </item>
79
      </item>
2220
@@ -93,7 +93,7 @@
2221
93
      <item row="4" column="0" colspan="3">
93
      <item row="4" column="0" colspan="3">
2222
94
       <widget class="QLabel" name="label_2">
94
       <widget class="QLabel" name="label_2">
2223
95
        <property name="text">
95
        <property name="text">
2225
96
         <string>Please note that your files will not sync if you set bandwidth to 0</string>
96
         <string notr="true">Please note that your files will not sync if you set bandwidth to 0</string>
2226
97
        </property>
97
        </property>
2227
98
        <property name="scaledContents">
98
        <property name="scaledContents">
2228
99
         <bool>false</bool>
99
         <bool>false</bool>
2229
@@ -122,7 +122,7 @@
2230
122
   <item>
122
   <item>
2231
123
    <widget class="QGroupBox" name="file_sync_settings">
123
    <widget class="QGroupBox" name="file_sync_settings">
2232
124
     <property name="title">
124
     <property name="title">
2234
125
      <string>File Sync Settings</string>
125
      <string notr="true">File Sync Settings</string>
2235
126
     </property>
126
     </property>
2236
127
     <layout class="QVBoxLayout" name="verticalLayout_1">
127
     <layout class="QVBoxLayout" name="verticalLayout_1">
2237
128
      <property name="margin">
128
      <property name="margin">
2238
@@ -131,28 +131,28 @@
2239
131
      <item>
131
      <item>
2240
132
       <widget class="QCheckBox" name="autoconnect_checkbox">
132
       <widget class="QCheckBox" name="autoconnect_checkbox">
2241
133
        <property name="text">
133
        <property name="text">
2243
134
         <string>Connect automatically when computer starts</string>
134
         <string notr="true">Connect automatically when computer starts</string>
2244
135
        </property>
135
        </property>
2245
136
       </widget>
136
       </widget>
2246
137
      </item>
137
      </item>
2247
138
      <item>
138
      <item>
2248
139
       <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
139
       <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
2249
140
        <property name="text">
140
        <property name="text">
2251
141
         <string>Automatically sync all new cloud folders to this computer</string>
141
         <string notr="true">Automatically sync all new cloud folders to this computer</string>
2252
142
        </property>
142
        </property>
2253
143
       </widget>
143
       </widget>
2254
144
      </item>
144
      </item>
2255
145
      <item>
145
      <item>
2256
146
       <widget class="QCheckBox" name="share_autosubscribe_checkbox">
146
       <widget class="QCheckBox" name="share_autosubscribe_checkbox">
2257
147
        <property name="text">
147
        <property name="text">
2259
148
         <string>Automatically sync all folders shared with me to this computer</string>
148
         <string notr="true">Automatically sync all folders shared with me to this computer</string>
2260
149
        </property>
149
        </property>
2261
150
       </widget>
150
       </widget>
2262
151
      </item>
151
      </item>
2263
152
      <item>
152
      <item>
2264
153
       <widget class="QCheckBox" name="show_all_notifications_checkbox">
153
       <widget class="QCheckBox" name="show_all_notifications_checkbox">
2265
154
        <property name="text">
154
        <property name="text">
2267
155
         <string>Allow all notifications to this device</string>
155
         <string notr="true">Allow all notifications to this device</string>
2268
156
        </property>
156
        </property>
2269
157
       </widget>
157
       </widget>
2270
158
      </item>
158
      </item>
2271
@@ -191,22 +191,25 @@
2272
191
      </spacer>
191
      </spacer>
2273
192
     </item>
192
     </item>
2274
193
     <item>
193
     <item>
2275
194
      <widget class="QPushButton" name="apply_changes_button">
2276
195
       <property name="text">
2277
196
        <string>Apply these settings</string>
2278
197
       </property>
2279
198
      </widget>
2280
199
     </item>
2281
200
     <item>
2282
201
      <widget class="QPushButton" name="restore_defaults_button">
194
      <widget class="QPushButton" name="restore_defaults_button">
2283
202
       <property name="text">
195
       <property name="text">
2285
203
        <string>Default settings</string>
196
        <string notr="true">Default settings</string>
2286
204
       </property>
197
       </property>
2287
205
       <property name="secondary" stdset="0">
198
       <property name="secondary" stdset="0">
2288
206
        <bool>true</bool>
199
        <bool>true</bool>
2289
207
       </property>
200
       </property>
2290
208
      </widget>
201
      </widget>
2291
209
     </item>
202
     </item>
2292
203
     <item>
2293
204
      <widget class="QPushButton" name="apply_changes_button">
2294
205
       <property name="text">
2295
206
        <string notr="true">Apply these settings</string>
2296
207
       </property>
2297
208
       <property name="default">
2298
209
        <bool>true</bool>
2299
210
       </property>
2300
211
      </widget>
2301
212
     </item>
2302
210
    </layout>
213
    </layout>
2303
211
   </item>
214
   </item>
2304
212
  </layout>
215
  </layout>
2305
213
216
2306
=== added file 'data/qt/side_widget.ui'
2307
--- data/qt/side_widget.ui	1970-01-01 00:00:00 +0000
2308
+++ data/qt/side_widget.ui	2012-03-06 15:41:39 +0000
2309
@@ -0,0 +1,214 @@
2310
1
<?xml version="1.0" encoding="UTF-8"?>
2311
2
<ui version="4.0">
2312
3
 <class>SideWidget</class>
2313
4
 <widget class="QFrame" name="SideWidget">
2314
5
  <property name="geometry">
2315
6
   <rect>
2316
7
    <x>0</x>
2317
8
    <y>0</y>
2318
9
    <width>170</width>
2319
10
    <height>466</height>
2320
11
   </rect>
2321
12
  </property>
2322
13
  <property name="sizePolicy">
2323
14
   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
2324
15
    <horstretch>0</horstretch>
2325
16
    <verstretch>0</verstretch>
2326
17
   </sizepolicy>
2327
18
  </property>
2328
19
  <property name="minimumSize">
2329
20
   <size>
2330
21
    <width>170</width>
2331
22
    <height>466</height>
2332
23
   </size>
2333
24
  </property>
2334
25
  <layout class="QVBoxLayout" name="verticalLayout">
2335
26
   <property name="spacing">
2336
27
    <number>40</number>
2337
28
   </property>
2338
29
   <property name="margin">
2339
30
    <number>0</number>
2340
31
   </property>
2341
32
   <item>
2342
33
    <widget class="QLabel" name="ubuntu_one_logo_label">
2343
34
     <property name="sizePolicy">
2344
35
      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2345
36
       <horstretch>0</horstretch>
2346
37
       <verstretch>0</verstretch>
2347
38
      </sizepolicy>
2348
39
     </property>
2349
40
     <property name="pixmap">
2350
41
      <pixmap resource="images.qrc">:/logo.png</pixmap>
2351
42
     </property>
2352
43
    </widget>
2353
44
   </item>
2354
45
   <item>
2355
46
    <widget class="QFrame" name="states_frame">
2356
47
     <property name="sizePolicy">
2357
48
      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
2358
49
       <horstretch>0</horstretch>
2359
50
       <verstretch>0</verstretch>
2360
51
      </sizepolicy>
2361
52
     </property>
2362
53
     <layout class="QVBoxLayout" name="verticalLayout_2">
2363
54
      <property name="spacing">
2364
55
       <number>20</number>
2365
56
      </property>
2366
57
      <property name="margin">
2367
58
       <number>0</number>
2368
59
      </property>
2369
60
      <item>
2370
61
       <layout class="QHBoxLayout" name="horizontalLayout">
2371
62
        <property name="spacing">
2372
63
         <number>7</number>
2373
64
        </property>
2374
65
        <item>
2375
66
         <widget class="QLabel" name="install_icon">
2376
67
          <property name="sizePolicy">
2377
68
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2378
69
            <horstretch>0</horstretch>
2379
70
            <verstretch>0</verstretch>
2380
71
           </sizepolicy>
2381
72
          </property>
2382
73
          <property name="pixmap">
2383
74
           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
2384
75
          </property>
2385
76
         </widget>
2386
77
        </item>
2387
78
        <item>
2388
79
         <widget class="QLabel" name="install_label">
2389
80
          <property name="enabled">
2390
81
           <bool>true</bool>
2391
82
          </property>
2392
83
          <property name="text">
2393
84
           <string notr="true">Install</string>
2394
85
          </property>
2395
86
         </widget>
2396
87
        </item>
2397
88
       </layout>
2398
89
      </item>
2399
90
      <item>
2400
91
       <layout class="QHBoxLayout" name="horizontalLayout_2">
2401
92
        <property name="spacing">
2402
93
         <number>7</number>
2403
94
        </property>
2404
95
        <property name="sizeConstraint">
2405
96
         <enum>QLayout::SetDefaultConstraint</enum>
2406
97
        </property>
2407
98
        <item>
2408
99
         <widget class="QLabel" name="signin_icon">
2409
100
          <property name="sizePolicy">
2410
101
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2411
102
            <horstretch>0</horstretch>
2412
103
            <verstretch>0</verstretch>
2413
104
           </sizepolicy>
2414
105
          </property>
2415
106
          <property name="text">
2416
107
           <string/>
2417
108
          </property>
2418
109
          <property name="pixmap">
2419
110
           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
2420
111
          </property>
2421
112
         </widget>
2422
113
        </item>
2423
114
        <item>
2424
115
         <widget class="QLabel" name="signin_label">
2425
116
          <property name="enabled">
2426
117
           <bool>true</bool>
2427
118
          </property>
2428
119
          <property name="text">
2429
120
           <string notr="true">Sign In</string>
2430
121
          </property>
2431
122
         </widget>
2432
123
        </item>
2433
124
       </layout>
2434
125
      </item>
2435
126
      <item>
2436
127
       <layout class="QHBoxLayout" name="horizontalLayout_4">
2437
128
        <property name="spacing">
2438
129
         <number>7</number>
2439
130
        </property>
2440
131
        <item>
2441
132
         <widget class="QLabel" name="folders_icon">
2442
133
          <property name="sizePolicy">
2443
134
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2444
135
            <horstretch>0</horstretch>
2445
136
            <verstretch>0</verstretch>
2446
137
           </sizepolicy>
2447
138
          </property>
2448
139
          <property name="text">
2449
140
           <string/>
2450
141
          </property>
2451
142
          <property name="pixmap">
2452
143
           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
2453
144
          </property>
2454
145
         </widget>
2455
146
        </item>
2456
147
        <item>
2457
148
         <widget class="QLabel" name="folders_label">
2458
149
          <property name="enabled">
2459
150
           <bool>true</bool>
2460
151
          </property>
2461
152
          <property name="text">
2462
153
           <string notr="true">Select sync folders</string>
2463
154
          </property>
2464
155
         </widget>
2465
156
        </item>
2466
157
       </layout>
2467
158
      </item>
2468
159
      <item>
2469
160
       <layout class="QHBoxLayout" name="horizontalLayout_5">
2470
161
        <property name="spacing">
2471
162
         <number>7</number>
2472
163
        </property>
2473
164
        <item>
2474
165
         <widget class="QLabel" name="sync_icon">
2475
166
          <property name="sizePolicy">
2476
167
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2477
168
            <horstretch>0</horstretch>
2478
169
            <verstretch>0</verstretch>
2479
170
           </sizepolicy>
2480
171
          </property>
2481
172
          <property name="text">
2482
173
           <string/>
2483
174
          </property>
2484
175
          <property name="pixmap">
2485
176
           <pixmap resource="images.qrc">:/progress_finish_grey.png</pixmap>
2486
177
          </property>
2487
178
         </widget>
2488
179
        </item>
2489
180
        <item>
2490
181
         <widget class="QLabel" name="sync_label">
2491
182
          <property name="enabled">
2492
183
           <bool>true</bool>
2493
184
          </property>
2494
185
          <property name="text">
2495
186
           <string notr="true">Sync, stream, share!</string>
2496
187
          </property>
2497
188
         </widget>
2498
189
        </item>
2499
190
       </layout>
2500
191
      </item>
2501
192
     </layout>
2502
193
    </widget>
2503
194
   </item>
2504
195
   <item>
2505
196
    <spacer name="verticalSpacer">
2506
197
     <property name="orientation">
2507
198
      <enum>Qt::Vertical</enum>
2508
199
     </property>
2509
200
     <property name="sizeHint" stdset="0">
2510
201
      <size>
2511
202
       <width>20</width>
2512
203
       <height>40</height>
2513
204
      </size>
2514
205
     </property>
2515
206
    </spacer>
2516
207
   </item>
2517
208
  </layout>
2518
209
 </widget>
2519
210
 <resources>
2520
211
  <include location="images.qrc"/>
2521
212
 </resources>
2522
213
 <connections/>
2523
214
</ui>
2524
0
215
2525
=== modified file 'data/qt/signin.ui'
2526
--- data/qt/signin.ui	2011-12-19 21:10:06 +0000
2527
+++ data/qt/signin.ui	2012-03-06 15:41:39 +0000
2528
@@ -6,155 +6,133 @@
2529
6
   <rect>
6
   <rect>
2530
7
    <x>0</x>
7
    <x>0</x>
2531
8
    <y>0</y>
8
    <y>0</y>
2534
9
    <width>344</width>
9
    <width>370</width>
2535
10
    <height>312</height>
10
    <height>447</height>
2536
11
   </rect>
11
   </rect>
2537
12
  </property>
12
  </property>
2542
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout_2">
2539
14
   <string>Form</string>
2540
15
  </property>
2541
16
  <layout class="QHBoxLayout" name="horizontalLayout_3">
2543
17
   <property name="margin">
14
   <property name="margin">
2544
18
    <number>0</number>
15
    <number>0</number>
2545
19
   </property>
16
   </property>
2546
20
   <item>
17
   <item>
2547
21
    <widget class="QFrame" name="signin">
18
    <widget class="QFrame" name="signin">
2548
22
     <layout class="QVBoxLayout" name="sign_in">
19
     <layout class="QVBoxLayout" name="sign_in">
2549
23
      <property name="spacing">
2550
24
       <number>15</number>
2551
25
      </property>
2552
26
      <property name="margin">
20
      <property name="margin">
2554
27
       <number>3</number>
21
       <number>0</number>
2555
28
      </property>
22
      </property>
2556
29
      <item>
23
      <item>
2569
30
       <widget class="QLabel" name="sign_in_label">
24
       <widget class="QFrame" name="frame">
2570
31
        <property name="text">
25
        <layout class="QHBoxLayout" name="horizontalLayout_3">
2571
32
         <string>Sign in to Ubuntu One</string>
26
         <property name="leftMargin">
2572
33
        </property>
27
          <number>0</number>
2573
34
       </widget>
28
         </property>
2574
35
      </item>
29
         <property name="topMargin">
2575
36
      <item>
30
          <number>22</number>
2576
37
       <widget class="QLabel" name="description_label">
31
         </property>
2577
38
        <property name="text">
32
         <property name="rightMargin">
2578
39
         <string>Sign in with your existing Ubuntu One username and password.</string>
33
          <number>0</number>
2579
40
        </property>
34
         </property>
2580
41
       </widget>
35
         <property name="bottomMargin">
2581
36
          <number>0</number>
2582
37
         </property>
2583
38
         <item>
2584
39
          <widget class="QLabel" name="banner">
2585
40
           <property name="text">
2586
41
            <string/>
2587
42
           </property>
2588
43
           <property name="textFormat">
2589
44
            <enum>Qt::PlainText</enum>
2590
45
           </property>
2591
46
           <property name="pixmap">
2592
47
            <pixmap resource="images.qrc">:/banner.png</pixmap>
2593
48
           </property>
2594
49
           <property name="alignment">
2595
50
            <set>Qt::AlignCenter</set>
2596
51
           </property>
2597
52
           <property name="wordWrap">
2598
53
            <bool>true</bool>
2599
54
           </property>
2600
55
          </widget>
2601
56
         </item>
2602
57
        </layout>
2603
58
       </widget>
2604
59
      </item>
2605
60
      <item>
2606
61
       <spacer name="verticalSpacer_2">
2607
62
        <property name="orientation">
2608
63
         <enum>Qt::Vertical</enum>
2609
64
        </property>
2610
65
        <property name="sizeHint" stdset="0">
2611
66
         <size>
2612
67
          <width>20</width>
2613
68
          <height>40</height>
2614
69
         </size>
2615
70
        </property>
2616
71
       </spacer>
2617
72
      </item>
2618
73
      <item>
2619
74
       <widget class="QLabel" name="welcome_label">
2620
75
        <property name="font">
2621
76
         <font>
2622
77
          <pointsize>11</pointsize>
2623
78
          <weight>50</weight>
2624
79
          <bold>false</bold>
2625
80
         </font>
2626
81
        </property>
2627
82
        <property name="text">
2628
83
         <string notr="true">Welcome to Ubuntu One</string>
2629
84
        </property>
2630
85
        <property name="alignment">
2631
86
         <set>Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
2632
87
        </property>
2633
88
       </widget>
2634
89
      </item>
2635
90
      <item>
2636
91
       <spacer name="verticalSpacer">
2637
92
        <property name="orientation">
2638
93
         <enum>Qt::Vertical</enum>
2639
94
        </property>
2640
95
        <property name="sizeHint" stdset="0">
2641
96
         <size>
2642
97
          <width>20</width>
2643
98
          <height>40</height>
2644
99
         </size>
2645
100
        </property>
2646
101
       </spacer>
2647
42
      </item>
102
      </item>
2648
43
      <item>
103
      <item>
2649
44
       <layout class="QHBoxLayout" name="horizontalLayout">
104
       <layout class="QHBoxLayout" name="horizontalLayout">
2650
45
        <item>
105
        <item>
2763
46
         <layout class="QVBoxLayout" name="verticalLayout_2">
106
         <spacer name="horizontalSpacer">
2764
47
          <property name="spacing">
107
          <property name="orientation">
2765
48
           <number>15</number>
108
           <enum>Qt::Horizontal</enum>
2766
49
          </property>
109
          </property>
2767
50
          <item>
110
          <property name="sizeHint" stdset="0">
2768
51
           <layout class="QVBoxLayout" name="verticalLayout_4">
111
           <size>
2769
52
            <property name="spacing">
112
            <width>40</width>
2770
53
             <number>0</number>
113
            <height>20</height>
2771
54
            </property>
114
           </size>
2772
55
            <item>
115
          </property>
2773
56
             <widget class="QLabel" name="email_label">
116
         </spacer>
2774
57
              <property name="text">
117
        </item>
2775
58
               <string>Email address</string>
118
        <item>
2776
59
              </property>
119
         <layout class="QVBoxLayout" name="verticalLayout">
2777
60
             </widget>
120
          <item>
2778
61
            </item>
121
           <widget class="QPushButton" name="login_button">
2779
62
            <item>
122
            <property name="text">
2780
63
             <widget class="QLineEdit" name="email_entry">
123
             <string notr="true">Existing account</string>
2781
64
              <property name="text">
124
            </property>
2782
65
               <string/>
125
            <property name="default">
2783
66
              </property>
126
             <bool>true</bool>
2784
67
             </widget>
127
            </property>
2785
68
            </item>
128
           </widget>
2786
69
           </layout>
129
          </item>
2787
70
          </item>
130
          <item>
2788
71
          <item>
131
           <widget class="QPushButton" name="register_button">
2789
72
           <layout class="QVBoxLayout" name="verticalLayout_3">
132
            <property name="text">
2790
73
            <property name="spacing">
133
             <string notr="true">Setup new account</string>
2791
74
             <number>0</number>
134
            </property>
2792
75
            </property>
135
           </widget>
2681
76
            <item>
2682
77
             <widget class="QLabel" name="password_label">
2683
78
              <property name="text">
2684
79
               <string>Password</string>
2685
80
              </property>
2686
81
             </widget>
2687
82
            </item>
2688
83
            <item>
2689
84
             <widget class="QLineEdit" name="password_entry">
2690
85
              <property name="echoMode">
2691
86
               <enum>QLineEdit::Password</enum>
2692
87
              </property>
2693
88
             </widget>
2694
89
            </item>
2695
90
           </layout>
2696
91
          </item>
2697
92
          <item>
2698
93
           <layout class="QHBoxLayout" name="horizontalLayout_2">
2699
94
            <item>
2700
95
             <widget class="QPushButton" name="signin_button">
2701
96
              <property name="text">
2702
97
               <string>Sign in</string>
2703
98
              </property>
2704
99
              <property name="default">
2705
100
               <bool>true</bool>
2706
101
              </property>
2707
102
             </widget>
2708
103
            </item>
2709
104
            <item>
2710
105
             <widget class="QPushButton" name="cancel_button">
2711
106
              <property name="text">
2712
107
               <string>Cancel</string>
2713
108
              </property>
2714
109
              <property name="secondary" stdset="0">
2715
110
               <bool>true</bool>
2716
111
              </property>
2717
112
             </widget>
2718
113
            </item>
2719
114
            <item>
2720
115
             <spacer name="horizontalSpacer">
2721
116
              <property name="orientation">
2722
117
               <enum>Qt::Horizontal</enum>
2723
118
              </property>
2724
119
              <property name="sizeHint" stdset="0">
2725
120
               <size>
2726
121
                <width>40</width>
2727
122
                <height>20</height>
2728
123
               </size>
2729
124
              </property>
2730
125
             </spacer>
2731
126
            </item>
2732
127
           </layout>
2733
128
          </item>
2734
129
          <item>
2735
130
           <layout class="QHBoxLayout" name="horizontalLayout_4">
2736
131
            <item>
2737
132
             <widget class="GoToWebButton" name="forgot_password_button">
2738
133
              <property name="sizePolicy">
2739
134
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2740
135
                <horstretch>0</horstretch>
2741
136
                <verstretch>0</verstretch>
2742
137
               </sizepolicy>
2743
138
              </property>
2744
139
              <property name="text">
2745
140
               <string>Forgot your password?</string>
2746
141
              </property>
2747
142
             </widget>
2748
143
            </item>
2749
144
            <item>
2750
145
             <spacer name="horizontalSpacer_3">
2751
146
              <property name="orientation">
2752
147
               <enum>Qt::Horizontal</enum>
2753
148
              </property>
2754
149
              <property name="sizeHint" stdset="0">
2755
150
               <size>
2756
151
                <width>40</width>
2757
152
                <height>20</height>
2758
153
               </size>
2759
154
              </property>
2760
155
             </spacer>
2761
156
            </item>
2762
157
           </layout>
2793
158
          </item>
136
          </item>
2794
159
         </layout>
137
         </layout>
2795
160
        </item>
138
        </item>
2796
@@ -173,31 +151,13 @@
2797
173
        </item>
151
        </item>
2798
174
       </layout>
152
       </layout>
2799
175
      </item>
153
      </item>
2800
176
      <item>
2801
177
       <spacer name="verticalSpacer">
2802
178
        <property name="orientation">
2803
179
         <enum>Qt::Vertical</enum>
2804
180
        </property>
2805
181
        <property name="sizeHint" stdset="0">
2806
182
         <size>
2807
183
          <width>20</width>
2808
184
          <height>40</height>
2809
185
         </size>
2810
186
        </property>
2811
187
       </spacer>
2812
188
      </item>
2813
189
     </layout>
154
     </layout>
2814
190
    </widget>
155
    </widget>
2815
191
   </item>
156
   </item>
2816
192
  </layout>
157
  </layout>
2817
193
 </widget>
158
 </widget>
2826
194
 <customwidgets>
159
 <resources>
2827
195
  <customwidget>
160
  <include location="images.qrc"/>
2828
196
   <class>GoToWebButton</class>
161
 </resources>
2821
197
   <extends>QPushButton</extends>
2822
198
   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
2823
199
  </customwidget>
2824
200
 </customwidgets>
2825
201
 <resources/>
2829
202
 <connections/>
162
 <connections/>
2830
203
</ui>
163
</ui>
2831
204
164
2832
=== modified file 'data/qt/ubuntuone.qss'
2833
--- data/qt/ubuntuone.qss	2011-11-23 17:22:33 +0000
2834
+++ data/qt/ubuntuone.qss	2012-03-06 15:41:39 +0000
2835
@@ -12,9 +12,9 @@
2836
12
    border: none;
12
    border: none;
2837
13
}
13
}
2838
14
14
2840
15
QFrame#signin,
15
UbuntuOneWizard,
2841
16
QFrame#frame_header {
16
QFrame#frame_header {
2843
17
    background: #ffffff;
17
    background: white;
2844
18
    border-radius: 5px;
18
    border-radius: 5px;
2845
19
    border-style: solid;
19
    border-style: solid;
2846
20
    border-color: #939389;
20
    border-color: #939389;
2847
@@ -59,6 +59,15 @@
2848
59
    font-size: 24px;
59
    font-size: 24px;
2849
60
}
60
}
2850
61
61
2851
62
SideWidget {
2852
63
    background-color: white;
2853
64
    border-style: dotted;
2854
65
    border-color: #939389;
2855
66
    border-right-width: 1px;
2856
67
    color: white;
2857
68
    min-height: 100px;
2858
69
}
2859
70
2860
62
QPushButton {
71
QPushButton {
2861
63
    border-radius: 5px;
72
    border-radius: 5px;
2862
64
    border-style: solid;
73
    border-style: solid;
2863
@@ -68,55 +77,57 @@
2864
68
    border-width: 1px;
77
    border-width: 1px;
2865
69
}
78
}
2866
70
79
2868
71
QPushButton[enabled="true"] {
80
QPushButton:disabled {
2869
81
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2870
82
        stop: 0 #eaeaea, stop: 1.0 #cacaca);
2871
83
    color: #595959;
2872
84
    border-color: #939389;
2873
85
}
2874
86
2875
87
QPushButton:enabled {
2876
88
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2877
89
        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
2878
90
    color: #333333;
2879
91
    border-color: #999999;
2880
92
}
2881
93
2882
94
QPushButton:enabled:focus,
2883
95
QPushButton:enabled:hover {
2884
96
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2885
97
        stop: 0 #ffffff,stop: 1.0 #ededed);
2886
98
    color: #333333;
2887
99
    border-color: #999999;
2888
100
}
2889
101
2890
102
QPushButton:enabled:pressed {
2891
103
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2892
104
        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
2893
105
    color: #333333;
2894
106
    border-color: #999999;
2895
107
}
2896
108
2897
109
QPushButton:default:enabled {
2898
72
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
110
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2899
73
        stop: 0 #fe9e84,stop: 1.0 #dd4814);
111
        stop: 0 #fe9e84,stop: 1.0 #dd4814);
2900
74
    color: white;
112
    color: white;
2901
75
    border-color: #999999;
113
    border-color: #999999;
2902
76
}
114
}
2903
77
115
2905
78
QPushButton:hover[enabled="true"] {
116
QPushButton:default:enabled:focus,
2906
117
QPushButton:default:enabled:hover {
2907
79
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
118
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2908
80
        stop: 0 #ffb19c,stop: 1.0 #dd4814);
119
        stop: 0 #ffb19c,stop: 1.0 #dd4814);
2909
81
    color: white;
120
    color: white;
2910
82
    border-color: #999999;
121
    border-color: #999999;
2911
83
}
122
}
2912
84
123
2914
85
QPushButton:pressed[enabled="true"] {
124
QPushButton:default:enabled:pressed {
2915
86
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
125
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2916
87
        stop: 0 #b93f14,stop: 1.0 #dd4814);
126
        stop: 0 #b93f14,stop: 1.0 #dd4814);
2917
88
    color: white;
127
    color: white;
2918
89
    border-color: #999999;
128
    border-color: #999999;
2919
90
}
129
}
2920
91
130
2921
92
QPushButton[secondary="true"] {
2922
93
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2923
94
        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
2924
95
    color: #333333;
2925
96
    border-color: #999999;
2926
97
}
2927
98
2928
99
QPushButton:hover[secondary="true"] {
2929
100
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2930
101
        stop: 0 #ffffff,stop: 1.0 #ededed);
2931
102
    color: #333333;
2932
103
    border-color: #999999;
2933
104
}
2934
105
2935
106
QPushButton:pressed[secondary="true"] {
2936
107
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2937
108
        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
2938
109
    color: #333333;
2939
110
    border-color: #999999;
2940
111
}
2941
112
2942
113
QPushButton[enabled="false"] {
2943
114
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
2944
115
        stop: 0 #eaeaea, stop: 1.0 #cacaca);
2945
116
    color: #595959;
2946
117
    border-color: #939389;
2947
118
}
2948
119
2949
120
QPushButton#help_button {
131
QPushButton#help_button {
2950
121
    background: transparent;
132
    background: transparent;
2951
122
    border: none;
133
    border: none;
2952
@@ -278,6 +289,10 @@
2953
278
    color: #df2d1f;
289
    color: #df2d1f;
2954
279
}
290
}
2955
280
291
2956
292
QLabel#welcome_label {
2957
293
    font-size: 20px;
2958
294
}
2959
295
2960
281
QAbstractItemView {
296
QAbstractItemView {
2961
282
    border-style: solid;
297
    border-style: solid;
2962
283
    border-color: #898989;
298
    border-color: #898989;
2963
284
299
2964
=== removed file 'docs/ubuntuone-control-panel-gtk.1'
2965
--- docs/ubuntuone-control-panel-gtk.1	2011-09-07 13:50:37 +0000
2966
+++ docs/ubuntuone-control-panel-gtk.1	1970-01-01 00:00:00 +0000
2967
@@ -1,15 +0,0 @@
2968
1
.TH UBUNTUONE-CONTROL-PANEL-GTK 1
2969
2
2970
3
.SH NAME
2971
4
ubuntuone-control-panel-gtk \- A GTK UI for managing an Ubuntu One account
2972
5
2973
6
.SH SYNOPSYS
2974
7
.B ubutuone-control-panel-gtk
2975
8
2976
9
.SH DESCRIPTION
2977
10
This manual page briefly documents the
2978
11
.BR ubuntuone-control-panel-gtk
2979
12
process, which provides a desktop application to manage an Ubuntu One account.
2980
13
2981
14
.SH AUTHOR
2982
15
This manual page was written by Natalia Bidart <natalia.bidart@canonical.com>
2983
16
0
2984
=== added file 'docs/ubuntuone-control-panel-qt.1'
2985
--- docs/ubuntuone-control-panel-qt.1	1970-01-01 00:00:00 +0000
2986
+++ docs/ubuntuone-control-panel-qt.1	2012-03-06 15:41:39 +0000
2987
@@ -0,0 +1,27 @@
2988
1
.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
2989
2
.TH UBUNTUONE-CONTROL-PANEL-QT "1" "March 2012" "ubuntuone-control-panel-qt" "User Commands"
2990
3
.SH NAME
2991
4
ubuntuone-control-panel-qt \- control panel for Ubuntu One
2992
5
.SH DESCRIPTION
2993
6
usage: ubuntuone\-control\-panel\-qt [\-h] [\-\-switch\-to PANEL_NAME] [\-a]
2994
7
.IP
2995
8
[\-\-minimized] [\-\-with\-icon]
2996
9
.SS "optional arguments:"
2997
10
.TP
2998
11
\fB\-h\fR, \fB\-\-help\fR
2999
12
show this help message and exit
3000
13
.TP
3001
14
\fB\-\-switch\-to\fR PANEL_NAME
3002
15
Start Ubuntu One in the PANEL_NAME tab. Possible
3003
16
values are: dashboard, volumes, devices, applications
3004
17
.TP
3005
18
\fB\-a\fR, \fB\-\-alert\fR
3006
19
Start Ubuntu One alerting the user to its presence.
3007
20
.TP
3008
21
\fB\-\-minimized\fR
3009
22
Start Ubuntu One only in the notification area, with
3010
23
no visible window. Implies \fB\-\-with\-icon\fR
3011
24
.TP
3012
25
\fB\-\-with\-icon\fR
3013
26
Start Ubuntu One with an icon in the notification
3014
27
area.
3015
0
28
3016
=== modified file 'po/POTFILES.in'
3017
--- po/POTFILES.in	2011-09-16 14:37:20 +0000
3018
+++ po/POTFILES.in	2012-03-06 15:41:39 +0000
3019
@@ -1,9 +1,1 @@
3020
1
ubuntuone/controlpanel/gui/__init__.py
1
ubuntuone/controlpanel/gui/__init__.py
3021
2
[type: gettext/glade] data/gtk/dashboard.ui
3022
3
[type: gettext/glade] data/gtk/device.ui
3023
4
[type: gettext/glade] data/gtk/devices.ui
3024
5
[type: gettext/glade] data/gtk/install.ui
3025
6
[type: gettext/glade] data/gtk/management.ui
3026
7
[type: gettext/glade] data/gtk/overview.ui
3027
8
[type: gettext/glade] data/gtk/services.ui
3028
9
[type: gettext/glade] data/gtk/volumes.ui
3029
10
2
3030
=== modified file 'run-tests'
3031
--- run-tests	2012-02-06 20:49:41 +0000
3032
+++ run-tests	2012-03-06 15:41:39 +0000
3033
@@ -16,8 +16,7 @@
3034
16
# You should have received a copy of the GNU General Public License along
16
# You should have received a copy of the GNU General Public License along
3035
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
3036
18
18
3039
19
QT_TESTS_PATH=ubuntuone/controlpanel/gui/qt/tests
19
QT_TESTS_PATH="ubuntuone/controlpanel/gui/qt/tests, ubuntuone/controlpanel/gui/qt/main/tests"
3038
20
GTK_TESTS_PATH=ubuntuone/controlpanel/gui/gtk/tests
3040
21
DBUS_TESTS_PATH=ubuntuone/controlpanel/dbustests
20
DBUS_TESTS_PATH=ubuntuone/controlpanel/dbustests
3041
22
WINDOWS_TESTS=test_windows.py
21
WINDOWS_TESTS=test_windows.py
3042
23
22
3043
@@ -39,7 +38,6 @@
3044
39
        echo "Please install the 'pep8' package."
38
        echo "Please install the 'pep8' package."
3045
40
    fi
39
    fi
3046
41
}
40
}
3047
42
unset GTK_MODULES
3048
43
41
3049
44
XVFB_CMDLINE=""
42
XVFB_CMDLINE=""
3050
45
XVFB=$(which xvfb-run)
43
XVFB=$(which xvfb-run)
3051
@@ -48,17 +46,14 @@
3052
48
fi
46
fi
3053
49
47
3054
50
echo "*** Running test suite for ""$MODULE"" ***"
48
echo "*** Running test suite for ""$MODULE"" ***"
3056
51
u1trial --reactor=gi -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH, $GTK_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
49
u1trial --reactor=gi -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
3057
52
50
3058
53
echo "*** Running DBus test suite ***"
51
echo "*** Running DBus test suite ***"
3059
54
u1trial --reactor=glib "$DBUS_TESTS_PATH"
52
u1trial --reactor=glib "$DBUS_TESTS_PATH"
3060
55
53
3061
56
echo "*** Running GTK test suite ***"
3062
57
$XVFB_CMDLINE u1trial --reactor=glib "$GTK_TESTS_PATH"
3063
58
3064
59
echo "*** Running QT test suite for ""$MODULE"" ***"
54
echo "*** Running QT test suite for ""$MODULE"" ***"
3065
60
./setup.py build
55
./setup.py build
3067
61
$XVFB_CMDLINE u1trial -p "$GTK_TESTS_PATH" -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
56
$XVFB_CMDLINE u1trial -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
3068
62
rm -rf _trial_temp
57
rm -rf _trial_temp
3069
63
rm -rf build
58
rm -rf build
3070
64
59
3071
65
60
3072
=== modified file 'run-tests.bat'
3073
--- run-tests.bat	2012-01-31 16:55:33 +0000
3074
+++ run-tests.bat	2012-03-06 15:41:39 +0000
3075
@@ -18,7 +18,7 @@
3076
18
18
3077
19
SET MODULE="ubuntuone"
19
SET MODULE="ubuntuone"
3078
20
SET PYTHONEXEPATH="C:\Python27"
20
SET PYTHONEXEPATH="C:\Python27"
3080
21
SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
21
SET IGNORE_PATHS="ubuntuone\controlpanel\dbustests"
3081
22
SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
22
SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
3082
23
23
3083
24
:: throw the first parameter away if is /skip-lint,
24
:: throw the first parameter away if is /skip-lint,
3084
25
25
3085
=== modified file 'setup.py'
3086
--- setup.py	2012-02-22 12:31:22 +0000
3087
+++ setup.py	2012-03-06 15:41:39 +0000
3088
@@ -39,12 +39,11 @@
3089
39
39
3090
40
POT_FILE = 'po/ubuntuone-control-panel.pot'
40
POT_FILE = 'po/ubuntuone-control-panel.pot'
3091
41
SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
41
SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
3092
42
GUI_SERVICE_FILE = 'com.ubuntuone.controlpanel.gui.service'
3093
43
MESSAGE_ENTRY = 'ubuntuone-control-panel'
42
MESSAGE_ENTRY = 'ubuntuone-control-panel'
3094
44
CONSTANTS = 'ubuntuone/controlpanel/constants.py'
43
CONSTANTS = 'ubuntuone/controlpanel/constants.py'
3095
45
44
3096
46
CLEANFILES = [
45
CLEANFILES = [
3098
47
    SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
46
    SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
3099
48
    'MANIFEST']
47
    'MANIFEST']
3100
49
QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
48
QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
3101
50
49
3102
@@ -52,7 +51,7 @@
3103
52
def replace_prefix(prefix):
51
def replace_prefix(prefix):
3104
53
    """Replace every '@prefix@' with prefix within 'filename' content."""
52
    """Replace every '@prefix@' with prefix within 'filename' content."""
3105
54
    # replace .service file, DATA_DIR constant
53
    # replace .service file, DATA_DIR constant
3107
55
    for filename in (SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
54
    for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
3108
56
        with open(filename + '.in') as in_file:
55
        with open(filename + '.in') as in_file:
3109
57
            content = in_file.read()
56
            content = in_file.read()
3110
58
            with open(filename, 'w') as out_file:
57
            with open(filename, 'w') as out_file:
3111
@@ -160,7 +159,6 @@
3112
160
159
3113
161
    def run(self):
160
    def run(self):
3114
162
        """Execute the command."""
161
        """Execute the command."""
3115
163
        self._wrapuic()
3116
164
        basepath = os.path.join('data',  'qt')
162
        basepath = os.path.join('data',  'qt')
3117
165
        # TODO: build the resource files so that we can include them
163
        # TODO: build the resource files so that we can include them
3118
166
        #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
164
        #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
3119
@@ -175,40 +173,6 @@
3120
175
173
3121
176
        build_extra.build_extra.run(self)
174
        build_extra.build_extra.run(self)
3122
177
175
3123
178
    # pylint: disable=E1002
3124
179
    _wrappeduic = False
3125
180
3126
181
    @classmethod
3127
182
    def _wrapuic(cls):
3128
183
        """Wrap uic to use gettext's _() in place of tr()"""
3129
184
        if cls._wrappeduic:
3130
185
            return
3131
186
3132
187
        from PyQt4.uic.Compiler import compiler, qtproxies, indenter
3133
188
3134
189
        # pylint: disable=C0103
3135
190
        class _UICompiler(compiler.UICompiler):
3136
191
            """Speciallized compiler for qt .ui files."""
3137
192
            def createToplevelWidget(self, classname, widgetname):
3138
193
                o = indenter.getIndenter()
3139
194
                o.level = 0
3140
195
                o.write('from gettext import gettext as _')
3141
196
                return super(_UICompiler, self).createToplevelWidget(classname,
3142
197
                    widgetname)
3143
198
        compiler.UICompiler = _UICompiler
3144
199
3145
200
        class _i18n_string(qtproxies.i18n_string):
3146
201
            """Provide a translated text."""
3147
202
3148
203
            def __str__(self):
3149
204
                return "_('%s')" % self.string.encode('string-escape')
3150
205
3151
206
        qtproxies.i18n_string = _i18n_string
3152
207
3153
208
        cls._wrappeduic = True
3154
209
        # pylint: enable=C0103
3155
210
    # pylint: enable=E1002
3156
211
3157
212
176
3158
213
class ControlPanelClean(DistUtilsExtra.auto.clean_build_tree):
177
class ControlPanelClean(DistUtilsExtra.auto.clean_build_tree):
3159
214
    """Class to clean up after the build."""
178
    """Class to clean up after the build."""
3160
@@ -241,7 +205,6 @@
3161
241
        'ubuntuone',
205
        'ubuntuone',
3162
242
        'ubuntuone.controlpanel',
206
        'ubuntuone.controlpanel',
3163
243
        'ubuntuone.controlpanel.gui',
207
        'ubuntuone.controlpanel.gui',
3164
244
        'ubuntuone.controlpanel.gui.gtk',
3165
245
        'ubuntuone.controlpanel.gui.qt',
208
        'ubuntuone.controlpanel.gui.qt',
3166
246
        'ubuntuone.controlpanel.gui.qt.main',
209
        'ubuntuone.controlpanel.gui.qt.main',
3167
247
        'ubuntuone.controlpanel.gui.qt.ui',
210
        'ubuntuone.controlpanel.gui.qt.ui',
3168
@@ -253,7 +216,7 @@
3169
253
    data_files=[
216
    data_files=[
3170
254
        ('lib/ubuntuone-control-panel',
217
        ('lib/ubuntuone-control-panel',
3171
255
         ['bin/ubuntuone-control-panel-backend']),
218
         ['bin/ubuntuone-control-panel-backend']),
3173
256
        ('share/dbus-1/services/', [SERVICE_FILE, GUI_SERVICE_FILE]),
219
        ('share/dbus-1/services/', [SERVICE_FILE]),
3174
257
        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
220
        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
3175
258
        ('share/apport/package-hooks/',
221
        ('share/apport/package-hooks/',
3176
259
         ['data/source_ubuntuone-control-panel.py']),
222
         ['data/source_ubuntuone-control-panel.py']),
3177
260
223
3178
=== modified file 'ubuntuone/controlpanel/backend.py'
3179
--- ubuntuone/controlpanel/backend.py	2012-02-06 15:23:27 +0000
3180
+++ ubuntuone/controlpanel/backend.py	2012-03-06 15:41:39 +0000
3181
@@ -343,10 +343,23 @@
3182
343
343
3183
344
    @log_call(logger.debug, with_args=False)
344
    @log_call(logger.debug, with_args=False)
3184
345
    @inlineCallbacks
345
    @inlineCallbacks
3189
346
    def login(self, email, password):
346
    def login(self, email=None, password=None):
3190
347
        """Login using 'email' and 'password'."""
347
        """Login using 'email' and 'password' if not None, else prompt user."""
3191
348
        result = yield self.login_client.login_email_password(
348
        result = None
3192
349
                    email=email, password=password)
349
        if email is not None and password is not None:
3193
350
            result = yield self.login_client.login_email_password(
3194
351
                        email=email, password=password)
3195
352
        else:
3196
353
            result = yield self.login_client.login()
3197
354
        # cache credentils
3198
355
        self._credentials = result
3199
356
        returnValue(result)
3200
357
3201
358
    @log_call(logger.debug)
3202
359
    @inlineCallbacks
3203
360
    def register(self):
3204
361
        """Register a new user."""
3205
362
        result = yield self.login_client.register()
3206
350
        # cache credentils
363
        # cache credentils
3207
351
        self._credentials = result
364
        self._credentials = result
3208
352
        returnValue(result)
365
        returnValue(result)
3209
353
366
3210
=== removed file 'ubuntuone/controlpanel/dbustests/test_gui_service.py'
3211
--- ubuntuone/controlpanel/dbustests/test_gui_service.py	2011-11-21 13:37:07 +0000
3212
+++ ubuntuone/controlpanel/dbustests/test_gui_service.py	1970-01-01 00:00:00 +0000
3213
@@ -1,104 +0,0 @@
3214
1
# -*- coding: utf-8 -*-
3215
2
3216
3
# Authors: Alejandro J. Cura <alecu@canonical.com>
3217
4
#          Natalia B. Bidart <nataliabidart@canonical.com>
3218
5
#          Eric Casteleijn <eric.casteleijn@canonical.com>
3219
6
#
3220
7
# Copyright 2011 Canonical Ltd.
3221
8
#
3222
9
# This program is free software: you can redistribute it and/or modify it
3223
10
# under the terms of the GNU General Public License version 3, as published
3224
11
# by the Free Software Foundation.
3225
12
#
3226
13
# This program is distributed in the hope that it will be useful, but
3227
14
# WITHOUT ANY WARRANTY; without even the implied warranties of
3228
15
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3229
16
# PURPOSE.  See the GNU General Public License for more details.
3230
17
#
3231
18
# You should have received a copy of the GNU General Public License along
3232
19
# with this program.  If not, see <http://www.gnu.org/licenses/>.
3233
20
3234
21
"""Tests for the control panel backend DBus service."""
3235
22
3236
23
import dbus
3237
24
import mocker
3238
25
3239
26
from dbus.mainloop.glib import DBusGMainLoop
3240
27
from twisted.internet import defer
3241
28
3242
29
from ubuntuone.controlpanel.gui.gtk import gui
3243
30
from ubuntuone.devtools.testcases.dbus import DBusTestCase
3244
31
from twisted.trial.unittest import TestCase
3245
32
3246
33
3247
34
class MockWindow(object):
3248
35
    """A mock backend."""
3249
36
3250
37
    exception = None
3251
38
3252
39
    def __init__(self, switch_to=None, alert=False):
3253
40
        self.called = []
3254
41
3255
42
    def draw_attention(self):
3256
43
        """Draw attention to the control panel."""
3257
44
        self.called.append('draw_attention')
3258
45
3259
46
    def switch_to(self, panel):
3260
47
        """Switch to named panel."""
3261
48
        self.called.append(('switch_to', panel))
3262
49
3263
50
3264
51
class DBusServiceMockTestCase(TestCase):
3265
52
    """Tests for the main function."""
3266
53
3267
54
    @defer.inlineCallbacks
3268
55
    def setUp(self):
3269
56
        yield super(DBusServiceMockTestCase, self).setUp()
3270
57
        self.mocker = mocker.Mocker()
3271
58
3272
59
    @defer.inlineCallbacks
3273
60
    def tearDown(self):
3274
61
        yield super(DBusServiceMockTestCase, self).tearDown()
3275
62
        self.mocker.restore()
3276
63
        self.mocker.verify()
3277
64
3278
65
    def test_dbus_service_main(self):
3279
66
        """The main method starts the loop and hooks up to DBus."""
3280
67
        self.patch(gui, 'ControlPanelWindow', MockWindow)
3281
68
        dbus_gmain_loop = self.mocker.replace(
3282
69
            "dbus.mainloop.glib.DBusGMainLoop")
3283
70
        register_service = self.mocker.replace(
3284
71
            "ubuntuone.controlpanel.gui.gtk.gui.register_service")
3285
72
        publish_service = self.mocker.replace(
3286
73
            "ubuntuone.controlpanel.gui.gtk.gui.publish_service")
3287
74
        main = self.mocker.replace("gtk.main")
3288
75
        dbus_gmain_loop(set_as_default=True)
3289
76
        loop = self.mocker.mock()
3290
77
        self.mocker.result(loop)
3291
78
        register_service(mocker.ANY)
3292
79
        self.mocker.result(True)
3293
80
        publish_service(switch_to='', alert=False)
3294
81
        main()
3295
82
        self.mocker.replay()
3296
83
        gui.main()
3297
84
3298
85
3299
86
class DBusServiceTestCase(DBusTestCase):
3300
87
    """Test for the DBus service."""
3301
88
3302
89
    def _set_called(self, *args, **kwargs):
3303
90
        """Keep track of function calls, useful for monkeypatching."""
3304
91
        self._called = (args, kwargs)
3305
92
3306
93
    @defer.inlineCallbacks
3307
94
    def setUp(self):
3308
95
        """Initialize each test run."""
3309
96
        yield super(DBusServiceTestCase, self).setUp()
3310
97
        DBusGMainLoop(set_as_default=True)
3311
98
        self._called = False
3312
99
3313
100
    def test_register_service(self):
3314
101
        """The DBus service is successfully registered."""
3315
102
        bus = dbus.SessionBus()
3316
103
        ret = gui.register_service(bus)
3317
104
        self.assertTrue(ret)
3318
105
0
3319
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
3320
--- ubuntuone/controlpanel/gui/__init__.py	2012-02-17 16:03:00 +0000
3321
+++ ubuntuone/controlpanel/gui/__init__.py	2012-03-06 15:41:39 +0000
3322
@@ -1,5 +1,5 @@
3323
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
3325
2
2
#
3326
3
# Copyright 2011-2012 Canonical Ltd.
3
# Copyright 2011-2012 Canonical Ltd.
3327
4
#
4
#
3328
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
3329
@@ -18,10 +18,11 @@
3330
18
18
3331
19
import gettext
19
import gettext
3332
20
20
3333
21
from ubuntuone.controlpanel import TRANSLATION_DOMAIN
3334
21
from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
22
from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
3335
22
23
3336
23
24
3338
24
_ = gettext.gettext
25
gettext.install(TRANSLATION_DOMAIN, unicode=True)
3339
25
26
3340
26
27
3341
27
ERROR_COLOR = u'red'
28
ERROR_COLOR = u'red'
3342
@@ -72,13 +73,17 @@
3343
72
RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + u'+forgot_password'
73
RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + u'+forgot_password'
3344
73
TWITTER_LINK = u'http://twitter.com/ubuntuone/'
74
TWITTER_LINK = u'http://twitter.com/ubuntuone/'
3345
74
75
3346
76
# Undefined variable '_', pylint: disable=E0602
3347
77
# Translatable strings
3348
78
3349
79
ACCOUNT_LABEL = _('Your services')
3350
75
ALWAYS_SUBSCRIBED = _('Always in sync')
80
ALWAYS_SUBSCRIBED = _('Always in sync')
3351
76
CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
81
CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
3352
77
CONTACTS = _('Thunderbird plug-in')
82
CONTACTS = _('Thunderbird plug-in')
3353
78
CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
83
CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
3354
79
DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
84
DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
3355
80
                             'summary')
85
                             'summary')
3357
81
DASHBOARD_TITLE = _('Welcome to Ubuntu One!')
86
DASHBOARD_TITLE = WELCOME_LABEL = _('Welcome to Ubuntu One!')
3358
82
DASHBOARD_VALUE_ERROR = _('The information could not be retrieved. '
87
DASHBOARD_VALUE_ERROR = _('The information could not be retrieved. '
3359
83
                          'Maybe your internet connection is down?')
88
                          'Maybe your internet connection is down?')
3360
84
DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone'
89
DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone'
3361
@@ -90,9 +95,13 @@
3362
90
DEVICE_REMOVAL_ERROR = _('The device could not be removed.')
95
DEVICE_REMOVAL_ERROR = _('The device could not be removed.')
3363
91
DEVICES_BUTTON_TOOLTIP = _('Manage devices registered with your personal '
96
DEVICES_BUTTON_TOOLTIP = _('Manage devices registered with your personal '
3364
92
                           'cloud')
97
                           'cloud')
3365
98
DEVICES_LOCAL_LABEL = _('This device')
3366
99
DEVICES_MANAGE_LABEL = _('Go to the web page to manage your other devices')
3367
100
DEVICES_REMOTE_LABEL = _('Other devices')
3368
93
DEVICES_TITLE = _('The devices connected with your personal cloud are listed '
101
DEVICES_TITLE = _('The devices connected with your personal cloud are listed '
3369
94
                  'below.')
102
                  'below.')
3371
95
EXPLORE = _('Explore')
103
EDIT_ACCOUNT_LABEL = _('Edit your services  online')
3372
104
EDIT_PROFILE_LABEL = _('Edit personal details online')
3373
96
FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed')
105
FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed')
3374
97
FOLDER_ADD_BUTTON_TEXT = _('Sync another folder with your cloud')
106
FOLDER_ADD_BUTTON_TEXT = _('Sync another folder with your cloud')
3375
98
FOLDER_INVALID_PATH = _('The chosen directory "%(folder_path)s" is not valid. '
107
FOLDER_INVALID_PATH = _('The chosen directory "%(folder_path)s" is not valid. '
3376
@@ -102,12 +111,18 @@
3377
102
                        'cloud folder.')
111
                        'cloud folder.')
3378
103
FOLDER_OWNED_BY = _('My personal folders')
112
FOLDER_OWNED_BY = _('My personal folders')
3379
104
FOLDER_SHARED_BY = _('Shared by %(other_user_display_name)s')
113
FOLDER_SHARED_BY = _('Shared by %(other_user_display_name)s')
3380
114
FOLDERS_BUTTON_ADD_FOLDER = _('Add a folder from this computer')
3381
115
FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '
3382
116
                                                     'folders')
3383
117
FOLDERS_COLUMN_EXPLORE = _('Explore')
3384
118
FOLDERS_COLUMN_NAME = _('Name')
3385
119
FOLDERS_COLUMN_SYNC_LOCALLY = _('Sync Locally?')
3386
105
FOLDERS_CONFIRM_MERGE = _('The contents of your cloud folder will be merged '
120
FOLDERS_CONFIRM_MERGE = _('The contents of your cloud folder will be merged '
3387
106
                          'with your local folder "%(folder_path)s" when '
121
                          'with your local folder "%(folder_path)s" when '
3388
107
                          'subscribing.\nDo you want to subscribe to this '
122
                          'subscribing.\nDo you want to subscribe to this '
3389
108
                          'cloud folder?')
123
                          'cloud folder?')
3392
109
FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '
124
FOLDERS_MANAGE_LABEL = _('Go to the web for public and private sharing '
3393
110
                                                     'folders')
125
    'options')
3394
111
FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '
126
FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '
3395
112
  'this computer')
127
  'this computer')
3396
113
FILE_SYNC_CONNECT = _('Connect')
128
FILE_SYNC_CONNECT = _('Connect')
3397
@@ -136,18 +151,26 @@
3398
136
GENERAL_ERROR_TITLE = _('Ubuntu One experienced an error')
151
GENERAL_ERROR_TITLE = _('Ubuntu One experienced an error')
3399
137
GENERAL_ERROR_MSG = _('Sorry, an error has occurred and Ubuntu One '
152
GENERAL_ERROR_MSG = _('Sorry, an error has occurred and Ubuntu One '
3400
138
                      'needs to close.')
153
                      'needs to close.')
3401
154
GET_HELP_ONLINE = _('Get help online')
3402
155
GET_MORE_STORAGE = _('Get more storage')
3403
139
GREETING = _('Hi %(user_display_name)s')
156
GREETING = _('Hi %(user_display_name)s')
3404
157
INSTALL = _('Install')
3405
140
INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
158
INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
3406
141
                    '</i> in order to enable more sync services.')
159
                    '</i> in order to enable more sync services.')
3407
142
INSTALL_PLUGIN = _('Install the %(plugin_name)s for the sync service: '
160
INSTALL_PLUGIN = _('Install the %(plugin_name)s for the sync service: '
3408
143
                   '%(service_name)s')
161
                   '%(service_name)s')
3409
144
INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
162
INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
3410
145
LOADING = _('Loading...')
163
LOADING = _('Loading...')
3411
164
LOADING_OVERLAY = _('Getting information, please wait...')
3412
165
MAIN_ACCOUNT_TAB = _('Account information')
3413
166
MAIN_DEVICES_TAB = _('Devices')
3414
167
MAIN_FOLDERS_TAB = _('Folders')
3415
168
MAIN_PREFERENCES_TAB = _('Settings')
3416
146
MAIN_WINDOW_TITLE = _('%(app_name)s Control Panel')
169
MAIN_WINDOW_TITLE = _('%(app_name)s Control Panel')
3417
170
MUSIC_DISPLAY_NAME = _('Purchased Music')
3418
171
MUSIC_REAL_PATH = '.ubuntuone/Purchased from Ubuntu One'
3419
147
MY_FOLDERS = _('My folders')
172
MY_FOLDERS = _('My folders')
3420
148
NAME_NOT_SET = _('[unknown user name]')
173
NAME_NOT_SET = _('[unknown user name]')
3421
149
MUSIC_DISPLAY_NAME = _('Purchased Music')
3422
150
MUSIC_REAL_PATH = '.ubuntuone/Purchased from Ubuntu One'
3423
151
NETWORK_OFFLINE = _('An internet connection is required to join or sign '
174
NETWORK_OFFLINE = _('An internet connection is required to join or sign '
3424
152
                    'in to %(app_name)s.')
175
                    'in to %(app_name)s.')
3425
153
NO_DEVICES = _('No devices to show.')
176
NO_DEVICES = _('No devices to show.')
3426
@@ -155,18 +178,42 @@
3427
155
NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
178
NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
3428
156
PERCENTAGE_LABEL = _('%(percentage)s used')
179
PERCENTAGE_LABEL = _('%(percentage)s used')
3429
157
PLEASE_WAIT = _('Please wait')
180
PLEASE_WAIT = _('Please wait')
3430
181
PROFILE_LABEL = _('Personal details')
3431
158
QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
182
QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
3433
159
USAGE_LABEL = _('%(used)s of %(total)s')
183
REMOVE_BUTTON = _('Remove')
3434
184
RESTORE_LABEL = _('Restore')
3435
185
SELECT_FOLDERS = _('Select sync folders')
3436
160
SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
186
SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
3437
161
SERVICES_TITLE = _('Enable the sync services for this computer.')
187
SERVICES_TITLE = _('Enable the sync services for this computer.')
3438
188
SETTINGS_ALLOW_NOTIFICATIONS = _('Allow all notifications to this device')
3439
189
SETTINGS_AUTO_CONNECT = _('Connect automatically when computer starts')
3440
190
SETTINGS_BANDWIDTH = _('Bandwidth Settings')
3441
191
SETTINGS_BANDWIDTH_ZERO_WARNING = _('Please note that your files will not '
3442
192
    'sync if you set bandwidth to 0')
3443
193
SETTINGS_BUTTON_APPLY = _('Apply these settings')
3444
194
SETTINGS_BUTTON_DEFAULT = _('Default settings')
3445
162
SETTINGS_CHANGE_ERROR = _('The settings could not be changed,\n'
195
SETTINGS_CHANGE_ERROR = _('The settings could not be changed,\n'
3446
163
                          'previous values were restored.')
196
                          'previous values were restored.')
3447
197
SETTINGS_FILE_SYNC = _('File Sync Settings')
3448
198
SETTINGS_KILOBITS_PER_SECOND = _('Kilobits per second')
3449
199
SETTINGS_LIMIT_DOWNLOAD = _('Limit download speed to')
3450
200
SETTINGS_LIMIT_UPLOAD = _('Limit upload speed to')
3451
201
SETTINGS_SYNC_ALL_FOLDERS = _('Automatically sync all new cloud folders '
3452
202
    'to this computer')
3453
203
SETTINGS_SYNC_ALL_SHARES = _('Automatically sync all folders shared with me '
3454
204
    'to this computer')
3455
164
SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
205
SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
3456
165
SHARES_TITLE = _('Manage permissions for shares made to other users.')
206
SHARES_TITLE = _('Manage permissions for shares made to other users.')
3457
207
SIGN_IN = _('Sign in')
3458
166
SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
208
SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
3460
167
SYNC_LOCALLY = _('Sync locally?')
209
SYNC_STREAM_SHARE = _('Sync, stream, share')
3461
210
TALK_TO_US = _('Talk to us')
3462
168
VALUE_ERROR = _('Value could not be retrieved.')
211
VALUE_ERROR = _('Value could not be retrieved.')
3463
169
UNKNOWN_ERROR = _('Unknown error')
212
UNKNOWN_ERROR = _('Unknown error')
3464
213
USAGE_LABEL = _('%(used)s of %(total)s')
3465
214
QUIT_LABEL = _('Quit Ubuntu One')
3466
215
3467
216
# pylint: enable=E0602
3468
170
217
3469
171
218
3470
172
def humanize(int_bytes):
219
def humanize(int_bytes):
3471
173
220
3472
=== removed directory 'ubuntuone/controlpanel/gui/gtk'
3473
=== removed file 'ubuntuone/controlpanel/gui/gtk/__init__.py'
3474
--- ubuntuone/controlpanel/gui/gtk/__init__.py	2011-05-24 14:20:18 +0000
3475
+++ ubuntuone/controlpanel/gui/gtk/__init__.py	1970-01-01 00:00:00 +0000
3476
@@ -1,28 +0,0 @@
3477
1
# -*- coding: utf-8 -*-
3478
2
3479
3
# Authors: Natalia B Bidart <natalia.bidart@canonical.com>
3480
4
#
3481
5
# Copyright 2010 Canonical Ltd.
3482
6
#
3483
7
# This program is free software: you can redistribute it and/or modify it
3484
8
# under the terms of the GNU General Public License version 3, as published
3485
9
# by the Free Software Foundation.
3486
10
#
3487
11
# This program is distributed in the hope that it will be useful, but
3488
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
3489
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3490
14
# PURPOSE.  See the GNU General Public License for more details.
3491
15
#
3492
16
# You should have received a copy of the GNU General Public License along
3493
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
3494
18
3495
19
"""The GTK graphical interface for the control panel for Ubuntu One."""
3496
20
3497
21
DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
3498
22
DBUS_PATH = '/gui'
3499
23
DBUS_IFACE_GUI = 'com.ubuntuone.controlpanel.gui'
3500
24
3501
25
# Unused import main
3502
26
# pylint: disable=W0611
3503
27
3504
28
from ubuntuone.controlpanel.gui.gtk.gui import main
3505
29
0
3506
=== removed file 'ubuntuone/controlpanel/gui/gtk/gui.py'
3507
--- ubuntuone/controlpanel/gui/gtk/gui.py	2012-02-06 21:02:54 +0000
3508
+++ ubuntuone/controlpanel/gui/gtk/gui.py	1970-01-01 00:00:00 +0000
3509
@@ -1,1667 +0,0 @@
3510
1
# -*- coding: utf-8 -*-
3511
2
3512
3
# Authors: Natalia B Bidart <natalia.bidart@canonical.com>
3513
4
#          Eric Casteleijn <eric.casteleijn@canonical.com>
3514
5
#
3515
6
# Copyright 2010 Canonical Ltd.
3516
7
#
3517
8
# This program is free software: you can redistribute it and/or modify it
3518
9
# under the terms of the GNU General Public License version 3, as published
3519
10
# by the Free Software Foundation.
3520
11
#
3521
12
# This program is distributed in the hope that it will be useful, but
3522
13
# WITHOUT ANY WARRANTY; without even the implied warranties of
3523
14
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3524
15
# PURPOSE.  See the GNU General Public License for more details.
3525
16
#
3526
17
# You should have received a copy of the GNU General Public License along
3527
18
# with this program.  If not, see <http://www.gnu.org/licenses/>.
3528
19
3529
20
"""The user interface for the control panel for Ubuntu One."""
3530
21
3531
22
from __future__ import division
3532
23
3533
24
import os
3534
25
3535
26
from functools import wraps
3536
27
3537
28
import dbus
3538
29
import gtk
3539
30
import gobject
3540
31
3541
32
from dbus.mainloop.glib import DBusGMainLoop
3542
33
from ubuntu_sso import networkstate
3543
34
# pylint: disable=E0611,F0401
3544
35
from ubuntuone.platform.credentials import (
3545
36
    APP_NAME as U1_APP_NAME,
3546
37
    CredentialsManagementTool,
3547
38
)
3548
39
# pylint: enable=E0611,F0401
3549
40
3550
41
# Wildcard import ubuntuone.controlpanel.gui
3551
42
# pylint: disable=W0401, W0614
3552
43
from ubuntuone.controlpanel.gui import *
3553
44
# pylint: enable=W0401, W0614
3554
45
from ubuntuone.controlpanel.gui.gtk import (
3555
46
    DBUS_IFACE_GUI, DBUS_BUS_NAME as DBUS_BUS_NAME_GUI,
3556
47
    DBUS_PATH as DBUS_PATH_GUI, package_manager)
3557
48
from ubuntuone.controlpanel.gui.gtk.widgets import LabelLoading, PanelTitle
3558
49
# Use ubiquity package when ready (LP: #673665)
3559
50
from ubuntuone.controlpanel.gui.gtk.widgets import GreyableBin
3560
51
3561
52
from ubuntuone.controlpanel import (DBUS_BUS_NAME, DBUS_PREFERENCES_PATH,
3562
53
    DBUS_PREFERENCES_IFACE, TRANSLATION_DOMAIN, backend)
3563
54
from ubuntuone.controlpanel.backend import (DEVICE_TYPE_PHONE,
3564
55
    DEVICE_TYPE_COMPUTER)
3565
56
from ubuntuone.controlpanel.dbus_service import bool_str
3566
57
from ubuntuone.controlpanel.logger import setup_logging, log_call
3567
58
from ubuntuone.controlpanel.utils import (get_data_file,
3568
59
    ERROR_TYPE, ERROR_MESSAGE)
3569
60
3570
61
3571
62
try:
3572
63
    from gi.repository import Unity     # pylint: disable=E0611
3573
64
    USE_LIBUNITY = True
3574
65
    U1_DOTDESKTOP = "ubuntuone-installer.desktop"
3575
66
except ImportError:
3576
67
    USE_LIBUNITY = False
3577
68
3578
69
logger = setup_logging('gtk.gui')
3579
70
3580
71
3581
72
WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ERROR_COLOR
3582
73
3583
74
CP_WMCLASS_NAME = 'ubuntuone-control-panel-gtk'
3584
75
CP_WMCLASS_CLASS = 'ubuntuone-installer'
3585
76
3586
77
3587
78
def error_handler(*args, **kwargs):
3588
79
    """Log errors when calling D-Bus methods in a async way."""
3589
80
    logger.error('Error handler received: %r, %r', args, kwargs)
3590
81
3591
82
3592
83
def register_service(bus):
3593
84
    """Try to register DBus service for making sure we run only one instance.
3594
85
3595
86
    Return True if succesfully registered, False if already running.
3596
87
    """
3597
88
    name = bus.request_name(DBUS_BUS_NAME_GUI,
3598
89
                                    dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
3599
90
    return name != dbus.bus.REQUEST_NAME_REPLY_EXISTS
3600
91
3601
92
3602
93
def publish_service(window=None, switch_to='', alert=False):
3603
94
    """Publish the service on DBus."""
3604
95
    if window is None:
3605
96
        window = ControlPanelWindow(switch_to=switch_to, alert=alert)
3606
97
    return ControlPanelService(window)
3607
98
3608
99
3609
100
def main(switch_to='', alert=False):
3610
101
    """Hook the DBus listeners and start the main loop."""
3611
102
    DBusGMainLoop(set_as_default=True)
3612
103
    bus = dbus.SessionBus()
3613
104
    if register_service(bus):
3614
105
        publish_service(switch_to=switch_to, alert=alert)
3615
106
    else:
3616
107
        obj = bus.get_object(DBUS_BUS_NAME_GUI, DBUS_PATH_GUI)
3617
108
        service = dbus.Interface(obj, dbus_interface=DBUS_IFACE_GUI)
3618
109
3619
110
        def gui_error_handler(*args, **kwargs):
3620
111
            """Log errors when calling D-Bus methods in a async way."""
3621
112
            logger.error('Error handler received: %r, %r', args, kwargs)
3622
113
            gtk.main_quit()
3623
114
3624
115
        def gui_reply_handler(*args, **kwargs):
3625
116
            """Exit when done."""
3626
117
            gtk.main_quit()
3627
118
3628
119
        service.switch_to_alert(
3629
120
            switch_to, alert, reply_handler=gui_reply_handler,
3630
121
            error_handler=gui_error_handler)
3631
122
3632
123
    gtk.main()
3633
124
3634
125
3635
126
def on_size_allocate(widget, allocation, label):
3636
127
    """Resize labels according to who 'widget' is being resized."""
3637
128
    label.set_size_request(allocation.width - 2, -1)
3638
129
3639
130
3640
131
@log_call(logger.debug)
3641
132
def uri_hook(button, uri, *args, **kwargs):
3642
133
    """Open an URI or do nothing if URI is not an URL."""
3643
134
    if uri.startswith('http') or uri.startswith(FILE_URI_PREFIX):
3644
135
        gtk.show_uri(None, uri, gtk.gdk.CURRENT_TIME)
3645
136
3646
137
3647
138
class ControlPanelMixin(object):
3648
139
    """A basic mixin class to provide common functionality to widgets."""
3649
140
3650
141
    def __init__(self, filename=None, backend_instance=None):
3651
142
        if backend_instance is not None:
3652
143
            self.backend = backend_instance
3653
144
        else:
3654
145
            bus = dbus.SessionBus()
3655
146
            try:
3656
147
                obj = bus.get_object(DBUS_BUS_NAME,
3657
148
                                     DBUS_PREFERENCES_PATH,
3658
149
                                     follow_name_owner_changes=True)
3659
150
                iface = DBUS_PREFERENCES_IFACE
3660
151
                self.backend = dbus.Interface(obj, dbus_interface=iface)
3661
152
            except dbus.exceptions.DBusException:
3662
153
                logger.exception('Can not connect to DBus at %r',
3663
154
                                 (DBUS_BUS_NAME, DBUS_PREFERENCES_PATH))
3664
155
                raise
3665
156
3666
157
        if filename is not None:
3667
158
            builder = gtk.Builder()
3668
159
            builder.set_translation_domain(TRANSLATION_DOMAIN)
3669
160
            builder.add_from_file(get_data_file(os.path.join('gtk', filename)))
3670
161
            builder.connect_signals(self)
3671
162
3672
163
            # untested directly
3673
164
            for obj in builder.get_objects():
3674
165
                name = getattr(obj, 'name', None)
3675
166
                if name is None and isinstance(obj, gtk.Buildable):
3676
167
                    # work around bug lp:507739
3677
168
                    name = gtk.Buildable.get_name(obj)
3678
169
                if name is None:
3679
170
                    logger.warning("%s has no name (??)", obj)
3680
171
                else:
3681
172
                    setattr(self, name, obj)
3682
173
3683
174
        logger.debug('%s: started.', self.__class__.__name__)
3684
175
3685
176
    def _set_warning(self, message, label):
3686
177
        """Set 'message' as warning in 'label'."""
3687
178
        label.set_markup(WARNING_MARKUP % message)
3688
179
        label.show()
3689
180
3690
181
    def destroy(self):
3691
182
        """Cleanup."""
3692
183
3693
184
3694
185
class UbuntuOneBin(gtk.VBox):
3695
186
    """A Ubuntu One bin."""
3696
187
3697
188
    TITLE = ''
3698
189
3699
190
    def __init__(self, title=None):
3700
191
        gtk.VBox.__init__(self)
3701
192
        self._is_processing = False
3702
193
3703
194
        if title is None:
3704
195
            title = self.TITLE
3705
196
3706
197
        title = '<span font_size="large">%s</span>' % title
3707
198
        self.title = PanelTitle(markup=title)
3708
199
        self.pack_start(self.title, expand=False)
3709
200
3710
201
        self.message = LabelLoading(LOADING)
3711
202
        self.pack_start(self.message, expand=False)
3712
203
3713
204
        self.connect('size-allocate', on_size_allocate, self.title)
3714
205
        self.show_all()
3715
206
3716
207
    def _get_is_processing(self):
3717
208
        """Is this panel processing a request?"""
3718
209
        return self._is_processing
3719
210
3720
211
    def _set_is_processing(self, new_value):
3721
212
        """Set if this panel is processing a request."""
3722
213
        if new_value:
3723
214
            self.message.start()
3724
215
            self.set_sensitive(False)
3725
216
        else:
3726
217
            self.message.stop()
3727
218
            self.set_sensitive(True)
3728
219
3729
220
        self._is_processing = new_value
3730
221
3731
222
    is_processing = property(fget=_get_is_processing, fset=_set_is_processing)
3732
223
3733
224
    @log_call(logger.debug)
3734
225
    def on_success(self, message=''):
3735
226
        """Use this callback to stop the Loading and show 'message'."""
3736
227
        self.message.stop()
3737
228
        self.message.set_markup(message)
3738
229
3739
230
    @log_call(logger.error)
3740
231
    def on_error(self, message=None, error_dict=None):
3741
232
        """Use this callback to stop the Loading and set a warning message."""
3742
233
        if message is None and error_dict is None:
3743
234
            message = VALUE_ERROR
3744
235
        elif message is None and error_dict is not None:
3745
236
            error_type = error_dict.get(ERROR_TYPE, UNKNOWN_ERROR)
3746
237
            error_msg = error_dict.get(ERROR_MESSAGE)
3747
238
            if error_msg:
3748
239
                message = "%s (%s: %s)" % (VALUE_ERROR, error_type, error_msg)
3749
240
            else:
3750
241
                message = "%s (%s)" % (VALUE_ERROR, error_type)
3751
242
3752
243
        assert message is not None
3753
244
3754
245
        self.message.stop()
3755
246
        self.message.set_markup(WARNING_MARKUP % message)
3756
247
3757
248
3758
249
class OverviewPanel(GreyableBin, ControlPanelMixin):
3759
250
    """The overview panel. Introduces Ubuntu One to the not logged user."""
3760
251
3761
252
    __gsignals__ = {
3762
253
        'credentials-found': (gobject.SIGNAL_RUN_FIRST,  gobject.TYPE_NONE,
3763
254
                              (gobject.TYPE_BOOLEAN,)),
3764
255
    }
3765
256
3766
257
    def __init__(self, main_window):
3767
258
        GreyableBin.__init__(self)
3768
259
        creds_backend = CredentialsManagementTool()
3769
260
        ControlPanelMixin.__init__(self, filename='overview.ui',
3770
261
                                   backend_instance=creds_backend)
3771
262
        self.add(self.itself)
3772
263
        self.banner.set_from_file(get_data_file(OVERVIEW_BANNER))
3773
264
        self.files_icon.set_from_file(get_data_file(FILES_ICON))
3774
265
        self.music_stream_icon.set_from_file(get_data_file(MUSIC_STREAM_ICON))
3775
266
        self.contacts_icon.set_from_file(get_data_file(CONTACTS_ICON))
3776
267
        self.notes_icon.set_from_file(get_data_file(NOTES_ICON))
3777
268
3778
269
        self.warning_label.set_text('')
3779
270
        self.warning_label.set_property('xalign', 0.5)
3780
271
3781
272
        self.connect_button.set_uri(CONNECT_BUTTON_LABEL)
3782
273
3783
274
        self.main_window = main_window
3784
275
        self._credentials_are_new = False
3785
276
        self.show()
3786
277
3787
278
        kw = dict(result_cb=self.on_network_state_changed)
3788
279
        self.network_manager_state = networkstate.NetworkManagerState(**kw)
3789
280
        self.network_manager_state.find_online_state()
3790
281
3791
282
    def _set_warning(self, message, label=None):
3792
283
        """Set 'message' as global warning."""
3793
284
        ControlPanelMixin._set_warning(self, message,
3794
285
                                       label=self.warning_label)
3795
286
3796
287
    def _window_xid(self):
3797
288
        """Return settings for credentials backend."""
3798
289
        if self.main_window.window is not None:
3799
290
            settings = {'window_id': str(self.main_window.window.xid)}
3800
291
        else:
3801
292
            settings = {}
3802
293
        return settings
3803
294
3804
295
    def set_property(self, prop_name, new_value):
3805
296
        """Override 'set_property' to disable buttons if prop is 'greyed'."""
3806
297
        if prop_name == 'greyed':
3807
298
            self.set_sensitive(not new_value)
3808
299
        GreyableBin.set_property(self, prop_name, new_value)
3809
300
3810
301
    def set_sensitive(self, value):
3811
302
        """Set the sensitiveness as per 'value'."""
3812
303
        self.join_now_button.set_sensitive(value)
3813
304
        self.connect_button.set_sensitive(value)
3814
305
3815
306
    def get_sensitive(self):
3816
307
        """Return the sensitiveness."""
3817
308
        result = self.join_now_button.get_sensitive() and \
3818
309
                 self.connect_button.get_sensitive()
3819
310
        return result
3820
311
3821
312
    def on_join_now_button_clicked(self, *a, **kw):
3822
313
        """User wants to join now."""
3823
314
        d = self.backend.register(**self._window_xid())
3824
315
        d.addCallback(self.on_credentials_result)
3825
316
        d.addErrback(self.on_credentials_error)
3826
317
        self.set_property('greyed', True)
3827
318
        self.warning_label.set_text('')
3828
319
3829
320
    def on_connect_button_clicked(self, *a, **kw):
3830
321
        """User wants to connect now."""
3831
322
        d = self.backend.login(**self._window_xid())
3832
323
        d.addCallback(self.on_credentials_result)
3833
324
        d.addErrback(self.on_credentials_error)
3834
325
        self.set_property('greyed', True)
3835
326
        self.warning_label.set_text('')
3836
327
3837
328
    def on_learn_more_button_clicked(self, *a, **kw):
3838
329
        """User wants to learn more."""
3839
330
        uri_hook(self.learn_more_button, LEARN_MORE_LINK)
3840
331
3841
332
    def on_credentials_result(self, result):
3842
333
        """Process the credentials response.
3843
334
3844
335
        If 'result' is a non empty dict, they were found.
3845
336
        If 'result' is an empty dict, they were not found.
3846
337
        If 'result' is None, the user cancelled the process.
3847
338
3848
339
        """
3849
340
        if result is None:
3850
341
            self.on_authorization_denied()
3851
342
        elif result == {}:
3852
343
            self.on_credentials_not_found()
3853
344
        else:
3854
345
            self.on_credentials_found(result)
3855
346
3856
347
    @log_call(logger.info, with_args=False)
3857
348
    def on_credentials_found(self, credentials):
3858
349
        """Credentials backend notifies of credentials found."""
3859
350
        self.set_property('greyed', False)
3860
351
        self.emit('credentials-found', self._credentials_are_new)
3861
352
3862
353
    @log_call(logger.info)
3863
354
    def on_credentials_not_found(self):
3864
355
        """Creds backend notifies of credentials not found."""
3865
356
        self._credentials_are_new = True
3866
357
        self.set_property('greyed', False)
3867
358
3868
359
    @log_call(logger.error)
3869
360
    def on_credentials_error(self, error_dict):
3870
361
        """Creds backend notifies of an error when fetching credentials."""
3871
362
        self.set_property('greyed', False)
3872
363
        self._set_warning(CREDENTIALS_ERROR)
3873
364
3874
365
    @log_call(logger.info)
3875
366
    def on_authorization_denied(self):
3876
367
        """Creds backend notifies that user refused auth for 'app_name'."""
3877
368
        self.set_property('greyed', False)
3878
369
3879
370
    @log_call(logger.info)
3880
371
    def on_network_state_changed(self, state):
3881
372
        """Network state is reported."""
3882
373
        msg = ''
3883
374
        if state is networkstate.OFFLINE:
3884
375
            msg = NETWORK_OFFLINE % {'app_name': U1_APP_NAME}
3885
376
            self.set_sensitive(False)
3886
377
            self._set_warning(msg)
3887
378
        else:
3888
379
            self.set_sensitive(True)
3889
380
            self.warning_label.set_text(msg)
3890
381
            d = self.backend.find_credentials()
3891
382
            d.addCallback(self.on_credentials_result)
3892
383
            d.addErrback(self.on_credentials_error)
3893
384
3894
385
3895
386
class DashboardPanel(UbuntuOneBin, ControlPanelMixin):
3896
387
    """The dashboard panel. The user can manage the subscription."""
3897
388
3898
389
    TITLE = DASHBOARD_TITLE
3899
390
    VALUE_ERROR = DASHBOARD_VALUE_ERROR
3900
391
3901
392
    def __init__(self, main_window=None):
3902
393
        UbuntuOneBin.__init__(self)
3903
394
        ControlPanelMixin.__init__(self, filename='dashboard.ui')
3904
395
        self.add(self.itself)
3905
396
        self.show()
3906
397
3907
398
        self.is_processing = True
3908
399
3909
400
        self.backend.connect_to_signal('AccountInfoReady',
3910
401
                                       self.on_account_info_ready)
3911
402
        self.backend.connect_to_signal('AccountInfoError',
3912
403
                                       self.on_account_info_error)
3913
404
        self.account.hide()
3914
405
3915
406
    @log_call(logger.debug)
3916
407
    def on_account_info_ready(self, info):
3917
408
        """Backend notifies of account info."""
3918
409
        self.on_success()
3919
410
3920
411
        for i in (u'name', u'type', u'email'):
3921
412
            label = getattr(self, '%s_label' % i)
3922
413
            label.set_markup('%s' % (info[i]))
3923
414
        self.account.show()
3924
415
3925
416
        self.is_processing = False
3926
417
3927
418
    @log_call(logger.error)
3928
419
    def on_account_info_error(self, error_dict=None):
3929
420
        """Backend notifies of an error when fetching account info."""
3930
421
        self.on_error(message=self.VALUE_ERROR)
3931
422
        self.is_processing = False
3932
423
3933
424
3934
425
class VolumesPanel(UbuntuOneBin, ControlPanelMixin):
3935
426
    """The volumes panel."""
3936
427
3937
428
    TITLE = FOLDERS_TITLE
3938
429
    MAX_COLS = 8
3939
430
    FREE_SPACE = '<span foreground="grey">%s</span>' % FREE_SPACE_TEXT
3940
431
    NO_FREE_SPACE = '<span foreground="red"><b>%s</b></span>' % FREE_SPACE_TEXT
3941
432
    ROW_HEADER = '<span font_size="large"><b>%s</b></span> %s'
3942
433
    ROOT = '%s - <span foreground="%s" font_size="small">%s</span>'
3943
434
3944
435
    def __init__(self, main_window=None):
3945
436
        UbuntuOneBin.__init__(self)
3946
437
        ControlPanelMixin.__init__(self, filename='volumes.ui')
3947
438
        self.add(self.itself)
3948
439
        self.show_all()
3949
440
3950
441
        kw = dict(parent=main_window,
3951
442
                  flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
3952
443
                  type=gtk.MESSAGE_WARNING,
3953
444
                  buttons=gtk.BUTTONS_YES_NO)
3954
445
        self.confirm_dialog = gtk.MessageDialog(**kw)
3955
446
3956
447
        # name, subscribed, icon name, show toggle, sensitive, icon size,
3957
448
        # id, path
3958
449
        self._empty_row = ('', False, '', False, False, gtk.ICON_SIZE_MENU,
3959
450
                           None, None)
3960
451
3961
452
        self.backend.connect_to_signal('VolumesInfoReady',
3962
453
                                       self.on_volumes_info_ready)
3963
454
        self.backend.connect_to_signal('VolumesInfoError',
3964
455
                                       self.on_volumes_info_error)
3965
456
        self.backend.connect_to_signal('VolumeSettingsChanged',
3966
457
                                       self.on_volume_settings_changed)
3967
458
        self.backend.connect_to_signal('VolumeSettingsChangeError',
3968
459
                                       self.on_volume_settings_change_error)
3969
460
3970
461
    def _process_name(self, name):
3971
462
        """Tweak 'name' with a translatable music folder name."""
3972
463
        if name == MUSIC_REAL_PATH:
3973
464
            result = MUSIC_DISPLAY_NAME
3974
465
        else:
3975
466
            result = name
3976
467
        return result
3977
468
3978
469
    def on_volumes_info_ready(self, info):
3979
470
        """Backend notifies of volumes info."""
3980
471
3981
472
        self.volumes_store.clear()
3982
473
        if not info:
3983
474
            self.on_success(NO_FOLDERS)
3984
475
            return
3985
476
        else:
3986
477
            self.on_success()
3987
478
3988
479
        for name, free_bytes, volumes in info:
3989
480
            if backend.ControlBackend.NAME_NOT_SET in name:
3990
481
                name = NAME_NOT_SET
3991
482
3992
483
            if name:
3993
484
                name = name + "'s"
3994
485
                # we already added user folders, let's add an empty row
3995
486
                treeiter = self.volumes_store.append(None, self._empty_row)
3996
487
            else:
3997
488
                name = MY_FOLDERS
3998
489
3999
490
            scroll_to_cell = False
4000
491
            if free_bytes == backend.ControlBackend.FREE_BYTES_NOT_AVAILABLE:
4001
492
                free_bytes = ''
4002
493
            else:
4003
494
                free_bytes = int(free_bytes)
4004
495
                if free_bytes < SHARES_MIN_SIZE_FULL:
4005
496
                    free_bytes_str = self.NO_FREE_SPACE
4006
497
                    scroll_to_cell = True
4007
498
                else:
4008
499
                    free_bytes_str = self.FREE_SPACE
4009
500
                free_bytes_args = {'free_space': humanize(free_bytes)}
4010
501
                free_bytes = free_bytes_str % free_bytes_args
4011
502
4012
503
            row = (self.ROW_HEADER % (name, free_bytes),
4013
504
                   True, CONTACT_ICON_NAME, False, False,
4014
505
                   gtk.ICON_SIZE_LARGE_TOOLBAR, None, None)
4015
506
            treeiter = self.volumes_store.append(None, row)
4016
507
4017
508
            if scroll_to_cell:
4018
509
                path = self.volumes_store.get_string_from_iter(treeiter)
4019
510
                self.volumes_view.scroll_to_cell(path)
4020
511
4021
512
            for volume in volumes:
4022
513
                sensitive = True
4023
514
                name = self._process_name(volume[u'display_name'])
4024
515
                icon_name = FOLDER_ICON_NAME
4025
516
4026
517
                is_root = volume[u'type'] == backend.ControlBackend.ROOT_TYPE
4027
518
                is_share = volume[u'type'] == backend.ControlBackend.SHARE_TYPE
4028
519
4029
520
                if is_root:
4030
521
                    sensitive = False
4031
522
                    name = self.ROOT % (name, ORANGE, ALWAYS_SUBSCRIBED)
4032
523
                elif is_share:
4033
524
                    icon_name = SHARE_ICON_NAME
4034
525
                elif name == MUSIC_DISPLAY_NAME:
4035
526
                    icon_name = MUSIC_ICON_NAME
4036
527
4037
528
                if volume[u'path'] is None:
4038
529
                    logger.warning('on_volumes_info_ready: about to store a '
4039
530
                                   'volume with None path: %r', volume)
4040
531
4041
532
                row = (name, bool(volume[u'subscribed']), icon_name, True,
4042
533
                       sensitive, gtk.ICON_SIZE_MENU, volume['volume_id'],
4043
534
                       volume[u'path'])
4044
535
4045
536
                if is_root:  # root should go first!
4046
537
                    self.volumes_store.prepend(treeiter, row)
4047
538
                else:
4048
539
                    self.volumes_store.append(treeiter, row)
4049
540
4050
541
        self.volumes_view.expand_all()
4051
542
        self.volumes_view.show_all()
4052
543
4053
544
        self.is_processing = False
4054
545
4055
546
    @log_call(logger.error)
4056
547
    def on_volumes_info_error(self, error_dict=None):
4057
548
        """Backend notifies of an error when fetching volumes info."""
4058
549
        self.on_error(error_dict=error_dict)
4059
550
4060
551
    @log_call(logger.info)
4061
552
    def on_volume_settings_changed(self, volume_id):
4062
553
        """The settings for 'volume_id' were changed."""
4063
554
        self.is_processing = False
4064
555
4065
556
    @log_call(logger.error)
4066
557
    def on_volume_settings_change_error(self, volume_id, error_dict=None):
4067
558
        """The settings for 'volume_id' were not changed."""
4068
559
        self.load()
4069
560
4070
561
    def on_subscribed_toggled(self, widget, path, *args, **kwargs):
4071
562
        """The user toggled 'widget'."""
4072
563
        treeiter = self.volumes_store.get_iter(path)
4073
564
        volume_id = self.volumes_store.get_value(treeiter, 6)
4074
565
        volume_path = self.volumes_store.get_value(treeiter, 7)
4075
566
        subscribed = self.volumes_store.get_value(treeiter, 1)
4076
567
4077
568
        response = gtk.RESPONSE_YES
4078
569
        if not subscribed and os.path.exists(volume_path):
4079
570
            self.confirm_dialog.set_markup(FOLDERS_CONFIRM_MERGE %
4080
571
                                           {'folder_path': volume_path})
4081
572
            response = self.confirm_dialog.run()
4082
573
            self.confirm_dialog.hide()
4083
574
4084
575
        if response == gtk.RESPONSE_YES:
4085
576
            subscribed = not subscribed
4086
577
            self.volumes_store.set_value(treeiter, 1, subscribed)
4087
578
            self.backend.change_volume_settings(volume_id,
4088
579
                {'subscribed': bool_str(subscribed)},
4089
580
                reply_handler=NO_OP, error_handler=error_handler)
4090
581
4091
582
            self.is_processing = True
4092
583
4093
584
    def on_volumes_view_row_activated(self, widget, path, *args, **kwargs):
4094
585
        """The user double clicked on a row."""
4095
586
        treeiter = self.volumes_store.get_iter(path)
4096
587
        volume_path = self.volumes_store.get_value(treeiter, 7)
4097
588
        if volume_path is None:
4098
589
            logger.warning('on_volumes_view_row_activated: volume_path for '
4099
590
                           'tree_path %r is None', path)
4100
591
        elif not os.path.exists(volume_path):
4101
592
            logger.warning('on_volumes_view_row_activated: path %r '
4102
593
                           'does not exist', volume_path)
4103
594
        else:
4104
595
            uri_hook(None, FILE_URI_PREFIX + volume_path)
4105
596
4106
597
    def load(self):
4107
598
        """Load the volume list."""
4108
599
        self.backend.volumes_info(reply_handler=NO_OP,
4109
600
                                  error_handler=error_handler)
4110
601
        self.is_processing = True
4111
602
4112
603
4113
604
class SharesPanel(UbuntuOneBin, ControlPanelMixin):
4114
605
    """The shares panel - NOT IMPLEMENTED YET."""
4115
606
4116
607
    TITLE = SHARES_TITLE
4117
608
4118
609
    def __init__(self, main_window=None):
4119
610
        UbuntuOneBin.__init__(self)
4120
611
        ControlPanelMixin.__init__(self)
4121
612
        self.show_all()
4122
613
        self.on_success('Not implemented yet.')
4123
614
4124
615
4125
616
class Device(gtk.EventBox, ControlPanelMixin):
4126
617
    """The device widget."""
4127
618
4128
619
    def __init__(self, confirm_remove_dialog=None):
4129
620
        gtk.EventBox.__init__(self)
4130
621
        ControlPanelMixin.__init__(self, filename='device.ui')
4131
622
4132
623
        self.confirm_dialog = confirm_remove_dialog
4133
624
        self._updating = False
4134
625
        self._last_settings = {}
4135
626
        self.id = None
4136
627
        self.is_local = False
4137
628
        self.configurable = False
4138
629
4139
630
        self.update(device_id=None, device_name='',
4140
631
                    is_local=False, configurable=False, limit_bandwidth=False,
4141
632
                    max_upload_speed=0, max_download_speed=0,
4142
633
                    show_all_notifications=True)
4143
634
4144
635
        self.add(self.itself)
4145
636
        self.show()
4146
637
4147
638
        self.backend.connect_to_signal('DeviceSettingsChanged',
4148
639
                                       self.on_device_settings_changed)
4149
640
        self.backend.connect_to_signal('DeviceSettingsChangeError',
4150
641
                                       self.on_device_settings_change_error)
4151
642
        self.backend.connect_to_signal('DeviceRemoved',
4152
643
                                       self.on_device_removed)
4153
644
        self.backend.connect_to_signal('DeviceRemovalError',
4154
645
                                       self.on_device_removal_error)
4155
646
4156
647
    def _change_device_settings(self, *args):
4157
648
        """Update backend settings for this device."""
4158
649
        if self._updating:
4159
650
            return
4160
651
4161
652
        # Not disabling the GUI to avoid annyong twitchings
4162
653
        #self.set_sensitive(False)
4163
654
        self.warning_label.set_text('')
4164
655
        self.backend.change_device_settings(self.id, self.__dict__,
4165
656
            reply_handler=NO_OP, error_handler=error_handler)
4166
657
4167
658
    def _block_signals(f):
4168
659
        """Execute 'f' while having the _updating flag set."""
4169
660
4170
661
        # pylint: disable=E0213,W0212,E1102
4171
662
4172
663
        @wraps(f)
4173
664
        def inner(self, *args, **kwargs):
4174
665
            """Execute 'f' while having the _updating flag set."""
4175
666
            old = self._updating
4176
667
            self._updating = True
4177
668
4178
669
            result = f(self, *args, **kwargs)
4179
670
4180
671
            self._updating = old
4181
672
            return result
4182
673
4183
674
        return inner
4184
675
4185
676
    on_show_all_notifications_toggled = _change_device_settings
4186
677
    on_max_upload_speed_value_changed = _change_device_settings
4187
678
    on_max_download_speed_value_changed = _change_device_settings
4188
679
4189
680
    def on_limit_bandwidth_toggled(self, *args, **kwargs):
4190
681
        """The limit bandwidth checkbox was toggled."""
4191
682
        self.throttling_limits.set_sensitive(self.limit_bandwidth.get_active())
4192
683
        self._change_device_settings()
4193
684
4194
685
    def on_remove_clicked(self, widget):
4195
686
        """Remove button was clicked or activated."""
4196
687
        response = gtk.RESPONSE_YES
4197
688
        if self.confirm_dialog is not None:
4198
689
            response = self.confirm_dialog.run()
4199
690
            self.confirm_dialog.hide()
4200
691
4201
692
        if response == gtk.RESPONSE_YES:
4202
693
            self.backend.remove_device(self.id,
4203
694
                reply_handler=NO_OP, error_handler=error_handler)
4204
695
            self.set_sensitive(False)
4205
696
4206
697
    @_block_signals
4207
698
    def update(self, **kwargs):
4208
699
        """Update according to named parameters.
4209
700
4210
701
        Possible settings are:
4211
702
            * device_id (string, not shown to the user)
4212
703
            * device_name (string)
4213
704
            * type (either DEVICE_TYPE_PHONE or DEVICE_TYPE_COMPUTER)
4214
705
            * is_local (True/False)
4215
706
            * configurable (True/False)
4216
707
            * if configurable, the following can be set:
4217
708
                * show_all_notifications (True/False)
4218
709
                * limit_bandwidth (True/False)
4219
710
                * max_upload_speed (bytes)
4220
711
                * max_download_speed (bytes)
4221
712
4222
713
        """
4223
714
        if 'device_id' in kwargs:
4224
715
            self.id = kwargs['device_id']
4225
716
4226
717
        if 'device_name' in kwargs:
4227
718
            name = kwargs['device_name'].replace(DEVICE_REMOVABLE_PREFIX, '')
4228
719
            name = '<span font_size="large"><b>%s</b></span>' % name
4229
720
            self.device_name.set_markup(name)
4230
721
4231
722
        if 'device_type' in kwargs:
4232
723
            dtype = kwargs['device_type']
4233
724
            if dtype in (DEVICE_TYPE_COMPUTER, DEVICE_TYPE_PHONE):
4234
725
                self.device_type.set_from_icon_name(dtype.lower(),
4235
726
                    gtk.ICON_SIZE_LARGE_TOOLBAR)
4236
727
4237
728
        if 'is_local' in kwargs:
4238
729
            self.is_local = bool(kwargs['is_local'])
4239
730
4240
731
        if 'configurable' in kwargs:
4241
732
            self.configurable = bool(kwargs['configurable'])
4242
733
            self.config_settings.set_visible(self.configurable)
4243
734
4244
735
        if 'show_all_notifications' in kwargs:
4245
736
            value = bool(kwargs['show_all_notifications'])
4246
737
            self.show_all_notifications.set_active(value)
4247
738
4248
739
        if 'limit_bandwidth' in kwargs:
4249
740
            enabled = bool(kwargs['limit_bandwidth'])
4250
741
            self.limit_bandwidth.set_active(enabled)
4251
742
            self.throttling_limits.set_sensitive(enabled)
4252
743
4253
744
        for speed in ('max_upload_speed', 'max_download_speed'):
4254
745
            if speed in kwargs:
4255
746
                value = int(kwargs[speed]) // KILOBYTES
4256
747
                getattr(self, speed).set_value(value)
4257
748
4258
749
        self._last_settings = self.__dict__
4259
750
4260
751
    @property
4261
752
    def __dict__(self):
4262
753
        result = {
4263
754
            'device_id': self.id,
4264
755
            'device_name': self.device_name.get_text(),
4265
756
            'device_type': self.device_type.get_icon_name()[0].capitalize(),
4266
757
            'is_local': bool_str(self.is_local),
4267
758
            'configurable': bool_str(self.configurable),
4268
759
            'show_all_notifications': \
4269
760
                bool_str(self.show_all_notifications.get_active()),
4270
761
            'limit_bandwidth': bool_str(self.limit_bandwidth.get_active()),
4271
762
            'max_upload_speed': \
4272
763
                str(self.max_upload_speed.get_value_as_int() * KILOBYTES),
4273
764
            'max_download_speed': \
4274
765
                str(self.max_download_speed.get_value_as_int() * KILOBYTES),
4275
766
        }
4276
767
        return result
4277
768
4278
769
    @log_call(logger.info, with_args=False)
4279
770
    def on_device_settings_changed(self, device_id):
4280
771
        """The change of this device settings succeded."""
4281
772
        if device_id != self.id:
4282
773
            return
4283
774
        self.set_sensitive(True)
4284
775
        self.warning_label.set_text('')
4285
776
        self._last_settings = self.__dict__
4286
777
4287
778
    @log_call(logger.error)
4288
779
    def on_device_settings_change_error(self, device_id, error_dict=None):
4289
780
        """The change of this device settings failed."""
4290
781
        if device_id != self.id:
4291
782
            return
4292
783
        self.update(**self._last_settings)
4293
784
        self._set_warning(DEVICE_CHANGE_ERROR, self.warning_label)
4294
785
        self.set_sensitive(True)
4295
786
4296
787
    # is safe to log the device_id since it was already removed
4297
788
    @log_call(logger.warning)
4298
789
    def on_device_removed(self, device_id):
4299
790
        """The removal of this device succeded."""
4300
791
        if device_id != self.id:
4301
792
            return
4302
793
        self.hide()
4303
794
4304
795
    @log_call(logger.error)
4305
796
    def on_device_removal_error(self, device_id, error_dict=None):
4306
797
        """The removal of this device failed."""
4307
798
        if device_id != self.id:
4308
799
            return
4309
800
        self._set_warning(DEVICE_REMOVAL_ERROR, self.warning_label)
4310
801
        self.set_sensitive(True)
4311
802
4312
803
4313
804
class DevicesPanel(UbuntuOneBin, ControlPanelMixin):
4314
805
    """The devices panel."""
4315
806
4316
807
    __gsignals__ = {
4317
808
        'local-device-removed': (gobject.SIGNAL_RUN_FIRST,
4318
809
                                 gobject.TYPE_NONE, ()),
4319
810
    }
4320
811
4321
812
    TITLE = DEVICES_TITLE
4322
813
4323
814
    def __init__(self, main_window=None):
4324
815
        UbuntuOneBin.__init__(self)
4325
816
        ControlPanelMixin.__init__(self, filename='devices.ui')
4326
817
        self.add(self.itself)
4327
818
        self.show()
4328
819
4329
820
        self._devices = {}
4330
821
        kw = dict(parent=main_window,
4331
822
                  flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
4332
823
                  type=gtk.MESSAGE_WARNING,
4333
824
                  buttons=gtk.BUTTONS_YES_NO,
4334
825
                  message_format=DEVICE_CONFIRM_REMOVE)
4335
826
        self.confirm_remove_dialog = gtk.MessageDialog(**kw)
4336
827
4337
828
        self.backend.connect_to_signal('DevicesInfoReady',
4338
829
                                       self.on_devices_info_ready)
4339
830
        self.backend.connect_to_signal('DevicesInfoError',
4340
831
                                       self.on_devices_info_error)
4341
832
        self.backend.connect_to_signal('DeviceRemoved',
4342
833
                                       self.on_device_removed)
4343
834
4344
835
    @log_call(logger.info, with_args=False)
4345
836
    def on_devices_info_ready(self, info):
4346
837
        """Backend notifies of devices info."""
4347
838
        for child in self.devices.get_children():
4348
839
            self.devices.remove(child)
4349
840
4350
841
        if not info:
4351
842
            self.on_success(NO_DEVICES)
4352
843
        else:
4353
844
            self.on_success()
4354
845
4355
846
        # Class 'style' has no 'bg' member
4356
847
        # pylint: disable=E1101
4357
848
        odd_row_color = self.message.style.bg[gtk.STATE_NORMAL]
4358
849
        for i, device_info in enumerate(info):
4359
850
            device = Device(confirm_remove_dialog=self.confirm_remove_dialog)
4360
851
            device_info['device_name'] = device_info.pop('name', '')
4361
852
            device_info['device_type'] = device_info.pop('type',
4362
853
                                                         DEVICE_TYPE_COMPUTER)
4363
854
            device.update(**device_info)
4364
855
4365
856
            if i % 2 == 1:
4366
857
                device.modify_bg(gtk.STATE_NORMAL, odd_row_color)
4367
858
4368
859
            self.devices.pack_start(device)
4369
860
            self._devices[device.id] = device
4370
861
4371
862
        self.is_processing = False
4372
863
4373
864
    @log_call(logger.error)
4374
865
    def on_devices_info_error(self, error_dict=None):
4375
866
        """Backend notifies of an error when fetching volumes info."""
4376
867
        self.on_error(error_dict=error_dict)
4377
868
        self.is_processing = False
4378
869
4379
870
    @log_call(logger.warning)
4380
871
    def on_device_removed(self, device_id):
4381
872
        """The removal of a device succeded."""
4382
873
        if device_id in self._devices:
4383
874
            child = self._devices.pop(device_id)
4384
875
            self.devices.remove(child)
4385
876
4386
877
            if child.is_local:
4387
878
                self.emit('local-device-removed')
4388
879
4389
880
    def load(self):
4390
881
        """Load the device list."""
4391
882
        self.backend.devices_info(reply_handler=NO_OP,
4392
883
                                  error_handler=error_handler)
4393
884
        self.is_processing = True
4394
885
4395
886
4396
887
class InstallPackage(gtk.VBox, ControlPanelMixin):
4397
888
    """A widget to process the install of a package."""
4398
889
4399
890
    __gsignals__ = {
4400
891
        'finished': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()),
4401
892
    }
4402
893
4403
894
    def __init__(self, package_name, message=None):
4404
895
        gtk.VBox.__init__(self)
4405
896
        ControlPanelMixin.__init__(self, filename='install.ui')
4406
897
        self.add(self.itself)
4407
898
4408
899
        self.package_name = package_name
4409
900
        self.package_manager = package_manager.PackageManager()
4410
901
        self.args = {'package_name': self.package_name}
4411
902
        self.transaction = None
4412
903
4413
904
        self.progress_bar = None
4414
905
4415
906
        self.message = message
4416
907
        if self.message is None:
4417
908
            self.message = INSTALL_PACKAGE % self.args
4418
909
        self.reset()
4419
910
4420
911
        self.show()
4421
912
4422
913
    def reset(self):
4423
914
        """Reset this interface."""
4424
915
        children = self.itself.get_children()
4425
916
        if self.progress_bar in children:
4426
917
            self.itself.remove(self.progress_bar)
4427
918
        if self.install_button_box not in children:
4428
919
            self.itself.pack_start(self.install_button_box)
4429
920
        self.install_label.set_markup(self.message)
4430
921
4431
922
    @package_manager.inline_callbacks
4432
923
    def on_install_button_clicked(self, button):
4433
924
        """The install button was clicked."""
4434
925
        try:
4435
926
            # create the install transaction
4436
927
            self.transaction = yield self.package_manager.install(
4437
928
                                    self.package_name)
4438
929
4439
930
            logger.debug('on_install_button_clicked: transaction is %r',
4440
931
                         self.transaction)
4441
932
            success = package_manager.aptdaemon.enums.EXIT_SUCCESS
4442
933
            if self.transaction == success:
4443
934
                self.on_install_finished(None, self.transaction)
4444
935
                return
4445
936
4446
937
            # create the progress bar and pack it to the box
4447
938
            self.progress_bar = package_manager.PackageManagerProgressBar(
4448
939
                                    self.transaction)
4449
940
            self.progress_bar.show()
4450
941
4451
942
            self.itself.remove(self.install_button_box)
4452
943
            self.itself.pack_start(self.progress_bar)
4453
944
4454
945
            self.transaction.connect('finished', self.on_install_finished)
4455
946
            self.install_label.set_markup(INSTALLING % self.args)
4456
947
            yield self.transaction.run()
4457
948
        except package_manager.aptdaemon.errors.NotAuthorizedError:
4458
949
            self.reset()
4459
950
        except:  # pylint: disable=W0702
4460
951
            logger.exception('on_install_button_clicked')
4461
952
            self._set_warning(FAILED_INSTALL % self.args,
4462
953
                              self.install_label)
4463
954
            if self.progress_bar is not None:
4464
955
                self.progress_bar.hide()
4465
956
4466
957
    @log_call(logger.info)
4467
958
    def on_install_finished(self, transaction, exit_code):
4468
959
        """The installation finished."""
4469
960
        if self.progress_bar is not None:
4470
961
            self.progress_bar.set_sensitive(False)
4471
962
4472
963
        logger.info('on_install_finished: installation of %r was %r',
4473
964
                    self.package_name, exit_code)
4474
965
        if exit_code != package_manager.aptdaemon.enums.EXIT_SUCCESS:
4475
966
            if hasattr(transaction, 'error'):
4476
967
                logger.error('transaction failed: %r', transaction.error)
4477
968
            self._set_warning(FAILED_INSTALL % self.args,
4478
969
                              self.install_label)
4479
970
        else:
4480
971
            self.install_label.set_markup(SUCCESS_INSTALL % self.args)
4481
972
            self.emit('finished')
4482
973
4483
974
4484
975
class Service(gtk.VBox, ControlPanelMixin):
4485
976
    """A service."""
4486
977
4487
978
    def __init__(self, service_id, name,
4488
979
                 container=None, check_button=None, action_button=None,
4489
980
                 *args, **kwargs):
4490
981
        gtk.VBox.__init__(self)
4491
982
        ControlPanelMixin.__init__(self)
4492
983
        self.id = service_id
4493
984
        self.container = container
4494
985
        self.check_button = check_button
4495
986
        self.action_button = action_button
4496
987
4497
988
        self.warning_label = gtk.Label()
4498
989
        self.pack_start(self.warning_label, expand=False)
4499
990
4500
991
        self.button = gtk.CheckButton(label=name)
4501
992
        self.pack_start(self.button, expand=False)
4502
993
4503
994
        self.show_all()
4504
995
4505
996
4506
997
class FileSyncService(Service):
4507
998
    """The file sync service."""
4508
999
4509
1000
    def __init__(self, container, check_button, action_button):
4510
1001
        Service.__init__(self, service_id='file-sync',
4511
1002
                         name=FILE_SYNC_SERVICE_NAME,
4512
1003
                         container=container,
4513
1004
                         check_button=check_button,
4514
1005
                         action_button=action_button)
4515
1006
4516
1007
        self.container.set_sensitive(False)
4517
1008
4518
1009
        self.backend.connect_to_signal('FileSyncStatusChanged',
4519
1010
                                       self.on_file_sync_status_changed)
4520
1011
        self.backend.connect_to_signal('FilesEnabled', self.on_files_enabled)
4521
1012
        self.backend.connect_to_signal('FilesDisabled', self.on_files_disabled)
4522
1013
4523
1014
    @log_call(logger.debug)
4524
1015
    def on_file_sync_status_changed(self, status):
4525
1016
        """File Sync status changed."""
4526
1017
        enabled = status != backend.FILE_SYNC_DISABLED
4527
1018
        logger.info('FileSyncService: on_file_sync_status_changed: '
4528
1019
                    'status %r, enabled? %r', status, enabled)
4529
1020
        self.check_button.set_active(enabled)
4530
1021
        # if service is disabled, disable the action_button
4531
1022
        self.action_button.set_sensitive(enabled)
4532
1023
4533
1024
        if not self.container.is_sensitive():
4534
1025
            # first time we're getting this event
4535
1026
            self.check_button.connect('toggled', self.on_button_toggled)
4536
1027
            self.container.set_sensitive(True)
4537
1028
4538
1029
    def on_files_enabled(self):
4539
1030
        """Files service was enabled."""
4540
1031
        self.on_file_sync_status_changed('enabled!')
4541
1032
4542
1033
    def on_files_disabled(self):
4543
1034
        """Files service was disabled."""
4544
1035
        self.on_file_sync_status_changed(backend.FILE_SYNC_DISABLED)
4545
1036
4546
1037
    @log_call(logger.debug)
4547
1038
    def on_button_toggled(self, button):
4548
1039
        """Button was toggled, exclude/replicate the service properly."""
4549
1040
        logger.info('File Sync enabled? %r', self.check_button.get_active())
4550
1041
        if self.check_button.get_active():
4551
1042
            self.backend.enable_files(reply_handler=NO_OP,
4552
1043
                                      error_handler=error_handler)
4553
1044
        else:
4554
1045
            self.backend.disable_files(reply_handler=NO_OP,
4555
1046
                                       error_handler=error_handler)
4556
1047
4557
1048
    def load(self):
4558
1049
        """Load the information."""
4559
1050
        self.backend.file_sync_status(reply_handler=NO_OP,
4560
1051
                                      error_handler=error_handler)
4561
1052
4562
1053
4563
1054
class DesktopcouchService(Service):
4564
1055
    """A desktopcouch service."""
4565
1056
4566
1057
    def __init__(self, service_id, name, enabled,
4567
1058
                 container, check_button,
4568
1059
                 dependency=None, dependency_name=None):
4569
1060
        Service.__init__(self, service_id, name,
4570
1061
                         container, check_button, action_button=None)
4571
1062
4572
1063
        self.backend.connect_to_signal('ReplicationSettingsChanged',
4573
1064
            self.on_replication_settings_changed)
4574
1065
        self.backend.connect_to_signal('ReplicationSettingsChangeError',
4575
1066
            self.on_replication_settings_change_error)
4576
1067
4577
1068
        self.check_button.set_active(enabled)
4578
1069
4579
1070
        self.dependency = None
4580
1071
        if dependency is not None:
4581
1072
            if dependency_name is None:
4582
1073
                dependency_name = dependency
4583
1074
            args = {'plugin_name': dependency_name, 'service_name': service_id}
4584
1075
            message = INSTALL_PLUGIN % args
4585
1076
            self.dependency = InstallPackage(dependency, message)
4586
1077
            self.dependency.connect('finished', self.on_depedency_finished)
4587
1078
4588
1079
            self.container.pack_end(self.dependency, expand=False)
4589
1080
            self.check_button.set_sensitive(False)
4590
1081
4591
1082
        self.check_button.connect('toggled', self.on_button_toggled)
4592
1083
4593
1084
    def on_depedency_finished(self, widget):
4594
1085
        """The dependency was installed."""
4595
1086
        self.check_button.set_sensitive(True)
4596
1087
        self.container.remove(self.dependency)
4597
1088
        self.dependency = None
4598
1089
4599
1090
    @log_call(logger.debug)
4600
1091
    def on_button_toggled(self, button):
4601
1092
        """Button was toggled, exclude/replicate the service properly."""
4602
1093
        logger.info('Starting replication for %r? %r',
4603
1094
                    self.id, self.check_button.get_active())
4604
1095
4605
1096
        args = {'enabled': bool_str(self.check_button.get_active())}
4606
1097
        self.backend.change_replication_settings(self.id, args,
4607
1098
            reply_handler=NO_OP, error_handler=error_handler)
4608
1099
4609
1100
    @log_call(logger.info)
4610
1101
    def on_replication_settings_changed(self, replication_id):
4611
1102
        """The change of settings for this replication succeded."""
4612
1103
        if replication_id != self.id:
4613
1104
            return
4614
1105
        self.warning_label.set_text('')
4615
1106
4616
1107
    @log_call(logger.error)
4617
1108
    def on_replication_settings_change_error(self, replication_id,
4618
1109
                                             error_dict=None):
4619
1110
        """The change of settings for this replication failed."""
4620
1111
        if replication_id != self.id:
4621
1112
            return
4622
1113
        self.check_button.set_active(not self.check_button.get_active())
4623
1114
        self._set_warning(SETTINGS_CHANGE_ERROR, self.warning_label)
4624
1115
4625
1116
4626
1117
class ServicesPanel(UbuntuOneBin, ControlPanelMixin):
4627
1118
    """The services panel."""
4628
1119
4629
1120
    TITLE = SERVICES_TITLE
4630
1121
4631
1122
    def __init__(self, main_window=None):
4632
1123
        UbuntuOneBin.__init__(self)
4633
1124
        ControlPanelMixin.__init__(self, filename='services.ui')
4634
1125
        self.add(self.itself)
4635
1126
        self.files_icon.set_from_file(get_data_file(SERVICES_FILES_ICON))
4636
1127
        self.files_example.set_from_file(get_data_file(SERVICES_FILES_EXAMPLE))
4637
1128
        self.contacts_icon.set_from_file(get_data_file(SERVICES_CONTACTS_ICON))
4638
1129
4639
1130
        self.plugin_names = {'contacts': CONTACTS}
4640
1131
4641
1132
        self.package_manager = package_manager.PackageManager()
4642
1133
        self.install_box = None
4643
1134
4644
1135
        self._replications_ready = False  # hack to solve LP: #750309
4645
1136
        self.backend.connect_to_signal('ReplicationsInfoReady',
4646
1137
                                       self.on_replications_info_ready)
4647
1138
        self.backend.connect_to_signal('ReplicationsInfoError',
4648
1139
                                       self.on_replications_info_error)
4649
1140
4650
1141
        self.file_sync_service = FileSyncService(container=self.files,
4651
1142
            check_button=self.file_sync_check,
4652
1143
            action_button=self.file_sync_button)
4653
1144
4654
1145
        self.show()
4655
1146
4656
1147
    @property
4657
1148
    def has_desktopcouch(self):
4658
1149
        """Is desktopcouch installed?"""
4659
1150
        return self.package_manager.is_installed(DESKTOPCOUCH_PKG)
4660
1151
4661
1152
    def on_file_sync_button_clicked(self, *args, **kwargs):
4662
1153
        """The "Show me my U1 folder" button was clicked.
4663
1154
4664
1155
        XXX: this should be part of the FileSyncService widget.
4665
1156
        XXX: the Ubuntu One folder should be the user's root.
4666
1157
4667
1158
        """
4668
1159
        uri_hook(None, FILE_URI_PREFIX + os.path.expanduser('~/Ubuntu One'))
4669
1160
4670
1161
    def on_contacts_button_clicked(self, *args, **kwargs):
4671
1162
        """The "Take me to the Ubuntu One website" button was clicked.
4672
1163
4673
1164
        XXX: this should be part of the DesktopcouchService widget.
4674
1165
4675
1166
        """
4676
1167
        uri_hook(None, CONTACTS)
4677
1168
4678
1169
    @log_call(logger.debug)
4679
1170
    def load(self):
4680
1171
        """Load info."""
4681
1172
        self.file_sync_service.load()
4682
1173
        self.replications.hide()
4683
1174
        if self.install_box is not None:
4684
1175
            self.itself.remove(self.install_box)
4685
1176
            self.install_box = None
4686
1177
4687
1178
        logger.info('load: has_desktopcouch? %r', self.has_desktopcouch)
4688
1179
        if not self.has_desktopcouch:
4689
1180
            self.message.set_text('')
4690
1181
4691
1182
            self.install_box = InstallPackage(DESKTOPCOUCH_PKG)
4692
1183
            self.install_box.connect('finished', self.load_replications)
4693
1184
            self.itself.pack_end(self.install_box, expand=False)
4694
1185
            self.itself.reorder_child(self.install_box, 0)
4695
1186
        else:
4696
1187
            self.load_replications()
4697
1188
4698
1189
        self.message.stop()
4699
1190
4700
1191
    @log_call(logger.debug)
4701
1192
    def load_replications(self, *args):
4702
1193
        """Load replications info."""
4703
1194
        self._replications_ready = False  # hack to solve LP: #750309
4704
1195
        # ask replications to the backend
4705
1196
        self.message.start()
4706
1197
        self.backend.replications_info(reply_handler=NO_OP,
4707
1198
                                       error_handler=error_handler)
4708
1199
4709
1200
    @log_call(logger.debug)
4710
1201
    def on_replications_info_ready(self, info):
4711
1202
        """The replication info is ready."""
4712
1203
        self.on_success()
4713
1204
4714
1205
        self.replications.show()
4715
1206
4716
1207
        if self.install_box is not None:
4717
1208
            self.itself.remove(self.install_box)
4718
1209
            self.install_box = None
4719
1210
4720
1211
        for item in info:
4721
1212
            pkg = item['dependency']
4722
1213
            if not pkg or self.package_manager.is_installed(pkg):
4723
1214
                pkg = None
4724
1215
4725
1216
            sid = item['replication_id']
4726
1217
            container = getattr(self, sid, None)
4727
1218
            check_button = getattr(self, '%s_check' % sid, None)
4728
1219
            name = self.plugin_names.get(sid, None)
4729
1220
            child = DesktopcouchService(service_id=sid, name=item['name'],
4730
1221
                enabled=bool(item['enabled']), container=container,
4731
1222
                check_button=check_button,
4732
1223
                dependency=pkg, dependency_name=name)
4733
1224
            setattr(self, '%s_service' % sid, child)
4734
1225
            self._replications_ready = True  # hack to solve LP: #750309
4735
1226
4736
1227
    @log_call(logger.error)
4737
1228
    def on_replications_info_error(self, error_dict=None):
4738
1229
        """The replication info can not be retrieved."""
4739
1230
        if error_dict is not None and \
4740
1231
           error_dict.get('error_type', None) == 'NoPairingRecord':
4741
1232
            self.on_error(NO_PAIRING_RECORD)
4742
1233
        else:
4743
1234
            self.on_error(error_dict=error_dict)
4744
1235
4745
1236
    def refresh(self):
4746
1237
        """If replication list has been loaded, hide and show them."""
4747
1238
        if self._replications_ready:  # hack to solve LP: #750309
4748
1239
            self.replications.hide()
4749
1240
            self.replications.show()
4750
1241
4751
1242
4752
1243
class FileSyncStatus(gtk.HBox, ControlPanelMixin):
4753
1244
    """A file sync status widget."""
4754
1245
4755
1246
    def __init__(self):
4756
1247
        gtk.HBox.__init__(self)
4757
1248
        ControlPanelMixin.__init__(self)
4758
1249
4759
1250
        self.label = LabelLoading(LOADING)
4760
1251
        self.pack_start(self.label, expand=True)
4761
1252
4762
1253
        self.button = gtk.LinkButton(uri='')
4763
1254
        self.button.connect('clicked', self._on_button_clicked)
4764
1255
        self.pack_start(self.button, expand=False)
4765
1256
4766
1257
        self.show_all()
4767
1258
4768
1259
        self.backend.connect_to_signal('FileSyncStatusDisabled',
4769
1260
                                       self.on_file_sync_status_disabled)
4770
1261
        self.backend.connect_to_signal('FileSyncStatusStarting',
4771
1262
                                       self.on_file_sync_status_starting)
4772
1263
        self.backend.connect_to_signal('FileSyncStatusStopped',
4773
1264
                                       self.on_file_sync_status_stopped)
4774
1265
        self.backend.connect_to_signal('FileSyncStatusDisconnected',
4775
1266
                                       self.on_file_sync_status_disconnected)
4776
1267
        self.backend.connect_to_signal('FileSyncStatusSyncing',
4777
1268
                                       self.on_file_sync_status_syncing)
4778
1269
        self.backend.connect_to_signal('FileSyncStatusIdle',
4779
1270
                                       self.on_file_sync_status_idle)
4780
1271
        self.backend.connect_to_signal('FileSyncStatusError',
4781
1272
                                       self.on_file_sync_status_error)
4782
1273
        self.backend.connect_to_signal('FilesStartError',
4783
1274
                                       self.on_files_start_error)
4784
1275
        self.backend.connect_to_signal('FilesEnabled',
4785
1276
                                       self.on_file_sync_status_starting)
4786
1277
        self.backend.connect_to_signal('FilesDisabled',
4787
1278
                                       self.on_file_sync_status_disabled)
4788
1279
4789
1280
    def _update_status(self, msg, action, callback,
4790
1281
                       icon=None, color=None, tooltip=None):
4791
1282
        """Update the status info."""
4792
1283
        if icon is not None:
4793
1284
            foreground = '' if color is None else 'foreground="%s"' % color
4794
1285
            msg = '<span %s>%s</span> %s' % (foreground, icon, msg)
4795
1286
        self.label.set_markup(msg)
4796
1287
        self.label.stop()
4797
1288
4798
1289
        self.button.set_label(action)
4799
1290
        self.button.set_uri(action)
4800
1291
        self.button.set_sensitive(True)
4801
1292
        self.button.set_data('callback', callback)
4802
1293
        if tooltip is not None:
4803
1294
            self.button.set_tooltip_text(tooltip)
4804
1295
4805
1296
    def _on_button_clicked(self, button):
4806
1297
        """Button was clicked, act accordingly the label."""
4807
1298
        button.set_visited(False)
4808
1299
        button.set_sensitive(False)
4809
1300
        button.get_data('callback')(button)
4810
1301
4811
1302
    @log_call(logger.info)
4812
1303
    def on_file_sync_status_disabled(self, msg=None):
4813
1304
        """Backend notifies of file sync status being disabled."""
4814
1305
        self._update_status(FILE_SYNC_DISABLED,
4815
1306
                            FILE_SYNC_ENABLE, self.on_enable_clicked,
4816
1307
                            ERROR_ICON, ERROR_COLOR, FILE_SYNC_ENABLE_TOOLTIP)
4817
1308
4818
1309
    @log_call(logger.info)
4819
1310
    def on_file_sync_status_starting(self, msg=None):
4820
1311
        """Backend notifies of file sync status being starting."""
4821
1312
        self._update_status(FILE_SYNC_STARTING,
4822
1313
                            FILE_SYNC_STOP, self.on_stop_clicked,
4823
1314
                            SYNCING_ICON, ORANGE, FILE_SYNC_STOP_TOOLTIP)
4824
1315
4825
1316
    @log_call(logger.info)
4826
1317
    def on_file_sync_status_stopped(self, msg=None):
4827
1318
        """Backend notifies of file sync being stopped."""
4828
1319
        self._update_status(FILE_SYNC_STOPPED,
4829
1320
                            FILE_SYNC_START, self.on_start_clicked,
4830
1321
                            ERROR_ICON, ERROR_COLOR, FILE_SYNC_START_TOOLTIP)
4831
1322
4832
1323
    @log_call(logger.info)
4833
1324
    def on_file_sync_status_disconnected(self, msg=None):
4834
1325
        """Backend notifies of file sync status being ready."""
4835
1326
        self._update_status(FILE_SYNC_DISCONNECTED,
4836
1327
                            FILE_SYNC_CONNECT, self.on_connect_clicked,
4837
1328
                            ERROR_ICON, ERROR_COLOR,
4838
1329
                            FILE_SYNC_CONNECT_TOOLTIP,)
4839
1330
4840
1331
    @log_call(logger.info)
4841
1332
    def on_file_sync_status_syncing(self, msg=None):
4842
1333
        """Backend notifies of file sync status being syncing."""
4843
1334
        self._update_status(FILE_SYNC_SYNCING,
4844
1335
                            FILE_SYNC_DISCONNECT, self.on_disconnect_clicked,
4845
1336
                            SYNCING_ICON, ORANGE, FILE_SYNC_DISCONNECT_TOOLTIP)
4846
1337
4847
1338
    @log_call(logger.info)
4848
1339
    def on_file_sync_status_idle(self, msg=None):
4849
1340
        """Backend notifies of file sync status being idle."""
4850
1341
        self._update_status(FILE_SYNC_IDLE,
4851
1342
                            FILE_SYNC_DISCONNECT, self.on_disconnect_clicked,
4852
1343
                            IDLE_ICON, SUCCESS_COLOR,
4853
1344
                            FILE_SYNC_DISCONNECT_TOOLTIP)
4854
1345
4855
1346
    @log_call(logger.error)
4856
1347
    def on_file_sync_status_error(self, error_dict=None):
4857
1348
        """Backend notifies of an error when fetching file sync status."""
4858
1349
        msg = FILE_SYNC_ERROR
4859
1350
        reason = error_dict.get('error_msg', '') if error_dict else ''
4860
1351
        if reason:
4861
1352
            msg += ' (' + reason + ')'
4862
1353
        self._update_status(WARNING_MARKUP % msg,
4863
1354
                            FILE_SYNC_RESTART, self.on_restart_clicked,
4864
1355
                            tooltip=FILE_SYNC_RESTART_TOOLTIP)
4865
1356
4866
1357
    @log_call(logger.error)
4867
1358
    def on_files_start_error(self, error_dict=None):
4868
1359
        """Backend notifies of an error when starting the files service."""
4869
1360
        # service is probably disabled, ask for status to backend
4870
1361
        self.backend.file_sync_status(reply_handler=NO_OP,
4871
1362
                                      error_handler=error_handler)
4872
1363
4873
1364
    def on_connect_clicked(self, button=None):
4874
1365
        """User requested connection."""
4875
1366
        self.backend.connect_files(reply_handler=NO_OP,
4876
1367
                                   error_handler=error_handler)
4877
1368
4878
1369
    def on_disconnect_clicked(self, button=None):
4879
1370
        """User requested disconnection."""
4880
1371
        self.backend.disconnect_files(reply_handler=NO_OP,
4881
1372
                                      error_handler=error_handler)
4882
1373
4883
1374
    def on_enable_clicked(self, button=None):
4884
1375
        """User requested enable the service."""
4885
1376
        self.backend.enable_files(reply_handler=NO_OP,
4886
1377
                                  error_handler=error_handler)
4887
1378
4888
1379
    def on_restart_clicked(self, button=None):
4889
1380
        """User requested restart the service."""
4890
1381
        self.backend.restart_files(reply_handler=NO_OP,
4891
1382
                                   error_handler=error_handler)
4892
1383
4893
1384
    def on_start_clicked(self, button=None):
4894
1385
        """User requested start the service."""
4895
1386
        self.backend.start_files(reply_handler=NO_OP,
4896
1387
                                 error_handler=error_handler)
4897
1388
4898
1389
    def on_stop_clicked(self, button=None):
4899
1390
        """User requested stop the service."""
4900
1391
        self.backend.stop_files(reply_handler=NO_OP,
4901
1392
                                error_handler=error_handler)
4902
1393
4903
1394
    def load(self):
4904
1395
        """Load the information."""
4905
1396
        self.backend.file_sync_status(reply_handler=NO_OP,
4906
1397
                                      error_handler=error_handler)
4907
1398
4908
1399
4909
1400
class ManagementPanel(gtk.VBox, ControlPanelMixin):
4910
1401
    """The management panel.
4911
1402
4912
1403
    The user can manage dashboard, volumes, devices and services.
4913
1404
4914
1405
    """
4915
1406
4916
1407
    __gsignals__ = {
4917
1408
        'local-device-removed': (gobject.SIGNAL_RUN_FIRST,
4918
1409
                                 gobject.TYPE_NONE, ()),
4919
1410
        'unauthorized': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()),
4920
1411
    }
4921
1412
4922
1413
    DASHBOARD_BUTTON_NAME = 'ModeLeft'
4923
1414
    SERVICES_BUTTON_NAME = 'ModeRight'
4924
1415
4925
1416
    def __init__(self, main_window=None):
4926
1417
        gtk.VBox.__init__(self)
4927
1418
        ControlPanelMixin.__init__(self, filename='management.ui')
4928
1419
        self.add(self.itself)
4929
1420
        self.facebook_logo.set_from_file(get_data_file(FACEBOOK_LOGO))
4930
1421
        self.twitter_logo.set_from_file(get_data_file(TWITTER_LOGO))
4931
1422
        self.show()
4932
1423
4933
1424
        self.backend.connect_to_signal('AccountInfoReady',
4934
1425
                                       self.on_account_info_ready)
4935
1426
        self.backend.connect_to_signal('AccountInfoError',
4936
1427
                                       self.on_account_info_error)
4937
1428
        self.backend.connect_to_signal('UnauthorizedError',
4938
1429
                                       self.on_unauthorized_error)
4939
1430
4940
1431
        self.quota_progressbar.set_sensitive(False)
4941
1432
4942
1433
        self.quota_label = LabelLoading(LOADING)
4943
1434
        self.quota_box.pack_start(self.quota_label, expand=False)
4944
1435
        self.quota_box.reorder_child(self.quota_label, 0)
4945
1436
4946
1437
        self.status_label = FileSyncStatus()
4947
1438
        self.status_box.pack_end(self.status_label, expand=True)
4948
1439
4949
1440
        self.dashboard = DashboardPanel(main_window=main_window)
4950
1441
        self.volumes = VolumesPanel(main_window=main_window)
4951
1442
        self.shares = SharesPanel(main_window=main_window)
4952
1443
        self.devices = DevicesPanel(main_window=main_window)
4953
1444
        self.services = ServicesPanel(main_window=main_window)
4954
1445
4955
1446
        cb = lambda button, page_num: self.notebook.set_current_page(page_num)
4956
1447
        self.tabs = (u'dashboard', u'volumes', u'shares',
4957
1448
                     u'devices', u'services')
4958
1449
        for page_num, tab in enumerate(self.tabs):
4959
1450
            setattr(self, ('%s_page' % tab).upper(), page_num)
4960
1451
            button = getattr(self, '%s_button' % tab)
4961
1452
            button.connect('clicked', cb, page_num)
4962
1453
            self.notebook.insert_page(getattr(self, tab), position=page_num)
4963
1454
4964
1455
        self.dashboard_button.set_name(self.DASHBOARD_BUTTON_NAME)
4965
1456
        self.dashboard_button.set_tooltip_text(DASHBOARD_BUTTON_TOOLTIP)
4966
1457
4967
1458
        self.volumes_button.set_tooltip_text(FOLDERS_BUTTON_TOOLTIP)
4968
1459
        self.volumes_button.connect('clicked', lambda b: self.volumes.load())
4969
1460
4970
1461
        self.shares_button.set_tooltip_text(SHARES_BUTTON_TOOLTIP)
4971
1462
4972
1463
        self.devices_button.set_tooltip_text(DEVICES_BUTTON_TOOLTIP)
4973
1464
        self.devices_button.connect('clicked', lambda b: self.devices.load())
4974
1465
        self.devices.connect('local-device-removed',
4975
1466
                             lambda widget: self.emit('local-device-removed'))
4976
1467
4977
1468
        self.services_button.set_name(self.SERVICES_BUTTON_NAME)
4978
1469
        self.services_button.set_tooltip_text(SERVICES_BUTTON_TOOLTIP)
4979
1470
        self.services_button.connect('clicked',
4980
1471
                                     lambda b: self.services.refresh())
4981
1472
4982
1473
        self.enable_volumes = lambda: self.volumes_button.set_sensitive(True)
4983
1474
        self.disable_volumes = lambda: self.volumes_button.set_sensitive(False)
4984
1475
        self.backend.connect_to_signal('FilesEnabled', self.enable_volumes)
4985
1476
        self.backend.connect_to_signal('FilesDisabled', self.disable_volumes)
4986
1477
4987
1478
    def _update_quota(self, msg, data=None):
4988
1479
        """Update the quota info."""
4989
1480
        fraction = 0.0
4990
1481
        if data is not None:
4991
1482
            fraction = data.get('percentage', 0.0) / 100
4992
1483
            if fraction > 0 and fraction < 0.05:
4993
1484
                fraction = 0.05
4994
1485
            else:
4995
1486
                fraction = round(fraction, 2)
4996
1487
4997
1488
        logger.debug('ManagementPanel: updating quota to %r.', fraction)
4998
1489
        if fraction >= QUOTA_THRESHOLD:
4999
1490
            self.quota_label.set_markup(WARNING_MARKUP % msg)
5000
1491
        else:
Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2012-03-06	Approve on 2012-03-06
Review via email: mp+96155@code.launchpad.net