human-theme

Merge lp:~psyke83/human-theme/visual-refresh-lucid into lp:human-theme

  1. visual-refresh-lucid
  2. Merge into ubuntu
Proposed by Conn O Griofa
Status: Needs review
Proposed branch: lp:~psyke83/human-theme/visual-refresh-lucid
Merge into: lp:human-theme
Diff against target: 1321 lines (+580/-412)
5 files modified
AUTHORS (+3/-0)
DarkRoom/gtk-2.0/gtkrc (+94/-125)
Human/gtk-2.0/gtkrc (+22/-33)
HumanLogin/gtk-2.0/gtkrc (+446/-254)
debian/changelog (+15/-0)
To merge this branch: bzr merge lp:~psyke83/human-theme/visual-refresh-lucid
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+19787@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conn O Griofa (psyke83) wrote :

Contains visual refresh of Huma, HumanLogin & DarkRoom GTK themes.

Reply

Unmerged revisions

96. By Conn O Griofa

Merge HumanLogin changes from dashua's humanlogin-visualrefresh-lucid branch; updated AUTHORS, debian/changelog

95. By Conn O Griofa

Visual refresh of Human and Darkroom themes; added name to AUTHORS file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2009-09-29 13:40:25 +0000
3+++ AUTHORS 2010-02-20 21:35:23 +0000
4@@ -1,3 +1,6 @@
5 Kenneth Wimer <kwwii@ubuntu.com>
6 Daniel Holbach <daniel.holbach@ubuntu.com>
7 Zniavre <zniavre@gmail.com>
8+Conn O Griofa <connogriofa@gmail.com>
9+James Schriver <jws141@gmail.com>
10+
11
12=== modified file 'DarkRoom/gtk-2.0/gtkrc'
13--- DarkRoom/gtk-2.0/gtkrc 2010-02-08 09:56:27 +0000
14+++ DarkRoom/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
15@@ -6,7 +6,9 @@
16 #
17 # Feel free to modify and share!
18
19-gtk_color_scheme = "fg_color:#EBE0CE\nbg_color:#4C4039\nbase_color:#FFF\ntext_color:#140D0A\nselected_bg_color:#D78E49\nselected_fg_color:#FFF\ntooltip_bg_color:#473D37\ntooltip_fg_color:#FFF"
20+gtk_color_scheme = "fg_color:#EBE0CE\nbg_color:#4C4039\nbase_color:#FFF\ntext_color:#140D0A\nselected_bg_color:#8F5F4A\nselected_fg_color:#FFF\ntooltip_bg_color:#473D37\ntooltip_fg_color:#FFF"
21+
22+gtk-icon-sizes = "panel-menu=24,24:gtk-button=16,16"
23
24 style "murrine-default"
25 {
26@@ -20,12 +22,12 @@
27
28 GtkPaned ::handle-size = 6
29
30- GtkRange ::trough-border = 0
31- GtkRange ::slider-width = 15
32- GtkRange ::stepper-size = 15
33+ GtkRange ::trough-border = 2
34+ GtkRange ::slider-width = 14
35+ GtkRange ::stepper-size = 14
36
37 GtkScale ::slider-length = 20
38- GtkScale ::trough-side-details = 0 # 0 = thin slider, >0 = thick slider
39+ GtkScale ::trough-side-details = 1
40 GtkScrollbar ::min-slider-length = 30
41
42 GtkMenuBar ::internal-padding = 0
43@@ -40,48 +42,58 @@
44 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
45 #WnckTasklist ::fade-overlay-rect = 0
46
47- GtkToolbar :: shadow-type = GTK_SHADOW_NONE
48- GtkMenuBar :: shadow-type = GTK_SHADOW_NONE
49+ # The following line hints to gecko (and possibly other appliations)
50+ # that the entry should be drawn transparently on the canvas.
51+ # Without this, gecko will fill in the background of the entry.
52+ GtkEntry::honors-transparent-bg-hint = 1
53
54- GtkWidget :: link-color ="#5E6FFF"
55- GtkWidget :: visited-link-color = shade (0.2, @fg_color)
56+ GtkWidget::link-color = "#5E6FFF"
57+ GtkWidget::visited-link-color = shade (0.2, @fg_color)
58
59 xthickness = 1
60 ythickness = 1
61
62- fg[NORMAL] = @fg_color # Metacity and mouseover, Most text
63- fg[PRELIGHT] = @fg_color # Text when mouseover
64- fg[ACTIVE] = @fg_color # Text when mouseclicking button, Tabs, Active window list
65- fg[SELECTED] = @selected_fg_color # Metacity X when window selected
66- fg[INSENSITIVE] = shade (0.17, @fg_color) # Insensitive Text
67-
68- bg[NORMAL] = @bg_color # Normal Background, inactive Metacity bar, buttons
69- bg[PRELIGHT] = shade (1.15, @bg_color) # Mouseover buttons
70- bg[ACTIVE] = shade (0.77, @bg_color) # Mouseclicking, Tabs, active window list
71- bg[SELECTED] = @selected_bg_color # Metacity Bar
72- bg[INSENSITIVE] = @bg_color # Insensitive buttons
73-
74- base[NORMAL] = @base_color # Background, most
75- base[PRELIGHT] = shade (0.95, @bg_color) # Mouseover menu
76- base[ACTIVE] = @selected_bg_color # Menu active item in inactive window
77- base[SELECTED] = @selected_bg_color # Menu active item in active window
78- base[INSENSITIVE] = @bg_color # Background, insensitive
79-
80- text[NORMAL] = @text_color # Text in window
81- text[PRELIGHT] = @text_color # Text on Mouseover
82- text[ACTIVE] = @selected_fg_color # Active text in inactive window
83- text[SELECTED] = @selected_fg_color # Active text in active window
84- text[INSENSITIVE] = shade (0.17, @fg_color) # Insensitive text
85+ fg[NORMAL] = @fg_color
86+ fg[PRELIGHT] = @fg_color
87+ fg[ACTIVE] = @fg_color
88+ fg[SELECTED] = @selected_fg_color
89+ fg[INSENSITIVE] = shade (0.15, @fg_color)
90+
91+ bg[NORMAL] = @bg_color
92+ bg[PRELIGHT] = shade (1.2, @bg_color)
93+ bg[ACTIVE] = shade (0.78, @bg_color)
94+ bg[SELECTED] = @selected_bg_color
95+ bg[INSENSITIVE] = @bg_color
96+
97+ base[NORMAL] = @base_color
98+ base[PRELIGHT] = shade (0.95, @bg_color)
99+ base[ACTIVE] = shade (0.9, @selected_bg_color)
100+ base[SELECTED] = shade (1.05, @selected_bg_color)
101+ base[INSENSITIVE] = @bg_color
102+
103+ text[NORMAL] = @text_color
104+ text[PRELIGHT] = @text_color
105+ text[ACTIVE] = @selected_fg_color
106+ text[SELECTED] = @selected_fg_color
107+ text[INSENSITIVE] = shade (0.15, @fg_color)
108
109 engine "murrine"
110 {
111- animation = FALSE # FALSE = disabled, TRUE = enabled
112- colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
113- contrast = 1.07 # 0.8 for less contrast, more than 1.0 for more contrast on borders
114- glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
115- gradient_shades = {1.20,1.05,1.20,1.02} # default: {1.1,1.0,1.0,1.1}
116- highlight_shade = 1.06 # set highlight amount for buttons or widgets
117- lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
118+ animation = TRUE # FALSE = disabled, TRUE = enabled
119+ arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
120+ #border_colors = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
121+ border_shades = { 1.2, 1.0 } # gradient to draw on border
122+ #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
123+ comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
124+ colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
125+ contrast = 1.0 # 0.8 for less contrast, more than 1.0 for more contrast on borders
126+ focus_color = shade (1.0, @selected_bg_color)
127+ glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
128+ glow_shade = 1.2 # sets glow amount for buttons or widgets
129+ glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
130+ gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
131+ highlight_shade = 1.05 # set highlight amount for buttons or widgets
132+ lightborder_shade = 1.4 # sets lightborder amount for buttons or widgets
133 lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides
134 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
135 listviewstyle = 1 # 0 = nothing, 1 = dotted
136@@ -89,13 +101,19 @@
137 menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
138 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
139 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
140- reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow
141- rgba = TRUE # FALSE = disabled, TRUE = enabled
142+ prelight_shade = 1.2 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
143+ progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
144+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
145+ rgba = FALSE # FALSE = disabled, TRUE = enabled
146 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
147- scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
148- sliderstyle = 1 # 0 = nothing added, 1 = handles
149- stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles, 2 = unknown
150+ scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
151+ shadow_shades = { 1.2, 0.8 } # draw gradient on shadow of some widgets
152+ sliderstyle = 0 # 0 = nothing added, 1 = handles
153+ spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
154+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
155+ textstyle = 0 # 0 = normal text, 1 = inset
156 toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
157+ trough_shades = { 1.05, 1.25 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
158 }
159 }
160
161@@ -113,15 +131,14 @@
162
163 style "murrine-button" = "murrine-wider"
164 {
165- bg[NORMAL] = shade (0.95, @bg_color)
166- bg[INSENSITIVE] = shade (0.97, @bg_color)
167-
168+ bg[NORMAL] = shade (1.05, @bg_color) # pre-selected buttons, keep same as focus colour
169+ bg[SELECTED] = shade (1.0, @selected_bg_color) # pre-selected buttons, keep same as focus colour
170 }
171
172 style "murrine-notebook"
173 {
174- bg[NORMAL] = shade (1.08, @bg_color)
175- bg[ACTIVE] = shade (0.75, @bg_color)
176+ bg[NORMAL] = shade (1.18, @bg_color)
177+ bg[ACTIVE] = shade (1.08, @bg_color)
178 }
179
180 style "murrine-tasklist" = "murrine-wide"
181@@ -130,25 +147,19 @@
182
183 style "murrine-menu" = "murrine-wider"
184 {
185- bg[NORMAL] = shade (1.15, @bg_color)
186+ bg[NORMAL] = shade (1.15, @bg_color)
187+ fg[PRELIGHT] = @selected_fg_color
188 }
189
190 style "murrine-menubar"
191 {
192- #bg[NORMAL]= shade (0.85, @bg_color) # dark menu bg
193+ fg[PRELIGHT] = @selected_fg_color
194 }
195
196 style "murrine-menu-item" = "murrine-wider"
197 {
198- bg[PRELIGHT] = shade (1.15, @bg_color) #should match bg[NORMAL] of "murrine-menu"
199- #bg[SELECTED] = shade (1.15, @bg_color)
200- fg[PRELIGHT] = @selected_fg_color
201-
202- engine "murrine"
203- {
204- highlight_shade = 1.03
205- roundness = 3
206- }
207+ bg[PRELIGHT] = shade (1.02, @selected_bg_color)
208+ bg[SELECTED] = shade (1.02, @selected_bg_color)
209 }
210
211 style "murrine-separator-menu-item"
212@@ -157,20 +168,14 @@
213
214 style "murrine-treeview"
215 {
216- bg[NORMAL] = shade (1.5, @bg_color)
217- fg[NORMAL] = shade (0.5, @bg_color)
218- fg[PRELIGHT] = shade (0.5, @bg_color)
219 }
220
221 style "murrine-treeview-header" = "murrine-default"
222 {
223- bg[NORMAL] = shade (0.95, @bg_color)
224- bg[INSENSITIVE] = shade (0.93, @bg_color)
225 }
226
227 style "murrine-frame-title"
228 {
229- fg[NORMAL] = lighter (@fg_color)
230 }
231
232 style "murrine-tooltips" = "murrine-wider"
233@@ -181,15 +186,7 @@
234
235 style "murrine-progressbar"
236 {
237- #xthickness = 0
238- #ythickness = 0
239-
240 fg[PRELIGHT] = @selected_fg_color
241-
242- engine "murrine"
243- {
244- contrast = 1.3 # Darken unfilled progressbar background
245- }
246 }
247
248 style "murrine-statusbar"
249@@ -202,21 +199,11 @@
250
251 style "murrine-spinbutton"
252 {
253- bg[NORMAL] = shade (0.95, @bg_color) # need to fix rectangular border bug on spinbutton
254- bg[INSENSITIVE] = shade (0.99, @bg_color)
255 }
256
257 style "murrine-scale"
258 {
259- GtkRange ::slider-width = 13
260-
261- bg[NORMAL] = shade (0.95, @bg_color)
262- bg[INSENSITIVE] = shade (0.99, @bg_color)
263-
264- engine "murrine"
265- {
266- contrast = 1.4
267- }
268+ GtkRange::slider-width = 13
269 }
270
271 style "murrine-hscale"
272@@ -229,13 +216,7 @@
273
274 style "murrine-scrollbar"
275 {
276- bg[NORMAL] = shade (0.95, @bg_color)
277- bg[INSENSITIVE] = shade (0.99, @bg_color)
278-
279- engine "murrine"
280- {
281- contrast = 1.8
282- }
283+ bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
284 }
285
286 style "murrine-hscrollbar"
287@@ -253,38 +234,24 @@
288
289 style "metacity-frame"
290 {
291- bg[NORMAL] = @bg_color
292 }
293
294-style "murrine-radiocheck" = "murrine-default"
295+style "murrine-radiocheck"
296 {
297- base[NORMAL] = @bg_color
298- text[NORMAL] = @fg_color # Text in window
299- text[PRELIGHT] = @fg_color # Text on Mouseover
300-
301- engine "murrine"
302- {
303- highlight_shade = 1.0
304- }
305+ text[NORMAL] = @selected_fg_color
306+ text[PRELIGHT] = @selected_fg_color
307+ bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
308 }
309
310 style "murrine-panel"
311 {
312- bg[NORMAL]= shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"
313+ bg[NORMAL] = shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"
314 }
315
316 #########################################
317 # Matches
318 #########################################
319
320-# Theme radio buttons and checkmarks
321-class "GtkRadio*" style "murrine-radiocheck"
322-class "GtkCheck*" style "murrine-radiocheck"
323-
324-# Keep proper colour for Metacity
325-class "MetaFrames" style "metacity-frame"
326-#class "GtkWindow" style "metacity-frame"
327-
328 # Theme default style is applied to every widget
329 class "GtkWidget" style "murrine-default"
330
331@@ -303,6 +270,14 @@
332 class "GtkVScrollbar" style "murrine-vscrollbar"
333 class "GtkHScrollbar" style "murrine-hscrollbar"
334
335+class "GtkRadio*" style:highest "murrine-radiocheck" # HACK: override button selection colour
336+class "GtkCheck*" style:highest "murrine-radiocheck" # HACK: override button selection colour
337+
338+# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
339+class "MetaFrames" style "metacity-frame"
340+#class "GtkWindow" style "metacity-frame"
341+
342+
343 # General matching following, the order is choosen so that the right styles override each other
344 # eg. progressbar needs to be more important then the menu match.
345
346@@ -312,6 +287,8 @@
347 widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"
348 widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"
349 widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"
350+widget_class "*<GtkNotebook>*<GtkViewport>" style "murrine-notebook"
351+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "murrine-notebook"
352
353 widget_class "*<GtkButton>" style "murrine-button"
354 widget_class "*<GtkNotebook>" style "murrine-notebook"
355@@ -328,6 +305,7 @@
356 widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
357 widget_class "*.<GtkTreeView>*" style "murrine-treeview"
358
359+widget_class "*<GtkProgress>" style "murrine-progressbar"
360 widget_class "*<GtkProgressBar>" style "murrine-progressbar"
361
362 # Treeview header
363@@ -335,8 +313,6 @@
364 widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
365 widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
366 widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
367-widget_class "*.<GtkTreeView>*<GtkLabel>*" style "murrine-treeview-header" # DARK: ensure GtkTreeView header text is light
368-widget_class "*.<GtkTreeView>*<GtkArrow>*" style:highest "murrine-treeview-header" # DARK: ensure GtkArrows are light
369
370 # Workarounds for Evolution
371 widget_class "*.ETable.ECanvas" style "murrine-treeview-header"
372@@ -370,9 +346,9 @@
373 {
374 text[NORMAL] = @fg_color
375 text[PRELIGHT] = @fg_color
376- text[SELECTED] = @selected_fg_color
377 text[ACTIVE] = @fg_color
378- text[INSENSITIVE] = shade (0.17, @fg_color)
379+ text[SELECTED] = @selected_fg_color
380+ text[INSENSITIVE] = shade (0.15, @fg_color)
381 }
382 widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"
383
384@@ -380,9 +356,9 @@
385 {
386 text[NORMAL] = @fg_color
387 text[PRELIGHT] = @selected_fg_color
388+ text[ACTIVE] = @fg_color
389 text[SELECTED] = @selected_fg_color
390- text[ACTIVE] = @fg_color
391- text[INSENSITIVE] = shade (0.17, @fg_color)
392+ text[INSENSITIVE] = shade (0.15, @fg_color)
393 }
394
395 widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"
396@@ -396,7 +372,7 @@
397 fg[PRELIGHT] = @text_color
398 fg[ACTIVE] = @selected_fg_color
399 fg[SELECTED] = @selected_fg_color
400- fg[INSENSITIVE] = shade (0.17, @fg_color)
401+ fg[INSENSITIVE] = shade (0.15, @fg_color)
402 }
403
404 widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"
405@@ -416,13 +392,6 @@
406
407 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
408
409-style "murrine-darker"
410-{
411- fg[NORMAL] = shade (0.1, @fg_color)
412- fg[ACTIVE] = shade (0.1, @fg_color)
413-}
414-widget "*auti*IconView*" style : highest "murrine-darker"
415-
416 # Theme panel elements
417 widget "*PanelWidget*" style "murrine-panel"
418 widget "*PanelApplet*" style "murrine-panel"
419
420=== modified file 'Human/gtk-2.0/gtkrc'
421--- Human/gtk-2.0/gtkrc 2010-02-08 09:56:27 +0000
422+++ Human/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
423@@ -42,6 +42,11 @@
424 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
425 #WnckTasklist ::fade-overlay-rect = 0
426
427+ # The following line hints to gecko (and possibly other appliations)
428+ # that the entry should be drawn transparently on the canvas.
429+ # Without this, gecko will fill in the background of the entry.
430+ GtkEntry::honors-transparent-bg-hint = 1
431+
432 #GtkWidget      ::link-color         = @fg_color
433 #GtkWidget      ::visited-link-color = shade (0.2, @fg_color)
434
435@@ -75,15 +80,20 @@
436 engine "murrine"
437 {
438 animation = TRUE # FALSE = disabled, TRUE = enabled
439+ arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
440+ #border_colors = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
441+ border_shades = { 1.2, 1.0 } # gradient to draw on border
442+ #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
443+ comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
444 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
445 contrast = 0.9 # 0.8 for less contrast, more than 1.0 for more contrast on borders
446 focus_color = shade (1.5, @selected_bg_color)
447 glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
448- glow_shade = 1.15 # sets glow amount for buttons or widgets
449+ glow_shade = 1.1 # sets glow amount for buttons or widgets
450 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
451 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
452- highlight_shade = 1.0 # set highlight amount for buttons or widgets
453- lightborder_shade = 0.95 # sets lightborder amount for buttons or widgets
454+ highlight_shade = 1.02 # set highlight amount for buttons or widgets
455+ lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
456 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
457 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
458 listviewstyle = 1 # 0 = nothing, 1 = dotted
459@@ -91,16 +101,19 @@
460 menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
461 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
462 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
463+ prelight_shade = 1.02 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
464 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
465- reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow
466+ reliefstyle = 3 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
467 rgba = FALSE # FALSE = disabled, TRUE = enabled
468 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
469 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
470- #scrollbar_color = shade (0.9, @bg_color)
471+ shadow_shades = { 1.0, 1.0 } # draw gradient on shadow of some widgets
472 sliderstyle = 0 # 0 = nothing added, 1 = handles
473- stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = unknown
474- #profile = NODOKA # engine profile options: CANDIDO, CLEARLOOKS, MIST, MURRINE, NODOKA
475+ spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
476+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
477+ textstyle = 0 # 0 = normal text, 1 = inset
478 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
479+ trough_shades = { 0.96, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
480 }
481 }
482
483@@ -125,11 +138,6 @@
484 {
485 bg[NORMAL] = shade (1.05, @bg_color)
486 bg[ACTIVE] = shade (0.96, @bg_color)
487-
488- engine "murrine"
489- {
490- gradient_shades = {1.1,1.06,0.92,0.85} # { 1.1, 1.02, 0.97, 0.93 }
491- }
492 }
493
494 style "murrine-tasklist" = "murrine-wide"
495@@ -151,11 +159,6 @@
496 {
497 bg[PRELIGHT] = shade (1.02, @selected_bg_color)
498 bg[SELECTED] = shade (1.02, @selected_bg_color)
499-
500- engine "murrine"
501- {
502- highlight_shade = 1.03
503- }
504 }
505
506 style "murrine-separator-menu-item"
507@@ -186,11 +189,6 @@
508 ythickness = 0
509
510 fg[PRELIGHT] = @selected_fg_color
511-
512- engine "murrine"
513- {
514- highlight_shade = 1.05
515- }
516 }
517
518 style "murrine-statusbar"
519@@ -207,12 +205,7 @@
520
521 style "murrine-scale"
522 {
523- GtkRange ::slider-width = 13
524-
525- engine "murrine"
526- {
527- highlight_shade = 1.05
528- }
529+ GtkRange::slider-width = 13
530 }
531
532 style "murrine-hscale"
533@@ -225,10 +218,6 @@
534
535 style "murrine-scrollbar"
536 {
537- engine "murrine"
538- {
539- highlight_shade = 1.05
540- }
541 bg[SELECTED] = shade (0.8, @bg_color)
542 }
543
544@@ -253,7 +242,7 @@
545 {
546 text[NORMAL] = @selected_fg_color
547 text[PRELIGHT] = @selected_fg_color
548- bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
549+ bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
550 }
551
552 style "murrine-panel"
553
554=== modified file 'HumanLogin/gtk-2.0/gtkrc'
555--- HumanLogin/gtk-2.0/gtkrc 2009-10-13 20:04:33 +0000
556+++ HumanLogin/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
557@@ -1,187 +1,297 @@
558+# Ubuntu Human Login theme
559+# (c) 2010 Kenneth Wimer <kwwii@ubuntu.com>, James Schriver <jws141@gmail.com>
560+# Licensed under the GPL.
561+# Requires Murrine GTK Engine v0.91.0
562+
563 gtk-color-scheme = "bg_color: #191313\nfg_color: #938888\nbase_color: #000\ntext_color: #fff\nselected_bg_color: #464040\nselected_fg_color: #ffffff\ntooltip_bg_color: #000\ntooltip_fg_color: #fff"
564
565-style "industrial-default"
566-{
567- xthickness = 1
568- ythickness = 1
569-
570-
571- GtkWidget::interior_focus = 1
572- GtkButton::default_inside_border = { 3, 3, 3, 3 }
573- GtkRange::trough_border = 0
574-
575- GtkWidget::focus_padding = 1
576-
577- GtkPaned::handle_size = 7
578-
579- GtkRange::slider_width = 15
580- GtkRange::stepper_size = 15
581- GtkScrollbar::min_slider_length = 30
582- GtkCheckButton::indicator_size = 13
583- GtkRadioButton::indicator_size = 13
584- GtkMenuBar::internal-padding = 0
585- GtkMenuBar::shadow-type = GTK_SHADOW_NONE
586-
587- WnckTasklist::fade-opacity = 1
588- WnckTasklist::fade-overlay-rect = 0
589- WnckTasklist::fade-loop-time = 2
590-
591- GtkButton::child_displacement_x = 0
592- GtkButton::child_displacement_y = 1
593-
594- GtkEntry::progress-border = { 0, 0, 0, 0 }
595-
596- GtkMenuItem::selected_shadow_type = GTK_SHADOW_IN
597-
598- GtkRange::activate-slider = 1
599-
600- # The following line hints to gecko (and possibly other appliations)
601- # that the entry should be drawn transparently on the canvas.
602- # Without this, gecko will fill in the background of the entry.
603- GtkEntry::honors-transparent-bg-hint = 1
604-
605-
606- # color definitions
607- bg[NORMAL] = @bg_color
608- bg[PRELIGHT] = shade (1.1, @bg_color)
609- bg[ACTIVE] = shade (0.85, @bg_color)
610- bg[SELECTED] = mix (0.65, @selected_bg_color, @bg_color)
611- bg[INSENSITIVE] = shade (0.85, @bg_color)
612-
613- fg[NORMAL] = @fg_color
614- fg[PRELIGHT] = @fg_color
615- fg[ACTIVE] = @fg_color
616- fg[SELECTED] = @selected_fg_color
617- fg[INSENSITIVE] = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
618-
619- base[NORMAL] = @base_color
620- base[PRELIGHT] = @base_color #XXX
621- base[ACTIVE] = mix (0.45, @selected_bg_color, @base_color) #b6c9cf
622- base[SELECTED] = @selected_bg_color
623- base[INSENSITIVE] = mix (0.95, @base_color, @text_color)
624-
625- text[NORMAL] = @text_color
626- text[PRELIGHT] = @text_color #XXX
627- text[ACTIVE] = @selected_fg_color
628- text[SELECTED] = @selected_fg_color
629- text[INSENSITIVE] = @selected_fg_color
630-
631-# text[INSENSITIVE] = mix (0.5, @text_color, @base_color)
632-
633-# bg[NORMAL] = "#f6f6f6"
634-# bg[PRELIGHT] = "#ffffff"
635-# fg[PRELIGHT] = "#202020"
636-# bg[ACTIVE] = "#d9d9d9"
637-# bg[INSENSITIVE] = "#d9d9d9"
638-# bg[SELECTED] = "#99a6bf"
639-#
640-# base[SELECTED] = "#6484a4"
641-# text[SELECTED] = "#ffffff"
642-# #this is selected item without focus:
643-# base[ACTIVE] = "#b6c9cf"
644-# text[INSENSITIVE] = "#757575"
645-#
646-# #defaults
647-# #base[NORMAL] = "#b6c9cf"
648-# #text[NORMAL] = "#000000"
649-#
650- engine "industrial"
651- {
652- # Set a hint to disable backward compatibility fallbacks.
653- hint = "use-hints"
654- }
655-}
656-
657-# Style to apply an exterior forcus to GtkEntry
658-style "industrial-exterior-focus"
659-{
660- GtkWidget::interior-focus = 0
661- GtkWidget::focus-line-width = 0
662-}
663-
664-# Add trough side details to GtkScale
665-style "industrial-scale"
666-{
667- GtkRange::trough-side-details = 1
668+style "murrine-default"
669+{
670+ ########
671+ # Style Properties
672+ ########
673+ GtkButton ::child-displacement-x = 1
674+ GtkButton ::child-displacement-y = 1
675+ GtkButton ::default-border = { 0, 0, 0, 0 }
676+ GtkCheckButton ::indicator-size = 14
677+
678+ GtkPaned ::handle-size = 6
679+
680+ GtkRange ::trough-border = 2
681+ GtkRange ::slider-width = 14
682+ GtkRange ::stepper-size = 14
683+
684+ GtkScale ::slider-length = 20
685+ GtkScale ::trough-side-details = 1
686+ GtkScrollbar ::min-slider-length = 30
687+
688+ GtkMenuBar ::internal-padding = 0
689+ GtkExpander ::expander-size = 16
690+ GtkToolbar ::internal-padding = 1
691+ GtkTreeView ::expander-size = 14
692+ GtkTreeView ::vertical-separator = 0
693+
694+ GtkMenu ::horizontal-padding = 0
695+ GtkMenu ::vertical-padding = 0
696+
697+ # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
698+ #WnckTasklist ::fade-overlay-rect = 0
699+
700+ # The following line hints to gecko (and possibly other appliations)
701+ # that the entry should be drawn transparently on the canvas.
702+ # Without this, gecko will fill in the background of the entry.
703+ GtkEntry::honors-transparent-bg-hint = 1
704+
705+ GtkWidget::link-color = "#5E6FFF"
706+ GtkWidget::visited-link-color = shade (0.2, @fg_color)
707+
708+ xthickness = 1
709+ ythickness = 1
710+
711+ # color definitions
712+ bg[NORMAL] = @bg_color
713+ bg[PRELIGHT] = shade (1.1, @bg_color)
714+ bg[ACTIVE] = shade (0.85, @bg_color)
715+ bg[SELECTED] = mix (0.65, @selected_bg_color, @bg_color)
716+ bg[INSENSITIVE] = shade (0.85, @bg_color)
717+
718+ fg[NORMAL] = @fg_color
719+ fg[PRELIGHT] = @fg_color
720+ fg[ACTIVE] = @fg_color
721+ fg[SELECTED] = @selected_fg_color
722+ fg[INSENSITIVE] = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
723+
724+ base[NORMAL] = @base_color
725+ base[PRELIGHT] = @base_color #XXX
726+ base[ACTIVE] = mix (0.45, @selected_bg_color, @base_color) #b6c9cf
727+ base[SELECTED] = @selected_bg_color
728+ base[INSENSITIVE] = mix (0.95, @base_color, @text_color)
729+
730+ text[NORMAL] = @text_color
731+ text[PRELIGHT] = @text_color #XXX
732+ text[ACTIVE] = @selected_fg_color
733+ text[SELECTED] = @selected_fg_color
734+
735+ engine "murrine"
736+ {
737+ animation = TRUE # FALSE = disabled, TRUE = enabled
738+ arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
739+ #border_colors = { @selected_bg_color, @selected_bg_color }
740+ border_shades = { 1.2, 1.0 } # gradient to draw on border
741+ #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
742+ comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
743+ colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
744+ contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
745+ #focus_color = @selected_bg_color
746+ glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
747+ glow_shade = 1.20 # sets glow amount for buttons or widgets
748+ glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
749+ gradient_shades = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
750+ highlight_shade = 1.0 # set highlight amount for buttons or widgets
751+ lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
752+ lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
753+ listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
754+ listviewstyle = 1 # 0 = nothing, 1 = dotted
755+ menubaritemstyle = 1 # 0 = menuitem look, 1 = button look
756+ menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
757+ menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
758+ menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
759+ prelight_shade = 1.2 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
760+ progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
761+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
762+ rgba = FALSE # FALSE = disabled, TRUE = enabled
763+ roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
764+ scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
765+ shadow_shades = { 1.2, 0.8 } # draw gradient on shadow of some widgets
766+ sliderstyle = 0 # 0 = nothing added, 1 = handles
767+ spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
768+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
769+ textstyle = 0 # 0 = normal text, 1 = inset
770+ toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
771+ trough_shades = { 1.05, 1.25 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
772+ }
773+}
774+
775+style "murrine-wide"
776+{
777+ xthickness = 2
778+ ythickness = 2
779+}
780+
781+style "murrine-wider"
782+{
783+ xthickness = 3
784+ ythickness = 3
785+}
786+
787+style "murrine-button" = "murrine-wider"
788+{
789+ bg[NORMAL] = @selected_bg_color
790+ bg[PRELIGHT] = shade (1.4, @selected_bg_color)
791+ bg[SELECTED] = shade (0.35, @selected_bg_color)
792+ bg[ACTIVE] = shade (0.35, @selected_bg_color)
793+
794+ engine "murrine"
795+ {
796+ border_shades = {1.2, 1.0} # draw a gradient on the border.
797+ border_colors = { @selected_bg_color, @selected_bg_color }
798+ glowstyle = 0
799+ gradient_shades = {1.1,1.0,1.0,0.7}
800+ highlight_shade = 1.0
801+ lightborder_shade = 1.0
802+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
803+ }
804+}
805+
806+style "murrine-notebook"
807+{
808+ bg[NORMAL] = shade (1.18, @bg_color)
809+ bg[ACTIVE] = shade (1.08, @bg_color)
810+}
811+
812+style "murrine-tasklist" = "murrine-wide"
813+{
814 }
815
816 # Style for the entry progress bar -- ie. change the colors
817-style "industrial-entry"
818-{
819- xthickness = 2
820- ythickness = 2
821-# KEN REMOVED
822-# bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
823-# fg[SELECTED] = @text_color
824-}
825-
826-# generic squared buttons style, used for the tasklist (treeview is in the extra treeview style)
827-style "industrial-squared"
828-{
829- engine "industrial"
830- {
831- rounded_buttons = FALSE
832- }
833-}
834-
835-style "industrial-wide"
836-{
837- xthickness = 2
838- ythickness = 2
839-}
840-
841-# style to remove the border around the progress bar
842-style "industrial-progress"
843-{
844- xthickness = 0
845- ythickness = 0
846-}
847-
848-# make scrollbar arrows lighter
849-style "industrial-arrows"
850-{
851- fg[NORMAL] = mix (0.8, @fg_color, @bg_color)
852+style "murrine-entry"
853+{
854+ xthickness = 2
855+ ythickness = 2
856+
857+ engine "murrine"
858+ {
859+ border_shades = {1.2, 1.0} # draw a gradient on the border.
860+ border_colors = { @selected_bg_color, @selected_bg_color }
861+ }
862+}
863+
864+style "murrine-menu" = "murrine-wider"
865+{
866+ bg[NORMAL] = shade (1.15, @bg_color)
867+ fg[PRELIGHT] = @selected_fg_color
868+}
869+
870+style "murrine-menubar"
871+{
872+ xthickness = 3
873+ ythickness = 3
874 }
875
876 # menuitems
877-style "industrial-menuitem"
878-{
879- xthickness = 3
880- ythickness = 3
881-
882- bg[PRELIGHT] = @selected_bg_color
883- bg[SELECTED] = @selected_bg_color
884- fg[PRELIGHT] = @selected_fg_color
885- fg[SELECTED] = @selected_fg_color
886-}
887-
888-style "industrial-menubar"
889-{
890- xthickness = 3
891- ythickness = 3
892-}
893-
894-style "industrial-tree-header"
895-{
896- engine "industrial"
897- {
898- hint = "treeview-header"
899- }
900- xthickness = 2
901- ythickness = 2
902-}
903-
904-style "industrial-tooltips"
905-{
906- xthickness = 4
907- ythickness = 4
908- bg[NORMAL] = @tooltip_bg_color
909- fg[NORMAL] = @tooltip_fg_color
910-}
911-
912-style "industrial-druid"
913-{
914- bg[SELECTED] = @selected_bg_color
915+style "murrine-menu-item"
916+{
917+ xthickness = 3
918+ ythickness = 3
919+
920+ engine "murrine"
921+ {
922+ border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
923+ border_shades = { 1.0, .8 } # gradient to draw on border
924+ glowstyle = 0
925+ gradient_shades = {1.1,1.0,1.0,0.7}
926+ highlight_shade = 1.0
927+ lightborder_shade = 1.0
928+ roundness = 0
929+ }
930+
931+ bg[PRELIGHT] = @selected_bg_color
932+ bg[SELECTED] = @selected_bg_color
933+ fg[PRELIGHT] = @selected_fg_color
934+ fg[SELECTED] = @selected_fg_color
935+}
936+
937+style "murrine-separator-menu-item"
938+{
939+}
940+
941+style "murrine-treeview"
942+{
943+
944+ engine "clearlooks"
945+ {
946+ hint = "treeview"
947+
948+ }
949+}
950+
951+style "murrine-treeview-header" = "murrine-default"
952+{
953+}
954+
955+style "murrine-frame-title"
956+{
957+ engine "murrine"
958+ {
959+ border_shades = {1.2, 1.0} # draw a gradient on the border.
960+ border_colors = { @selected_bg_color, @selected_bg_color }
961+ }
962+}
963+
964+style "murrine-tooltips" = "murrine-wider"
965+{
966+ bg[NORMAL] = @tooltip_bg_color
967+ fg[NORMAL] = @tooltip_fg_color
968+}
969+
970+
971+style "murrine-progressbar"
972+{
973+ engine "murrine"
974+ {
975+ border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
976+ border_shades = { 1.0, .8 } # gradient to draw on border
977+ }
978+
979+ fg[PRELIGHT] = @selected_fg_color
980+}
981+
982+style "murrine-statusbar"
983+{
984+}
985+
986+#Add trough side details to GtkScale
987+style "murrine-scale"
988+{
989+ GtkRange::trough-side-details = 1
990+
991+ engine "murrine"
992+ {
993+ border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
994+ border_shades = { 1.0, .8 } # gradient to draw on border
995+ }
996+}
997+
998+style "murrine-hscale"
999+{
1000+}
1001+
1002+style "murrine-vscale"
1003+{
1004+}
1005+
1006+style "murrine-scrollbar"
1007+{
1008+ engine "murrine"
1009+ {
1010+ border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
1011+ border_shades = { 1.0, .8 } # gradient to draw on border
1012+ }
1013+
1014+ bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
1015+}
1016+
1017+style "murrine-hscrollbar"
1018+{
1019+}
1020+
1021+style "murrine-vscrollbar"
1022+{
1023+}
1024+
1025+style "murrine-nautilus-location"
1026+{
1027+ bg[NORMAL] = @selected_bg_color
1028 }
1029
1030 style "metacity-frame"
1031@@ -204,107 +314,189 @@
1032
1033 # Focused title text color
1034 fg[SELECTED] = @selected_fg_color
1035-}
1036-
1037-style "industrial-spinbutton"
1038-{
1039- engine "industrial"
1040- {
1041- hint = "spinbutton"
1042- }
1043-}
1044-
1045-style "industrial-comboboxentry"
1046-{
1047- engine "industrial"
1048- {
1049- hint = "comboboxentry"
1050- }
1051-}
1052-
1053-# default style
1054-class "GtkWidget" style "industrial-default"
1055-
1056-# wide
1057-class "GtkNotebook" style "industrial-wide"
1058-class "GtkButton" style "industrial-wide"
1059-class "GtkRange" style "industrial-wide"
1060-class "GtkMenu" style "industrial-wide"
1061-class "GtkFrame" style "industrial-wide"
1062-class "GtkStatusbar" style "industrial-wide"
1063-class "GtkEntry" style "industrial-entry"
1064-
1065-class "GtkEntry" style "industrial-exterior-focus"
1066-class "GtkSpinButton" style "industrial-spinbutton"
1067-class "GtkScale" style "industrial-scale"
1068-
1069-class "GtkVScrollbar" style "industrial-arrows"
1070-class "GtkHScrollbar" style "industrial-arrows"
1071-
1072-widget_class "*<GtkComboBoxEntry>.*" style "industrial-comboboxentry"
1073-widget_class "*<GtkCombo>.*" style "industrial-comboboxentry"
1074-
1075-# treeview
1076-widget_class "*.<GtkTreeView>.GtkButton" style "industrial-tree-header"
1077-widget_class "*.<GtkList>.GtkButton" style "industrial-tree-header"
1078-widget_class "*.<GtkCList>.GtkButton" style "industrial-tree-header"
1079-widget_class "*.<ETree>.*" style "industrial-tree-header"
1080-widget_class "*.<ETable>.*" style "industrial-tree-header"
1081-
1082-# menuitems and interior
1083-widget_class "*<GtkMenuItem>*" style "industrial-menuitem"
1084-
1085-widget_class "*.<GtkProgress>" style "industrial-progress"
1086-
1087-# druide
1088-widget_class "*GnomeDruidPage*" style "industrial-druid"
1089-
1090-widget "gtk-tooltip*" style "industrial-tooltips"
1091-
1092-widget "*.tasklist-button" style "industrial-squared"
1093-
1094-class "MetaFrames" style "metacity-frame"
1095-
1096+
1097+ engine "murrine"
1098+ {
1099+ border_shades = {1.2, 1.0} # draw a gradient on the border.
1100+ border_colors = { @selected_bg_color, @selected_bg_color }
1101+ }
1102+}
1103+
1104+style "murrine-spinbutton" = "murrine-button"
1105+{
1106+}
1107+
1108+style "murrine-comboboxentry"
1109+{
1110+ engine "murrine"
1111+ {
1112+ border_shades = {1.2, 1.0} # draw a gradient on the border.
1113+ border_colors = { @selected_bg_color, @selected_bg_color }
1114+ }
1115+}
1116+
1117+style "murrine-radiocheck"
1118+{
1119+ text[NORMAL] = @selected_fg_color
1120+ text[PRELIGHT] = @selected_fg_color
1121+ bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
1122+}
1123+
1124+style "murrine-panel"
1125+{
1126+ bg[NORMAL] = shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"
1127+}
1128+
1129+#########################################
1130+# Matches
1131+#########################################
1132+
1133+# Theme default style is applied to every widget
1134+class "GtkWidget" style "murrine-default"
1135+
1136+# Increase the x/ythickness in some widgets
1137+class "GtkToolbar" style "murrine-default"
1138+class "GtkRange" style "murrine-wide"
1139+class "GtkFrame" style "murrine-wide"
1140+class "GtkSeparator" style "murrine-wide"
1141+class "GtkEntry" style "murrine-entry"
1142+
1143+class "GtkSpinButton" style "murrine-spinbutton"
1144+class "GtkScale" style "murrine-scale"
1145+class "GtkVScale" style "murrine-vscale"
1146+class "GtkHScale" style "murrine-hscale"
1147+class "GtkScrollbar" style "murrine-scrollbar"
1148+class "GtkVScrollbar" style "murrine-vscrollbar"
1149+class "GtkHScrollbar" style "murrine-hscrollbar"
1150+
1151+class "GtkRadio*" style:highest "murrine-radiocheck" # HACK: override button selection colour
1152+class "GtkCheck*" style:highest "murrine-radiocheck" # HACK: override button selection colour
1153+
1154+# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
1155+class "MetaFrames" style "metacity-frame"
1156+#class "GtkWindow" style "metacity-frame"
1157+
1158+
1159+# General matching following, the order is choosen so that the right styles override each other
1160+# eg. progressbar needs to be more important then the menu match.
1161+
1162+# This is not perfect, it could be done better
1163+# (That is modify *every* widget in the notebook, and change those back that
1164+# we really don't want changed)
1165+widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"
1166+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"
1167+widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"
1168+widget_class "*<GtkNotebook>*<GtkViewport>" style "murrine-notebook"
1169+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "murrine-notebook"
1170+
1171+widget_class "*<GtkButton>" style "murrine-button"
1172+widget_class "*<GtkNotebook>" style "murrine-notebook"
1173+widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
1174+
1175+widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
1176+widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
1177+
1178+widget_class "*<GtkMenuBar>*" style "murrine-menubar"
1179+widget_class "*<GtkMenu>*" style "murrine-menu"
1180+widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
1181+widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
1182+
1183+widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
1184+widget_class "*.<GtkTreeView>*" style "murrine-treeview"
1185+
1186+widget_class "*<GtkProgress>" style "murrine-progressbar"
1187+widget_class "*<GtkProgressBar>" style "murrine-progressbar"
1188+
1189+# Treeview header
1190+widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
1191+widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
1192+widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
1193+widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
1194+
1195+# Workarounds for Evolution
1196+widget_class "*.ETable.ECanvas" style "murrine-treeview-header"
1197+widget_class "*.ETree.ECanvas" style "murrine-treeview-header"
1198+
1199+# The window of the tooltip is called "gtk-tooltip"
1200+################################
1201+# FIXME:
1202+# This will not work if one embeds eg. a button into the tooltip.
1203+# As far as I can tell right now we will need to rework the theme
1204+# quite a bit to get this working correctly.
1205+# (It will involve setting different priorities, etc.)
1206+################################
1207+widget "gtk-tooltip*" style "murrine-tooltips"
1208+
1209+###################################################
1210+# Special cases and work arounds
1211+###################################################
1212+
1213+# Special case the nautilus-extra-view-widget
1214+# ToDo: A more generic approach for all applications that have a widget like this.
1215+widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location"
1216
1217 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
1218 # Note that the work around assumes that the combobox is _not_ in
1219 # appears-as-list mode.
1220+# Similar hack also in the menuitem style.
1221 # This style does not affect GtkComboBoxEntry, it does have an effect
1222 # on comboboxes in appears-as-list mode though.
1223-style "industrial-text-is-fg-color-workaround"
1224+style "murrine-combobox-text-color-workaround"
1225 {
1226- text[NORMAL] = @fg_color
1227- text[PRELIGHT] = @fg_color
1228- text[SELECTED] = @selected_fg_color
1229- text[ACTIVE] = @fg_color
1230- text[INSENSITIVE] = darker (@bg_color)
1231+ text[NORMAL] = @fg_color
1232+ text[PRELIGHT] = @fg_color
1233+ text[ACTIVE] = @fg_color
1234+ text[SELECTED] = @selected_fg_color
1235+ text[INSENSITIVE] = shade (0.15, @fg_color)
1236 }
1237-widget_class "*.<GtkComboBox>.<GtkCellView>" style "industrial-text-is-fg-color-workaround"
1238+widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"
1239
1240-style "industrial-menuitem-text-is-fg-color-workaround"
1241+style "murrine-menuitem-text-is-fg-color-workaround"
1242 {
1243 text[NORMAL] = @fg_color
1244 text[PRELIGHT] = @selected_fg_color
1245+ text[ACTIVE] = @fg_color
1246 text[SELECTED] = @selected_fg_color
1247- text[ACTIVE] = @fg_color
1248- text[INSENSITIVE] = darker (@bg_color)
1249+ text[INSENSITIVE] = shade (0.15, @fg_color)
1250 }
1251-widget "*.gtk-combobox-popup-menu.*" style "industrial-menuitem-text-is-fg-color-workaround"
1252+
1253+widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"
1254
1255 # Work around the usage of GtkLabel inside GtkListItems to display text.
1256 # This breaks because the label is shown on a background that is based on the
1257 # base color set.
1258-style "industrial-fg-is-text-color-workaround"
1259+style "murrine-fg-is-text-color-workaround"
1260 {
1261 fg[NORMAL] = @text_color
1262 fg[PRELIGHT] = @text_color
1263 fg[ACTIVE] = @selected_fg_color
1264 fg[SELECTED] = @selected_fg_color
1265- fg[INSENSITIVE] = darker (@bg_color)
1266+ fg[INSENSITIVE] = shade (0.15, @fg_color)
1267 }
1268-widget_class "*<GtkListItem>*" style "industrial-fg-is-text-color-workaround"
1269+
1270+widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"
1271+
1272 # The same problem also exists for GtkCList and GtkCTree
1273 # Only match GtkCList and not the parent widgets, because that would also change the headers.
1274-widget_class "*<GtkCList>" style "industrial-fg-is-text-color-workaround"
1275-
1276-
1277+widget_class "*<GtkCList>" style "murrine-fg-is-text-color-workaround"
1278+
1279+style "murrine-evo-new-button-workaround"
1280+{
1281+
1282+ engine "murrine"
1283+ {
1284+ toolbarstyle = 0
1285+ }
1286+}
1287+
1288+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
1289+
1290+# Theme panel elements
1291+widget "*PanelWidget*" style "murrine-panel"
1292+widget "*PanelApplet*" style "murrine-panel"
1293+widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet
1294+class "PanelApp*" style "murrine-panel"
1295+class "PanelToplevel*" style "murrine-panel"
1296+widget_class "*Mail*" style "murrine-panel"
1297+widget_class "*notif*" style "murrine-panel"
1298+widget_class "*Notif*" style "murrine-panel"
1299
1300=== modified file 'debian/changelog'
1301--- debian/changelog 2010-02-10 15:44:44 +0000
1302+++ debian/changelog 2010-02-20 21:35:23 +0000
1303@@ -1,3 +1,18 @@
1304+human-theme (0.39) UNRELEASED; urgency=low
1305+
1306+ * Visual refresh of Human & Darkroom theme
1307+ * Documented new Murrine GIT engine options in gtkrc code
1308+ * Small gtkrc code cleanups/removal of unnecessary colour hacks
1309+ * Enabled filled arrow type
1310+ * Modified trough gradient (progressbar & scollbar background)
1311+ * Various tweaks to widget outline & shadow gradients
1312+ * Added names (Conn O Griofa & James Schriver) to AUTHORS file
1313+ * HumanLogin: deprecate industrial engine; border_shades and colors to
1314+ GtkEntry, ComboboxEntry, Metacity-Frame, buttons; new lighter spinbutton
1315+ and murrine buttons with gradients (merge from James Schriver)
1316+
1317+ -- Conn O Griofa <connogriofa@gmail.com> Sat, 20 Feb 2010 20:41:55 +0000
1318+
1319 human-theme (0.38) lucid; urgency=low
1320
1321 * merging from vish's changes to fix LP: #518325

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: