← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-control-panel/oneiric

« back to all changes in this revision

Viewing changes to data/gtk/services.ui

https://launchpad.net/bugs/845105
https://launchpad.net/bugs/850142
https://launchpad.net/bugs/849494
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/835093
https://launchpad.net/bugs/819955
* New upstream release:
  [ Alejandro J. Cura <alecu@canonical.com>]
    - Do not throw a webclient error when closing
      (LP: #845105).
  [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
    - Removed all code related to Bookmarks (LP: #850142).
    - Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
  [ Rodney Dawes <rodney.dawes@canonical.com> ]
    - Don't install a .desktop file for control panel
      (part of LP: #838778).
    - Point the indicator/Unity API at the installer .desktop file
      (part of LP: #838778).
    - Set the WMCLASS so Unity will fall back properly
      (part of LP: #838778).
    - Fix a few grammar mistakes (LP: #835093).
    - Don't show the "Get NGB free!" label on "Join now" button at all
      (LP: #819955).
* debian/control:
  - ubuntuone-control-panel-gtk depends now on ubuntuone-installer >= 2.0.0.
  - require ubuntuone-client >= 2.0.0.
  - require ubuntu-sso-client >= 1.4.0.
  - no longer install a .desktop file (will be installed by ubuntuone-installer).

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/gtk/services.ui
59
59
                                        <property name="use_action_appearance">False</property>
60
60
                                        <property name="draw_indicator">True</property>
61
61
                                      </object>
 
62
                                      <packing>
 
63
                                        <property name="x_options"></property>
 
64
                                        <property name="y_options"></property>
 
65
                                      </packing>
62
66
                                    </child>
63
67
                                    <child>
64
68
                                      <object class="GtkImage" id="files_icon">
65
69
                                        <property name="visible">True</property>
66
70
                                        <property name="can_focus">False</property>
67
 
                                        <property name="xpad">5</property>
68
71
                                      </object>
69
72
                                      <packing>
70
73
                                        <property name="left_attach">1</property>
71
74
                                        <property name="right_attach">2</property>
 
75
                                        <property name="x_options"></property>
 
76
                                        <property name="y_options"></property>
72
77
                                      </packing>
73
78
                                    </child>
74
79
                                    <child>
154
159
                                  <object class="GtkImage" id="files_example">
155
160
                                    <property name="visible">True</property>
156
161
                                    <property name="can_focus">False</property>
157
 
                                    <property name="xpad">5</property>
158
 
                                    <property name="ypad">5</property>
159
162
                                  </object>
160
163
                                  <packing>
161
164
                                    <property name="expand">False</property>
188
191
                          <object class="GtkAlignment" id="alignment3">
189
192
                            <property name="visible">True</property>
190
193
                            <property name="can_focus">False</property>
 
194
                            <property name="top_padding">6</property>
191
195
                            <child>
192
196
                              <object class="GtkHBox" id="hbox3">
193
197
                                <property name="visible">True</property>
203
207
                                        <property name="can_focus">False</property>
204
208
                                        <property name="n_rows">2</property>
205
209
                                        <property name="n_columns">3</property>
 
210
                                        <property name="column_spacing">5</property>
206
211
                                        <property name="row_spacing">5</property>
207
212
                                        <child>
208
213
                                          <object class="GtkCheckButton" id="contacts_check">
212
217
                                            <property name="use_action_appearance">False</property>
213
218
                                            <property name="draw_indicator">True</property>
214
219
                                          </object>
 
220
                                          <packing>
 
221
                                            <property name="x_options"></property>
 
222
                                            <property name="y_options"></property>
 
223
                                          </packing>
215
224
                                        </child>
216
225
                                        <child>
217
226
                                          <object class="GtkImage" id="contacts_icon">
218
227
                                            <property name="visible">True</property>
219
228
                                            <property name="can_focus">False</property>
220
 
                                            <property name="xpad">5</property>
221
229
                                          </object>
222
230
                                          <packing>
223
231
                                            <property name="left_attach">1</property>
224
232
                                            <property name="right_attach">2</property>
 
233
                                            <property name="x_options"></property>
 
234
                                            <property name="y_options"></property>
225
235
                                          </packing>
226
236
                                        </child>
227
237
                                        <child>
245
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>
246
256
                                            <property name="use_markup">True</property>
247
257
                                            <property name="wrap">True</property>
248
 
                                            <property name="width_chars">35</property>
249
258
                                          </object>
250
259
                                          <packing>
251
260
                                            <property name="left_attach">2</property>
269
278
                                    </child>
270
279
                                  </object>
271
280
                                  <packing>
272
 
                                    <property name="expand">False</property>
 
281
                                    <property name="expand">True</property>
273
282
                                    <property name="fill">True</property>
274
283
                                    <property name="position">0</property>
275
284
                                  </packing>
276
285
                                </child>
277
286
                                <child>
278
 
                                  <object class="GtkVBox" id="bookmarks">
279
 
                                    <property name="visible">True</property>
280
 
                                    <property name="can_focus">False</property>
281
 
                                    <child>
282
 
                                      <object class="GtkTable" id="bookmarks_sync">
283
 
                                        <property name="visible">True</property>
284
 
                                        <property name="can_focus">False</property>
285
 
                                        <property name="n_rows">2</property>
286
 
                                        <property name="n_columns">3</property>
287
 
                                        <property name="row_spacing">5</property>
288
 
                                        <child>
289
 
                                          <object class="GtkCheckButton" id="bookmarks_check">
290
 
                                            <property name="visible">True</property>
291
 
                                            <property name="can_focus">True</property>
292
 
                                            <property name="receives_default">False</property>
293
 
                                            <property name="use_action_appearance">False</property>
294
 
                                            <property name="draw_indicator">True</property>
295
 
                                          </object>
296
 
                                        </child>
297
 
                                        <child>
298
 
                                          <object class="GtkImage" id="bookmarks_icon">
299
 
                                            <property name="visible">True</property>
300
 
                                            <property name="can_focus">False</property>
301
 
                                            <property name="xpad">5</property>
302
 
                                          </object>
303
 
                                          <packing>
304
 
                                            <property name="left_attach">1</property>
305
 
                                            <property name="right_attach">2</property>
306
 
                                          </packing>
307
 
                                        </child>
308
 
                                        <child>
309
 
                                          <object class="GtkLabel" id="label6">
310
 
                                            <property name="visible">True</property>
311
 
                                            <property name="can_focus">False</property>
312
 
                                            <property name="xalign">0</property>
313
 
                                            <property name="label" translatable="yes">Enable Bookmarks Sync</property>
314
 
                                          </object>
315
 
                                          <packing>
316
 
                                            <property name="left_attach">2</property>
317
 
                                            <property name="right_attach">3</property>
318
 
                                          </packing>
319
 
                                        </child>
320
 
                                        <child>
321
 
                                          <object class="GtkLabel" id="label7">
322
 
                                            <property name="visible">True</property>
323
 
                                            <property name="can_focus">False</property>
324
 
                                            <property name="xalign">0</property>
325
 
                                            <property name="yalign">0</property>
326
 
                                            <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
327
 
                                            <property name="use_markup">True</property>
328
 
                                            <property name="wrap">True</property>
329
 
                                            <property name="width_chars">30</property>
330
 
                                          </object>
331
 
                                          <packing>
332
 
                                            <property name="left_attach">2</property>
333
 
                                            <property name="right_attach">3</property>
334
 
                                            <property name="top_attach">1</property>
335
 
                                            <property name="bottom_attach">2</property>
336
 
                                          </packing>
337
 
                                        </child>
338
 
                                        <child>
339
 
                                          <placeholder/>
340
 
                                        </child>
341
 
                                        <child>
342
 
                                          <placeholder/>
343
 
                                        </child>
344
 
                                      </object>
345
 
                                      <packing>
346
 
                                        <property name="expand">False</property>
347
 
                                        <property name="fill">True</property>
348
 
                                        <property name="position">0</property>
349
 
                                      </packing>
350
 
                                    </child>
351
 
                                  </object>
352
 
                                  <packing>
353
 
                                    <property name="expand">False</property>
354
 
                                    <property name="fill">True</property>
355
 
                                    <property name="pack_type">end</property>
356
 
                                    <property name="position">1</property>
357
 
                                  </packing>
 
287
                                  <placeholder/>
358
288
                                </child>
359
289
                              </object>
360
290
                            </child>