Merge lp:~dashua/ubuntu-themes/fix.lp.1046129 into lp:ubuntu-themes

Proposed by James Schriver on 2013-08-03
Status: Needs review
Proposed branch: lp:~dashua/ubuntu-themes/fix.lp.1046129
Merge into: lp:ubuntu-themes
Diff against target: 355 lines (+288/-26)
2 files modified
Ambiance/gtk-2.0/gtkrc (+144/-13)
Radiance/gtk-2.0/gtkrc (+144/-13)
To merge this branch: bzr merge lp:~dashua/ubuntu-themes/fix.lp.1046129
Reviewer Review Type Date Requested Status
Adolfo Jayme (community) Approve on 2013-08-04
Ubuntu Artwork Packagers 2013-08-03 Pending
Review via email: mp+178442@code.launchpad.net

Description of the change

Add new radio and check assets for use with gtk-2.0 Ambiance/Radiance for theme consistency. Re-based upon lp:ubuntu-themes

To post a comment you must log in.
Adolfo Jayme (fitojb) wrote :

Thank you very much!

review: Approve
Adolfo Jayme (fitojb) wrote :

Can someone from the ~ubuntu-art-pkg team approve this? It's been waiting since last August.

Unmerged revisions

305. By James Schriver on 2013-08-03

