~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947
» Revision
215
: debian/patches/04_add_theme_selection.patch
« back to all changes in this revision
Viewing changes to debian/patches/04_add_theme_selection.patch
- browse files at revision 215
- compare with another revision
- download diff
- download tarball
- view history from revision 215
- Committer: Package Import Robot
- Author(s): Jeremy Bicha
- Date: 2012-01-15 13:55:05 UTC
- mfrom: (0.1.15 sid)
- Revision ID: package-import@ubuntu.com-20120115135505-42eak1svpn6j9afc
Tags: 1:3.2.2-2ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
- Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
- Add dependency on ubuntu-system-service
- Don't depend on cheese, cups-pk-helper, libsocialweb, or mesa-utils
since they're in universe
- Depend on ubuntu-docs instead of gnome-user-guide
* debian/rules:
- Add binary-post-install rule for gnome-control-center-data
- Don't build with cheese or libsocialweb
* debian/gnome-control-center-data.install:
* debian/source/include-binaries:
- Install UbuntuLogo.png & apport hook
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
- Add a link to the control center shell for indicators
* debian/patches/04_add_theme_selection.patch:
- Add theme selection to User Interface panel
- Refreshed for Precise design and renamed to User Interface
* debian/patches/01_allow_external_panels.patch:
- Allow running external (non-embedded) panels (LP: #787694)
* debian/patches/02_no_assert_on_null_streams.patch:
- Temporary patch to not assert on NULL streams (LP: #741155)
* debian/patches/03_show_wacom_under_unity.patch:
- show the wacom panel under unity (lp: #840555)
* debian/patches/05_run_update_manager.patch:
- Run update-manager instead of PackageKit updater (LP: #801335)
* debian/patches/07_make_window_wider.patch
- Make the System Settings window a bit wider to reduce need for scrolling
* debian/patches/10_keyboard_layout_on_unity.patch:
- Show keyboard layout bits on Unity (LP: #834523)
* Add 11_power-configure_lid_action.patch: Add back configuration for lid
action. (LP: #792636, GNOME#659045)
* debian/patches/12_add_never_turn_screen_off.patch:
- Add back the "never turn screen off" option (LP: #862154)
* debian/patches/50_ubuntu_systemwide_prefs.patch:
- Add back system-wide proxy settings (LP: #795519)
* debian/patches/52_ubuntu_language_list_mods.patch:
- Change the list of options, when setting language from User
Accounts, to items representing available translations, and with
that make it similar to the language list in language-selector.
- Make items representing language @variants be displayed as such.
* debian/patches/53_use_ubuntu_help.patch: Use gnome-help when running
GNOME or GNOME Fallback (LP: #852911)
* debian/patches/55_user_accounts_hide_controls.patch:
- When not using GDM, hide certain controls in the User Accounts
panel that only apply to it. (LP: #821766, LP: #821771)
- When a user is using an ecryptfs home directory, do not allow
the user to log in without a password
* debian/patches/56_use_ubuntu_info_branding.patch:
- Use Ubuntu branding in System info panel (LP: #860497)
* debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Use the non-monochrome
icon for the Keyboard panel (LP: #862027)
* debian/patches/90_git_sound_tab_order.patch: Reorder the tabs, the sound
effect one is the less used and shouldn't be first in the list
* debian/patches/91_git_build_use_fontconfig.patch:
- git patch to fix the build of the region capplet
* debian/patches/92_git_minimal_output_height.patch:
- set a minimal height on the output list (lp: #850032)
* debian/control:
- Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
- Add dependency on ubuntu-system-service
- Don't depend on cheese, cups-pk-helper, libsocialweb, or mesa-utils
since they're in universe
- Depend on ubuntu-docs instead of gnome-user-guide
* debian/rules:
- Add binary-post-install rule for gnome-control-center-data
- Don't build with cheese or libsocialweb
* debian/gnome-control-center-data.install:
* debian/source/include-binaries:
- Install UbuntuLogo.png & apport hook
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
- Add a link to the control center shell for indicators
* debian/patches/04_add_theme_selection.patch:
- Add theme selection to User Interface panel
- Refreshed for Precise design and renamed to User Interface
* debian/patches/01_allow_external_panels.patch:
- Allow running external (non-embedded) panels (LP: #787694)
* debian/patches/02_no_assert_on_null_streams.patch:
- Temporary patch to not assert on NULL streams (LP: #741155)
* debian/patches/03_show_wacom_under_unity.patch:
- show the wacom panel under unity (lp: #840555)
* debian/patches/05_run_update_manager.patch:
- Run update-manager instead of PackageKit updater (LP: #801335)
* debian/patches/07_make_window_wider.patch
- Make the System Settings window a bit wider to reduce need for scrolling
* debian/patches/10_keyboard_layout_on_unity.patch:
- Show keyboard layout bits on Unity (LP: #834523)
* Add 11_power-configure_lid_action.patch: Add back configuration for lid
action. (LP: #792636, GNOME#659045)
* debian/patches/12_add_never_turn_screen_off.patch:
- Add back the "never turn screen off" option (LP: #862154)
* debian/patches/50_ubuntu_systemwide_prefs.patch:
- Add back system-wide proxy settings (LP: #795519)
* debian/patches/52_ubuntu_language_list_mods.patch:
- Change the list of options, when setting language from User
Accounts, to items representing available translations, and with
that make it similar to the language list in language-selector.
- Make items representing language @variants be displayed as such.
* debian/patches/53_use_ubuntu_help.patch: Use gnome-help when running
GNOME or GNOME Fallback (LP: #852911)
* debian/patches/55_user_accounts_hide_controls.patch:
- When not using GDM, hide certain controls in the User Accounts
panel that only apply to it. (LP: #821766, LP: #821771)
- When a user is using an ecryptfs home directory, do not allow
the user to log in without a password
* debian/patches/56_use_ubuntu_info_branding.patch:
- Use Ubuntu branding in System info panel (LP: #860497)
* debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Use the non-monochrome
icon for the Keyboard panel (LP: #862027)
* debian/patches/90_git_sound_tab_order.patch: Reorder the tabs, the sound
effect one is the less used and shouldn't be first in the list
* debian/patches/91_git_build_use_fontconfig.patch:
- git patch to fix the build of the region capplet
* debian/patches/92_git_minimal_output_height.patch:
- set a minimal height on the output list (lp: #850032)
- files added:
- .pc/01_menu_category.patch
- .pc/01_menu_category.patch/shell
- .pc/91_configure_cheese.patch
- files removed:
- debian/control-center2.xpm
- files modified:
- .pc/91_git_build_use_fontconfig.patch/configure.ac
added
removed
debian/patches/04_add_theme_selection.patch
1
diff --git a/configure.ac b/configure.ac
2
index f1a1913..76d3c47 100644
3
--- a/configure.ac
4
+++ b/configure.ac
5
@@ -91,7 +91,7 @@ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0)
1
Index: gnome-control-center-3.2.2/configure.ac
2
===================================================================
3
--- gnome-control-center-3.2.2.orig/configure.ac 2012-01-15 13:37:59.728359058 -0500
4
+++ gnome-control-center-3.2.2/configure.ac 2012-01-15 13:38:02.428372439 -0500
5
@@ -91,7 +91,7 @@
6
6
PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
7
7
PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu-3.0 gio-unix-2.0)
8
8
PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
11
11
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES dbus-glib-1
12
12
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
13
13
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
14
diff --git a/panels/background/background.ui b/panels/background/background.ui
15
index e695c52..ed47577 100644
16
--- a/panels/background/background.ui
17
+++ b/panels/background/background.ui
18
@@ -1,316 +1,431 @@
14
Index: gnome-control-center-3.2.2/panels/background/background.ui
15
===================================================================
16
--- gnome-control-center-3.2.2.orig/panels/background/background.ui 2011-11-08 15:20:01.000000000 -0500
17
+++ gnome-control-center-3.2.2/panels/background/background.ui 2012-01-15 13:40:34.301125544 -0500
18
@@ -1,7 +1,6 @@
19
19
-<?xml version="1.0"?>
20
20
+<?xml version="1.0" encoding="UTF-8"?>
21
21
<interface>
22
22
<requires lib="gtk+" version="2.16"/>
23
23
- <!-- interface-naming-policy project-wide -->
24
- <object class="GtkListStore" id="sources-liststore">
25
- <columns>
26
- <!-- column-name source-name -->
27
- <column type="gchararray"/>
28
- <!-- column-name source-id -->
29
- <column type="guint"/>
30
- <!-- column-name source-pointer -->
31
- <column type="gpointer"/>
32
- </columns>
33
- </object>
24
<object class="GtkListStore" id="sources-liststore">
25
<columns>
26
<!-- column-name source-name -->
27
@@ -12,291 +11,434 @@
28
<column type="gpointer"/>
29
</columns>
30
</object>
34
31
- <object class="GtkHBox" id="background-panel">
35
32
- <property name="visible">True</property>
36
33
- <property name="border_width">10</property>
37
34
- <property name="spacing">12</property>
38
+ <object class="GtkWindow" id="window1">
39
+ <property name="can_focus">False</property>
40
<child>
35
- <child>
41
36
- <object class="GtkVBox" id="vbox2">
42
+ <object class="GtkBox" id="background-panel">
43
<property name="visible">True</property>
44
+ <property name="can_focus">False</property>
45
<property name="orientation">vertical</property>
37
- <property name="visible">True</property>
38
- <property name="orientation">vertical</property>
46
39
- <property name="spacing">0</property>
47
+ <property name="spacing">3</property>
48
<child>
40
- <child>
49
41
- <object class="GtkComboBox" id="sources-combobox">
50
+ <object class="GtkFrame" id="frame1">
51
<property name="visible">True</property>
42
- <property name="visible">True</property>
52
43
- <property name="model">sources-liststore</property>
53
44
- <child>
54
45
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
72
63
- <property name="hscrollbar_policy">automatic</property>
73
64
- <property name="vscrollbar_policy">automatic</property>
74
65
- <property name="shadow_type">in</property>
75
+ <property name="can_focus">False</property>
76
+ <property name="label_xalign">0</property>
77
+ <property name="shadow_type">none</property>
78
<child>
66
- <child>
79
67
- <object class="GtkIconView" id="backgrounds-iconview">
80
+ <object class="GtkAlignment" id="alignment1">
81
<property name="visible">True</property>
68
- <property name="visible">True</property>
82
69
- <property name="can_focus">True</property>
83
70
- <property name="row_spacing">0</property>
84
71
- <property name="column_spacing">0</property>
91
78
- <attribute name="gicon">0</attribute>
92
79
- </attributes>
93
80
- </child>
94
+ <property name="can_focus">False</property>
95
+ <property name="left_padding">12</property>
96
<child>
81
- <child>
97
82
- <!-- this cell renderer is here just to have
98
83
- the text spoken in orca -->
99
84
- <object class="GtkCellRendererText" id="text-renderer">
100
85
- <property name="visible">False</property>
101
+ <object class="GtkHBox" id="background-container">
102
+ <property name="visible">True</property>
103
+ <property name="can_focus">False</property>
104
+ <property name="border_width">10</property>
105
+ <property name="spacing">12</property>
106
+ <child>
107
+ <object class="GtkVBox" id="vbox2">
108
+ <property name="visible">True</property>
109
+ <property name="can_focus">False</property>
110
+ <child>
111
+ <object class="GtkComboBox" id="sources-combobox">
112
+ <property name="visible">True</property>
113
+ <property name="can_focus">False</property>
114
+ <property name="model">sources-liststore</property>
115
+ <child>
116
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
117
+ <attributes>
118
+ <attribute name="text">0</attribute>
119
+ </attributes>
120
+ </child>
121
+ </object>
122
+ <packing>
123
+ <property name="expand">False</property>
124
+ <property name="fill">True</property>
125
+ <property name="padding">6</property>
126
+ <property name="position">0</property>
127
+ </packing>
128
+ </child>
129
+ <child>
130
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
131
+ <property name="width_request">220</property>
132
+ <property name="height_request">380</property>
133
+ <property name="visible">True</property>
134
+ <property name="can_focus">True</property>
135
+ <property name="shadow_type">in</property>
136
+ <child>
137
+ <object class="GtkIconView" id="backgrounds-iconview">
138
+ <property name="visible">True</property>
139
+ <property name="can_focus">True</property>
140
+ <property name="row_spacing">0</property>
141
+ <property name="column_spacing">0</property>
142
+ <child>
143
+ <object class="GtkCellRendererPixbuf" id="pixbuf-renderer">
144
+ <property name="stock_size">6</property>
145
+ </object>
146
+ <attributes>
147
+ <attribute name="gicon">0</attribute>
148
+ </attributes>
149
+ </child>
150
+ <child>
151
+ <object class="GtkCellRendererText" id="text-renderer">
152
+ <property name="visible">False</property>
153
+ </object>
154
+ <attributes>
155
+ <attribute name="text">2</attribute>
156
+ </attributes>
157
+ </child>
158
+ </object>
159
+ </child>
160
+ </object>
161
+ <packing>
162
+ <property name="expand">True</property>
163
+ <property name="fill">True</property>
164
+ <property name="position">1</property>
165
+ </packing>
166
+ </child>
167
+ <child>
168
+ <object class="GtkToolbar" id="toolbar1">
169
+ <property name="visible">True</property>
170
+ <property name="can_focus">False</property>
171
+ <property name="icon_size">1</property>
172
+ <style>
173
+ <class name="inline-toolbar"/>
174
+ </style>
175
+ <child>
176
+ <object class="GtkToolButton" id="add_button">
177
+ <property name="visible">True</property>
178
+ <property name="can_focus">False</property>
179
+ <property name="use_action_appearance">False</property>
180
+ <property name="label" translatable="yes">Add wallpaper</property>
181
+ <property name="use_underline">True</property>
182
+ <property name="icon_name">list-add-symbolic</property>
183
+ </object>
184
+ <packing>
185
+ <property name="expand">False</property>
186
+ <property name="homogeneous">True</property>
187
+ </packing>
188
+ </child>
189
+ <child>
190
+ <object class="GtkToolButton" id="remove_button">
191
+ <property name="visible">True</property>
192
+ <property name="sensitive">False</property>
193
+ <property name="can_focus">False</property>
194
+ <property name="use_action_appearance">False</property>
195
+ <property name="label" translatable="yes">Remove wallpaper</property>
196
+ <property name="use_underline">True</property>
197
+ <property name="icon_name">list-remove-symbolic</property>
198
+ </object>
199
+ <packing>
200
+ <property name="expand">False</property>
201
+ <property name="homogeneous">True</property>
202
+ </packing>
203
+ </child>
204
+ </object>
205
+ <packing>
206
+ <property name="expand">False</property>
207
+ <property name="fill">True</property>
208
+ <property name="position">2</property>
209
+ </packing>
210
+ </child>
211
+ </object>
212
+ <packing>
213
+ <property name="expand">False</property>
214
+ <property name="fill">True</property>
215
+ <property name="position">0</property>
216
+ </packing>
217
+ </child>
218
+ <child>
219
+ <object class="GtkVBox" id="vbox3">
220
+ <property name="visible">True</property>
221
+ <property name="can_focus">False</property>
222
+ <property name="spacing">6</property>
223
+ <child>
224
+ <object class="GtkHBox" id="heading-hbox">
225
+ <property name="visible">True</property>
226
+ <property name="can_focus">False</property>
227
+ <property name="spacing">24</property>
228
+ <child>
229
+ <object class="GtkLabel" id="background-label">
230
+ <property name="visible">True</property>
231
+ <property name="can_focus">False</property>
232
+ <property name="xalign">0</property>
233
+ <property name="label">Current background</property>
234
+ <attributes>
235
+ <attribute name="weight" value="bold"/>
236
+ </attributes>
237
+ </object>
238
+ <packing>
239
+ <property name="expand">False</property>
240
+ <property name="fill">True</property>
241
+ <property name="position">0</property>
242
+ </packing>
243
+ </child>
244
+ <child>
245
+ <object class="GtkLabel" id="size_label">
246
+ <property name="visible">True</property>
247
+ <property name="can_focus">False</property>
248
+ <property name="xalign">1</property>
249
+ <property name="label">1280x700px</property>
250
+ </object>
251
+ <packing>
252
+ <property name="expand">True</property>
253
+ <property name="fill">True</property>
254
+ <property name="position">1</property>
255
+ </packing>
256
+ </child>
257
+ </object>
258
+ <packing>
259
+ <property name="expand">False</property>
260
+ <property name="fill">True</property>
261
+ <property name="position">0</property>
262
+ </packing>
263
+ </child>
264
+ <child>
265
+ <object class="GtkDrawingArea" id="preview-area">
266
+ <property name="visible">True</property>
267
+ <property name="can_focus">False</property>
268
+ </object>
269
+ <packing>
270
+ <property name="expand">True</property>
271
+ <property name="fill">True</property>
272
+ <property name="position">1</property>
273
+ </packing>
274
+ </child>
275
+ <child>
276
+ <object class="GtkHBox" id="bottom-hbox">
277
+ <property name="visible">True</property>
278
+ <property name="can_focus">False</property>
279
+ <property name="spacing">12</property>
280
+ <child>
281
+ <object class="GtkHBox" id="hbox2">
282
+ <property name="visible">True</property>
283
+ <property name="can_focus">False</property>
284
+ <property name="spacing">2</property>
285
+ <child>
286
+ <object class="GtkImage" id="slide_image">
287
+ <property name="visible">True</property>
288
+ <property name="can_focus">False</property>
289
+ <property name="icon_name">slideshow-symbolic</property>
290
+ </object>
291
+ <packing>
292
+ <property name="expand">False</property>
293
+ <property name="fill">True</property>
294
+ <property name="position">0</property>
295
+ </packing>
296
+ </child>
297
+ <child>
298
+ <object class="GtkLabel" id="slide-label">
299
+ <property name="visible">True</property>
300
+ <property name="can_focus">False</property>
301
+ <property name="xalign">0</property>
302
+ <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
303
+ </object>
304
+ <packing>
305
+ <property name="expand">False</property>
306
+ <property name="fill">True</property>
307
+ <property name="position">1</property>
308
+ </packing>
309
+ </child>
310
+ <child>
311
+ <object class="GtkLabel" id="strut">
312
+ <property name="visible">True</property>
313
+ <property name="can_focus">False</property>
314
+ <property name="label"> </property>
315
+ </object>
316
+ <packing>
317
+ <property name="expand">False</property>
318
+ <property name="fill">True</property>
319
+ <property name="position">1</property>
320
+ </packing>
321
+ </child>
322
+ </object>
323
+ <packing>
324
+ <property name="expand">True</property>
325
+ <property name="fill">True</property>
326
+ <property name="position">0</property>
327
+ </packing>
328
+ </child>
329
+ <child>
330
+ <object class="GtkHBox" id="edit-hbox">
331
+ <property name="visible">True</property>
332
+ <property name="can_focus">False</property>
333
+ <property name="spacing">6</property>
334
+ <child>
335
+ <object class="GtkColorButton" id="style-pcolor">
336
+ <property name="visible">True</property>
337
+ <property name="can_focus">True</property>
338
+ <property name="receives_default">True</property>
339
+ <property name="use_action_appearance">False</property>
340
+ <property name="color">#000000000000</property>
341
+ </object>
342
+ <packing>
343
+ <property name="expand">False</property>
344
+ <property name="fill">False</property>
345
+ <property name="position">0</property>
346
+ </packing>
347
+ </child>
348
+ <child>
349
+ <object class="GtkButton" id="swap-color-button">
350
+ <property name="visible">True</property>
351
+ <property name="can_focus">True</property>
352
+ <property name="receives_default">True</property>
353
+ <property name="use_action_appearance">False</property>
354
+ <child>
355
+ <object class="GtkImage" id="image1">
356
+ <property name="visible">True</property>
357
+ <property name="can_focus">False</property>
358
+ <property name="icon_name">object-flip-horizontal-symbolic</property>
359
+ </object>
360
+ </child>
361
+ </object>
362
+ <packing>
363
+ <property name="expand">False</property>
364
+ <property name="fill">False</property>
365
+ <property name="position">1</property>
366
+ </packing>
367
+ </child>
368
+ <child>
369
+ <object class="GtkColorButton" id="style-scolor">
370
+ <property name="visible">True</property>
371
+ <property name="can_focus">True</property>
372
+ <property name="receives_default">True</property>
373
+ <property name="use_action_appearance">False</property>
374
+ <property name="color">#000000000000</property>
375
+ </object>
376
+ <packing>
377
+ <property name="expand">False</property>
378
+ <property name="fill">False</property>
379
+ <property name="position">2</property>
380
+ </packing>
381
+ </child>
382
+ <child>
383
+ <object class="GtkComboBox" id="style-combobox">
384
+ <property name="visible">True</property>
385
+ <property name="can_focus">False</property>
386
+ <property name="model">style-liststore</property>
387
+ <property name="active">0</property>
388
+ <child>
389
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
390
+ <attributes>
391
+ <attribute name="text">0</attribute>
392
+ </attributes>
393
+ </child>
394
+ </object>
395
+ <packing>
396
+ <property name="expand">False</property>
397
+ <property name="fill">False</property>
398
+ <property name="pack_type">end</property>
399
+ <property name="position">3</property>
400
+ </packing>
401
+ </child>
402
+ </object>
403
+ <packing>
404
+ <property name="expand">False</property>
405
+ <property name="fill">False</property>
406
+ <property name="pack_type">end</property>
407
+ <property name="position">1</property>
408
+ </packing>
409
+ </child>
410
+ </object>
411
+ <packing>
412
+ <property name="expand">False</property>
413
+ <property name="fill">True</property>
414
+ <property name="position">2</property>
415
+ </packing>
416
+ </child>
417
+ </object>
418
+ <packing>
419
+ <property name="expand">True</property>
420
+ <property name="fill">True</property>
421
+ <property name="position">1</property>
422
+ </packing>
423
+ </child>
424
</object>
86
- </object>
425
87
- <attributes>
426
88
- <attribute name="text">2</attribute>
427
89
- </attributes>
428
</child>
429
</object>
430
</child>
90
- </child>
91
- </object>
92
- </child>
431
93
- </object>
432
94
- <packing>
433
95
- <property name="expand">True</property>
458
120
- </child>
459
121
- <child>
460
122
- <object class="GtkToolButton" id="remove_button">
461
+ <child type="label">
462
+ <object class="GtkLabel" id="label1">
463
<property name="visible">True</property>
123
- <property name="visible">True</property>
464
124
- <property name="label" translatable="yes">Remove wallpaper</property>
465
125
- <property name="use_action_appearance">False</property>
466
126
- <property name="use_underline">True</property>
467
127
- <property name="icon_name">list-remove-symbolic</property>
468
128
- <property name="sensitive">False</property>
469
+ <property name="can_focus">False</property>
470
+ <property name="label" translatable="yes"><b>Background</b></property>
471
+ <property name="use_markup">True</property>
472
</object>
129
- </object>
473
130
- <packing>
474
131
- <property name="expand">False</property>
475
132
- <property name="homogeneous">True</property>
476
133
- </packing>
477
</child>
478
</object>
479
<packing>
480
<property name="expand">False</property>
481
<property name="fill">True</property>
134
- </child>
135
- </object>
136
- <packing>
137
- <property name="expand">False</property>
138
- <property name="fill">True</property>
482
139
- <property name="position">2</property>
483
+ <property name="padding">6</property>
484
+ <property name="position">0</property>
485
</packing>
486
</child>
140
- </packing>
141
- </child>
487
142
- </object>
488
143
- <packing>
489
144
- <property name="expand">False</property>
491
146
- <property name="position">0</property>
492
147
- </packing>
493
148
- </child>
494
- <child>
149
+ <object class="GtkListStore" id="style-liststore">
150
+ <columns>
151
+ <!-- column-name name -->
152
+ <column type="gchararray"/>
153
+ <!-- column-name value -->
154
+ <column type="gint"/>
155
+ </columns>
156
+ <data>
157
+ <row>
158
+ <col id="0" translatable="yes">Tile</col>
159
+ <col id="1">1</col>
160
+ </row>
161
+ <row>
162
+ <col id="0" translatable="yes">Zoom</col>
163
+ <col id="1">5</col>
164
+ </row>
165
+ <row>
166
+ <col id="0" translatable="yes">Center</col>
167
+ <col id="1">2</col>
168
+ </row>
169
+ <row>
170
+ <col id="0" translatable="yes">Scale</col>
171
+ <col id="1">3</col>
172
+ </row>
173
+ <row>
174
+ <col id="0" translatable="yes">Fill</col>
175
+ <col id="1">4</col>
176
+ </row>
177
+ <row>
178
+ <col id="0" translatable="yes">Span</col>
179
+ <col id="1">6</col>
180
+ </row>
181
+ </data>
182
+ </object>
183
+ <object class="GtkWindow" id="window1">
184
+ <property name="can_focus">False</property>
185
<child>
495
186
- <object class="GtkVBox" id="vbox3">
496
- <property name="visible">True</property>
497
- <property name="can_focus">False</property>
187
+ <object class="GtkBox" id="background-panel">
188
<property name="visible">True</property>
189
<property name="can_focus">False</property>
498
190
- <property name="spacing">6</property>
191
+ <property name="orientation">vertical</property>
192
+ <property name="spacing">3</property>
499
193
<child>
500
194
- <object class="GtkHBox" id="heading-hbox">
501
+ <object class="GtkFrame" id="frame2">
195
+ <object class="GtkHBox" id="background-container">
502
196
<property name="visible">True</property>
503
197
<property name="can_focus">False</property>
504
198
- <property name="spacing">24</property>
505
+ <property name="label_xalign">0</property>
506
+ <property name="shadow_type">none</property>
507
<child>
199
- <child>
508
200
- <object class="GtkLabel" id="background-label">
509
+ <object class="GtkAlignment" id="alignment2">
510
<property name="visible">True</property>
511
<property name="can_focus">False</property>
201
- <property name="visible">True</property>
202
- <property name="can_focus">False</property>
512
203
- <property name="xalign">0</property>
513
204
- <property name="label">Current background</property>
514
205
- <attributes>
547
238
- <child>
548
239
- <object class="GtkHBox" id="bottom-hbox">
549
240
- <property name="visible">True</property>
550
- <property name="spacing">12</property>
551
- <child>
241
+ <property name="border_width">10</property>
242
<property name="spacing">12</property>
243
<child>
552
244
- <object class="GtkHBox" id="hbox2">
553
- <property name="visible">True</property>
245
+ <object class="GtkVBox" id="vbox3">
246
<property name="visible">True</property>
554
247
- <property name="spacing">2</property>
555
- <child>
248
+ <property name="can_focus">False</property>
249
<child>
556
250
- <object class="GtkImage" id="slide_image">
557
- <property name="visible">True</property>
251
+ <object class="GtkLabel" id="label1">
252
<property name="visible">True</property>
558
253
- <property name="icon_name">slideshow-symbolic</property>
559
- </object>
560
- <packing>
561
- <property name="expand">False</property>
562
- <property name="position">0</property>
563
- </packing>
564
- </child>
565
- <child>
254
+ <property name="can_focus">False</property>
255
+ <property name="xalign">0</property>
256
+ <property name="label" translatable="yes"><b>Background</b></property>
257
+ <property name="use_markup">True</property>
258
</object>
259
<packing>
260
<property name="expand">False</property>
261
+ <property name="fill">True</property>
262
<property name="position">0</property>
263
</packing>
264
</child>
265
<child>
566
266
- <object class="GtkLabel" id="slide-label">
567
- <property name="visible">True</property>
267
+ <object class="GtkDrawingArea" id="preview-area">
268
<property name="visible">True</property>
568
269
- <property name="xalign">0</property>
569
270
- <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
570
- </object>
571
- <packing>
271
+ <property name="can_focus">False</property>
272
</object>
273
<packing>
572
274
- <property name="expand">False</property>
573
- <property name="position">1</property>
574
- </packing>
575
- </child>
576
+ <property name="left_padding">12</property>
275
+ <property name="expand">True</property>
276
+ <property name="fill">True</property>
277
<property name="position">1</property>
278
</packing>
279
</child>
577
280
<child>
578
281
- <object class="GtkLabel" id="strut">
579
+ <object class="GtkBox" id="box1">
282
+ <object class="GtkHBox" id="heading-hbox">
580
283
<property name="visible">True</property>
581
284
- <property name="label" translatable="no"> </property>
582
- </object>
583
- <packing>
584
- <property name="expand">False</property>
285
+ <property name="can_focus">False</property>
286
+ <property name="halign">center</property>
287
+ <property name="valign">end</property>
288
+ <property name="spacing">4</property>
289
+ <child>
290
+ <object class="GtkLabel" id="background-label">
291
+ <property name="visible">True</property>
292
+ <property name="can_focus">False</property>
293
+ <property name="halign">center</property>
294
+ <property name="label">Current background</property>
295
+ <attributes>
296
+ <attribute name="style" value="italic"/>
297
+ </attributes>
298
+ </object>
299
+ <packing>
300
+ <property name="expand">False</property>
301
+ <property name="fill">True</property>
302
+ <property name="position">0</property>
303
+ </packing>
304
+ </child>
305
+ <child>
306
+ <object class="GtkLabel" id="size_label">
307
+ <property name="width_request">15</property>
308
+ <property name="visible">True</property>
309
+ <property name="can_focus">False</property>
310
+ <property name="label">(2560 x 2560)</property>
311
+ <attributes>
312
+ <attribute name="style" value="italic"/>
313
+ </attributes>
314
+ </object>
315
+ <packing>
316
+ <property name="expand">False</property>
317
+ <property name="fill">True</property>
318
+ <property name="position">1</property>
319
+ </packing>
320
+ </child>
321
</object>
322
<packing>
323
<property name="expand">False</property>
585
324
- <property name="position">1</property>
586
- </packing>
587
- </child>
588
- </object>
589
- <packing>
590
- <property name="position">0</property>
591
- </packing>
592
- </child>
593
- <child>
325
+ <property name="fill">True</property>
326
+ <property name="padding">6</property>
327
+ <property name="position">2</property>
328
+ </packing>
329
+ </child>
330
+ <child>
331
+ <object class="GtkHBox" id="bottom-hbox">
332
+ <property name="visible">True</property>
333
+ <property name="can_focus">False</property>
334
+ <property name="spacing">12</property>
335
+ <child>
336
+ <object class="GtkHBox" id="hbox2">
337
+ <property name="visible">True</property>
338
+ <property name="can_focus">False</property>
339
+ <property name="spacing">2</property>
340
+ <child>
341
+ <object class="GtkImage" id="slide_image">
342
+ <property name="visible">True</property>
343
+ <property name="can_focus">False</property>
344
+ <property name="icon_name">slideshow-symbolic</property>
345
+ </object>
346
+ <packing>
347
+ <property name="expand">False</property>
348
+ <property name="fill">True</property>
349
+ <property name="position">0</property>
350
+ </packing>
351
+ </child>
352
+ <child>
353
+ <object class="GtkLabel" id="strut">
354
+ <property name="visible">True</property>
355
+ <property name="can_focus">False</property>
356
+ <property name="label"> </property>
357
+ </object>
358
+ <packing>
359
+ <property name="expand">False</property>
360
+ <property name="fill">True</property>
361
+ <property name="position">1</property>
362
+ </packing>
363
+ </child>
364
+ <child>
365
+ <object class="GtkLabel" id="slide-label">
366
+ <property name="visible">True</property>
367
+ <property name="can_focus">False</property>
368
+ <property name="xalign">0</property>
369
+ <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
370
+ </object>
371
+ <packing>
372
+ <property name="expand">False</property>
373
+ <property name="fill">True</property>
374
+ <property name="position">1</property>
375
+ </packing>
376
+ </child>
377
+ </object>
378
+ <packing>
379
+ <property name="expand">True</property>
380
+ <property name="fill">True</property>
381
+ <property name="position">0</property>
382
+ </packing>
383
+ </child>
384
+ <child>
385
+ <object class="GtkHBox" id="edit-hbox">
386
+ <property name="visible">True</property>
387
+ <property name="can_focus">False</property>
388
+ <property name="spacing">6</property>
389
+ <child>
390
+ <object class="GtkColorButton" id="style-pcolor">
391
+ <property name="use_action_appearance">False</property>
392
+ <property name="visible">True</property>
393
+ <property name="can_focus">True</property>
394
+ <property name="receives_default">True</property>
395
+ <property name="use_action_appearance">False</property>
396
+ <property name="color">#000000000000</property>
397
+ </object>
398
+ <packing>
399
+ <property name="expand">False</property>
400
+ <property name="fill">False</property>
401
+ <property name="position">0</property>
402
+ </packing>
403
+ </child>
404
+ <child>
405
+ <object class="GtkButton" id="swap-color-button">
406
+ <property name="use_action_appearance">False</property>
407
+ <property name="visible">True</property>
408
+ <property name="can_focus">True</property>
409
+ <property name="receives_default">True</property>
410
+ <property name="use_action_appearance">False</property>
411
+ <child>
412
+ <object class="GtkImage" id="image1">
413
+ <property name="visible">True</property>
414
+ <property name="can_focus">False</property>
415
+ <property name="icon_name">object-flip-horizontal-symbolic</property>
416
+ </object>
417
+ </child>
418
+ </object>
419
+ <packing>
420
+ <property name="expand">False</property>
421
+ <property name="fill">False</property>
422
+ <property name="position">1</property>
423
+ </packing>
424
+ </child>
425
+ <child>
426
+ <object class="GtkColorButton" id="style-scolor">
427
+ <property name="use_action_appearance">False</property>
428
+ <property name="visible">True</property>
429
+ <property name="can_focus">True</property>
430
+ <property name="receives_default">True</property>
431
+ <property name="use_action_appearance">False</property>
432
+ <property name="color">#000000000000</property>
433
+ </object>
434
+ <packing>
435
+ <property name="expand">False</property>
436
+ <property name="fill">False</property>
437
+ <property name="position">2</property>
438
+ </packing>
439
+ </child>
440
+ <child>
441
+ <object class="GtkComboBox" id="style-combobox">
442
+ <property name="visible">True</property>
443
+ <property name="can_focus">False</property>
444
+ <property name="model">style-liststore</property>
445
+ <property name="active">0</property>
446
+ <child>
447
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
448
+ <attributes>
449
+ <attribute name="text">0</attribute>
450
+ </attributes>
451
+ </child>
452
+ </object>
453
+ <packing>
454
+ <property name="expand">False</property>
455
+ <property name="fill">False</property>
456
+ <property name="pack_type">end</property>
457
+ <property name="position">3</property>
458
+ </packing>
459
+ </child>
460
+ </object>
461
+ <packing>
462
+ <property name="expand">False</property>
463
+ <property name="fill">False</property>
464
+ <property name="pack_type">end</property>
465
+ <property name="position">1</property>
466
+ </packing>
467
+ </child>
468
+ </object>
469
+ <packing>
470
+ <property name="expand">False</property>
471
+ <property name="fill">True</property>
472
+ <property name="position">3</property>
473
</packing>
474
</child>
475
</object>
476
<packing>
477
+ <property name="expand">True</property>
478
+ <property name="fill">True</property>
479
<property name="position">0</property>
480
</packing>
481
</child>
482
<child>
594
483
- <object class="GtkHBox" id="edit-hbox">
595
- <property name="visible">True</property>
484
+ <object class="GtkVBox" id="vbox2">
485
<property name="visible">True</property>
596
486
- <property name="spacing">6</property>
597
- <child>
487
+ <property name="can_focus">False</property>
488
<child>
598
489
- <object class="GtkColorButton" id="style-pcolor">
599
- <property name="visible">True</property>
490
+ <object class="GtkComboBox" id="sources-combobox">
491
<property name="visible">True</property>
600
492
- <property name="can_focus">True</property>
601
493
- <property name="receives_default">True</property>
602
494
- <property name="color">#000000000000</property>
603
- </object>
604
- <packing>
605
- <property name="expand">False</property>
495
+ <property name="can_focus">False</property>
496
+ <property name="model">sources-liststore</property>
497
+ <child>
498
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
499
+ <attributes>
500
+ <attribute name="text">0</attribute>
501
+ </attributes>
502
+ </child>
503
</object>
504
<packing>
505
<property name="expand">False</property>
606
506
- <property name="fill">False</property>
607
- <property name="position">0</property>
608
- </packing>
609
- </child>
610
- <child>
507
+ <property name="fill">True</property>
508
<property name="position">0</property>
509
</packing>
510
</child>
511
<child>
611
512
- <object class="GtkButton" id="swap-color-button">
612
- <property name="visible">True</property>
613
- <property name="can_focus">True</property>
513
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
514
+ <property name="width_request">220</property>
515
+ <property name="height_request">380</property>
516
<property name="visible">True</property>
517
<property name="can_focus">True</property>
614
518
- <property name="receives_default">True</property>
615
519
- <property name="use_action_appearance">False</property>
616
+ <property name="can_focus">False</property>
617
+ <property name="spacing">3</property>
618
+ <property name="homogeneous">True</property>
520
+ <property name="shadow_type">in</property>
619
521
<child>
620
522
- <object class="GtkImage" id="image1">
621
+ <object class="GtkLabel" id="label3">
523
+ <object class="GtkIconView" id="backgrounds-iconview">
622
524
<property name="visible">True</property>
623
<property name="can_focus">False</property>
525
- <property name="can_focus">False</property>
624
526
- <property name="icon_name">object-flip-horizontal-symbolic</property>
625
+ <property name="xalign">0</property>
626
+ <property name="label" translatable="yes">Theme to be used for the UI</property>
527
+ <property name="can_focus">True</property>
528
+ <property name="row_spacing">0</property>
529
+ <property name="column_spacing">0</property>
530
+ <child>
531
+ <object class="GtkCellRendererPixbuf" id="pixbuf-renderer">
532
+ <property name="stock_size">6</property>
533
+ </object>
534
+ <attributes>
535
+ <attribute name="gicon">0</attribute>
536
+ </attributes>
537
+ </child>
538
+ <child>
539
+ <object class="GtkCellRendererText" id="text-renderer">
540
+ <property name="visible">False</property>
541
+ </object>
542
+ <attributes>
543
+ <attribute name="text">2</attribute>
544
+ </attributes>
545
+ </child>
627
546
</object>
628
+ <packing>
629
+ <property name="expand">False</property>
630
+ <property name="fill">True</property>
631
+ <property name="position">0</property>
632
+ </packing>
633
547
</child>
634
- </object>
635
- <packing>
548
</object>
549
<packing>
636
550
- <property name="expand">False</property>
637
551
- <property name="fill">False</property>
638
- <property name="position">1</property>
639
- </packing>
640
- </child>
641
- <child>
552
+ <property name="expand">True</property>
553
+ <property name="fill">True</property>
554
<property name="position">1</property>
555
</packing>
556
</child>
557
<child>
642
558
- <object class="GtkComboBox" id="style-combobox">
643
- <property name="visible">True</property>
559
+ <object class="GtkToolbar" id="toolbar1">
560
<property name="visible">True</property>
644
561
- <property name="model">style-liststore</property>
645
562
- <property name="active">0</property>
563
+ <property name="can_focus">False</property>
564
+ <property name="icon_size">1</property>
565
+ <style>
566
+ <class name="inline-toolbar"/>
567
+ </style>
646
568
<child>
647
569
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
648
570
- <attributes>
649
571
- <attribute name="text">0</attribute>
650
572
- </attributes>
651
+ <object class="GtkComboBoxText" id="theme-selector">
652
+ <property name="visible">True</property>
653
+ <property name="can_focus">False</property>
654
+ </object>
655
+ <packing>
656
+ <property name="expand">False</property>
657
+ <property name="fill">True</property>
658
+ <property name="padding">3</property>
659
+ <property name="position">1</property>
573
+ <object class="GtkToolButton" id="add_button">
574
+ <property name="use_action_appearance">False</property>
575
+ <property name="visible">True</property>
576
+ <property name="can_focus">False</property>
577
+ <property name="use_action_appearance">False</property>
578
+ <property name="label" translatable="yes">Add wallpaper</property>
579
+ <property name="use_underline">True</property>
580
+ <property name="icon_name">list-add-symbolic</property>
581
+ </object>
582
+ <packing>
583
+ <property name="expand">False</property>
584
+ <property name="homogeneous">True</property>
585
+ </packing>
586
+ </child>
587
+ <child>
588
+ <object class="GtkToolButton" id="remove_button">
589
+ <property name="use_action_appearance">False</property>
590
+ <property name="visible">True</property>
591
+ <property name="sensitive">False</property>
592
+ <property name="can_focus">False</property>
593
+ <property name="use_action_appearance">False</property>
594
+ <property name="label" translatable="yes">Remove wallpaper</property>
595
+ <property name="use_underline">True</property>
596
+ <property name="icon_name">list-remove-symbolic</property>
597
+ </object>
598
+ <packing>
599
+ <property name="expand">False</property>
600
+ <property name="homogeneous">True</property>
660
601
+ </packing>
661
602
</child>
662
603
</object>
663
- <packing>
664
- <property name="expand">False</property>
604
<packing>
605
<property name="expand">False</property>
665
606
- <property name="fill">False</property>
666
607
- <property name="pack_type">end</property>
667
- <property name="position">3</property>
668
- </packing>
669
- </child>
608
+ <property name="fill">True</property>
609
<property name="position">3</property>
610
</packing>
611
</child>
670
612
- <child>
671
613
- <object class="GtkColorButton" id="style-scolor">
672
614
- <property name="visible">True</property>
680
622
- <property name="fill">False</property>
681
623
- <property name="position">2</property>
682
624
- </packing>
683
</child>
625
- </child>
684
626
</object>
685
- <packing>
686
- <property name="expand">False</property>
627
<packing>
628
<property name="expand">False</property>
687
629
- <property name="fill">False</property>
688
- <property name="pack_type">end</property>
689
- <property name="position">1</property>
690
- </packing>
630
+ <property name="fill">True</property>
631
+ <property name="position">1</property>
632
+ </packing>
691
633
+ </child>
692
+ <child type="label">
693
+ <object class="GtkLabel" id="label2">
634
+ </object>
635
+ <packing>
636
+ <property name="expand">False</property>
637
+ <property name="fill">True</property>
638
+ <property name="position">0</property>
639
+ </packing>
640
+ </child>
641
+ <child>
642
+ <object class="GtkBox" id="theme-box">
643
+ <property name="visible">True</property>
644
+ <property name="can_focus">False</property>
645
+ <property name="margin_bottom">8</property>
646
+ <property name="spacing">12</property>
647
+ <child>
648
+ <object class="GtkLabel" id="theme-label">
694
649
+ <property name="visible">True</property>
695
650
+ <property name="can_focus">False</property>
651
+ <property name="xalign">0</property>
652
+ <property name="xpad">6</property>
696
653
+ <property name="label" translatable="yes"><b>Theme</b></property>
697
654
+ <property name="use_markup">True</property>
698
655
+ </object>
699
</child>
656
+ <packing>
657
+ <property name="expand">False</property>
658
+ <property name="fill">True</property>
659
+ <property name="padding">6</property>
660
+ <property name="position">0</property>
661
+ </packing>
662
+ </child>
663
+ <child>
664
+ <object class="GtkComboBoxText" id="theme-selector">
665
+ <property name="width_request">220</property>
666
+ <property name="visible">True</property>
667
+ <property name="can_focus">False</property>
668
+ </object>
669
+ <packing>
670
+ <property name="expand">False</property>
671
+ <property name="fill">True</property>
672
+ <property name="padding">9</property>
673
<property name="pack_type">end</property>
674
<property name="position">1</property>
675
</packing>
676
@@ -304,13 +446,12 @@
700
677
</object>
701
678
<packing>
702
679
<property name="expand">False</property>
703
680
- <property name="position">2</property>
704
681
+ <property name="fill">True</property>
682
+ <property name="pack_type">end</property>
705
683
+ <property name="position">1</property>
706
684
</packing>
707
685
</child>
712
690
</child>
713
691
</object>
714
692
<object class="GtkSizeGroup" id="sizegroup">
715
@@ -322,6 +440,16 @@
693
@@ -322,38 +463,4 @@
716
694
<widget name="strut"/>
717
695
</widgets>
718
696
</object>
719
+ <object class="GtkListStore" id="sources-liststore">
720
+ <columns>
721
+ <!-- column-name source-name -->
722
+ <column type="gchararray"/>
723
+ <!-- column-name source-id -->
724
+ <column type="guint"/>
725
+ <!-- column-name source-pointer -->
726
+ <column type="gpointer"/>
727
+ </columns>
728
+ </object>
729
<object class="GtkListStore" id="style-liststore">
730
<columns>
731
<!-- column-name name -->
732
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
733
index f7f71ed..6d88f44 100644
734
--- a/panels/background/cc-background-panel.c
735
+++ b/panels/background/cc-background-panel.c
697
- <object class="GtkListStore" id="style-liststore">
698
- <columns>
699
- <!-- column-name name -->
700
- <column type="gchararray"/>
701
- <!-- column-name value -->
702
- <column type="gint"/>
703
- </columns>
704
- <data>
705
- <row>
706
- <col id="0" translatable="yes">Tile</col>
707
- <col id="1">1</col>
708
- </row>
709
- <row>
710
- <col id="0" translatable="yes">Zoom</col>
711
- <col id="1">5</col>
712
- </row>
713
- <row>
714
- <col id="0" translatable="yes">Center</col>
715
- <col id="1">2</col>
716
- </row>
717
- <row>
718
- <col id="0" translatable="yes">Scale</col>
719
- <col id="1">3</col>
720
- </row>
721
- <row>
722
- <col id="0" translatable="yes">Fill</col>
723
- <col id="1">4</col>
724
- </row>
725
- <row>
726
- <col id="0" translatable="yes">Span</col>
727
- <col id="1">6</col>
728
- </row>
729
- </data>
730
- </object>
731
</interface>
732
Index: gnome-control-center-3.2.2/panels/background/cc-background-panel.c
733
===================================================================
734
--- gnome-control-center-3.2.2.orig/panels/background/cc-background-panel.c 2011-11-08 15:20:01.000000000 -0500
735
+++ gnome-control-center-3.2.2/panels/background/cc-background-panel.c 2012-01-15 13:38:02.428372439 -0500
736
736
@@ -24,6 +24,7 @@
737
737
#include <string.h>
738
738
#include <glib/gi18n-lib.h>
741
741
742
742
#include "cc-background-panel.h"
743
743
#include "bg-wallpapers-source.h"
744
@@ -69,6 +70,7 @@ struct _CcBackgroundPanelPrivate
744
@@ -69,6 +70,7 @@
745
745
#endif
746
746
747
747
GSettings *settings;
749
749
750
750
GnomeDesktopThumbnailFactory *thumb_factory;
751
751
752
@@ -167,6 +169,12 @@ cc_background_panel_dispose (GObject *object)
752
@@ -167,6 +169,12 @@
753
753
priv->settings = NULL;
754
754
}
755
755
762
762
if (priv->copy_cancellable)
763
763
{
764
764
/* cancel any copy operation */
765
@@ -1137,6 +1145,121 @@ scrolled_realize_cb (GtkWidget *scrolled,
765
@@ -341,11 +349,13 @@
766
{
767
GdkColor pcolor, scolor;
768
769
- markup = g_strdup_printf ("<b>%s</b>", cc_background_item_get_name (priv->current_background));
770
+ markup = g_strdup_printf ("<i>%s</i>", cc_background_item_get_name (priv->current_background));
771
gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup);
772
g_free (markup);
773
774
- gtk_label_set_text (GTK_LABEL (WID ("size_label")), cc_background_item_get_size (priv->current_background));
775
+ markup = g_strdup_printf ("%s%s%s", "(", cc_background_item_get_size (priv->current_background), ")");
776
+ gtk_label_set_markup (GTK_LABEL (WID ("size_label")), markup);
777
+ g_free (markup);
778
779
gdk_color_parse (cc_background_item_get_pcolor (priv->current_background), &pcolor);
780
gdk_color_parse (cc_background_item_get_scolor (priv->current_background), &scolor);
781
@@ -1136,6 +1146,121 @@
766
782
g_object_set (G_OBJECT (scrolled), "height-request", 280, NULL);
767
783
}
768
784
884
900
static void
885
901
cc_background_panel_init (CcBackgroundPanel *self)
886
902
{
887
@@ -1268,6 +1382,9 @@ cc_background_panel_init (CcBackgroundPanel *self)
903
@@ -1267,6 +1392,9 @@
888
904
889
905
/* Setup the edit box with our current settings */
890
906
source_update_edit_box (priv, TRUE);
894
910
}
895
911
896
912
void
897
diff --git a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
898
index 8d9f7c0..36a4d28 100644
899
--- a/panels/background/gnome-background-panel.desktop.in.in
900
+++ b/panels/background/gnome-background-panel.desktop.in.in
913
Index: gnome-control-center-3.2.2/panels/background/gnome-background-panel.desktop.in.in
914
===================================================================
915
--- gnome-control-center-3.2.2.orig/panels/background/gnome-background-panel.desktop.in.in 2011-09-01 06:01:00.000000000 -0400
916
+++ gnome-control-center-3.2.2/panels/background/gnome-background-panel.desktop.in.in 2012-01-15 13:38:02.428372439 -0500
901
917
@@ -1,6 +1,6 @@
902
918
[Desktop Entry]
903
919
-_Name=Background
904
920
-_Comment=Change the background
905
+_Name=Appearance
921
+_Name=User Interface
906
922
+_Comment=Change the background and theme
907
923
Exec=gnome-control-center background
908
924
Icon=preferences-desktop-wallpaper
909
925
Terminal=false
910
@@ -10,4 +10,4 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Per
926
@@ -10,4 +10,4 @@
911
927
OnlyShowIn=GNOME;Unity;
912
928
X-GNOME-Settings-Panel=background
913
929
# Translators: those are keywords for the background control-center panel
914
930
-_X-GNOME-Keywords=Wallpaper;Screen;Desktop;
915
+_X-GNOME-Keywords=Wallpaper;Screen;Desktop;Theme;
931
+_X-GNOME-Keywords=Wallpaper;Screen;Desktop;Theme;Appearance;Launcher;Unity;Menus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.1