~ubuntu-branches/ubuntu/precise/gnome-control-center/precise-updates

« back to all changes in this revision

Viewing changes to .pc/53_use_ubuntu_help.patch/panels/color/color.ui

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha, Ken VanDine
  • Date: 2012-02-15 23:16:31 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20120215231631-vk7me0mhofpsq0hp
Tags: 1:3.3.5-0ubuntu1
* Upload the new serie, that will bring in quite some fixes, we revert
  some problematic or risky changes as well
* The new version includes those fixes:
  - "Change Password in User Accounts panel focuses "New password" field, 
     skipping "Current password"" (lp: #821759)
  - The dialog to add online accounts should have a title 
    (lp: #822380)
  - "Remove Profile" button clickable in Color panel when 
     no profile selected (lp: #869603)
  - Move Removable Media into System Info (lp: #835880)
  - Sound preferences: mouse scrolling balance only works for right.
    (lp: #918017)
  - gnome-control-center SIGSEGV in actualize_printers_list() 
    (lp: #903009)
  - selecting preffered applications is not an info (lp: #890143)
  - Add a keyboard shortcut by default for take screenshot of a selection"
    (lp: #625518)
* debian/patches/revert_git_datetime_port.patch:
  - revert use of datetimed, we don't use systemd and ubuntu-system-service 
    doesn't support it yet
* debian/patches/revert_git_drop_library.patch:
  - consolidate "01_allow_external_panels.patch", don't drop the library
    we use it from other components on ubuntu, the patch will be improved
    later to not use a copy of files like it does in that version
* debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_ua_gsettings.patch,
  debian/patches/revert_git_keyboard_gsettings.patch:
  - revert keyboard porting to gsettings, compiz still use gconf and we
    didn't update gnome-shell to the new serie (yet)

[ Jeremy Bicha ]
* New upstream release (Thanks Rico Tzchichholz!)
* debian/control.in:
  - Bump minimum dependency versions and add libwacom dependency
* debian/rules: Build without -Wl,-z,defs
* debian/watch: Watch for unstable releases
* Refreshed patches:
  - 01_allow_external_panels.patch
  - 04_add_theme_selection.patch
  - 50_ubuntu_systemwide_prefs.patch
  - 58_ubuntu_icon_views_redesign.patch
  - 59_install_gcm_components_on_demand.patch
  - 91_configure_cheese.patch
* Dropped upstream patches:
  - 00git_handle_media_dialog_close.patch
  - 03_show_wacom_under_unity.patch
  - 90_git_sound_tab_order.patch
  - 91_git_build_use_fontconfig.patch
  - 92_git_minimal_output_height.patch
  - 93_change_window_role_on_panel_change.patch
  - 94_git_adding_shortcuts.patch
  - 95_git_ctrlw_shortcut.patch
  - git_extra_keywords.patch

[ Ken VanDine ]
* debian/patches/96_sound_nua_panel.patch
  - refreshed with latest changes from ronoc

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
    <property name="can_focus">False</property>
6
6
    <property name="border_width">5</property>
7
7
    <property name="title"> </property>
 
8
    <property name="resizable">False</property>
8
9
    <property name="modal">True</property>
9
10
    <property name="window_position">center-on-parent</property>
10
11
    <property name="destroy_with_parent">True</property>
37
38
                <property name="expand">False</property>
38
39
                <property name="fill">False</property>
39
40
                <property name="position">0</property>
40
 
                <property name="secondary">True</property>
41
41
              </packing>
42
42
            </child>
43
43
            <child>
73
73
                <property name="visible">True</property>
74
74
                <property name="can_focus">False</property>
75
75
                <child>
76
 
                  <object class="GtkLabel" id="label12">
 
76
                  <object class="GtkLabel" id="label_assign_title">
77
77
                    <property name="visible">True</property>
78
78
                    <property name="can_focus">False</property>
79
79
                    <property name="label" translatable="yes" comments="Profiles that can be added to the device">Available Profiles</property>
98
98
              <object class="GtkComboBox" id="combobox_profile">
99
99
                <property name="visible">True</property>
100
100
                <property name="can_focus">False</property>
 
101
                <property name="margin_right">5</property>
101
102
              </object>
102
103
              <packing>
103
104
                <property name="expand">False</property>
105
106
                <property name="position">1</property>
106
107
              </packing>
107
108
            </child>
108
 
            <child>
109
 
              <object class="GtkHBox" id="hbox57">
110
 
                <property name="visible">True</property>
111
 
                <property name="can_focus">False</property>
112
 
                <property name="spacing">9</property>
113
 
                <child>
114
 
                  <object class="GtkImage" id="image2">
115
 
                    <property name="visible">True</property>
116
 
                    <property name="can_focus">False</property>
117
 
                    <property name="stock">gtk-dialog-info</property>
118
 
                    <property name="icon-size">6</property>
119
 
                  </object>
120
 
                  <packing>
121
 
                    <property name="expand">False</property>
122
 
                    <property name="fill">False</property>
123
 
                    <property name="position">0</property>
124
 
                  </packing>
125
 
                </child>
126
 
                <child>
127
 
                  <object class="GtkLabel" id="label13">
128
 
                    <property name="visible">True</property>
129
 
                    <property name="can_focus">False</property>
130
 
                    <property name="label" translatable="yes" comments="Some profiles are not compatible with some devices">Only profiles that are compatible with the device will be listed above.</property>
131
 
                    <property name="wrap">True</property>
132
 
                  </object>
133
 
                  <packing>
134
 
                    <property name="expand">False</property>
135
 
                    <property name="fill">False</property>
136
 
                    <property name="position">1</property>
137
 
                  </packing>
138
 
                </child>
139
 
              </object>
140
 
              <packing>
141
 
                <property name="expand">False</property>
142
 
                <property name="fill">False</property>
143
 
                <property name="position">2</property>
144
 
              </packing>
145
 
            </child>
146
109
          </object>
147
110
          <packing>
148
 
            <property name="expand">True</property>
 
111
            <property name="expand">False</property>
149
112
            <property name="fill">True</property>
150
113
            <property name="position">1</property>
151
114
          </packing>
259
222
                  <object class="GtkToolItem" id="left_button_group">
260
223
                    <property name="visible">True</property>
261
224
                    <property name="can_focus">False</property>
 
225
                    <property name="use_action_appearance">False</property>
262
226
                    <child>
263
227
                      <object class="GtkBox" id="left_button_group_box">
264
228
                        <property name="visible">True</property>
265
229
                        <property name="can_focus">False</property>
266
 
                        <property name="homogeneous">False</property>
267
230
                        <child>
268
231
                          <object class="GtkButton" id="toolbutton_device_add">
 
232
                            <property name="label" translatable="yes">Add device</property>
269
233
                            <property name="visible">True</property>
 
234
                            <property name="receives_default">False</property>
270
235
                            <property name="has_tooltip">True</property>
271
236
                            <property name="tooltip_markup" translatable="yes">Add a virtual device</property>
272
237
                            <property name="tooltip_text">Add a virtual device</property>
273
 
                            <property name="label" translatable="yes">Add device</property>
 
238
                            <property name="use_action_appearance">False</property>
274
239
                            <property name="use_underline">True</property>
275
240
                          </object>
276
241
                          <packing>
277
242
                            <property name="expand">False</property>
 
243
                            <property name="fill">True</property>
 
244
                            <property name="position">0</property>
278
245
                          </packing>
279
246
                        </child>
280
247
                        <child>
281
248
                          <object class="GtkButton" id="toolbutton_device_remove">
 
249
                            <property name="label" translatable="yes">Delete device</property>
282
250
                            <property name="visible">True</property>
 
251
                            <property name="receives_default">False</property>
283
252
                            <property name="has_tooltip">True</property>
284
253
                            <property name="tooltip_markup" translatable="yes">Remove a device</property>
285
254
                            <property name="tooltip_text">Remove a device</property>
286
 
                            <property name="label" translatable="yes">Delete device</property>
 
255
                            <property name="use_action_appearance">False</property>
287
256
                            <property name="use_underline">True</property>
288
257
                          </object>
289
258
                          <packing>
290
259
                            <property name="expand">False</property>
 
260
                            <property name="fill">True</property>
 
261
                            <property name="position">1</property>
291
262
                          </packing>
292
263
                        </child>
293
264
                        <child>
294
265
                          <object class="GtkButton" id="toolbutton_device_default">
 
266
                            <property name="label" translatable="yes">Set for all users</property>
 
267
                            <property name="receives_default">False</property>
295
268
                            <property name="has_tooltip">True</property>
296
269
                            <property name="tooltip_markup" translatable="yes">Set this device for all users on this computer</property>
297
270
                            <property name="tooltip_text">Set this device for all users on this computer</property>
298
 
                            <property name="label" translatable="yes">Set for all users</property>
 
271
                            <property name="use_action_appearance">False</property>
299
272
                            <property name="use_underline">True</property>
300
273
                          </object>
301
274
                          <packing>
302
275
                            <property name="expand">False</property>
 
276
                            <property name="fill">True</property>
 
277
                            <property name="position">2</property>
303
278
                          </packing>
304
279
                        </child>
305
280
                      </object>
307
282
                  </object>
308
283
                  <packing>
309
284
                    <property name="expand">True</property>
310
 
                    <property name="homogeneous">False</property>
311
285
                  </packing>
312
286
                </child>
313
287
                <child>
314
288
                  <object class="GtkToolItem" id="right_button_group">
315
289
                    <property name="visible">True</property>
316
290
                    <property name="can_focus">False</property>
 
291
                    <property name="use_action_appearance">False</property>
317
292
                    <child>
318
293
                      <object class="GtkBox" id="right_button_group_box">
319
294
                        <property name="visible">True</property>
320
295
                        <property name="can_focus">False</property>
321
296
                        <child>
322
297
                          <object class="GtkButton" id="toolbutton_profile_add">
323
 
                            <property name="visible">True</property>
324
298
                            <property name="label" translatable="yes">Add profile</property>
 
299
                            <property name="visible">True</property>
 
300
                            <property name="receives_default">False</property>
 
301
                            <property name="use_action_appearance">False</property>
325
302
                            <property name="use_underline">True</property>
326
303
                          </object>
327
304
                          <packing>
328
305
                            <property name="expand">False</property>
 
306
                            <property name="fill">True</property>
 
307
                            <property name="position">0</property>
329
308
                          </packing>
330
309
                        </child>
331
310
                        <child>
332
311
                          <object class="GtkButton" id="toolbutton_device_calibrate">
 
312
                            <property name="label" translatable="yes">Calibrate…</property>
 
313
                            <property name="receives_default">False</property>
333
314
                            <property name="has_tooltip">True</property>
334
315
                            <property name="tooltip_markup" translatable="yes">Calibrate the device</property>
335
316
                            <property name="tooltip_text" translatable="yes">Calibrate the device</property>
336
 
                            <property name="label" translatable="yes">Calibrate…</property>
 
317
                            <property name="use_action_appearance">False</property>
337
318
                            <property name="use_underline">True</property>
338
319
                          </object>
339
320
                          <packing>
340
321
                            <property name="expand">False</property>
 
322
                            <property name="fill">True</property>
 
323
                            <property name="position">1</property>
341
324
                          </packing>
342
325
                        </child>
343
326
                        <child>
344
327
                          <object class="GtkButton" id="toolbutton_profile_remove">
345
328
                            <property name="label" translatable="yes">Remove profile</property>
 
329
                            <property name="receives_default">False</property>
 
330
                            <property name="use_action_appearance">False</property>
346
331
                            <property name="use_underline">True</property>
347
332
                          </object>
348
333
                          <packing>
349
334
                            <property name="expand">False</property>
 
335
                            <property name="fill">True</property>
 
336
                            <property name="position">2</property>
350
337
                          </packing>
351
338
                        </child>
352
339
                        <child>
353
340
                          <object class="GtkButton" id="toolbutton_profile_view">
354
341
                            <property name="label" translatable="yes">View details</property>
 
342
                            <property name="receives_default">False</property>
 
343
                            <property name="use_action_appearance">False</property>
355
344
                            <property name="use_underline">True</property>
356
345
                          </object>
357
346
                          <packing>
358
347
                            <property name="expand">False</property>
 
348
                            <property name="fill">True</property>
 
349
                            <property name="position">3</property>
359
350
                          </packing>
360
351
                        </child>
361
352
                      </object>
362
353
                    </child>
363
354
                  </object>
 
355
                  <packing>
 
356
                    <property name="expand">False</property>
 
357
                  </packing>
364
358
                </child>
365
359
              </object>
 
360
              <packing>
 
361
                <property name="expand">False</property>
 
362
                <property name="fill">True</property>
 
363
                <property name="position">1</property>
 
364
              </packing>
366
365
            </child>
367
366
          </object>
 
367
          <packing>
 
368
            <property name="expand">False</property>
 
369
            <property name="fill">True</property>
 
370
            <property name="position">1</property>
 
371
          </packing>
368
372
        </child>
369
373
      </object>
370
374
    </child>
406
410
                <property name="expand">False</property>
407
411
                <property name="fill">False</property>
408
412
                <property name="position">0</property>
409
 
                <property name="secondary">True</property>
410
413
              </packing>
411
414
            </child>
412
415
            <child>