Add new radio and check assets for use with gtk-2.0 Ambiance/Radiance for theme consistency.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'Ambiance/gtk-2.0/assets'
2=== added file 'Ambiance/gtk-2.0/assets/check-selected.png'
3Binary files Ambiance/gtk-2.0/assets/check-selected.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/assets/check-selected.png 2013-08-03 23:53:25 +0000 differ
4=== added file 'Ambiance/gtk-2.0/assets/check-unselected.png'
5Binary files Ambiance/gtk-2.0/assets/check-unselected.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/assets/check-unselected.png 2013-08-03 23:53:25 +0000 differ
6=== added file 'Ambiance/gtk-2.0/assets/radio-selected.png'
7Binary files Ambiance/gtk-2.0/assets/radio-selected.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/assets/radio-selected.png 2013-08-03 23:53:25 +0000 differ
8=== added file 'Ambiance/gtk-2.0/assets/radio-unselected.png'
9Binary files Ambiance/gtk-2.0/assets/radio-unselected.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/assets/radio-unselected.png 2013-08-03 23:53:25 +0000 differ
10=== modified file 'Ambiance/gtk-2.0/gtkrc'
11--- Ambiance/gtk-2.0/gtkrc 2012-08-08 13:46:38 +0000
12+++ Ambiance/gtk-2.0/gtkrc 2013-08-03 23:53:25 +0000
13@@ -489,20 +489,151 @@
14 }
15 }
16
17-style "radiocheck" = "button" {
18- text[NORMAL] = shade (0.535, @selected_bg_color)
19- text[PRELIGHT] = shade(1.06, shade (0.535, @selected_bg_color))
20- bg[NORMAL] = shade (0.92, @bg_color)
21- bg[PRELIGHT] = mix (0.2, @selected_bg_color, shade(1.1, @bg_color))
22- fg[INSENSITIVE] = darker (@bg_color)
23- fg[ACTIVE] = @fg_color
24-
25- engine "murrine" {
26- reliefstyle = 3
27- gradient_shades = {1.2, 1.0, 1.0, 0.9}
28- shadow_shades = {0.6, 0.5}
29- textstyle = 0
30+style "radiocheck" {
31+ engine "pixmap" {
32+
33+ # Check Buttons
34+
35+ image
36+ {
37+ function = CHECK
38+ recolorable = TRUE
39+ state = NORMAL
40+ shadow = OUT
41+ overlay_file = "assets/check-unselected.png"
42+ overlay_stretch = FALSE
43+ }
44+ image
45+ {
46+ function = CHECK
47+ recolorable = TRUE
48+ state = PRELIGHT
49+ shadow = OUT
50+ overlay_file = "assets/check-unselected.png"
51+ overlay_stretch = FALSE
52+ }
53+ image
54+ {
55+ function = CHECK
56+ recolorable = TRUE
57+ state = ACTIVE
58+ shadow = OUT
59+ overlay_file = "assets/check-unselected.png"
60+ overlay_stretch = FALSE
61+ }
62+ image
63+ {
64+ function = CHECK
65+ recolorable = TRUE
66+ state = INSENSITIVE
67+ shadow = OUT
68+ overlay_file = "assets/check-unselected.png"
69+ overlay_stretch = FALSE
70+ }
71+ image
72+ {
73+ function = CHECK
74+ recolorable = TRUE
75+ state = NORMAL
76+ shadow = IN
77+ overlay_file = "assets/check-selected.png"
78+ overlay_stretch = FALSE
79+ }
80+ image
81+ {
82+ function = CHECK
83+ recolorable = TRUE
84+ state = PRELIGHT
85+ shadow = IN
86+ overlay_file = "assets/check-selected.png"
87+ overlay_stretch = FALSE
88+ }
89+ image
90+ {
91+ function = CHECK
92+ recolorable = TRUE
93+ state = ACTIVE
94+ shadow = IN
95+ overlay_file = "assets/check-selected.png"
96+ overlay_stretch = FALSE
97+ }
98+ image
99+ {
100+ function = CHECK
101+ recolorable = TRUE
102+ state = INSENSITIVE
103+ shadow = IN
104+ overlay_file = "assets/check-unselected.png"
105+ overlay_stretch = FALSE
106 }
107+
108+ # Radio Buttons
109+
110+ image
111+ {
112+ function = OPTION
113+ state = NORMAL
114+ shadow = OUT
115+ overlay_file = "assets/radio-unselected.png"
116+ overlay_stretch = FALSE
117+ }
118+ image
119+ {
120+ function = OPTION
121+ state = PRELIGHT
122+ shadow = OUT
123+ overlay_file = "assets/radio-unselected.png"
124+ overlay_stretch = FALSE
125+ }
126+ image
127+ {
128+ function = OPTION
129+ state = ACTIVE
130+ shadow = OUT
131+ overlay_file = "assets/radio-unselected.png"
132+ overlay_stretch = FALSE
133+ }
134+ image
135+ {
136+ function = OPTION
137+ state = INSENSITIVE
138+ shadow = OUT
139+ overlay_file = "assets/radio-unselected.png"
140+ overlay_stretch = FALSE
141+ }
142+ image
143+ {
144+ function = OPTION
145+ state = NORMAL
146+ shadow = IN
147+ overlay_file = "assets/radio-selected.png"
148+ overlay_stretch = FALSE
149+ }
150+ image
151+ {
152+ function = OPTION
153+ state = PRELIGHT
154+ shadow = IN
155+ overlay_file = "assets/radio-selected.png"
156+ overlay_stretch = FALSE
157+ }
158+ image
159+ {
160+ function = OPTION
161+ state = ACTIVE
162+ shadow = IN
163+ overlay_file = "assets/radio-selected.png"
164+ overlay_stretch = FALSE
165+ }
166+ image
167+ {
168+ function = OPTION
169+ state = INSENSITIVE
170+ shadow = IN
171+ overlay_file = "assets/radio-unselected.png"
172+ overlay_stretch = FALSE
173+ }
174+ }
175 }
176
177 style "tooltips" {
178
179=== added directory 'Radiance/gtk-2.0/assets'
180=== added file 'Radiance/gtk-2.0/assets/check-selected.png'
181Binary files Radiance/gtk-2.0/assets/check-selected.png 1970-01-01 00:00:00 +0000 and Radiance/gtk-2.0/assets/check-selected.png 2013-08-03 23:53:25 +0000 differ
182=== added file 'Radiance/gtk-2.0/assets/check-unselected.png'
183Binary files Radiance/gtk-2.0/assets/check-unselected.png 1970-01-01 00:00:00 +0000 and Radiance/gtk-2.0/assets/check-unselected.png 2013-08-03 23:53:25 +0000 differ
184=== added file 'Radiance/gtk-2.0/assets/radio-selected.png'
185Binary files Radiance/gtk-2.0/assets/radio-selected.png 1970-01-01 00:00:00 +0000 and Radiance/gtk-2.0/assets/radio-selected.png 2013-08-03 23:53:25 +0000 differ
186=== added file 'Radiance/gtk-2.0/assets/radio-unselected.png'
187Binary files Radiance/gtk-2.0/assets/radio-unselected.png 1970-01-01 00:00:00 +0000 and Radiance/gtk-2.0/assets/radio-unselected.png 2013-08-03 23:53:25 +0000 differ
188=== modified file 'Radiance/gtk-2.0/gtkrc'
189--- Radiance/gtk-2.0/gtkrc 2012-08-08 13:46:38 +0000
190+++ Radiance/gtk-2.0/gtkrc 2013-08-03 23:53:25 +0000
191@@ -449,20 +449,151 @@
192 }
193 }
194
195-style "radiocheck" = "button" {
196- text[NORMAL] = shade (0.535, @selected_bg_color)
197- text[PRELIGHT] = shade(1.06, shade (0.535, @selected_bg_color))
198- bg[NORMAL] = shade (0.92, @bg_color)
199- bg[PRELIGHT] = mix (0.2, @selected_bg_color, shade(1.1, @bg_color))
200- fg[INSENSITIVE] = darker (@bg_color)
201- fg[ACTIVE] = @fg_color
202-
203- engine "murrine" {
204- reliefstyle = 3
205- gradient_shades = {1.2, 1.0, 1.0, 0.9}
206- shadow_shades = {0.6, 0.5}
207- textstyle = 0
208+style "radiocheck" {
209+ engine "pixmap" {
210+
211+ # Check Buttons
212+
213+ image
214+ {
215+ function = CHECK
216+ recolorable = TRUE
217+ state = NORMAL
218+ shadow = OUT
219+ overlay_file = "assets/check-unselected.png"
220+ overlay_stretch = FALSE
221+ }
222+ image
223+ {
224+ function = CHECK
225+ recolorable = TRUE
226+ state = PRELIGHT
227+ shadow = OUT
228+ overlay_file = "assets/check-unselected.png"
229+ overlay_stretch = FALSE
230+ }
231+ image
232+ {
233+ function = CHECK
234+ recolorable = TRUE
235+ state = ACTIVE
236+ shadow = OUT
237+ overlay_file = "assets/check-unselected.png"
238+ overlay_stretch = FALSE
239+ }
240+ image
241+ {
242+ function = CHECK
243+ recolorable = TRUE
244+ state = INSENSITIVE
245+ shadow = OUT
246+ overlay_file = "assets/check-unselected.png"
247+ overlay_stretch = FALSE
248+ }
249+ image
250+ {
251+ function = CHECK
252+ recolorable = TRUE
253+ state = NORMAL
254+ shadow = IN
255+ overlay_file = "assets/check-selected.png"
256+ overlay_stretch = FALSE
257+ }
258+ image
259+ {
260+ function = CHECK
261+ recolorable = TRUE
262+ state = PRELIGHT
263+ shadow = IN
264+ overlay_file = "assets/check-selected.png"
265+ overlay_stretch = FALSE
266+ }
267+ image
268+ {
269+ function = CHECK
270+ recolorable = TRUE
271+ state = ACTIVE
272+ shadow = IN
273+ overlay_file = "assets/check-selected.png"
274+ overlay_stretch = FALSE
275+ }
276+ image
277+ {
278+ function = CHECK
279+ recolorable = TRUE
280+ state = INSENSITIVE
281+ shadow = IN
282+ overlay_file = "assets/check-unselected.png"
283+ overlay_stretch = FALSE
284 }
285+
286+ # Radio Buttons
287+
288+ image
289+ {
290+ function = OPTION
291+ state = NORMAL
292+ shadow = OUT
293+ overlay_file = "assets/radio-unselected.png"
294+ overlay_stretch = FALSE
295+ }
296+ image
297+ {
298+ function = OPTION
299+ state = PRELIGHT
300+ shadow = OUT
301+ overlay_file = "assets/radio-unselected.png"
302+ overlay_stretch = FALSE
303+ }
304+ image
305+ {
306+ function = OPTION
307+ state = ACTIVE
308+ shadow = OUT
309+ overlay_file = "assets/radio-unselected.png"
310+ overlay_stretch = FALSE
311+ }
312+ image
313+ {
314+ function = OPTION
315+ state = INSENSITIVE
316+ shadow = OUT
317+ overlay_file = "assets/radio-unselected.png"
318+ overlay_stretch = FALSE
319+ }
320+ image
321+ {
322+ function = OPTION
323+ state = NORMAL
324+ shadow = IN
325+ overlay_file = "assets/radio-selected.png"
326+ overlay_stretch = FALSE
327+ }
328+ image
329+ {
330+ function = OPTION
331+ state = PRELIGHT
332+ shadow = IN
333+ overlay_file = "assets/radio-selected.png"
334+ overlay_stretch = FALSE
335+ }
336+ image
337+ {
338+ function = OPTION
339+ state = ACTIVE
340+ shadow = IN
341+ overlay_file = "assets/radio-selected.png"
342+ overlay_stretch = FALSE
343+ }
344+ image
345+ {
346+ function = OPTION
347+ state = INSENSITIVE
348+ shadow = IN
349+ overlay_file = "assets/radio-unselected.png"
350+ overlay_stretch = FALSE
351+ }
352+ }
353 }
354
355 style "tooltips" {

Subscribers

People subscribed via source and target branches