Merge lp://qastaging/~dashua/community-themes/lucid-update2 into lp://qastaging/community-themes
- lucid-update2
- Merge into ubuntu
Proposed by
James Schriver
Status: | Merged |
---|---|
Merged at revision: | 50 |
Proposed branch: | lp://qastaging/~dashua/community-themes/lucid-update2 |
Merge into: | lp://qastaging/community-themes |
Diff against target: |
1804 lines (+643/-501) 8 files modified
Hanso/gtk-2.0/gtkrc (+176/-182) Homosapien/gtk-2.0/gtkrc (+80/-80) Sorbet/gtk-2.0/gtkrc (+76/-69) Sorbet/index.theme.in (+4/-6) Sorbet/metacity-1/metacity-theme-1.xml (+289/-149) Turrican/gtk-2.0/gtkrc (+8/-3) build/share/themes/Sorbet/index.theme (+3/-6) debian/changelog (+7/-6) |
To merge this branch: | bzr merge lp://qastaging/~dashua/community-themes/lucid-update2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Starr-Bochicchio | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
James Schriver (dashua) wrote : | # |
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Andrew Starr-Bochicchio (andrewsomething) wrote : | # |
The preview of Sorbet in the appearance's menu doesn't match the theme anymore. We probably just want to drop the GtkColorScheme field from the theme.index
review:
Needs Fixing
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
James Schriver (dashua) wrote : | # |
On Sun, 2010-02-28 at 16:28 +0000, Andrew Starr-Bochicchio wrote:
> Review: Needs Fixing
> The preview of Sorbet in the appearance's menu doesn't match the theme anymore. We probably just want to drop the GtkColorScheme field from the theme.index
Ok np. Not sure how that happened. Fixed and I'll resubmit. Thx.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Andrew Starr-Bochicchio (andrewsomething) : | # |
review:
Approve
- 50. By Andrew Starr-Bochicchio
-
* Update Sorbet to v0.5 lp:~dashua/homosapien/sorbet
* Update Turrican to remove depreacted stlye option "gradients"
* Turrican: Add new murrine style options
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Hanso/gtk-2.0/gtkrc' |
2 | --- Hanso/gtk-2.0/gtkrc 2010-02-26 23:26:42 +0000 |
3 | +++ Hanso/gtk-2.0/gtkrc 2010-02-28 17:40:28 +0000 |
4 | @@ -24,7 +24,7 @@ |
5 | GtkRange::trough-border = 1 |
6 | GtkRange::slider-width = 12 |
7 | GtkRange::stepper-size = 12 |
8 | - GtkRange::trough-under-steppers = 1 |
9 | + GtkRange::trough-under-steppers = 1 |
10 | |
11 | GtkScale::slider-length = 18 |
12 | GtkScale::trough-side-details = 1 |
13 | @@ -99,15 +99,15 @@ |
14 | menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe |
15 | prelight_shade = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors. |
16 | progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes |
17 | - reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
18 | - rgba = TRUE # FALSE = disabled, TRUE = enabled |
19 | + reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
20 | + rgba = TRUE # FALSE = disabled, TRUE = enabled |
21 | roundness = 2 # 0 = squared, 1 = old default, more will increase roundness |
22 | scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles |
23 | shadow_shades = { 0.8, 2.2 } |
24 | sliderstyle = 0 # 0 = nothing added, 1 = handles |
25 | spinbuttonstyle = 1 |
26 | stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider |
27 | -# textstyle = 1 |
28 | +# textstyle = 1 |
29 | trough_shades = {1.1,0.87} |
30 | toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient |
31 | } |
32 | @@ -127,10 +127,10 @@ |
33 | |
34 | style "dark" |
35 | { |
36 | - bg[NORMAL] = @bg_color |
37 | - bg[SELECTED] = shade(0.9,@selected_bg_color) |
38 | - bg[PRELIGHT] = shade (0.5, @selected_bg_color) |
39 | - bg[ACTIVE] = shade (0.7, @selected_bg_color) |
40 | + bg[NORMAL] = @bg_color |
41 | + bg[SELECTED] = shade(0.9,@selected_bg_color) |
42 | + bg[PRELIGHT] = shade (0.5, @selected_bg_color) |
43 | + bg[ACTIVE] = shade (0.7, @selected_bg_color) |
44 | bg[INSENSITIVE] = shade (0.7, @bg_color) |
45 | |
46 | |
47 | @@ -186,9 +186,9 @@ |
48 | border_colors = { "#2D2519", "#2D2519" } |
49 | glowstyle = 0 |
50 | gradient_shades = {1.1,1.0,1.0,0.7} |
51 | - highlight_shade = 1.0 |
52 | - lightborder_shade = 1.0 |
53 | - reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
54 | + highlight_shade = 1.0 |
55 | + lightborder_shade = 1.0 |
56 | + reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
57 | } |
58 | } |
59 | |
60 | @@ -211,7 +211,7 @@ |
61 | |
62 | style "panel" |
63 | { |
64 | - bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background |
65 | + bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background |
66 | bg[NORMAL] = "#2D2519" # Default top/bottom panel background |
67 | bg[PRELIGHT] = shade(1.0, @theme_color_27) # panel prelight |
68 | bg[ACTIVE] = @theme_color_27 # bottom panel active background |
69 | @@ -225,7 +225,7 @@ |
70 | |
71 | engine "murrine" |
72 | { |
73 | - border_shades = {1.2, 1.0} # draw a gradient on the border. |
74 | + border_shades = {1.2, 1.0} # draw a gradient on the border. |
75 | border_colors = { "#2D2416", "#2D2416" } |
76 | } |
77 | } |
78 | @@ -234,18 +234,17 @@ |
79 | { |
80 | bg[NORMAL] = "#2D2519" # top desktop panel menu background color |
81 | bg[SELECTED] = darker(@theme_color_04) # selected item background |
82 | - fg[NORMAL] = @bg_color # default panel text ! |
83 | + fg[NORMAL] = @bg_color # default panel text ! |
84 | fg[PRELIGHT] = @base_color # text after dropdown menu |
85 | |
86 | font_name = "Bold" |
87 | |
88 | engine "murrine" |
89 | { |
90 | - # Panel Menubar Tab |
91 | contrast = 0.75 |
92 | glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight |
93 | glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1 |
94 | - glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow |
95 | + glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow |
96 | roundness = 2 |
97 | } |
98 | } |
99 | @@ -272,9 +271,9 @@ |
100 | border_shades = { 1.1, 1.1} # draw a gradient on the border. |
101 | border_colors = { @selected_bg_color, @selected_bg_color } |
102 | glowstyle = 0 |
103 | - gradient_shades = {1.1,1.0,1.0,0.7} |
104 | - highlight_shade = 1.0 |
105 | - lightborder_shade = 1.0 |
106 | + gradient_shades = {1.1,1.0,1.0,0.7} |
107 | + highlight_shade = 1.0 |
108 | + lightborder_shade = 1.0 |
109 | |
110 | } |
111 | } |
112 | @@ -298,9 +297,9 @@ |
113 | ythickness = 1 |
114 | |
115 | bg[NORMAL] = shade(0.9, @bg_color) |
116 | - bg[PRELIGHT] = shade(1.0, @bg_color) |
117 | - bg[ACTIVE] = shade(0.8, @bg_color) |
118 | -} |
119 | + bg[PRELIGHT] = shade(1.0, @bg_color) |
120 | + bg[ACTIVE] = shade(0.8, @bg_color) |
121 | +} |
122 | |
123 | style "tooltips" |
124 | { |
125 | @@ -329,36 +328,36 @@ |
126 | { |
127 | image |
128 | { |
129 | - function = RESIZE_GRIP |
130 | - recolorable = TRUE |
131 | - detail = "statusbar" |
132 | - overlay_file = "statusgrip.png" |
133 | - overlay_border = {0,0,0,0} |
134 | - overlay_stretch = TRUE |
135 | + function = RESIZE_GRIP |
136 | + recolorable = TRUE |
137 | + detail = "statusbar" |
138 | + overlay_file = "statusgrip.png" |
139 | + overlay_border = {0,0,0,0} |
140 | + overlay_stretch = TRUE |
141 | } |
142 | image |
143 | { |
144 | - function = SHADOW |
145 | - shadow = IN |
146 | - file = "blank.png" |
147 | - } |
148 | - image |
149 | - { |
150 | - function = SHADOW |
151 | - shadow = OUT |
152 | - file = "blank.png" |
153 | - } |
154 | - image |
155 | - { |
156 | - function = SHADOW |
157 | - shadow = ETCHED_IN |
158 | - file = "blank.png" |
159 | - } |
160 | - image |
161 | - { |
162 | - function = SHADOW |
163 | - shadow = ETCHED_OUT |
164 | - file = "blank.png" |
165 | + function = SHADOW |
166 | + shadow = IN |
167 | + file = "blank.png" |
168 | + } |
169 | + image |
170 | + { |
171 | + function = SHADOW |
172 | + shadow = OUT |
173 | + file = "blank.png" |
174 | + } |
175 | + image |
176 | + { |
177 | + function = SHADOW |
178 | + shadow = ETCHED_IN |
179 | + file = "blank.png" |
180 | + } |
181 | + image |
182 | + { |
183 | + function = SHADOW |
184 | + shadow = ETCHED_OUT |
185 | + file = "blank.png" |
186 | } |
187 | } |
188 | } |
189 | @@ -395,12 +394,12 @@ |
190 | |
191 | engine "murrine" |
192 | { |
193 | - roundness = 2 |
194 | - contrast = 1.1 |
195 | - highlight_shade = 1.2 |
196 | - lightborder_shade = 1.1 |
197 | - gradient_shades = {1.0,0.85,0.8,1.0} |
198 | - reliefstyle = 2 |
199 | + roundness = 2 |
200 | + contrast = 1.1 |
201 | + highlight_shade = 1.2 |
202 | + lightborder_shade = 1.1 |
203 | + gradient_shades = {1.0,0.85,0.8,1.0} |
204 | + reliefstyle = 2 |
205 | } |
206 | } |
207 | |
208 | @@ -436,13 +435,15 @@ |
209 | { |
210 | text[NORMAL] = @selected_fg_color # Color for selected checks/radio items. |
211 | text[PRELIGHT] = @selected_fg_color # Color for selected checks/radio items on prelight. |
212 | - engine "murrine"{ |
213 | - roundness = 2 |
214 | - contrast = 1.03 |
215 | - highlight_shade = 1.0 |
216 | - lightborder_shade = 1.0 |
217 | - gradient_shades = {1.1,1.0,1.0,0.9} |
218 | - reliefstyle = 3 |
219 | + |
220 | + engine "murrine" |
221 | + { |
222 | + roundness = 2 |
223 | + contrast = 1.03 |
224 | + highlight_shade = 1.0 |
225 | + lightborder_shade = 1.0 |
226 | + gradient_shades = {1.1,1.0,1.0,0.9} |
227 | + reliefstyle = 3 |
228 | } |
229 | } |
230 | |
231 | @@ -527,41 +528,42 @@ |
232 | { |
233 | function = HANDLE |
234 | recolorable = TRUE |
235 | - state = NORMAL |
236 | - overlay_file = "Others/null.png" |
237 | - overlay_stretch = FALSE |
238 | - orientation = VERTICAL |
239 | - } |
240 | - image |
241 | - { |
242 | - function = HANDLE |
243 | - recolorable = TRUE |
244 | - state = PRELIGHT |
245 | - overlay_file = "Others/null.png" |
246 | - overlay_stretch = FALSE |
247 | - orientation = VERTICAL |
248 | - } |
249 | - image |
250 | - { |
251 | - function = HANDLE |
252 | - recolorable = TRUE |
253 | - state = ACTIVE |
254 | - overlay_file = "Panel/handle-v-pressed.png" |
255 | - overlay_stretch = FALSE |
256 | - orientation = VERTICAL |
257 | - } |
258 | - image |
259 | - { |
260 | - function = HANDLE |
261 | - recolorable = TRUE |
262 | - state = INSENSITIVE |
263 | - overlay_file = "Panel/handle-v-insens.png" |
264 | - overlay_stretch = FALSE |
265 | + state = NORMAL |
266 | + overlay_file = "Others/null.png" |
267 | + overlay_stretch = FALSE |
268 | + orientation = VERTICAL |
269 | + } |
270 | + image |
271 | + { |
272 | + function = HANDLE |
273 | + recolorable = TRUE |
274 | + state = PRELIGHT |
275 | + overlay_file = "Others/null.png" |
276 | + overlay_stretch = FALSE |
277 | + orientation = VERTICAL |
278 | + } |
279 | + image |
280 | + { |
281 | + function = HANDLE |
282 | + recolorable = TRUE |
283 | + state = ACTIVE |
284 | + overlay_file = "Panel/handle-v-pressed.png" |
285 | + overlay_stretch = FALSE |
286 | + orientation = VERTICAL |
287 | + } |
288 | + image |
289 | + { |
290 | + function = HANDLE |
291 | + recolorable = TRUE |
292 | + state = INSENSITIVE |
293 | + overlay_file = "Panel/handle-v-insens.png" |
294 | + overlay_stretch = FALSE |
295 | orientation = VERTICAL |
296 | } |
297 | |
298 | } |
299 | } |
300 | + |
301 | style "nautilus-view" = "default" |
302 | { |
303 | #xthickness = 8 |
304 | @@ -592,21 +594,21 @@ |
305 | { |
306 | image |
307 | { |
308 | - function = SHADOW |
309 | + function = SHADOW |
310 | } |
311 | image |
312 | { |
313 | - function = BUTTON |
314 | - file = "Others/null.png" # 1x1 pixel empty, transparent |
315 | + function = BUTTON |
316 | + file = "Others/null.png" # 1x1 pixel empty, transparent |
317 | } |
318 | image |
319 | { |
320 | - function = ARROW |
321 | - arrow_direction = DOWN |
322 | - border = {0,0,0,0} |
323 | - stretch = TRUE |
324 | - recolorable = TRUE |
325 | - file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down |
326 | + function = ARROW |
327 | + arrow_direction = DOWN |
328 | + border = {0,0,0,0} |
329 | + stretch = TRUE |
330 | + recolorable = TRUE |
331 | + file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down |
332 | } |
333 | } |
334 | } |
335 | @@ -619,52 +621,52 @@ |
336 | { |
337 | function = HANDLE |
338 | recolorable = TRUE |
339 | - state = NORMAL |
340 | - overlay_file = "Others/null.png" |
341 | - overlay_stretch = FALSE |
342 | - orientation = VERTICAL |
343 | - } |
344 | - image |
345 | - { |
346 | - function = HANDLE |
347 | - recolorable = TRUE |
348 | - state = PRELIGHT |
349 | - overlay_file = "Others/null.png" |
350 | - overlay_stretch = FALSE |
351 | - orientation = VERTICAL |
352 | - } |
353 | - image |
354 | - { |
355 | - function = HANDLE |
356 | - recolorable = TRUE |
357 | - state = ACTIVE |
358 | - overlay_file = "Panel/handle-v-pressed.png" |
359 | - overlay_stretch = FALSE |
360 | - orientation = VERTICAL |
361 | - } |
362 | - image |
363 | - { |
364 | - function = HANDLE |
365 | - recolorable = TRUE |
366 | - state = INSENSITIVE |
367 | - overlay_file = "Panel/handle-v-insens.png" |
368 | - overlay_stretch = FALSE |
369 | + state = NORMAL |
370 | + overlay_file = "Others/null.png" |
371 | + overlay_stretch = FALSE |
372 | + orientation = VERTICAL |
373 | + } |
374 | + image |
375 | + { |
376 | + function = HANDLE |
377 | + recolorable = TRUE |
378 | + state = PRELIGHT |
379 | + overlay_file = "Others/null.png" |
380 | + overlay_stretch = FALSE |
381 | + orientation = VERTICAL |
382 | + } |
383 | + image |
384 | + { |
385 | + function = HANDLE |
386 | + recolorable = TRUE |
387 | + state = ACTIVE |
388 | + overlay_file = "Panel/handle-v-pressed.png" |
389 | + overlay_stretch = FALSE |
390 | + orientation = VERTICAL |
391 | + } |
392 | + image |
393 | + { |
394 | + function = HANDLE |
395 | + recolorable = TRUE |
396 | + state = INSENSITIVE |
397 | + overlay_file = "Panel/handle-v-insens.png" |
398 | + overlay_stretch = FALSE |
399 | orientation = VERTICAL |
400 | } |
401 | |
402 | } |
403 | } |
404 | |
405 | -widget_class "*Nautilus*View*" style "nautilus-view" |
406 | +widget_class "*Nautilus*View*" style "nautilus-view" |
407 | widget_class "*NautilusSidePane.*" style "nautilus-sidebar-title" |
408 | widget_class "*Nautilus*Places*Sidebar*" style "nautilus-sidebar" |
409 | widget_class "*Nautilus*Side*.GtkWidget" style "nautilus-sidebar" |
410 | widget_class "*Nautilus*Side*Title*" style "nautilus-sidebar-title" |
411 | -widget_class "*Nautilus*Toolbar*" style "dark-toolbar" |
412 | -widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar" |
413 | -widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar" |
414 | -widget_class "*Nautilus*Tool*GtkToggleButton" style "dark-toolbar" |
415 | -widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep" |
416 | +widget_class "*Nautilus*Toolbar*" style "dark-toolbar" |
417 | +widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar" |
418 | +widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar" |
419 | +widget_class "*Nautilus*Tool*GtkToggleButton" style "dark-toolbar" |
420 | +widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep" |
421 | widget_class "*Nautilus*Tool*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark" |
422 | |
423 | # Evince/EOG |
424 | @@ -714,45 +716,45 @@ |
425 | widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook" |
426 | widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook" |
427 | widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook" |
428 | -widget_class "*<GtkNotebook>" style "notebook" |
429 | - |
430 | -widget_class "*<GtkComboBoxEntry>*" style "comboboxentry" |
431 | -widget_class "*<GtkCombo>*" style "comboboxentry" |
432 | - |
433 | -widget_class "*<GtkMenuBar>.*" style "menu-item" |
434 | -widget_class "*<GtkMenu>*" style "menu" |
435 | -widget_class "*<GtkMenuItem>" style "menu-item" |
436 | -widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item" |
437 | - |
438 | -widget_class "*<GtkFrame>" style "frame" |
439 | -widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title" |
440 | - |
441 | -widget_class "*<GtkStatusbar>*" style "wider" |
442 | -widget_class "*<GtkProgressBar>" style "progressbar" |
443 | +widget_class "*<GtkNotebook>" style "notebook" |
444 | + |
445 | +widget_class "*<GtkComboBoxEntry>*" style "comboboxentry" |
446 | +widget_class "*<GtkCombo>*" style "comboboxentry" |
447 | + |
448 | +widget_class "*<GtkMenuBar>.*" style "menu-item" |
449 | +widget_class "*<GtkMenu>*" style "menu" |
450 | +widget_class "*<GtkMenuItem>" style "menu-item" |
451 | +widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item" |
452 | + |
453 | +widget_class "*<GtkFrame>" style "frame" |
454 | +widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title" |
455 | + |
456 | +widget_class "*<GtkStatusbar>*" style "wider" |
457 | +widget_class "*<GtkProgressBar>" style "progressbar" |
458 | |
459 | # Treeview header |
460 | -widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview-header" |
461 | -widget_class "*.<GtkCTree>.<GtkButton>" style "treeview-header" |
462 | -widget_class "*.<GtkList>.<GtkButton>" style "treeview-header" |
463 | -widget_class "*.<GtkCList>.<GtkButton>" style "treeview-header" |
464 | +widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview-header" |
465 | +widget_class "*.<GtkCTree>.<GtkButton>" style "treeview-header" |
466 | +widget_class "*.<GtkList>.<GtkButton>" style "treeview-header" |
467 | +widget_class "*.<GtkCList>.<GtkButton>" style "treeview-header" |
468 | |
469 | #Panel |
470 | -widget "*PanelWidget*" style "panel" |
471 | -widget "*PanelApplet*" style "panel" |
472 | -widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet |
473 | -class "PanelApp*" style "panel" |
474 | -class "PanelToplevel*" style "panel" |
475 | +widget "*PanelWidget*" style "panel" |
476 | +widget "*PanelApplet*" style "panel" |
477 | +widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet |
478 | +class "PanelApp*" style "panel" |
479 | +class "PanelToplevel*" style "panel" |
480 | |
481 | # The panel menubar |
482 | -widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar" |
483 | +widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar" |
484 | |
485 | #XFCE panel |
486 | -widget_class "*notif*" style "panel" |
487 | -widget_class "*Notif*" style "panel" |
488 | -widget_class "*Tray*" style "panel" |
489 | -widget_class "*tray*" style "panel" |
490 | -widget "*Xfce*Panel*" style "panel" |
491 | -class "*Xfce*Panel*" style "panel" |
492 | +widget_class "*notif*" style "panel" |
493 | +widget_class "*Notif*" style "panel" |
494 | +widget_class "*Tray*" style "panel" |
495 | +widget_class "*tray*" style "panel" |
496 | +widget "*Xfce*Panel*" style "panel" |
497 | +class "*Xfce*Panel*" style "panel" |
498 | |
499 | # The window of the tooltip is called "gtk-tooltip" |
500 | ################################ |
501 | @@ -762,7 +764,7 @@ |
502 | # quite a bit to get this working correctly. |
503 | # (It will involve setting different priorities, etc.) |
504 | ################################ |
505 | -widget "new-tooltip-style*" style "tooltips" |
506 | +widget "new-tooltip-style*" style "tooltips" |
507 | |
508 | ################################################### |
509 | # Special cases and work arounds |
510 | @@ -786,14 +788,6 @@ |
511 | |
512 | style "menuitem-text-is-fg-color-workaround" |
513 | { |
514 | - #text[NORMAL] = @fg_color |
515 | - #text[PRELIGHT] = @selected_fg_color |
516 | - #text[SELECTED] = @selected_fg_color |
517 | - #text[ACTIVE] = @fg_color |
518 | - #text[INSENSITIVE] = darker (@bg_color) |
519 | - #Make it work with this theme! |
520 | - #text[NORMAL] = mix (1.5, @bg_color, '#ffffff') |
521 | - #text[PRELIGHT] = mix (1.4, @bg_color, '#ffffff') |
522 | } |
523 | widget "*.gtk-combobox-popup-menu.*" style "menuitem-text-is-fg-color-workaround" |
524 | |
525 | @@ -853,8 +847,8 @@ |
526 | { |
527 | # GtkStatusbar ::shadow-type = GTK_SHADOW_OUT |
528 | |
529 | - xthickness = 4 |
530 | - ythickness = 3 |
531 | + xthickness = 4 |
532 | + ythickness = 3 |
533 | } |
534 | |
535 | style "ff-toolbar" |
536 | @@ -870,9 +864,9 @@ |
537 | border_colors = { "#2D2519", "#2D2519" } |
538 | glowstyle = 0 |
539 | gradient_shades = {1.1,1.0,1.0,0.7} |
540 | - highlight_shade = 1.0 |
541 | - lightborder_shade = 1.0 |
542 | - reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
543 | + highlight_shade = 1.0 |
544 | + lightborder_shade = 1.0 |
545 | + reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow. |
546 | } |
547 | } |
548 | |
549 | |
550 | === modified file 'Homosapien/gtk-2.0/gtkrc' |
551 | --- Homosapien/gtk-2.0/gtkrc 2010-02-26 23:26:42 +0000 |
552 | +++ Homosapien/gtk-2.0/gtkrc 2010-02-28 17:40:28 +0000 |
553 | @@ -106,15 +106,15 @@ |
554 | menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe |
555 | prelight_shade = 1.06 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors. |
556 | progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes |
557 | - reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow |
558 | - rgba = TRUE # FALSE = disabled, TRUE = enabled |
559 | + reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow |
560 | + rgba = TRUE # FALSE = disabled, TRUE = enabled |
561 | roundness = 2 # 0 = squared, 1 = old default, more will increase roundness |
562 | scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles |
563 | shadow_shades = { 0.8, 2.2 } |
564 | sliderstyle = 0 # 0 = nothing added, 1 = handles |
565 | spinbuttonstyle = 1 |
566 | stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider |
567 | -# textstyle = 1 |
568 | +# textstyle = 1 |
569 | trough_shades = {1.1,0.87} |
570 | toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient |
571 | } |
572 | @@ -135,18 +135,18 @@ |
573 | |
574 | style "murrine-button" = "murrine-wider" |
575 | { |
576 | - GtkWidget ::focus-line-width = 0 |
577 | - GtkWidget ::focus-padding = 2 |
578 | + GtkWidget ::focus-line-width = 0 |
579 | + GtkWidget ::focus-padding = 2 |
580 | |
581 | - xthickness = 3 |
582 | - ythickness = 3 |
583 | + xthickness = 3 |
584 | + ythickness = 3 |
585 | |
586 | engine "murrine" |
587 | { |
588 | gradient_shades = { 1.1, 1.0, 1.0, 0.9 } |
589 | contrast = 1.0 |
590 | - reliefstyle = 0 |
591 | - focus_color = shade (1.0, @bg_color) |
592 | + reliefstyle = 0 |
593 | + focus_color = shade (1.0, @bg_color) |
594 | } |
595 | } |
596 | |
597 | @@ -167,7 +167,7 @@ |
598 | |
599 | style "murrine-menu" = "murrine-wider" |
600 | { |
601 | - bg[NORMAL] = shade (1.05, @bg_color) |
602 | + bg[NORMAL] = shade (1.05, @bg_color) |
603 | fg[PRELIGHT] = @selected_fg_color |
604 | } |
605 | |
606 | @@ -258,12 +258,12 @@ |
607 | { |
608 | border_shades = { .7, .7} # draw a gradient on the border. |
609 | border_colors = { @bg_color, @bg_color } |
610 | - glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl |
611 | - glow_shade = 1.1 # sets glow amount for buttons or widgets |
612 | - glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) |
613 | - gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1} |
614 | - highlight_shade = 1.05 # set highlight amount for buttons or widgets |
615 | - lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets |
616 | + glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl |
617 | + glow_shade = 1.1 # sets glow amount for buttons or widgets |
618 | + glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) |
619 | + gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1} |
620 | + highlight_shade = 1.05 # set highlight amount for buttons or widgets |
621 | + lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets |
622 | roundness = 4 |
623 | } |
624 | |
625 | @@ -290,7 +290,7 @@ |
626 | |
627 | style "murrine-radiocheck" |
628 | { |
629 | - text[NORMAL] = @selected_fg_color |
630 | + text[NORMAL] = @selected_fg_color |
631 | text[PRELIGHT] = @selected_fg_color |
632 | bg[SELECTED] = @selected_bg_color # HACK: override button selection colour |
633 | } |
634 | @@ -328,36 +328,36 @@ |
635 | { |
636 | function = HANDLE |
637 | recolorable = TRUE |
638 | - state = NORMAL |
639 | - overlay_file = "Others/null.png" |
640 | - overlay_stretch = FALSE |
641 | - orientation = VERTICAL |
642 | - } |
643 | - image |
644 | - { |
645 | - function = HANDLE |
646 | - recolorable = TRUE |
647 | - state = PRELIGHT |
648 | - overlay_file = "Others/null.png" |
649 | - overlay_stretch = FALSE |
650 | - orientation = VERTICAL |
651 | - } |
652 | - image |
653 | - { |
654 | - function = HANDLE |
655 | - recolorable = TRUE |
656 | - state = ACTIVE |
657 | - overlay_file = "Panel/handle-v-pressed.png" |
658 | - overlay_stretch = FALSE |
659 | - orientation = VERTICAL |
660 | - } |
661 | - image |
662 | - { |
663 | - function = HANDLE |
664 | - recolorable = TRUE |
665 | - state = INSENSITIVE |
666 | - overlay_file = "Panel/handle-v-insens.png" |
667 | - overlay_stretch = FALSE |
668 | + state = NORMAL |
669 | + overlay_file = "Others/null.png" |
670 | + overlay_stretch = FALSE |
671 | + orientation = VERTICAL |
672 | + } |
673 | + image |
674 | + { |
675 | + function = HANDLE |
676 | + recolorable = TRUE |
677 | + state = PRELIGHT |
678 | + overlay_file = "Others/null.png" |
679 | + overlay_stretch = FALSE |
680 | + orientation = VERTICAL |
681 | + } |
682 | + image |
683 | + { |
684 | + function = HANDLE |
685 | + recolorable = TRUE |
686 | + state = ACTIVE |
687 | + overlay_file = "Panel/handle-v-pressed.png" |
688 | + overlay_stretch = FALSE |
689 | + orientation = VERTICAL |
690 | + } |
691 | + image |
692 | + { |
693 | + function = HANDLE |
694 | + recolorable = TRUE |
695 | + state = INSENSITIVE |
696 | + overlay_file = "Panel/handle-v-insens.png" |
697 | + overlay_stretch = FALSE |
698 | orientation = VERTICAL |
699 | } |
700 | |
701 | @@ -405,10 +405,10 @@ |
702 | image |
703 | { |
704 | function = ARROW |
705 | - arrow_direction = DOWN |
706 | - border = {0,0,0,0} |
707 | - stretch = TRUE |
708 | - recolorable = TRUE |
709 | + arrow_direction = DOWN |
710 | + border = {0,0,0,0} |
711 | + stretch = TRUE |
712 | + recolorable = TRUE |
713 | file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down |
714 | } |
715 | } |
716 | @@ -433,27 +433,27 @@ |
717 | { |
718 | function = HANDLE |
719 | recolorable = TRUE |
720 | - state = PRELIGHT |
721 | - overlay_file = "Others/null.png" |
722 | - overlay_stretch = FALSE |
723 | - orientation = VERTICAL |
724 | - } |
725 | - image |
726 | - { |
727 | - function = HANDLE |
728 | - recolorable = TRUE |
729 | - state = ACTIVE |
730 | - overlay_file = "Panel/handle-v-pressed.png" |
731 | - overlay_stretch = FALSE |
732 | - orientation = VERTICAL |
733 | - } |
734 | - image |
735 | - { |
736 | - function = HANDLE |
737 | - recolorable = TRUE |
738 | - state = INSENSITIVE |
739 | - overlay_file = "Panel/handle-v-insens.png" |
740 | - overlay_stretch = FALSE |
741 | + state = PRELIGHT |
742 | + overlay_file = "Others/null.png" |
743 | + overlay_stretch = FALSE |
744 | + orientation = VERTICAL |
745 | + } |
746 | + image |
747 | + { |
748 | + function = HANDLE |
749 | + recolorable = TRUE |
750 | + state = ACTIVE |
751 | + overlay_file = "Panel/handle-v-pressed.png" |
752 | + overlay_stretch = FALSE |
753 | + orientation = VERTICAL |
754 | + } |
755 | + image |
756 | + { |
757 | + function = HANDLE |
758 | + recolorable = TRUE |
759 | + state = INSENSITIVE |
760 | + overlay_file = "Panel/handle-v-insens.png" |
761 | + overlay_stretch = FALSE |
762 | orientation = VERTICAL |
763 | } |
764 | |
765 | @@ -549,7 +549,7 @@ |
766 | # quite a bit to get this working correctly. |
767 | # (It will involve setting different priorities, etc.) |
768 | ################################ |
769 | -widget "new-tooltip-style*" style "murrine-tooltips" |
770 | +widget "new-tooltip-style*" style "murrine-tooltips" |
771 | |
772 | ################################################### |
773 | # Special cases and work arounds |
774 | @@ -557,7 +557,7 @@ |
775 | |
776 | # Special case the nautilus-extra-view-widget |
777 | # ToDo: A more generic approach for all applications that have a widget like this. |
778 | -widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location" |
779 | +widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location" |
780 | |
781 | # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 |
782 | # Note that the work around assumes that the combobox is _not_ in |
783 | @@ -616,11 +616,11 @@ |
784 | widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround" |
785 | |
786 | # Theme panel elements |
787 | -widget "*PanelWidget*" style "murrine-panel" |
788 | -widget "*PanelApplet*" style "murrine-panel" |
789 | -widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet |
790 | -class "PanelApp*" style "murrine-panel" |
791 | -class "PanelToplevel*" style "murrine-panel" |
792 | -widget_class "*Mail*" style "murrine-panel" |
793 | +widget "*PanelWidget*" style "murrine-panel" |
794 | +widget "*PanelApplet*" style "murrine-panel" |
795 | +widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet |
796 | +class "PanelApp*" style "murrine-panel" |
797 | +class "PanelToplevel*" style "murrine-panel" |
798 | +widget_class "*Mail*" style "murrine-panel" |
799 | widget_class "*notif*" style "murrine-panel" |
800 | widget_class "*Notif*" style "murrine-panel" |
801 | |
802 | === modified file 'Sorbet/gtk-2.0/gtkrc' |
803 | --- Sorbet/gtk-2.0/gtkrc 2010-02-26 21:28:39 +0000 |
804 | +++ Sorbet/gtk-2.0/gtkrc 2010-02-28 17:40:28 +0000 |
805 | @@ -3,7 +3,7 @@ |
806 | # by: James Schriver <jws141@gmail.com> |
807 | # Requires Murrine GTK Engine v0.91.0 |
808 | |
809 | -gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEFEF\nbase_color:#fff\ntext_color:#1A1A1A\nselected_bg_color:#E66924\nselected_fg_color:#FFFFFF\ntooltip_bg_color:#D6DCE4\ntooltip_fg_color:#222222\ntheme_color_04:#a9a49c\ntheme_color_26:#303334\ntheme_color_27:#706b64" |
810 | +gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEFEF\nbase_color:#fff\ntext_color:#1A1A1A\nselected_bg_color:#DF5926\nselected_fg_color:#FFFFFF\ntooltip_bg_color:#D6DCE4\ntooltip_fg_color:#222222\ntheme_color_04:#a9a49c\ntheme_color_26:#303334\ntheme_color_27:#706b64" |
811 | |
812 | style "default" |
813 | { |
814 | @@ -81,12 +81,12 @@ |
815 | { |
816 | animation = TRUE # FALSE = disabled, TRUE = enabled |
817 | arrowstyle = 1 |
818 | - # border_shades = { 1.2, 1.0 } # gradient to draw on border |
819 | - # border_colors = { "#E6DDD5", "#E6DDD5" } |
820 | +# border_shades = { 1.2, 1.0 } # gradient to draw on border |
821 | +# border_colors = { "#E6DDD5", "#E6DDD5" } |
822 | colorize_scrollbar = FALSE # FALSE = disabled, TRUE = enabled |
823 | comboboxstyle = 0 # colorize the GtkComboBox below the arrow. |
824 | contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders |
825 | - # focus_color = @selected_bg_color |
826 | +# focus_color = @selected_bg_color |
827 | glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl |
828 | glow_shade = 1.20 # sets glow amount for buttons or widgets |
829 | glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) |
830 | @@ -110,7 +110,7 @@ |
831 | sliderstyle = 0 # 0 = nothing added, 1 = handles |
832 | spinbuttonstyle = 1 |
833 | stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider |
834 | - #textstyle = 1 |
835 | +# textstyle = 1 |
836 | trough_shades = {1.1,0.87} # draw gradient on trough of GtkScrollbar and GtkProgressbar |
837 | toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient |
838 | } |
839 | @@ -136,18 +136,18 @@ |
840 | xthickness = 3 |
841 | ythickness = 3 |
842 | |
843 | - bg[NORMAL] = shade (0.96, @base_color) |
844 | - bg[ACTIVE] = mix(0.76, shade (0.92, @bg_color), shade (0.72, @base_color)) |
845 | - bg[PRELIGHT] = mix(0.93, shade (1.11, @bg_color), shade (1.04, @selected_bg_color)) |
846 | - bg[SELECTED] = mix(0.46, shade (1.11, @bg_color), shade (1.04, @selected_bg_color)) |
847 | + bg[NORMAL] = shade (0.96, @base_color) |
848 | + bg[ACTIVE] = mix(0.76, shade (0.92, @bg_color), shade (0.72, @base_color)) |
849 | + bg[PRELIGHT] = mix(0.93, shade (1.11, @bg_color), shade (1.04, @selected_bg_color)) |
850 | + bg[SELECTED] = mix(0.46, shade (1.11, @bg_color), shade (1.04, @selected_bg_color)) |
851 | bg[INSENSITIVE] = shade (1.06,@bg_color) |
852 | |
853 | engine "murrine" |
854 | { |
855 | gradient_shades = { 1.1, 1.0, 1.0, 0.9 } |
856 | - contrast = 1.0 |
857 | - reliefstyle = 0 |
858 | - focus_color = shade (1.0, @bg_color) |
859 | + contrast = 1.0 |
860 | + reliefstyle = 0 |
861 | + focus_color = shade (1.0, @bg_color) |
862 | } |
863 | } |
864 | |
865 | @@ -160,8 +160,8 @@ |
866 | |
867 | engine "murrine" |
868 | { |
869 | - focus_color = shade (0.65, @selected_bg_color) |
870 | - } |
871 | + focus_color = shade (0.65, @selected_bg_color) |
872 | + } |
873 | } |
874 | |
875 | style "notebook" |
876 | @@ -188,8 +188,8 @@ |
877 | roundness = 5 |
878 | } |
879 | |
880 | - bg[NORMAL] = shade(0.6, @bg_color) |
881 | - bg[PRELIGHT] = shade(.7, @bg_color) |
882 | + bg[NORMAL] = shade(0.5, @bg_color) |
883 | + bg[PRELIGHT] = shade(.6, @bg_color) |
884 | |
885 | } |
886 | |
887 | @@ -208,7 +208,7 @@ |
888 | |
889 | style "scale" { |
890 | bg[SELECTED] = shade (1.0, @selected_bg_color) |
891 | - fg[PRELIGHT] = @base_color |
892 | + fg[PRELIGHT] = @base_color |
893 | |
894 | engine "murrine" |
895 | { |
896 | @@ -224,6 +224,7 @@ |
897 | style "vscale" |
898 | { |
899 | } |
900 | + |
901 | style "progressbar" = "wide" { |
902 | fg[PRELIGHT] = @selected_fg_color |
903 | |
904 | @@ -244,7 +245,7 @@ |
905 | |
906 | engine "murrine" |
907 | { |
908 | - roundness = 0 |
909 | + roundness = 0 |
910 | } |
911 | } |
912 | |
913 | @@ -285,9 +286,19 @@ |
914 | |
915 | style "menu-item" |
916 | { |
917 | - fg[PRELIGHT] = @selected_fg_color |
918 | - bg[SELECTED] = shade (1.25, @selected_bg_color) |
919 | - bg[PRELIGHT] = shade (1.25, @selected_bg_color) |
920 | + fg[PRELIGHT] = @selected_fg_color |
921 | + bg[SELECTED] = shade (1.25, @selected_bg_color) |
922 | + bg[PRELIGHT] = shade (1.25, @selected_bg_color) |
923 | + |
924 | + engine "murrine" |
925 | + { |
926 | + border_shades = { 1.0, .8} # draw a gradient on the border. |
927 | + border_colors = { @selected_bg_color, @selected_bg_color} |
928 | + glowstyle = 0 |
929 | + gradient_shades = { 1.1, 1.0, 1.0, 0.9 } |
930 | + highlight_shade = 1.0 |
931 | + lightborder_shade = 1.20 |
932 | + } |
933 | } |
934 | |
935 | style "separator-menu-item" { |
936 | @@ -444,36 +455,36 @@ |
937 | { |
938 | function = HANDLE |
939 | recolorable = TRUE |
940 | - state = NORMAL |
941 | - overlay_file = "Others/null.png" |
942 | - overlay_stretch = FALSE |
943 | - orientation = VERTICAL |
944 | - } |
945 | - image |
946 | - { |
947 | - function = HANDLE |
948 | - recolorable = TRUE |
949 | - state = PRELIGHT |
950 | - overlay_file = "Others/null.png" |
951 | - overlay_stretch = FALSE |
952 | - orientation = VERTICAL |
953 | - } |
954 | - image |
955 | - { |
956 | - function = HANDLE |
957 | - recolorable = TRUE |
958 | - state = ACTIVE |
959 | - overlay_file = "Panel/handle-v-pressed.png" |
960 | - overlay_stretch = FALSE |
961 | - orientation = VERTICAL |
962 | - } |
963 | - image |
964 | - { |
965 | - function = HANDLE |
966 | - recolorable = TRUE |
967 | - state = INSENSITIVE |
968 | - overlay_file = "Panel/handle-v-insens.png" |
969 | - overlay_stretch = FALSE |
970 | + state = NORMAL |
971 | + overlay_file = "Others/null.png" |
972 | + overlay_stretch = FALSE |
973 | + orientation = VERTICAL |
974 | + } |
975 | + image |
976 | + { |
977 | + function = HANDLE |
978 | + recolorable = TRUE |
979 | + state = PRELIGHT |
980 | + overlay_file = "Others/null.png" |
981 | + overlay_stretch = FALSE |
982 | + orientation = VERTICAL |
983 | + } |
984 | + image |
985 | + { |
986 | + function = HANDLE |
987 | + recolorable = TRUE |
988 | + state = ACTIVE |
989 | + overlay_file = "Panel/handle-v-pressed.png" |
990 | + overlay_stretch = FALSE |
991 | + orientation = VERTICAL |
992 | + } |
993 | + image |
994 | + { |
995 | + function = HANDLE |
996 | + recolorable = TRUE |
997 | + state = INSENSITIVE |
998 | + overlay_file = "Panel/handle-v-insens.png" |
999 | + overlay_stretch = FALSE |
1000 | orientation = VERTICAL |
1001 | } |
1002 | |
1003 | @@ -485,11 +496,7 @@ |
1004 | |
1005 | # Theme radio buttons and checkmarks |
1006 | class "GtkRadio*" style "radiocheck" |
1007 | -class "GtkCheck*" style "radiocheck" |
1008 | - |
1009 | -# Keep proper colour for Metacity |
1010 | -#class "MetaFrames" style "metacity-frame" |
1011 | -#class "GtkWindow" style "metacity-frame" |
1012 | +class "GtkCheck*" style "radiocheck" |
1013 | |
1014 | # Theme default style is applied to every widget |
1015 | class "GtkWidget" style "default" |
1016 | @@ -519,17 +526,17 @@ |
1017 | widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook" |
1018 | widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook" |
1019 | |
1020 | -widget_class "*<GtkButton>" style "button" |
1021 | -widget_class "*<GtkNotebook>" style "notebook" |
1022 | -#widget_class "*<GtkStatusbar>*" style "statusbar" |
1023 | - |
1024 | -widget_class "*<GtkComboBoxEntry>*" style "entry" |
1025 | -widget_class "*<GtkCombo>*" style "entry" |
1026 | - |
1027 | -widget_class "*<GtkMenuBar>*" style "menubar" |
1028 | -widget_class "*<GtkMenu>*" style "menu" |
1029 | -widget_class "*<GtkMenuItem>*" style "menu-item" |
1030 | -widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item" |
1031 | +widget_class "*<GtkButton>" style "button" |
1032 | +widget_class "*<GtkNotebook>" style "notebook" |
1033 | +#widget_class "*<GtkStatusbar>*" style "statusbar" |
1034 | + |
1035 | +widget_class "*<GtkComboBoxEntry>*" style "entry" |
1036 | +widget_class "*<GtkCombo>*" style "entry" |
1037 | + |
1038 | +widget_class "*<GtkMenuBar>*" style "menubar" |
1039 | +widget_class "*<GtkMenu>*" style "menu" |
1040 | +widget_class "*<GtkMenuItem>*" style "menu-item" |
1041 | +widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item" |
1042 | |
1043 | widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title" |
1044 | widget_class "*.<GtkTreeView>*" style "treeview" |
1045 | @@ -543,8 +550,8 @@ |
1046 | widget_class "*.<GtkCList>.<GtkButton>" style "treeview-header" |
1047 | |
1048 | # Workarounds for Evolution |
1049 | -widget_class "*.ETable.ECanvas" style "treeview-header" |
1050 | -widget_class "*.ETree.ECanvas" style "treeview-header" |
1051 | +widget_class "*.ETable.ECanvas" style "treeview-header" |
1052 | +widget_class "*.ETree.ECanvas" style "treeview-header" |
1053 | |
1054 | ############################################ |
1055 | # NAUTILUS |
1056 | |
1057 | === modified file 'Sorbet/index.theme.in' |
1058 | --- Sorbet/index.theme.in 2010-02-26 21:28:39 +0000 |
1059 | +++ Sorbet/index.theme.in 2010-02-28 17:40:28 +0000 |
1060 | @@ -1,13 +1,11 @@ |
1061 | [Desktop Entry] |
1062 | Name=Sorbet |
1063 | Type=X-GNOME-Metatheme |
1064 | -Comment= |
1065 | +Comment= Ubuntu Sorbet Desktop Theme |
1066 | |
1067 | [X-GNOME-Metatheme] |
1068 | GtkTheme=Sorbet |
1069 | +IconTheme=Breathe |
1070 | MetacityTheme=Sorbet |
1071 | -IconTheme=Breathe |
1072 | -GtkColorScheme=fg_color:#101010,bg_color:#EFEFEF,base_color:#fff,text_color:#1A1A1A,selected_bg_color:#E66924,selected_fg_color:#FFFFFF,tooltip_bg_color:#D6DCE4,tooltip_fg_color:#222222,theme_color_04:#a9a49c,theme_color_26:#303334,theme_color_27:#706b64 |
1073 | -CursorTheme=DMZ-White |
1074 | -CursorSize=18 |
1075 | -NotificationTheme=ubuntu |
1076 | +CursorTheme=Human |
1077 | + |
1078 | |
1079 | === added file 'Sorbet/metacity-1/bg.png' |
1080 | Binary files Sorbet/metacity-1/bg.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/bg.png 2010-02-28 17:40:28 +0000 differ |
1081 | === added file 'Sorbet/metacity-1/bgb.png' |
1082 | Binary files Sorbet/metacity-1/bgb.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/bgb.png 2010-02-28 17:40:28 +0000 differ |
1083 | === added file 'Sorbet/metacity-1/bgp.png' |
1084 | Binary files Sorbet/metacity-1/bgp.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/bgp.png 2010-02-28 17:40:28 +0000 differ |
1085 | === added file 'Sorbet/metacity-1/bgpr.png' |
1086 | Binary files Sorbet/metacity-1/bgpr.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/bgpr.png 2010-02-28 17:40:28 +0000 differ |
1087 | === removed file 'Sorbet/metacity-1/close.png' |
1088 | Binary files Sorbet/metacity-1/close.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/close.png 1970-01-01 00:00:00 +0000 differ |
1089 | === added file 'Sorbet/metacity-1/close_dark.png' |
1090 | Binary files Sorbet/metacity-1/close_dark.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/close_dark.png 2010-02-28 17:40:28 +0000 differ |
1091 | === added file 'Sorbet/metacity-1/close_light.png' |
1092 | Binary files Sorbet/metacity-1/close_light.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/close_light.png 2010-02-28 17:40:28 +0000 differ |
1093 | === added file 'Sorbet/metacity-1/close_original.png' |
1094 | Binary files Sorbet/metacity-1/close_original.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/close_original.png 2010-02-28 17:40:28 +0000 differ |
1095 | === removed file 'Sorbet/metacity-1/closebg.png' |
1096 | Binary files Sorbet/metacity-1/closebg.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/closebg.png 1970-01-01 00:00:00 +0000 differ |
1097 | === removed file 'Sorbet/metacity-1/closebgp.png' |
1098 | Binary files Sorbet/metacity-1/closebgp.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/closebgp.png 1970-01-01 00:00:00 +0000 differ |
1099 | === removed file 'Sorbet/metacity-1/menu.png' |
1100 | Binary files Sorbet/metacity-1/menu.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/menu.png 1970-01-01 00:00:00 +0000 differ |
1101 | === added file 'Sorbet/metacity-1/menu_grey.png' |
1102 | Binary files Sorbet/metacity-1/menu_grey.png 1970-01-01 00:00:00 +0000 and Sorbet/metacity-1/menu_grey.png 2010-02-28 17:40:28 +0000 differ |
1103 | === removed file 'Sorbet/metacity-1/menu_over.png' |
1104 | Binary files Sorbet/metacity-1/menu_over.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/menu_over.png 1970-01-01 00:00:00 +0000 differ |
1105 | === modified file 'Sorbet/metacity-1/metacity-theme-1.xml' (properties changed: +x to -x) |
1106 | --- Sorbet/metacity-1/metacity-theme-1.xml 2010-02-26 21:28:39 +0000 |
1107 | +++ Sorbet/metacity-1/metacity-theme-1.xml 2010-02-28 17:40:28 +0000 |
1108 | @@ -1,24 +1,28 @@ |
1109 | -<?xml version="1.0"?> |
1110 | <metacity_theme> |
1111 | <info> |
1112 | <name>Sorbet</name> |
1113 | <author>Metacity - Zac Barton. Mockup - 0rAX0, James Schriver</author> |
1114 | - <copyright>2010</copyright> |
1115 | - <date>2010-02-22</date> |
1116 | + <copyright>Lorem Ipsum, 2010</copyright> |
1117 | + <date>2010-02-28</date> |
1118 | <description>Based off the mockup done by 0rAX0 which you can find at http://gnome-look.org/content/show.php/Homosapien+-+Mockup+only!?content=119462</description> |
1119 | + <!-- |
1120 | + Find the Original versions at http://gnome-look.org/content/show.php?content=119496 |
1121 | + |
1122 | + This customized version was created at http://www.zacbarton.com/homosapien/customizer/ |
1123 | + --> |
1124 | </info> |
1125 | |
1126 | <frame_geometry name="geometry_normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"> |
1127 | - <distance name="left_width" value="1"/> |
1128 | - <distance name="right_width" value="1"/> |
1129 | - <distance name="bottom_height" value="4"/> |
1130 | - <distance name="left_titlebar_edge" value="10"/> |
1131 | - <distance name="right_titlebar_edge" value="10"/> |
1132 | - <distance name="button_width" value="20"/> |
1133 | - <distance name="button_height" value="17"/> |
1134 | - <distance name="title_vertical_pad" value="1"/> |
1135 | - <border name="title_border" left="0" right="8" top="4" bottom="4"/> |
1136 | - <border name="button_border" left="0" right="0" top="6" bottom="5"/><!-- 4,3 or 5, 4 or 6, 5 or 7, 6 --> |
1137 | + <distance name="left_width" value="4"/> |
1138 | + <distance name="right_width" value="4"/> |
1139 | + <distance name="bottom_height" value="4"/> |
1140 | + <distance name="left_titlebar_edge" value="6"/> |
1141 | + <distance name="right_titlebar_edge" value="6"/> |
1142 | + <distance name="button_width" value="22"/> |
1143 | + <distance name="button_height" value="16"/> |
1144 | + <distance name="title_vertical_pad" value="0"/> |
1145 | + <border name="title_border" left="0" right="11" top="4" bottom="4"/> |
1146 | + <border name="button_border" left="0" right="0" top="6" bottom="5"/> |
1147 | </frame_geometry> |
1148 | |
1149 | <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"> |
1150 | @@ -27,10 +31,10 @@ |
1151 | <distance name="bottom_height" value="1"/> |
1152 | <distance name="left_titlebar_edge" value="5"/> |
1153 | <distance name="right_titlebar_edge" value="5"/> |
1154 | - <distance name="button_width" value="20"/> |
1155 | + <distance name="button_width" value="22"/> |
1156 | <distance name="button_height" value="16"/> |
1157 | <distance name="title_vertical_pad" value="0"/> |
1158 | - <border name="title_border" left="0" right="8" top="2" bottom="2"/> |
1159 | + <border name="title_border" left="0" right="11" top="2" bottom="2"/> |
1160 | <border name="button_border" left="0" right="0" top="6" bottom="5"/> |
1161 | </frame_geometry> |
1162 | |
1163 | @@ -50,53 +54,92 @@ |
1164 | |
1165 | <!-- TITLEBARS --> |
1166 | <draw_ops name="background_focused_normal"> |
1167 | + <!-- window border --> |
1168 | + <rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" filled="false" x="0" y="0" width="width-1" height="height-1"/> |
1169 | + |
1170 | <!-- background fill to fix theme manager rendering bugs --> |
1171 | - <!--<rectangle color="shade/gtk:bg[SELECTED]/0.65" filled="true" x="0" y="0" width="width" height="top_height"/> |
1172 | + <rectangle color="shade/gtk:bg[NORMAL]/0.75" filled="true" x="0" y="0" width="width" height="top_height"/> |
1173 | |
1174 | - <!-- titlebar background --> |
1175 | - <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1176 | - <color value="shade/gtk:bg[NORMAL]/0.45"/> |
1177 | - <color value="shade/gtk:bg[NORMAL]/0.65"/> |
1178 | - </gradient> |
1179 | - <gradient height="top_height" type="vertical" width="width" x="0" y="0"> |
1180 | - <color value="shade/gtk:bg[NORMAL]/0.8"/> |
1181 | - <color value="shade/gtk:bg[NORMAL]/0.4"/> |
1182 | - </gradient> |
1183 | + <!-- titlebar background --> |
1184 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1185 | + <color value="shade/gtk:bg[NORMAL]/0.20"/> |
1186 | + <color value="shade/gtk:bg[NORMAL]/0.40"/> |
1187 | + </gradient> |
1188 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1189 | + <color value="shade/gtk:bg[NORMAL]/0.40"/> |
1190 | + <color value="shade/gtk:bg[NORMAL]/0.20"/> |
1191 | + </gradient> |
1192 | |
1193 | <!-- titlebar borders --> |
1194 | + <!-- top --> |
1195 | + <line color="shade/gtk:bg[NORMAL]/0.50" x1="5" y1="1" x2="width-6" y2="1"/> |
1196 | <!-- bottom --> |
1197 | - <line color="shade/gtk:bg[SELECTED]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/> |
1198 | - |
1199 | - <!-- Sides --> |
1200 | - <!--<line color="shade/gtk:bg[NORMAL]/0.66" x1="0" y1="0" x2="width" y2="0"/> |
1201 | - <line color="shade/gtk:bg[NORMAL]/1.18" x1="0" y1="1" x2="width" y2="1"/> |
1202 | - <line color="shade/gtk:bg[NORMAL]/0.66" x1="0" y1="0" x2="0" y2="height"/> |
1203 | - <line color="shade/gtk:bg[NORMAL]/0.66" x1="width-1" y1="0" x2="width-1" y2="height"/> |
1204 | - <line color="shade/gtk:bg[NORMAL]/0.66" x1="0" y1="height-1" x2="width" y2="height-1"/> --> |
1205 | -</draw_ops> |
1206 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/> |
1207 | + |
1208 | + <!-- corners --> |
1209 | + <!-- top left --> |
1210 | + <!-- outer highlights --> |
1211 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="3" y1="1" x2="4" y2="1"/> |
1212 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="2" y1="2" x2="2" y2="2"/> |
1213 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="1" y1="3" x2="1" y2="4"/> |
1214 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="5" x2="0" y2="top_height-2"/> |
1215 | + <!-- inner highlights --> |
1216 | + <line color="shade/gtk:bg[NORMAL]/0.50" x1="3" y1="2" x2="4" y2="2"/> |
1217 | + <line color="shade/gtk:bg[NORMAL]/0.50" x1="2" y1="3" x2="2" y2="4"/> |
1218 | + <gradient type="vertical" x="1" y="5" width="1" height="7"> |
1219 | + <color value="shade/gtk:bg[NORMAL]/0.50"/> |
1220 | + <color value="shade/gtk:bg[NORMAL]/0.50"/> |
1221 | + </gradient> |
1222 | + <!-- top right --> |
1223 | + <!-- outer highlights --> |
1224 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="width-4" y1="1" x2="width-5" y2="1"/> |
1225 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="width-3" y1="2" x2="width-3" y2="2"/> |
1226 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="width-2" y1="3" x2="width-2" y2="4"/> |
1227 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="width-1" y1="5" x2="width-1" y2="top_height-2"/> |
1228 | + <!-- inner highlights --> |
1229 | + <line color="shade/gtk:bg[NORMAL]/0.50" x1="width-4" y1="2" x2="width-5" y2="2"/> |
1230 | + <line color="shade/gtk:bg[NORMAL]/0.50" x1="width-3" y1="3" x2="width-3" y2="4"/> |
1231 | + <gradient type="vertical" x="width-2" y="5" width="1" height="7"> |
1232 | + <color value="shade/gtk:bg[NORMAL]/0.50"/> |
1233 | + <color value="shade/gtk:bg[NORMAL]/0.50"/> |
1234 | + </gradient> |
1235 | + |
1236 | + |
1237 | + <!-- bottom left --> |
1238 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="0" y1="height-5" x2="0" y2="height-5"/> |
1239 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="1" y1="height-5" x2="1" y2="height-5"/> |
1240 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="height-4" x2="1" y2="height-4"/> |
1241 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="height-3" x2="2" y2="height-3"/> |
1242 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="height-2" x2="3" y2="height-2"/> |
1243 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="4" y2="height-2"/> |
1244 | + <!-- bottom right --> |
1245 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-1" y1="height-5" x2="width-1" y2="height-5"/> |
1246 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-2" y1="height-5" x2="width-2" y2="height-5"/> |
1247 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-2" y1="height-4" x2="width-2" y2="height-4"/> |
1248 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/> |
1249 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-4" y1="height-2" x2="width-4" y2="height-2"/> |
1250 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-5" y1="height-2" x2="width-5" y2="height-2"/> |
1251 | + </draw_ops> |
1252 | |
1253 | <draw_ops name="background_unfocused_normal"> |
1254 | <rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" filled="false" x="0" y="0" width="width-1" height="height-1"/> |
1255 | + |
1256 | <!-- corners --> |
1257 | <!-- top left --> |
1258 | - <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="1" y1="5" x2="1" y2="5"/> |
1259 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="3" x2="1" y2="4"/> |
1260 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="2" x2="2" y2="2"/> |
1261 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="1" x2="4" y2="1"/> |
1262 | - <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="5" y1="1" x2="5" y2="1"/> |
1263 | <!-- top right --> |
1264 | - <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-2" y1="5" x2="width-2" y2="5"/> |
1265 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-2" y1="3" x2="width-2" y2="4"/> |
1266 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-3" y1="2" x2="width-3" y2="2"/> |
1267 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-4" y1="1" x2="width-5" y2="1"/> |
1268 | - <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-5" y1="1" x2="width-5" y2="1"/> |
1269 | <!-- bottom left --> |
1270 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="0" y1="height-5" x2="0" y2="height-5"/> |
1271 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="1" y1="height-5" x2="1" y2="height-5"/> |
1272 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="height-4" x2="1" y2="height-4"/> |
1273 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="height-3" x2="2" y2="height-3"/> |
1274 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="height-2" x2="3" y2="height-2"/> |
1275 | - <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="5" y2="height-2"/> |
1276 | + <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="4" y2="height-2"/> |
1277 | <!-- bottom right --> |
1278 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-1" y1="height-5" x2="width-1" y2="height-5"/> |
1279 | <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-2" y1="height-5" x2="width-2" y2="height-5"/> |
1280 | @@ -107,17 +150,18 @@ |
1281 | </draw_ops> |
1282 | |
1283 | <draw_ops name="background_focused_maximized"> |
1284 | - <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1285 | - <color value="shade/gtk:bg[NORMAL]/0.45"/> |
1286 | - <color value="shade/gtk:bg[NORMAL]/0.65"/> |
1287 | - </gradient> |
1288 | - <gradient height="top_height" type="vertical" width="width" x="0" y="0"> |
1289 | - <color value="shade/gtk:bg[NORMAL]/0.8"/> |
1290 | - <color value="shade/gtk:bg[NORMAL]/0.4"/> |
1291 | - </gradient> |
1292 | + <!-- titlebar background --> |
1293 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1294 | + <color value="shade/gtk:bg[NORMAL]/0.20"/> |
1295 | + <color value="shade/gtk:bg[NORMAL]/0.40"/> |
1296 | + </gradient> |
1297 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
1298 | + <color value="shade/gtk:bg[NORMAL]/0.40"/> |
1299 | + <color value="shade/gtk:bg[NORMAL]/0.20"/> |
1300 | + </gradient> |
1301 | |
1302 | <!-- bottom titlebar border --> |
1303 | - <line color="shade/gtk:bg[SELECTED]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/> |
1304 | + <line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/> |
1305 | </draw_ops> |
1306 | |
1307 | <draw_ops name="background_unfocused_maximized"> |
1308 | @@ -127,82 +171,190 @@ |
1309 | |
1310 | <!-- TITLE --> |
1311 | <draw_ops name="title_focused"> |
1312 | - <title color="#e5e5e5" x="(3 `max` (width-title_width+15)) / 2" y="1 `max` ((height-title_height) / 2) + 1"/> |
1313 | + <title color="#e5e5e5" x="(3 `max` (width-title_width + 15)) / 2" y="1 `max` ((height-title_height) / 2) + 1"/> |
1314 | </draw_ops> |
1315 | |
1316 | <draw_ops name="title_unfocused"> |
1317 | - <title color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.30" x="(3 `max` (width-title_width+15)) / 2" y="1 `max` ((height-title_height) / 2) + 1"/> |
1318 | + <title color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.30" x="(3 `max` (width-title_width + 15)) / 2" y="1 `max` ((height-title_height) / 2) + 1"/> |
1319 | </draw_ops> |
1320 | |
1321 | |
1322 | <!-- BUTTONS --> |
1323 | - |
1324 | <draw_ops name="none"> |
1325 | </draw_ops> |
1326 | |
1327 | -<draw_ops name="right_left_background_focused_normal"> |
1328 | - <image filename="rlbg.png" x="0" y="0" width="object_width" height="object_height"/> |
1329 | -</draw_ops> |
1330 | -<draw_ops name="right_left_background_focused_pressed"> |
1331 | - <image filename="rlbgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1332 | -</draw_ops> |
1333 | -<draw_ops name="right_middle_background_focused_normal"> |
1334 | - <image filename="rmbg.png" x="0" y="0" width="object_width" height="object_height"/> |
1335 | -</draw_ops> |
1336 | -<draw_ops name="right_middle_background_focused_pressed"> |
1337 | - <image filename="rmbgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1338 | -</draw_ops> |
1339 | -<draw_ops name="right_right_background_focused_normal"> |
1340 | - <image filename="rrbg.png" x="0" y="0" width="object_width" height="object_height"/> |
1341 | - <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width" y2="0"/> |
1342 | - <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/> |
1343 | -</draw_ops> |
1344 | -<draw_ops name="right_right_background_focused_pressed"> |
1345 | - <image filename="rrbgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1346 | - <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width" y2="0"/> |
1347 | - <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/> |
1348 | -</draw_ops> |
1349 | -<draw_ops name="right_close_background_focused_normal"> |
1350 | - <image filename="closebg.png" x="0" y="0" width="object_width" height="object_height"/> |
1351 | -</draw_ops> |
1352 | -<draw_ops name="right_close_background_focused_pressed"> |
1353 | - <image filename="closebgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1354 | -</draw_ops> |
1355 | - |
1356 | -<draw_ops name="right_left_background_unfocused_normal"> |
1357 | -</draw_ops> |
1358 | -<draw_ops name="right_left_background_unfocused_pressed"> |
1359 | -</draw_ops> |
1360 | -<draw_ops name="right_middle_background_unfocused_normal"> |
1361 | -</draw_ops> |
1362 | -<draw_ops name="right_middle_background_unfocused_pressed"> |
1363 | -</draw_ops> |
1364 | -<draw_ops name="right_right_background_unfocused_normal"> |
1365 | - <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width" y2="0"/> |
1366 | - <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/> |
1367 | -</draw_ops> |
1368 | -<draw_ops name="right_right_background_unfocused_pressed"> |
1369 | - <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width" y2="0"/> |
1370 | - <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/> |
1371 | -</draw_ops> |
1372 | -<draw_ops name="right_close_background_unfocused_normal"> |
1373 | -</draw_ops> |
1374 | -<draw_ops name="right_close_background_unfocused_pressed"> |
1375 | -</draw_ops> |
1376 | - |
1377 | + <draw_ops name="right_left_background_focused_normal"> |
1378 | + <image filename="bg.png" x="0" y="0" width="object_width" height="object_height"/> |
1379 | + <!-- border --> |
1380 | + <line color="#a9a9a9" x1="0" y1="1" x2="0" y2="object_height-2"/> |
1381 | + <!-- rounding --> |
1382 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="0" y1="0" x2="0" y2="0"/> |
1383 | + <line color="shade/gtk:bg[NORMAL]/0.62" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1384 | + </draw_ops> |
1385 | + <draw_ops name="right_left_background_focused_pressed"> |
1386 | + <image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1387 | + <!-- border --> |
1388 | + <line color="#a6a6a6" x1="0" y1="1" x2="0" y2="object_height-2"/> |
1389 | + <!-- rounding --> |
1390 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="0" y1="0" x2="0" y2="0"/> |
1391 | + <line color="shade/gtk:bg[NORMAL]/0.62" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1392 | + </draw_ops> |
1393 | + |
1394 | + <draw_ops name="right_middle_background_focused_normal"> |
1395 | + <image filename="bg.png" x="0" y="0" width="object_width" height="object_height"/> |
1396 | + </draw_ops> |
1397 | + <draw_ops name="right_middle_background_focused_pressed"> |
1398 | + <image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1399 | + </draw_ops> |
1400 | + |
1401 | + <draw_ops name="right_right_background_focused_normal"> |
1402 | + <image filename="bgb.png" x="0" y="0" width="object_width" height="object_height"/> |
1403 | + <!-- fill --> |
1404 | + <gradient type="vertical" x="0" y="0" width="object_width" height="object_height"> |
1405 | + <color value="#EB703F"/> |
1406 | + <color value="#DF5926"/> |
1407 | + </gradient> |
1408 | + <!-- borders --> |
1409 | + <tint x="0" y="0" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1410 | + <tint x="object_width-1" y="1" width="0" height="object_height-2" color="#a6a6a6" alpha=".4"/> |
1411 | + <tint x="0" y="object_height-1" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1412 | + <tint x="0" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1413 | + <!-- rounding --> |
1414 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1415 | + <line color="shade/gtk:bg[NORMAL]/0.42" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1416 | + </draw_ops> |
1417 | + <draw_ops name="right_right_background_focused_pressed"> |
1418 | + <image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1419 | + <!-- border --> |
1420 | + <line color="#a6a6a6" x1="object_width-1" y1="1" x2="object_width-1" y2="object_height-2"/> |
1421 | + <!-- rounding --> |
1422 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1423 | + <line color="shade/gtk:bg[NORMAL]/0.62" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1424 | + </draw_ops> |
1425 | + |
1426 | + <draw_ops name="right_left_background_unfocused_normal"> |
1427 | + <!--<image filename="bg.png" x="0" y="0" width="object_width" height="object_height"/>--> |
1428 | + <!-- border --> |
1429 | + <line color="#a6a6a6" x1="0" y1="1" x2="0" y2="object_height-2"/> |
1430 | + <!-- fade --> |
1431 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1432 | + <!-- rounding --> |
1433 | + <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="0" y2="0"/> |
1434 | + <line color="gtk:bg[NORMAL]" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1435 | + </draw_ops> |
1436 | + <draw_ops name="right_left_background_unfocused_pressed"> |
1437 | + <!--<image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/>--> |
1438 | + <!-- border --> |
1439 | + <line color="#a6a6a6" x1="0" y1="1" x2="0" y2="object_height-2"/> |
1440 | + <!-- fade --> |
1441 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1442 | + <!-- rounding --> |
1443 | + <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="0" y2="0"/> |
1444 | + <line color="gtk:bg[NORMAL]" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1445 | + </draw_ops> |
1446 | + |
1447 | + <draw_ops name="right_middle_background_unfocused_normal"> |
1448 | + <!--<image filename="bg.png" x="0" y="0" width="object_width" height="object_height"/>--> |
1449 | + <!-- fade --> |
1450 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1451 | + </draw_ops> |
1452 | + <draw_ops name="right_middle_background_unfocused_pressed"> |
1453 | + <image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1454 | + <!-- fade --> |
1455 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1456 | + </draw_ops> |
1457 | + |
1458 | + <draw_ops name="right_right_background_unfocused_normal"> |
1459 | + <!--<image filename="bgb.png" x="0" y="0" width="object_width" height="object_height"/>--> |
1460 | + <!-- fill --> |
1461 | + <gradient type="vertical" x="0" y="0" width="object_width" height="object_height"> |
1462 | + <color value="#EB703F"/> |
1463 | + <color value="#DF5926"/> |
1464 | + </gradient> |
1465 | + <!-- borders --> |
1466 | + <tint x="0" y="0" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1467 | + <tint x="object_width-1" y="1" width="0" height="object_height-2" color="#a6a6a6" alpha=".4"/> |
1468 | + <tint x="0" y="object_height-1" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1469 | + <tint x="0" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1470 | + <!-- fade --> |
1471 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1472 | + <!-- rounding --> |
1473 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1474 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1475 | + </draw_ops> |
1476 | + <draw_ops name="right_right_background_unfocused_pressed"> |
1477 | + <image filename="bgp.png" x="0" y="0" width="object_width" height="object_height"/> |
1478 | + <!-- border --> |
1479 | + <line color="#a6a6a6" x1="object_width-1" y1="1" x2="object_width-1" y2="object_height-2"/> |
1480 | + <!-- fade --> |
1481 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1482 | + <!-- rounding --> |
1483 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1484 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1485 | + </draw_ops> |
1486 | + |
1487 | +<draw_ops name="close_background_focused_normal"> |
1488 | + <image filename="bgb.png" x="0" y="0" width="object_width" height="object_height"/> |
1489 | + <!-- fill --> |
1490 | + <gradient type="vertical" x="0" y="0" width="object_width" height="object_height"> |
1491 | + <color value="#EB703F"/> |
1492 | + <color value="#DF5926"/> |
1493 | + </gradient> |
1494 | + <!-- borders --> |
1495 | + <tint x="0" y="0" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1496 | + <tint x="object_width-1" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1497 | + <tint x="0" y="object_height-1" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1498 | + <tint x="0" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1499 | + <!-- rounding --> |
1500 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="0" y1="0" x2="0" y2="0"/> |
1501 | + <line color="shade/gtk:bg[NORMAL]/0.62" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1502 | + <line color="shade/gtk:bg[NORMAL]/0.52" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1503 | + <line color="shade/gtk:bg[NORMAL]/0.62" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1504 | +</draw_ops> |
1505 | +<draw_ops name="close_background_focused_pressed"> |
1506 | + <image filename="bgpr.png" x="0" y="0" width="object_width" height="object_height"/> |
1507 | +</draw_ops> |
1508 | +<draw_ops name="close_background_unfocused_normal"> |
1509 | + <image filename="bgb.png" x="0" y="0" width="object_width" height="object_height"/> |
1510 | + <!-- fill --> |
1511 | + <gradient type="vertical" x="0" y="0" width="object_width" height="object_height"> |
1512 | + <color value="#EB703F"/> |
1513 | + <color value="#DF5926"/> |
1514 | + </gradient> |
1515 | + <!-- borders --> |
1516 | + <tint x="0" y="0" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1517 | + <tint x="object_width-1" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1518 | + <tint x="0" y="object_height-1" width="object_width-1" height="0" color="#a6a6a6" alpha=".4"/> |
1519 | + <tint x="0" y="0" width="0" height="object_height-1" color="#a6a6a6" alpha=".4"/> |
1520 | + <!-- fade --> |
1521 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1522 | + <!-- rounding --> |
1523 | + <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="0" y2="0"/> |
1524 | + <line color="gtk:bg[NORMAL]" x1="0" y1="object_height-1" x2="0" y2="object_height-1"/> |
1525 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/> |
1526 | + <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/> |
1527 | +</draw_ops> |
1528 | +<draw_ops name="close_background_unfocused_pressed"> |
1529 | + <image filename="bgpr.png" x="0" y="0" width="object_width" height="object_height"/> |
1530 | + <!-- fade --> |
1531 | + <tint x="0" y="0" width="object_width" height="object_height" alpha=".4" color="gtk:bg[NORMAL]"/> |
1532 | +</draw_ops> |
1533 | + |
1534 | +<!-- Menu --> |
1535 | <draw_ops name="menu_focused_normal"> |
1536 | - <image filename="menu.png" x="0" y="4" width="object_width" height="object_height" alpha=".9"/> |
1537 | + <image filename="menu_grey.png" x="4" y="4" width="object_width" height="object_height" alpha=".9"/> |
1538 | </draw_ops> |
1539 | <draw_ops name="menu_focused_prelight"> |
1540 | - <image filename="menu.png" x="0" y="4" width="object_width" height="object_height" alpha="1"/> |
1541 | + <image filename="menu_grey.png" x="4" y="4" width="object_width" height="object_height" alpha="1"/> |
1542 | </draw_ops> |
1543 | <draw_ops name="menu_unfocused_normal"> |
1544 | - <image filename="menu_over.png" x="0" y="4" width="object_width" height="object_height" alpha=".4"/> |
1545 | + <image filename="menu_grey.png" x="4" y="4" width="object_width" height="object_height" alpha=".4"/> |
1546 | </draw_ops> |
1547 | <draw_ops name="menu_unfocused_prelight"> |
1548 | - <image filename="menu_over.png" x="0" y="4" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/> |
1549 | + <image filename="menu_grey.png" x="4" y="4" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/> |
1550 | </draw_ops> |
1551 | |
1552 | +<!-- Minimize --> |
1553 | <draw_ops name="minimize_focused_normal"> |
1554 | <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height"/> |
1555 | </draw_ops> |
1556 | @@ -222,6 +374,7 @@ |
1557 | <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1558 | </draw_ops> |
1559 | |
1560 | +<!-- Maximize --> |
1561 | <draw_ops name="maximize_focused_normal"> |
1562 | <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height"/> |
1563 | </draw_ops> |
1564 | @@ -241,6 +394,7 @@ |
1565 | <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1566 | </draw_ops> |
1567 | |
1568 | +<!-- Unmaximize --> |
1569 | <draw_ops name="unmaximize_focused_normal"> |
1570 | <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height"/> |
1571 | </draw_ops> |
1572 | @@ -260,25 +414,27 @@ |
1573 | <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1574 | </draw_ops> |
1575 | |
1576 | +<!-- Close --> |
1577 | <draw_ops name="close_focused_normal"> |
1578 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height"/> |
1579 | + <image filename="close_light.png" x="0" y="0" width="object_width" height="object_height"/> |
1580 | </draw_ops> |
1581 | <draw_ops name="close_focused_prelight"> |
1582 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".55" colorize="#2A1D12"/> |
1583 | + <image filename="close_dark.png" x="0" y="0" width="object_width" height="object_height" alpha=".7"/> |
1584 | </draw_ops> |
1585 | <draw_ops name="close_focused_pressed"> |
1586 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".4" colorize="#FFFFFF"/> |
1587 | + <image filename="close_light.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1588 | </draw_ops> |
1589 | <draw_ops name="close_unfocused_normal"> |
1590 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".4" colorize="#9B9692"/> |
1591 | + <image filename="close_dark.png" x="0" y="0" width="object_width" height="object_height" alpha=".4"/> |
1592 | </draw_ops> |
1593 | <draw_ops name="close_unfocused_prelight"> |
1594 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".55" colorize="shade/gtk:bg[NORMAL]/.85"/> |
1595 | + <image filename="close_dark.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/> |
1596 | </draw_ops> |
1597 | <draw_ops name="close_unfocused_pressed"> |
1598 | - <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1599 | + <image filename="close_light.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/> |
1600 | </draw_ops> |
1601 | |
1602 | + |
1603 | <!-- FRAME STYLE --> |
1604 | <frame_style name="none" geometry="geometry_normal"> |
1605 | <button function="menu" state="normal" draw_ops="none"/> |
1606 | @@ -295,22 +451,6 @@ |
1607 | <button function="close" state="pressed" draw_ops="none"/> |
1608 | </frame_style> |
1609 | |
1610 | -<frame_style name="normal" geometry="geometry_normal"> |
1611 | - <piece position="title" draw_ops="title_unfocused"/> |
1612 | - <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/> |
1613 | - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/> |
1614 | - <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> |
1615 | - <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/> |
1616 | - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> |
1617 | - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> |
1618 | - <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/> |
1619 | - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> |
1620 | - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> |
1621 | - <button function="close" state="normal" draw_ops="close_unfocused_normal"/> |
1622 | - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> |
1623 | - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> |
1624 | -</frame_style> |
1625 | - |
1626 | <frame_style name="normal_focused" geometry="geometry_normal"> |
1627 | <piece position="title" draw_ops="title_focused"/> |
1628 | <piece position="entire_background" draw_ops="background_focused_normal"/> |
1629 | @@ -385,9 +525,9 @@ |
1630 | <frame_style name="utility_focused" parent="none"> |
1631 | <piece position="title" draw_ops="title_focused"/> |
1632 | <piece position="entire_background" draw_ops="background_focused_normal"/> |
1633 | - <button function="right_right_background" state="normal" draw_ops="right_close_background_focused_normal"/> |
1634 | - <button function="right_right_background" state="prelight" draw_ops="right_close_background_focused_normal"/> |
1635 | - <button function="right_right_background" state="pressed" draw_ops="right_close_background_focused_pressed"/> |
1636 | + <button function="right_right_background" state="normal" draw_ops="close_background_focused_normal"/> |
1637 | + <button function="right_right_background" state="prelight" draw_ops="close_background_focused_normal"/> |
1638 | + <button function="right_right_background" state="pressed" draw_ops="close_background_focused_pressed"/> |
1639 | <button function="menu" state="normal" draw_ops="menu_focused_normal"/> |
1640 | <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/> |
1641 | <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> |
1642 | @@ -396,12 +536,12 @@ |
1643 | <button function="close" state="pressed" draw_ops="close_focused_pressed"/> |
1644 | </frame_style> |
1645 | |
1646 | -<frame_style name="utility_unfocused" parent="normal_unfocused"> |
1647 | +<frame_style name="utility_unfocused" parent="none"> |
1648 | <piece position="title" draw_ops="title_unfocused"/> |
1649 | <piece position="entire_background" draw_ops="background_unfocused_normal"/> |
1650 | - <button function="right_right_background" state="normal" draw_ops="right_close_background_unfocused_normal"/> |
1651 | - <button function="right_right_background" state="prelight" draw_ops="right_close_background_unfocused_normal"/> |
1652 | - <button function="right_right_background" state="pressed" draw_ops="right_close_background_unfocused_pressed"/> |
1653 | + <button function="right_right_background" state="normal" draw_ops="close_background_unfocused_normal"/> |
1654 | + <button function="right_right_background" state="prelight" draw_ops="close_background_unfocused_normal"/> |
1655 | + <button function="right_right_background" state="pressed" draw_ops="close_background_unfocused_pressed"/> |
1656 | <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/> |
1657 | <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/> |
1658 | <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> |
1659 | @@ -410,8 +550,8 @@ |
1660 | <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> |
1661 | </frame_style> |
1662 | |
1663 | -<frame_style name="border" geometry="geometry_border" parent="normal_focused"> |
1664 | - <piece position="entire_background" draw_ops="title_focused"/> |
1665 | +<frame_style name="border" geometry="geometry_border" parent="none"> |
1666 | + <piece position="entire_background" draw_ops="none"/> |
1667 | <piece position="title" draw_ops="none"/> |
1668 | </frame_style> |
1669 | |
1670 | @@ -431,23 +571,23 @@ |
1671 | <frame_style_set name="utility"> |
1672 | <frame focus="yes" state="normal" resize="both" style="utility_focused"/> |
1673 | <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> |
1674 | - <frame focus="yes" state="maximized" style="maximized_focused"/> |
1675 | - <frame focus="no" state="maximized" style="normal_focused"/> |
1676 | - <frame focus="yes" state="shaded" style="normal_focused"/><!-- todo --> |
1677 | - <frame focus="no" state="shaded" style="normal_unfocused"/><!-- todo --> |
1678 | - <frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/><!-- todo --> |
1679 | - <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> |
1680 | + <frame focus="yes" state="maximized" style="none"/> |
1681 | + <frame focus="no" state="maximized" style="none"/> |
1682 | + <frame focus="yes" state="shaded" style="none"/> |
1683 | + <frame focus="no" state="shaded" style="none"/> |
1684 | + <frame focus="yes" state="maximized_and_shaded" style="none"/> |
1685 | + <frame focus="no" state="maximized_and_shaded" style="none"/> |
1686 | </frame_style_set> |
1687 | |
1688 | <frame_style_set name="border"> |
1689 | <frame focus="yes" state="normal" resize="both" style="border"/> |
1690 | <frame focus="no" state="normal" resize="both" style="border"/> |
1691 | - <frame focus="yes" state="maximized" style="maximized_focused"/> |
1692 | - <frame focus="no" state="maximized" style="normal_focused"/> |
1693 | - <frame focus="yes" state="shaded" style="normal_focused"/><!-- todo --> |
1694 | - <frame focus="no" state="shaded" style="normal_unfocused"/><!-- todo --> |
1695 | - <frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/><!-- todo --> |
1696 | - <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> |
1697 | + <frame focus="yes" state="maximized" style="none"/> |
1698 | + <frame focus="no" state="maximized" style="none"/> |
1699 | + <frame focus="yes" state="shaded" style="none"/> |
1700 | + <frame focus="no" state="shaded" style="none"/> |
1701 | + <frame focus="yes" state="maximized_and_shaded" style="none"/> |
1702 | + <frame focus="no" state="maximized_and_shaded" style="none"/> |
1703 | </frame_style_set> |
1704 | |
1705 | |
1706 | @@ -459,4 +599,4 @@ |
1707 | <window type="utility" style_set="utility"/> |
1708 | <window type="border" style_set="border"/> |
1709 | |
1710 | -</metacity_theme> |
1711 | +</metacity_theme> |
1712 | |
1713 | === removed file 'Sorbet/metacity-1/rlbg.png' |
1714 | Binary files Sorbet/metacity-1/rlbg.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rlbg.png 1970-01-01 00:00:00 +0000 differ |
1715 | === removed file 'Sorbet/metacity-1/rlbgp.png' |
1716 | Binary files Sorbet/metacity-1/rlbgp.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rlbgp.png 1970-01-01 00:00:00 +0000 differ |
1717 | === removed file 'Sorbet/metacity-1/rmbg.png' |
1718 | Binary files Sorbet/metacity-1/rmbg.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rmbg.png 1970-01-01 00:00:00 +0000 differ |
1719 | === removed file 'Sorbet/metacity-1/rmbgp.png' |
1720 | Binary files Sorbet/metacity-1/rmbgp.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rmbgp.png 1970-01-01 00:00:00 +0000 differ |
1721 | === removed file 'Sorbet/metacity-1/rrbg.png' |
1722 | Binary files Sorbet/metacity-1/rrbg.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rrbg.png 1970-01-01 00:00:00 +0000 differ |
1723 | === removed file 'Sorbet/metacity-1/rrbgp.png' |
1724 | Binary files Sorbet/metacity-1/rrbgp.png 2010-02-26 21:28:39 +0000 and Sorbet/metacity-1/rrbgp.png 1970-01-01 00:00:00 +0000 differ |
1725 | === modified file 'Turrican/gtk-2.0/gtkrc' |
1726 | --- Turrican/gtk-2.0/gtkrc 2009-08-25 18:05:33 +0000 |
1727 | +++ Turrican/gtk-2.0/gtkrc 2010-02-28 17:40:28 +0000 |
1728 | @@ -76,13 +76,15 @@ |
1729 | engine "murrine" { |
1730 | #options |
1731 | animation = TRUE |
1732 | + arrowstyle = 1 |
1733 | + border_shades = { 1.2, 1.0} # draw a gradient on the border. |
1734 | +# border_colors = { @bg_color, @bg_color } |
1735 | colorize_scrollbar = FALSE |
1736 | contrast = 0.87 |
1737 | glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top curved, 4 = beryl highlight, 5 = new |
1738 | glow_shade = 1.0 |
1739 | glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow |
1740 | gradient_shades = {1.15,1.08,1.07,1.02} |
1741 | - gradients = TRUE |
1742 | highlight_shade = 1.0 |
1743 | lightborder_shade = 1.12 |
1744 | lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides |
1745 | @@ -92,13 +94,16 @@ |
1746 | menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped |
1747 | menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped |
1748 | menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe |
1749 | + prelight_shade = 1.06 |
1750 | progressbarstyle = 0 # 0 = nothing, 1 = diagonal stripes, 2 = blocks |
1751 | - reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow |
1752 | + reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow |
1753 | rgba = FALSE |
1754 | roundness = 2 |
1755 | - scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles |
1756 | + scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles |
1757 | sliderstyle = 1 # 0 = nothing added, 1 = handles |
1758 | stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles |
1759 | +# textstyle = 1 |
1760 | + trough_shades = {1.1,0.87} |
1761 | toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient |
1762 | } |
1763 | } |
1764 | |
1765 | === modified file 'build/share/themes/Sorbet/index.theme' |
1766 | --- build/share/themes/Sorbet/index.theme 2010-02-26 21:28:39 +0000 |
1767 | +++ build/share/themes/Sorbet/index.theme 2010-02-28 17:40:28 +0000 |
1768 | @@ -1,13 +1,10 @@ |
1769 | [Desktop Entry] |
1770 | Name=Sorbet |
1771 | Type=X-GNOME-Metatheme |
1772 | -Comment= |
1773 | +Comment= Ubuntu Sorbet Desktop Theme |
1774 | |
1775 | [X-GNOME-Metatheme] |
1776 | GtkTheme=Sorbet |
1777 | +IconTheme=Breathe |
1778 | MetacityTheme=Sorbet |
1779 | -IconTheme=Breathe |
1780 | -GtkColorScheme=fg_color:#101010,bg_color:#EFEFEF,base_color:#fff,text_color:#1A1A1A,selected_bg_color:#E66924,selected_fg_color:#FFFFFF,tooltip_bg_color:#D6DCE4,tooltip_fg_color:#222222,theme_color_04:#a9a49c,theme_color_26:#303334,theme_color_27:#706b64 |
1781 | -CursorTheme=DMZ-White |
1782 | -CursorSize=18 |
1783 | -NotificationTheme=ubuntu |
1784 | +CursorTheme=Human |
1785 | |
1786 | === modified file 'debian/changelog' |
1787 | --- debian/changelog 2010-02-27 14:53:26 +0000 |
1788 | +++ debian/changelog 2010-02-28 17:40:28 +0000 |
1789 | @@ -1,9 +1,10 @@ |
1790 | -community-themes (0.21.2) lucid; urgency=low |
1791 | - |
1792 | - * setup.cfg: Finish renaming Wasp to Wasp-Murrine. |
1793 | - Really closes LP: #528846. |
1794 | - |
1795 | - -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Sat, 27 Feb 2010 09:51:54 -0500 |
1796 | +community-themes (0.21.3) lucid; urgency=low |
1797 | + |
1798 | + * Update Sorbet to v0.5 lp:~dashua/homosapien/sorbet |
1799 | + * Update Turrican to remove depreacted stlye option "gradients" |
1800 | + * Turrican: Add new murrine style options |
1801 | + |
1802 | + -- James Schriver <james@james-laptop> Sun, 28 Feb 2010 10:56:01 -0500 |
1803 | |
1804 | community-themes (0.21.1) lucid; urgency=low |
1805 |
Sorbet: Update to v0.5;
* add fancy gradients to menu-item;
* darker metacity;
* tweaked buttons;
Turrican:
* Removed deprecated gradients;
* update style options to murrine v0.91.0