Unity Control Center

Merge lp:~seb128/unity-control-center/dont-dim-labels into lp:unity-control-center

  1. dont-dim-labels
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Robert Ancell
Approved revision: 12748
Merged at revision: 12748
Proposed branch: lp:~seb128/unity-control-center/dont-dim-labels
Merge into: lp:unity-control-center
Diff against target: 949 lines (+98/-98)
17 files modified
panels/bluetooth/bluetooth.ui (+4/-4)
panels/display/display-capplet.ui (+5/-5)
panels/info/info.ui (+17/-17)
panels/network/network-mobile.ui (+7/-7)
panels/network/network-proxy.ui (+6/-6)
panels/network/network-vpn.ui (+5/-5)
panels/network/network-wifi.ui (+13/-13)
panels/network/network-wired.ui (+5/-5)
panels/printers/pp-options-dialog.c (+2/-2)
panels/printers/printers.ui (+5/-5)
panels/region/gnome-region-panel.ui (+2/-2)
panels/user-accounts/data/account-dialog.ui (+9/-9)
panels/user-accounts/data/password-dialog.ui (+5/-5)
panels/user-accounts/data/user-accounts-dialog.ui (+6/-6)
panels/wacom/cc-wacom-nav-button.c (+1/-1)
panels/wacom/gnome-wacom-properties.ui (+2/-2)
panels/wacom/wacom-stylus-page.ui (+4/-4)
To merge this branch: bzr merge lp:~seb128/unity-control-center/dont-dim-labels
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+210662@code.launchpad.net

Commit message

Don't dim labels, that creates the impression that those options can't be
changed by the user. We create a new class rather for those which is not
used yet, but that let the option to update the theme later.

Description of the change

Don't dim labels, that creates the impression that those options can't be
changed by the user. We create a new class rather for those which is not
used yet, but that let the option to update the theme later.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Design recommended to use normal labels as a simple solution for this cycle, though ideally we might want some better styling for the "label - value" combos. Defining a new style (rather than dropping it) allows us to update the theme easily later if we want to do that

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:12748
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/68/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/bluetooth/bluetooth.ui'
2--- panels/bluetooth/bluetooth.ui 2014-02-20 22:57:03 +0000
3+++ panels/bluetooth/bluetooth.ui 2014-03-12 18:13:25 +0000
4@@ -192,7 +192,7 @@
5 <property name="xalign">1</property>
6 <property name="label" translatable="yes">Connection</property>
7 <style>
8- <class name="dim-label"/>
9+ <class name="dim-label-ucc"/>
10 </style>
11 </object>
12 <packing>
13@@ -279,7 +279,7 @@
14 <property name="xalign">1</property>
15 <property name="label" translatable="yes">Paired</property>
16 <style>
17- <class name="dim-label"/>
18+ <class name="dim-label-ucc"/>
19 </style>
20 </object>
21 <packing>
22@@ -321,7 +321,7 @@
23 <property name="xalign">1</property>
24 <property name="label" translatable="yes">Type</property>
25 <style>
26- <class name="dim-label"/>
27+ <class name="dim-label-ucc"/>
28 </style>
29 </object>
30 <packing>
31@@ -363,7 +363,7 @@
32 <property name="xalign">1</property>
33 <property name="label" translatable="yes">Address</property>
34 <style>
35- <class name="dim-label"/>
36+ <class name="dim-label-ucc"/>
37 </style>
38 </object>
39 <packing>
40
41=== modified file 'panels/display/display-capplet.ui'
42--- panels/display/display-capplet.ui 2014-02-20 10:15:07 +0000
43+++ panels/display/display-capplet.ui 2014-03-12 18:13:25 +0000
44@@ -127,7 +127,7 @@
45 <property name="use_underline">True</property>
46 <property name="mnemonic_widget">resolution_combo</property>
47 <style>
48- <class name="dim-label"/>
49+ <class name="dim-label-ucc"/>
50 </style>
51 </object>
52 <packing>
53@@ -144,7 +144,7 @@
54 <property name="use_underline">True</property>
55 <property name="mnemonic_widget">rotation_combo</property>
56 <style>
57- <class name="dim-label"/>
58+ <class name="dim-label-ucc"/>
59 </style>
60 </object>
61 <packing>
62@@ -176,7 +176,7 @@
63 <property name="use_underline">True</property>
64 <property name="mnemonic_widget">launcher_placement_combo</property>
65 <style>
66- <class name="dim-label"/>
67+ <class name="dim-label-ucc"/>
68 </style>
69 </object>
70 <packing>
71@@ -195,7 +195,7 @@
72 <property name="use_underline">True</property>
73 <property name="mnemonic_widget">stickyedge_switch</property>
74 <style>
75- <class name="dim-label"/>
76+ <class name="dim-label-ucc"/>
77 </style>
78 </object>
79 <packing>
80@@ -300,7 +300,7 @@
81 <property name="ypad">3</property>
82 <property name="label" translatable="yes">UI scale</property>
83 <style>
84- <class name="dim-label"/>
85+ <class name="dim-label-ucc"/>
86 </style>
87 </object>
88 <packing>
89
90=== modified file 'panels/info/info.ui'
91--- panels/info/info.ui 2014-02-20 17:15:24 +0000
92+++ panels/info/info.ui 2014-03-12 18:13:25 +0000
93@@ -279,7 +279,7 @@
94 <property name="label" translatable="yes">Device name</property>
95 <property name="mnemonic_widget">name_entry</property>
96 <style>
97- <class name="dim-label"/>
98+ <class name="dim-label-ucc"/>
99 </style>
100 </object>
101 </child>
102@@ -291,7 +291,7 @@
103 <property name="label" translatable="yes">Memory</property>
104 <property name="mnemonic_widget">memory_label</property>
105 <style>
106- <class name="dim-label"/>
107+ <class name="dim-label-ucc"/>
108 </style>
109 </object>
110 <packing>
111@@ -307,7 +307,7 @@
112 <property name="label" translatable="yes">Processor</property>
113 <property name="mnemonic_widget">processor_label</property>
114 <style>
115- <class name="dim-label"/>
116+ <class name="dim-label-ucc"/>
117 </style>
118 </object>
119 <packing>
120@@ -323,7 +323,7 @@
121 <property name="label" translatable="yes">OS type</property>
122 <property name="mnemonic_widget">os_type_label</property>
123 <style>
124- <class name="dim-label"/>
125+ <class name="dim-label-ucc"/>
126 </style>
127 </object>
128 <packing>
129@@ -339,7 +339,7 @@
130 <property name="label" translatable="yes">Disk</property>
131 <property name="mnemonic_widget">disk_label</property>
132 <style>
133- <class name="dim-label"/>
134+ <class name="dim-label-ucc"/>
135 </style>
136 </object>
137 <packing>
138@@ -494,7 +494,7 @@
139 <property name="xalign">1</property>
140 <property name="label" translatable="yes">Graphics</property>
141 <style>
142- <class name="dim-label"/>
143+ <class name="dim-label-ucc"/>
144 </style>
145 </object>
146 <packing>
147@@ -606,7 +606,7 @@
148 <property name="label" translatable="yes">_Web</property>
149 <property name="use_underline">True</property>
150 <style>
151- <class name="dim-label"/>
152+ <class name="dim-label-ucc"/>
153 </style>
154 </object>
155 </child>
156@@ -618,7 +618,7 @@
157 <property name="label" translatable="yes">_Mail</property>
158 <property name="use_underline">True</property>
159 <style>
160- <class name="dim-label"/>
161+ <class name="dim-label-ucc"/>
162 </style>
163 </object>
164 <packing>
165@@ -634,7 +634,7 @@
166 <property name="label" translatable="yes">_Calendar</property>
167 <property name="use_underline">True</property>
168 <style>
169- <class name="dim-label"/>
170+ <class name="dim-label-ucc"/>
171 </style>
172 </object>
173 <packing>
174@@ -650,7 +650,7 @@
175 <property name="label" translatable="yes">M_usic</property>
176 <property name="use_underline">True</property>
177 <style>
178- <class name="dim-label"/>
179+ <class name="dim-label-ucc"/>
180 </style>
181 </object>
182 <packing>
183@@ -666,7 +666,7 @@
184 <property name="label" translatable="yes">_Video</property>
185 <property name="use_underline">True</property>
186 <style>
187- <class name="dim-label"/>
188+ <class name="dim-label-ucc"/>
189 </style>
190 </object>
191 <packing>
192@@ -737,7 +737,7 @@
193 <property name="label" translatable="yes">_Photos</property>
194 <property name="use_underline">True</property>
195 <style>
196- <class name="dim-label"/>
197+ <class name="dim-label-ucc"/>
198 </style>
199 </object>
200 <packing>
201@@ -871,7 +871,7 @@
202 <property name="use_underline">True</property>
203 <property name="mnemonic_widget">media_audio_cdda_combobox</property>
204 <style>
205- <class name="dim-label"/>
206+ <class name="dim-label-ucc"/>
207 </style>
208 </object>
209 <packing>
210@@ -888,7 +888,7 @@
211 <property name="use_underline">True</property>
212 <property name="mnemonic_widget">media_video_dvd_combobox</property>
213 <style>
214- <class name="dim-label"/>
215+ <class name="dim-label-ucc"/>
216 </style>
217 </object>
218 <packing>
219@@ -934,7 +934,7 @@
220 <property name="use_underline">True</property>
221 <property name="mnemonic_widget">media_music_player_combobox</property>
222 <style>
223- <class name="dim-label"/>
224+ <class name="dim-label-ucc"/>
225 </style>
226 </object>
227 <packing>
228@@ -968,7 +968,7 @@
229 <property name="use_underline">True</property>
230 <property name="mnemonic_widget">media_dcf_combobox</property>
231 <style>
232- <class name="dim-label"/>
233+ <class name="dim-label-ucc"/>
234 </style>
235 </object>
236 <packing>
237@@ -1002,7 +1002,7 @@
238 <property name="use_underline">True</property>
239 <property name="mnemonic_widget">media_software_combobox</property>
240 <style>
241- <class name="dim-label"/>
242+ <class name="dim-label-ucc"/>
243 </style>
244 </object>
245 <packing>
246
247=== modified file 'panels/network/network-mobile.ui'
248--- panels/network/network-mobile.ui 2012-07-20 10:43:05 +0000
249+++ panels/network/network-mobile.ui 2014-03-12 18:13:25 +0000
250@@ -96,7 +96,7 @@
251 <property name="label" translatable="yes">IMEI</property>
252 <property name="mnemonic_widget">label_imei</property>
253 <style>
254- <class name="dim-label"/>
255+ <class name="dim-label-ucc"/>
256 </style>
257 </object>
258 <packing>
259@@ -114,7 +114,7 @@
260 <property name="label" translatable="yes">Provider</property>
261 <property name="mnemonic_widget">label_provider</property>
262 <style>
263- <class name="dim-label"/>
264+ <class name="dim-label-ucc"/>
265 </style>
266 </object>
267 <packing>
268@@ -242,7 +242,7 @@
269 <property name="xalign">1</property>
270 <property name="label" translatable="yes">IP Address</property>
271 <style>
272- <class name="dim-label"/>
273+ <class name="dim-label-ucc"/>
274 </style>
275 </object>
276 <packing>
277@@ -259,7 +259,7 @@
278 <property name="xalign">1</property>
279 <property name="label" translatable="yes">IPv6 Address</property>
280 <style>
281- <class name="dim-label"/>
282+ <class name="dim-label-ucc"/>
283 </style>
284 </object>
285 <packing>
286@@ -276,7 +276,7 @@
287 <property name="xalign">1</property>
288 <property name="label" translatable="yes">Default Route</property>
289 <style>
290- <class name="dim-label"/>
291+ <class name="dim-label-ucc"/>
292 </style>
293 </object>
294 <packing>
295@@ -294,7 +294,7 @@
296 <property name="yalign">0</property>
297 <property name="label" translatable="yes">DNS</property>
298 <style>
299- <class name="dim-label"/>
300+ <class name="dim-label-ucc"/>
301 </style>
302 </object>
303 <packing>
304@@ -311,7 +311,7 @@
305 <property name="xalign">1</property>
306 <property name="label" translatable="yes">Network</property>
307 <style>
308- <class name="dim-label"/>
309+ <class name="dim-label-ucc"/>
310 </style>
311 </object>
312 <packing>
313
314=== modified file 'panels/network/network-proxy.ui'
315--- panels/network/network-proxy.ui 2013-11-28 04:41:00 +0000
316+++ panels/network/network-proxy.ui 2014-03-12 18:13:25 +0000
317@@ -145,7 +145,7 @@
318 <property name="use_underline">True</property>
319 <property name="mnemonic_widget">combobox_proxy_mode</property>
320 <style>
321- <class name="dim-label"/>
322+ <class name="dim-label-ucc"/>
323 </style>
324 </object>
325 <packing>
326@@ -179,7 +179,7 @@
327 <property name="use_underline">True</property>
328 <property name="mnemonic_widget">entry_proxy_url</property>
329 <style>
330- <class name="dim-label"/>
331+ <class name="dim-label-ucc"/>
332 </style>
333 </object>
334 <packing>
335@@ -212,7 +212,7 @@
336 <property name="use_underline">True</property>
337 <property name="mnemonic_widget">entry_proxy_http</property>
338 <style>
339- <class name="dim-label"/>
340+ <class name="dim-label-ucc"/>
341 </style>
342 </object>
343 <packing>
344@@ -231,7 +231,7 @@
345 <property name="use_underline">True</property>
346 <property name="mnemonic_widget">entry_proxy_https</property>
347 <style>
348- <class name="dim-label"/>
349+ <class name="dim-label-ucc"/>
350 </style>
351 </object>
352 <packing>
353@@ -250,7 +250,7 @@
354 <property name="use_underline">True</property>
355 <property name="mnemonic_widget">entry_proxy_ftp</property>
356 <style>
357- <class name="dim-label"/>
358+ <class name="dim-label-ucc"/>
359 </style>
360 </object>
361 <packing>
362@@ -269,7 +269,7 @@
363 <property name="use_underline">True</property>
364 <property name="mnemonic_widget">entry_proxy_socks</property>
365 <style>
366- <class name="dim-label"/>
367+ <class name="dim-label-ucc"/>
368 </style>
369 </object>
370 <packing>
371
372=== modified file 'panels/network/network-vpn.ui'
373--- panels/network/network-vpn.ui 2012-09-13 14:50:48 +0000
374+++ panels/network/network-vpn.ui 2014-03-12 18:13:25 +0000
375@@ -102,7 +102,7 @@
376 <property name="label" translatable="yes">VPN Type</property>
377 <property name="mnemonic_widget">label_service_type</property>
378 <style>
379- <class name="dim-label"/>
380+ <class name="dim-label-ucc"/>
381 </style>
382 </object>
383 <packing>
384@@ -120,7 +120,7 @@
385 <property name="label" translatable="yes">Gateway</property>
386 <property name="mnemonic_widget">label_gateway</property>
387 <style>
388- <class name="dim-label"/>
389+ <class name="dim-label-ucc"/>
390 </style>
391 </object>
392 <packing>
393@@ -138,7 +138,7 @@
394 <property name="label" translatable="yes">Group Name</property>
395 <property name="mnemonic_widget">label_group_name</property>
396 <style>
397- <class name="dim-label"/>
398+ <class name="dim-label-ucc"/>
399 </style>
400 </object>
401 <packing>
402@@ -156,7 +156,7 @@
403 <property name="label" translatable="yes">Group Password</property>
404 <property name="mnemonic_widget">label_group_password</property>
405 <style>
406- <class name="dim-label"/>
407+ <class name="dim-label-ucc"/>
408 </style>
409 </object>
410 <packing>
411@@ -174,7 +174,7 @@
412 <property name="label" translatable="yes">Username</property>
413 <property name="mnemonic_widget">label_username</property>
414 <style>
415- <class name="dim-label"/>
416+ <class name="dim-label-ucc"/>
417 </style>
418 </object>
419 <packing>
420
421=== modified file 'panels/network/network-wifi.ui'
422--- panels/network/network-wifi.ui 2012-10-03 09:43:34 +0000
423+++ panels/network/network-wifi.ui 2014-03-12 18:13:25 +0000
424@@ -422,7 +422,7 @@
425 <property name="label" translatable="yes">Last used</property>
426 <property name="mnemonic_widget">label_last_used</property>
427 <style>
428- <class name="dim-label"/>
429+ <class name="dim-label-ucc"/>
430 </style>
431 </object>
432 <packing>
433@@ -455,7 +455,7 @@
434 <property name="label" translatable="yes">Hardware Address</property>
435 <property name="mnemonic_widget">label_mac</property>
436 <style>
437- <class name="dim-label"/>
438+ <class name="dim-label-ucc"/>
439 </style>
440 </object>
441 <packing>
442@@ -488,7 +488,7 @@
443 <property name="label" translatable="yes">Security</property>
444 <property name="mnemonic_widget">label_security</property>
445 <style>
446- <class name="dim-label"/>
447+ <class name="dim-label-ucc"/>
448 </style>
449 </object>
450 <packing>
451@@ -521,7 +521,7 @@
452 <property name="label" translatable="yes">Strength</property>
453 <property name="mnemonic_widget">label_strength</property>
454 <style>
455- <class name="dim-label"/>
456+ <class name="dim-label-ucc"/>
457 </style>
458 </object>
459 <packing>
460@@ -554,7 +554,7 @@
461 <property name="label" translatable="yes">Link speed</property>
462 <property name="mnemonic_widget">label_speed</property>
463 <style>
464- <class name="dim-label"/>
465+ <class name="dim-label-ucc"/>
466 </style>
467 </object>
468 <packing>
469@@ -587,7 +587,7 @@
470 <property name="label" translatable="yes">IPv4 Address</property>
471 <property name="mnemonic_widget">label_ipv4</property>
472 <style>
473- <class name="dim-label"/>
474+ <class name="dim-label-ucc"/>
475 </style>
476 </object>
477 <packing>
478@@ -620,7 +620,7 @@
479 <property name="label" translatable="yes">IPv6 Address</property>
480 <property name="mnemonic_widget">label_ipv6</property>
481 <style>
482- <class name="dim-label"/>
483+ <class name="dim-label-ucc"/>
484 </style>
485 </object>
486 <packing>
487@@ -653,7 +653,7 @@
488 <property name="label" translatable="yes">Default Route</property>
489 <property name="mnemonic_widget">label_route</property>
490 <style>
491- <class name="dim-label"/>
492+ <class name="dim-label-ucc"/>
493 </style>
494 </object>
495 <packing>
496@@ -687,7 +687,7 @@
497 <property name="label" translatable="yes">DNS</property>
498 <property name="mnemonic_widget">label_dns</property>
499 <style>
500- <class name="dim-label"/>
501+ <class name="dim-label-ucc"/>
502 </style>
503 </object>
504 <packing>
505@@ -934,7 +934,7 @@
506 <property name="label" translatable="yes">Network Name</property>
507 <property name="mnemonic_widget">label_hotspot_network_name</property>
508 <style>
509- <class name="dim-label"/>
510+ <class name="dim-label-ucc"/>
511 </style>
512 </object>
513 <packing>
514@@ -952,7 +952,7 @@
515 <property name="label" translatable="yes">Connected Devices</property>
516 <property name="mnemonic_widget">label_hotspot_connected</property>
517 <style>
518- <class name="dim-label"/>
519+ <class name="dim-label-ucc"/>
520 </style>
521 </object>
522 <packing>
523@@ -970,7 +970,7 @@
524 <property name="label" translatable="yes">Security type</property>
525 <property name="mnemonic_widget">label_hotspot_security</property>
526 <style>
527- <class name="dim-label"/>
528+ <class name="dim-label-ucc"/>
529 </style>
530 </object>
531 <packing>
532@@ -1033,7 +1033,7 @@
533 <property name="label" translatable="yes">Security key</property>
534 <property name="mnemonic_widget">label_hotspot_security_key</property>
535 <style>
536- <class name="dim-label"/>
537+ <class name="dim-label-ucc"/>
538 </style>
539 </object>
540 <packing>
541
542=== modified file 'panels/network/network-wired.ui'
543--- panels/network/network-wired.ui 2012-09-13 14:50:48 +0000
544+++ panels/network/network-wired.ui 2014-03-12 18:13:25 +0000
545@@ -88,7 +88,7 @@
546 <property name="label" translatable="yes">Hardware Address</property>
547 <property name="mnemonic_widget">label_mac</property>
548 <style>
549- <class name="dim-label"/>
550+ <class name="dim-label-ucc"/>
551 </style>
552 </object>
553 <packing>
554@@ -106,7 +106,7 @@
555 <property name="label" translatable="yes">IPv4 Address</property>
556 <property name="mnemonic_widget">label_ipv4</property>
557 <style>
558- <class name="dim-label"/>
559+ <class name="dim-label-ucc"/>
560 </style>
561 </object>
562 <packing>
563@@ -124,7 +124,7 @@
564 <property name="label" translatable="yes">IPv6 Address</property>
565 <property name="mnemonic_widget">label_ipv6</property>
566 <style>
567- <class name="dim-label"/>
568+ <class name="dim-label-ucc"/>
569 </style>
570 </object>
571 <packing>
572@@ -142,7 +142,7 @@
573 <property name="label" translatable="yes">Default Route</property>
574 <property name="mnemonic_widget">label_route</property>
575 <style>
576- <class name="dim-label"/>
577+ <class name="dim-label-ucc"/>
578 </style>
579 </object>
580 <packing>
581@@ -161,7 +161,7 @@
582 <property name="label" translatable="yes">DNS</property>
583 <property name="mnemonic_widget">label_dns</property>
584 <style>
585- <class name="dim-label"/>
586+ <class name="dim-label-ucc"/>
587 </style>
588 </object>
589 <packing>
590
591=== modified file 'panels/printers/pp-options-dialog.c'
592--- panels/printers/pp-options-dialog.c 2012-09-11 13:02:26 +0000
593+++ panels/printers/pp-options-dialog.c 2014-03-12 18:13:25 +0000
594@@ -350,7 +350,7 @@
595
596 label = gtk_label_new (option_display_name);
597 context = gtk_widget_get_style_context (label);
598- gtk_style_context_add_class (context, "dim-label");
599+ gtk_style_context_add_class (context, "dim-label-ucc");
600 gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
601 gtk_widget_set_margin_left (label, 10);
602 gtk_grid_attach (GTK_GRID (grid), label, 0, position, 1, 1);
603@@ -381,7 +381,7 @@
604
605 label = gtk_label_new (ppd_option_name_translate (&option));
606 context = gtk_widget_get_style_context (label);
607- gtk_style_context_add_class (context, "dim-label");
608+ gtk_style_context_add_class (context, "dim-label-ucc");
609 gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
610 gtk_widget_set_margin_left (label, 10);
611 gtk_grid_attach (GTK_GRID (grid), label, 0, position, 1, 1);
612
613=== modified file 'panels/printers/printers.ui'
614--- panels/printers/printers.ui 2012-08-09 12:23:49 +0000
615+++ panels/printers/printers.ui 2014-03-12 18:13:25 +0000
616@@ -103,7 +103,7 @@
617 <property name="xalign">1</property>
618 <property name="label" translatable="yes" comments="Translators: By supply we mean ink, toner, staples, water, ...">Supply</property>
619 <style>
620- <class name="dim-label"/>
621+ <class name="dim-label-ucc"/>
622 </style>
623 </object>
624 <packing>
625@@ -119,7 +119,7 @@
626 <property name="xalign">1</property>
627 <property name="label" translatable="yes" comments="Translators: Location of the printer (e.g. Lab, 1st floor,...).">Location</property>
628 <style>
629- <class name="dim-label"/>
630+ <class name="dim-label-ucc"/>
631 </style>
632 </object>
633 <packing>
634@@ -212,7 +212,7 @@
635 <property name="xalign">1</property>
636 <property name="label" translatable="yes">Jobs</property>
637 <style>
638- <class name="dim-label"/>
639+ <class name="dim-label-ucc"/>
640 </style>
641 </object>
642 <packing>
643@@ -288,7 +288,7 @@
644 <property name="xalign">1</property>
645 <property name="label" translatable="yes">Model</property>
646 <style>
647- <class name="dim-label"/>
648+ <class name="dim-label-ucc"/>
649 </style>
650 </object>
651 <packing>
652@@ -304,7 +304,7 @@
653 <property name="xalign">1</property>
654 <property name="label" translatable="yes">IP Address</property>
655 <style>
656- <class name="dim-label"/>
657+ <class name="dim-label-ucc"/>
658 </style>
659 </object>
660 <packing>
661
662=== modified file 'panels/region/gnome-region-panel.ui'
663--- panels/region/gnome-region-panel.ui 2013-11-28 06:01:52 +0000
664+++ panels/region/gnome-region-panel.ui 2014-03-12 18:13:25 +0000
665@@ -904,7 +904,7 @@
666 <property name="halign">end</property>
667 <property name="hexpand">True</property>
668 <property name="label" translatable="yes">Ctrl+Alt+Space</property>
669- <style><class name="dim-label"/></style>
670+ <style><class name="dim-label-ucc"/></style>
671 </object>
672 <packing>
673 <property name="left_attach">1</property>
674@@ -934,7 +934,7 @@
675 <property name="halign">end</property>
676 <property name="hexpand">True</property>
677 <property name="label" translatable="yes">Ctrl+Alt+Shift+Space</property>
678- <style><class name="dim-label"/></style>
679+ <style><class name="dim-label-ucc"/></style>
680 </object>
681 <packing>
682 <property name="left_attach">1</property>
683
684=== modified file 'panels/user-accounts/data/account-dialog.ui'
685--- panels/user-accounts/data/account-dialog.ui 2014-02-21 15:48:18 +0000
686+++ panels/user-accounts/data/account-dialog.ui 2014-03-12 18:13:25 +0000
687@@ -128,7 +128,7 @@
688 <property name="use_underline">True</property>
689 <property name="mnemonic_widget">local-username</property>
690 <style>
691- <class name="dim-label"/>
692+ <class name="dim-label-ucc"/>
693 </style>
694 </object>
695 <packing>
696@@ -156,7 +156,7 @@
697 <property name="use_underline">True</property>
698 <property name="mnemonic_widget">local-name</property>
699 <style>
700- <class name="dim-label"/>
701+ <class name="dim-label-ucc"/>
702 </style>
703 </object>
704 <packing>
705@@ -189,7 +189,7 @@
706 <property name="use_underline">True</property>
707 <property name="mnemonic_widget">local-account-type</property>
708 <style>
709- <class name="dim-label"/>
710+ <class name="dim-label-ucc"/>
711 </style>
712 </object>
713 <packing>
714@@ -221,7 +221,7 @@
715 <property name="use_underline">True</property>
716 <property name="mnemonic_widget">enterprise-domain</property>
717 <style>
718- <class name="dim-label"/>
719+ <class name="dim-label-ucc"/>
720 </style>
721 </object>
722 <packing>
723@@ -240,7 +240,7 @@
724 <property name="use_underline">True</property>
725 <property name="mnemonic_widget">enterprise-login</property>
726 <style>
727- <class name="dim-label"/>
728+ <class name="dim-label-ucc"/>
729 </style>
730 </object>
731 <packing>
732@@ -259,7 +259,7 @@
733 <property name="use_underline">True</property>
734 <property name="mnemonic_widget">enterprise-password</property>
735 <style>
736- <class name="dim-label"/>
737+ <class name="dim-label-ucc"/>
738 </style>
739 </object>
740 <packing>
741@@ -468,7 +468,7 @@
742 <property name="use_underline">True</property>
743 <property name="mnemonic_widget">join-domain</property>
744 <style>
745- <class name="dim-label"/>
746+ <class name="dim-label-ucc"/>
747 </style>
748 </object>
749 <packing>
750@@ -502,7 +502,7 @@
751 <property name="use_underline">True</property>
752 <property name="mnemonic_widget">join-name</property>
753 <style>
754- <class name="dim-label"/>
755+ <class name="dim-label-ucc"/>
756 </style>
757 </object>
758 <packing>
759@@ -536,7 +536,7 @@
760 <property name="use_underline">True</property>
761 <property name="mnemonic_widget">join-password</property>
762 <style>
763- <class name="dim-label"/>
764+ <class name="dim-label-ucc"/>
765 </style>
766 </object>
767 <packing>
768
769=== modified file 'panels/user-accounts/data/password-dialog.ui'
770--- panels/user-accounts/data/password-dialog.ui 2014-02-21 15:48:18 +0000
771+++ panels/user-accounts/data/password-dialog.ui 2014-03-12 18:13:25 +0000
772@@ -70,7 +70,7 @@
773 <property name="use_underline">True</property>
774 <property name="mnemonic_widget">normal-hint-entry</property>
775 <style>
776- <class name="dim-label"/>
777+ <class name="dim-label-ucc"/>
778 </style>
779 </object>
780 <packing>
781@@ -150,7 +150,7 @@
782 <property name="use_underline">True</property>
783 <property name="mnemonic_widget">verify-entry</property>
784 <style>
785- <class name="dim-label"/>
786+ <class name="dim-label-ucc"/>
787 </style>
788 </object>
789 <packing>
790@@ -171,7 +171,7 @@
791 <property name="use_underline">True</property>
792 <property name="mnemonic_widget">password-entry</property>
793 <style>
794- <class name="dim-label"/>
795+ <class name="dim-label-ucc"/>
796 </style>
797 </object>
798 <packing>
799@@ -278,7 +278,7 @@
800 <property name="use_underline">True</property>
801 <property name="mnemonic_widget">old-password-entry</property>
802 <style>
803- <class name="dim-label"/>
804+ <class name="dim-label-ucc"/>
805 </style>
806 </object>
807 <packing>
808@@ -308,7 +308,7 @@
809 <property name="use_underline">True</property>
810 <property name="mnemonic_widget">action-combo</property>
811 <style>
812- <class name="dim-label"/>
813+ <class name="dim-label-ucc"/>
814 </style>
815 </object>
816 <packing>
817
818=== modified file 'panels/user-accounts/data/user-accounts-dialog.ui'
819--- panels/user-accounts/data/user-accounts-dialog.ui 2014-02-21 15:48:18 +0000
820+++ panels/user-accounts/data/user-accounts-dialog.ui 2014-03-12 18:13:25 +0000
821@@ -193,7 +193,7 @@
822 <property name="use_underline">True</property>
823 <property name="mnemonic_widget">account-type-combo</property>
824 <style>
825- <class name="dim-label"/>
826+ <class name="dim-label-ucc"/>
827 </style>
828 </object>
829 <packing>
830@@ -254,7 +254,7 @@
831 <property name="use_underline">True</property>
832 <property name="mnemonic_widget">account-password-button</property>
833 <style>
834- <class name="dim-label"/>
835+ <class name="dim-label-ucc"/>
836 </style>
837 </object>
838 <packing>
839@@ -284,7 +284,7 @@
840 <property name="use_underline">True</property>
841 <property name="mnemonic_widget">autologin-switch</property>
842 <style>
843- <class name="dim-label"/>
844+ <class name="dim-label-ucc"/>
845 </style>
846 </object>
847 <packing>
848@@ -326,7 +326,7 @@
849 <property name="use_underline">True</property>
850 <property name="mnemonic_widget">account-fingerprint-button</property>
851 <style>
852- <class name="dim-label"/>
853+ <class name="dim-label-ucc"/>
854 </style>
855 </object>
856 <packing>
857@@ -414,7 +414,7 @@
858 <property name="use_underline">True</property>
859 <property name="mnemonic_widget">account-language-combo</property>
860 <style>
861- <class name="dim-label"/>
862+ <class name="dim-label-ucc"/>
863 </style>
864 </object>
865 <packing>
866@@ -446,7 +446,7 @@
867 <property name="use_underline">True</property>
868 <property name="mnemonic_widget">last-login-value-label</property>
869 <style>
870- <class name="dim-label"/>
871+ <class name="dim-label-ucc"/>
872 </style>
873 </object>
874 <packing>
875
876=== modified file 'panels/wacom/cc-wacom-nav-button.c'
877--- panels/wacom/cc-wacom-nav-button.c 2014-02-19 02:24:52 +0000
878+++ panels/wacom/cc-wacom-nav-button.c 2014-03-12 18:13:25 +0000
879@@ -219,7 +219,7 @@
880
881 /* Label */
882 priv->label = gtk_label_new (NULL);
883- gtk_style_context_add_class (gtk_widget_get_style_context (priv->label), "dim-label");
884+ gtk_style_context_add_class (gtk_widget_get_style_context (priv->label), "dim-label-ucc");
885 gtk_box_pack_start (GTK_BOX (self), priv->label,
886 FALSE, FALSE, 8);
887
888
889=== modified file 'panels/wacom/gnome-wacom-properties.ui'
890--- panels/wacom/gnome-wacom-properties.ui 2014-02-19 02:24:52 +0000
891+++ panels/wacom/gnome-wacom-properties.ui 2014-03-12 18:13:25 +0000
892@@ -295,7 +295,7 @@
893 <property name="valign">center</property>
894 <property name="label" translatable="yes">Tracking Mode</property>
895 <style>
896- <class name="dim-label"/>
897+ <class name="dim-label-ucc"/>
898 </style>
899 </object>
900 <packing>
901@@ -327,7 +327,7 @@
902 <property name="valign">center</property>
903 <property name="label" translatable="yes">Left-Handed Orientation</property>
904 <style>
905- <class name="dim-label"/>
906+ <class name="dim-label-ucc"/>
907 </style>
908 </object>
909 <packing>
910
911=== modified file 'panels/wacom/wacom-stylus-page.ui'
912--- panels/wacom/wacom-stylus-page.ui 2012-02-27 16:51:34 +0000
913+++ panels/wacom/wacom-stylus-page.ui 2014-03-12 18:13:25 +0000
914@@ -117,7 +117,7 @@
915 <property name="label" translatable="yes">Eraser Pressure Feel</property>
916 <property name="justify">right</property>
917 <style>
918- <class name="dim-label"/>
919+ <class name="dim-label-ucc"/>
920 </style>
921 </object>
922 <packing>
923@@ -194,7 +194,7 @@
924 <property name="label" translatable="yes">Top Button</property>
925 <property name="justify">right</property>
926 <style>
927- <class name="dim-label"/>
928+ <class name="dim-label-ucc"/>
929 </style>
930 </object>
931 <packing>
932@@ -227,7 +227,7 @@
933 <property name="label" translatable="yes">Lower Button</property>
934 <property name="justify">right</property>
935 <style>
936- <class name="dim-label"/>
937+ <class name="dim-label-ucc"/>
938 </style>
939 </object>
940 <packing>
941@@ -260,7 +260,7 @@
942 <property name="label" translatable="yes">Tip Pressure Feel</property>
943 <property name="justify">right</property>
944 <style>
945- <class name="dim-label"/>
946+ <class name="dim-label-ucc"/>
947 </style>
948 </object>
949 <packing>

Subscribers

People subscribed via source and target branches