human-theme

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

  1. visual-refresh-lucid
  2. Merge into ubuntu
Proposed by Conn O Griofa
Status: Needs review
Proposed branch: lp://staging/~psyke83/human-theme/visual-refresh-lucid
Merge into: lp://staging/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://staging/~psyke83/human-theme/visual-refresh-lucid
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+19787@code.staging.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
=== modified file 'AUTHORS'
--- AUTHORS 2009-09-29 13:40:25 +0000
+++ AUTHORS 2010-02-20 21:35:23 +0000
@@ -1,3 +1,6 @@
1Kenneth Wimer <kwwii@ubuntu.com>1Kenneth Wimer <kwwii@ubuntu.com>
2Daniel Holbach <daniel.holbach@ubuntu.com>2Daniel Holbach <daniel.holbach@ubuntu.com>
3Zniavre <zniavre@gmail.com>3Zniavre <zniavre@gmail.com>
4Conn O Griofa <connogriofa@gmail.com>
5James Schriver <jws141@gmail.com>
6
47
=== modified file 'DarkRoom/gtk-2.0/gtkrc'
--- DarkRoom/gtk-2.0/gtkrc 2010-02-08 09:56:27 +0000
+++ DarkRoom/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
@@ -6,7 +6,9 @@
6#6#
7# Feel free to modify and share!7# Feel free to modify and share!
88
9gtk_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"9gtk_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"
10
11gtk-icon-sizes = "panel-menu=24,24:gtk-button=16,16"
1012
11style "murrine-default"13style "murrine-default"
12{14{
@@ -20,12 +22,12 @@
2022
21 GtkPaned ::handle-size = 623 GtkPaned ::handle-size = 6
2224
23 GtkRange ::trough-border = 025 GtkRange ::trough-border = 2
24 GtkRange ::slider-width = 1526 GtkRange ::slider-width = 14
25 GtkRange ::stepper-size = 1527 GtkRange ::stepper-size = 14
2628
27 GtkScale ::slider-length = 2029 GtkScale ::slider-length = 20
28 GtkScale ::trough-side-details = 0 # 0 = thin slider, >0 = thick slider30 GtkScale ::trough-side-details = 1
29 GtkScrollbar ::min-slider-length = 3031 GtkScrollbar ::min-slider-length = 30
3032
31 GtkMenuBar ::internal-padding = 033 GtkMenuBar ::internal-padding = 0
@@ -40,48 +42,58 @@
40 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle42 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
41 #WnckTasklist ::fade-overlay-rect = 043 #WnckTasklist ::fade-overlay-rect = 0
4244
43 GtkToolbar :: shadow-type = GTK_SHADOW_NONE45 # The following line hints to gecko (and possibly other appliations)
44 GtkMenuBar :: shadow-type = GTK_SHADOW_NONE46 # that the entry should be drawn transparently on the canvas.
47 # Without this, gecko will fill in the background of the entry.
48 GtkEntry::honors-transparent-bg-hint = 1
4549
46 GtkWidget :: link-color ="#5E6FFF"50 GtkWidget::link-color = "#5E6FFF"
47 GtkWidget :: visited-link-color = shade (0.2, @fg_color)51 GtkWidget::visited-link-color = shade (0.2, @fg_color)
4852
49 xthickness = 153 xthickness = 1
50 ythickness = 154 ythickness = 1
5155
52 fg[NORMAL] = @fg_color # Metacity and mouseover, Most text56 fg[NORMAL] = @fg_color
53 fg[PRELIGHT] = @fg_color # Text when mouseover57 fg[PRELIGHT] = @fg_color
54 fg[ACTIVE] = @fg_color # Text when mouseclicking button, Tabs, Active window list58 fg[ACTIVE] = @fg_color
55 fg[SELECTED] = @selected_fg_color # Metacity X when window selected59 fg[SELECTED] = @selected_fg_color
56 fg[INSENSITIVE] = shade (0.17, @fg_color) # Insensitive Text60 fg[INSENSITIVE] = shade (0.15, @fg_color)
5761
58 bg[NORMAL] = @bg_color # Normal Background, inactive Metacity bar, buttons62 bg[NORMAL] = @bg_color
59 bg[PRELIGHT] = shade (1.15, @bg_color) # Mouseover buttons63 bg[PRELIGHT] = shade (1.2, @bg_color)
60 bg[ACTIVE] = shade (0.77, @bg_color) # Mouseclicking, Tabs, active window list64 bg[ACTIVE] = shade (0.78, @bg_color)
61 bg[SELECTED] = @selected_bg_color # Metacity Bar65 bg[SELECTED] = @selected_bg_color
62 bg[INSENSITIVE] = @bg_color # Insensitive buttons66 bg[INSENSITIVE] = @bg_color
6367
64 base[NORMAL] = @base_color # Background, most68 base[NORMAL] = @base_color
65 base[PRELIGHT] = shade (0.95, @bg_color) # Mouseover menu69 base[PRELIGHT] = shade (0.95, @bg_color)
66 base[ACTIVE] = @selected_bg_color # Menu active item in inactive window70 base[ACTIVE] = shade (0.9, @selected_bg_color)
67 base[SELECTED] = @selected_bg_color # Menu active item in active window71 base[SELECTED] = shade (1.05, @selected_bg_color)
68 base[INSENSITIVE] = @bg_color # Background, insensitive72 base[INSENSITIVE] = @bg_color
6973
70 text[NORMAL] = @text_color # Text in window74 text[NORMAL] = @text_color
71 text[PRELIGHT] = @text_color # Text on Mouseover75 text[PRELIGHT] = @text_color
72 text[ACTIVE] = @selected_fg_color # Active text in inactive window76 text[ACTIVE] = @selected_fg_color
73 text[SELECTED] = @selected_fg_color # Active text in active window77 text[SELECTED] = @selected_fg_color
74 text[INSENSITIVE] = shade (0.17, @fg_color) # Insensitive text78 text[INSENSITIVE] = shade (0.15, @fg_color)
7579
76 engine "murrine" 80 engine "murrine"
77 {81 {
78 animation = FALSE # FALSE = disabled, TRUE = enabled82 animation = TRUE # FALSE = disabled, TRUE = enabled
79 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled83 arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
80 contrast = 1.07 # 0.8 for less contrast, more than 1.0 for more contrast on borders84 #border_colors = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
81 glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight85 border_shades = { 1.2, 1.0 } # gradient to draw on border
82 gradient_shades = {1.20,1.05,1.20,1.02} # default: {1.1,1.0,1.0,1.1}86 #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
83 highlight_shade = 1.06 # set highlight amount for buttons or widgets87 comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
84 lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets88 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
89 contrast = 1.0 # 0.8 for less contrast, more than 1.0 for more contrast on borders
90 focus_color = shade (1.0, @selected_bg_color)
91 glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
92 glow_shade = 1.2 # sets glow amount for buttons or widgets
93 glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
94 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
95 highlight_shade = 1.05 # set highlight amount for buttons or widgets
96 lightborder_shade = 1.4 # sets lightborder amount for buttons or widgets
85 lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides97 lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides
86 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised98 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
87 listviewstyle = 1 # 0 = nothing, 1 = dotted99 listviewstyle = 1 # 0 = nothing, 1 = dotted
@@ -89,13 +101,19 @@
89 menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped101 menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
90 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped102 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
91 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe103 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
92 reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow104 prelight_shade = 1.2 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
93 rgba = TRUE # FALSE = disabled, TRUE = enabled105 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
106 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
107 rgba = FALSE # FALSE = disabled, TRUE = enabled
94 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness108 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
95 scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles109 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
96 sliderstyle = 1 # 0 = nothing added, 1 = handles110 shadow_shades = { 1.2, 0.8 } # draw gradient on shadow of some widgets
97 stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles, 2 = unknown111 sliderstyle = 0 # 0 = nothing added, 1 = handles
112 spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
113 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
114 textstyle = 0 # 0 = normal text, 1 = inset
98 toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient115 toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
116 trough_shades = { 1.05, 1.25 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
99 }117 }
100}118}
101119
@@ -113,15 +131,14 @@
113131
114style "murrine-button" = "murrine-wider"132style "murrine-button" = "murrine-wider"
115{133{
116 bg[NORMAL] = shade (0.95, @bg_color)134 bg[NORMAL] = shade (1.05, @bg_color) # pre-selected buttons, keep same as focus colour
117 bg[INSENSITIVE] = shade (0.97, @bg_color)135 bg[SELECTED] = shade (1.0, @selected_bg_color) # pre-selected buttons, keep same as focus colour
118
119}136}
120137
121style "murrine-notebook"138style "murrine-notebook"
122{139{
123 bg[NORMAL] = shade (1.08, @bg_color)140 bg[NORMAL] = shade (1.18, @bg_color)
124 bg[ACTIVE] = shade (0.75, @bg_color)141 bg[ACTIVE] = shade (1.08, @bg_color)
125}142}
126143
127style "murrine-tasklist" = "murrine-wide"144style "murrine-tasklist" = "murrine-wide"
@@ -130,25 +147,19 @@
130147
131style "murrine-menu" = "murrine-wider"148style "murrine-menu" = "murrine-wider"
132{149{
133 bg[NORMAL] = shade (1.15, @bg_color)150 bg[NORMAL] = shade (1.15, @bg_color)
151 fg[PRELIGHT] = @selected_fg_color
134}152}
135153
136style "murrine-menubar"154style "murrine-menubar"
137{155{
138 #bg[NORMAL]= shade (0.85, @bg_color) # dark menu bg156 fg[PRELIGHT] = @selected_fg_color
139}157}
140158
141style "murrine-menu-item" = "murrine-wider"159style "murrine-menu-item" = "murrine-wider"
142{160{
143 bg[PRELIGHT] = shade (1.15, @bg_color) #should match bg[NORMAL] of "murrine-menu"161 bg[PRELIGHT] = shade (1.02, @selected_bg_color)
144 #bg[SELECTED] = shade (1.15, @bg_color)162 bg[SELECTED] = shade (1.02, @selected_bg_color)
145 fg[PRELIGHT] = @selected_fg_color
146
147 engine "murrine"
148 {
149 highlight_shade = 1.03
150 roundness = 3
151 }
152}163}
153164
154style "murrine-separator-menu-item"165style "murrine-separator-menu-item"
@@ -157,20 +168,14 @@
157168
158style "murrine-treeview"169style "murrine-treeview"
159{170{
160 bg[NORMAL] = shade (1.5, @bg_color)
161 fg[NORMAL] = shade (0.5, @bg_color)
162 fg[PRELIGHT] = shade (0.5, @bg_color)
163}171}
164172
165style "murrine-treeview-header" = "murrine-default"173style "murrine-treeview-header" = "murrine-default"
166{174{
167 bg[NORMAL] = shade (0.95, @bg_color)
168 bg[INSENSITIVE] = shade (0.93, @bg_color)
169}175}
170176
171style "murrine-frame-title"177style "murrine-frame-title"
172{178{
173 fg[NORMAL] = lighter (@fg_color)
174}179}
175180
176style "murrine-tooltips" = "murrine-wider"181style "murrine-tooltips" = "murrine-wider"
@@ -181,15 +186,7 @@
181186
182style "murrine-progressbar"187style "murrine-progressbar"
183{188{
184 #xthickness = 0
185 #ythickness = 0
186
187 fg[PRELIGHT] = @selected_fg_color189 fg[PRELIGHT] = @selected_fg_color
188
189 engine "murrine"
190 {
191 contrast = 1.3 # Darken unfilled progressbar background
192 }
193}190}
194191
195style "murrine-statusbar"192style "murrine-statusbar"
@@ -202,21 +199,11 @@
202199
203style "murrine-spinbutton"200style "murrine-spinbutton"
204{201{
205 bg[NORMAL] = shade (0.95, @bg_color) # need to fix rectangular border bug on spinbutton
206 bg[INSENSITIVE] = shade (0.99, @bg_color)
207}202}
208203
209style "murrine-scale"204style "murrine-scale"
210{205{
211 GtkRange ::slider-width = 13206 GtkRange::slider-width = 13
212
213 bg[NORMAL] = shade (0.95, @bg_color)
214 bg[INSENSITIVE] = shade (0.99, @bg_color)
215
216 engine "murrine"
217 {
218 contrast = 1.4
219 }
220}207}
221208
222style "murrine-hscale"209style "murrine-hscale"
@@ -229,13 +216,7 @@
229216
230style "murrine-scrollbar"217style "murrine-scrollbar"
231{218{
232 bg[NORMAL] = shade (0.95, @bg_color)219 bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
233 bg[INSENSITIVE] = shade (0.99, @bg_color)
234
235 engine "murrine"
236 {
237 contrast = 1.8
238 }
239}220}
240221
241style "murrine-hscrollbar"222style "murrine-hscrollbar"
@@ -253,38 +234,24 @@
253234
254style "metacity-frame"235style "metacity-frame"
255{236{
256 bg[NORMAL] = @bg_color
257}237}
258238
259style "murrine-radiocheck" = "murrine-default"239style "murrine-radiocheck"
260{240{
261 base[NORMAL] = @bg_color 241 text[NORMAL] = @selected_fg_color
262 text[NORMAL] = @fg_color # Text in window242 text[PRELIGHT] = @selected_fg_color
263 text[PRELIGHT] = @fg_color # Text on Mouseover243 bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
264
265 engine "murrine"
266 {
267 highlight_shade = 1.0
268 }
269}244}
270245
271style "murrine-panel"246style "murrine-panel"
272{247{
273 bg[NORMAL]= shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"248 bg[NORMAL] = shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"
274}249}
275250
276#########################################251#########################################
277# Matches252# Matches
278#########################################253#########################################
279254
280# Theme radio buttons and checkmarks
281class "GtkRadio*" style "murrine-radiocheck"
282class "GtkCheck*" style "murrine-radiocheck"
283
284# Keep proper colour for Metacity
285class "MetaFrames" style "metacity-frame"
286#class "GtkWindow" style "metacity-frame"
287
288# Theme default style is applied to every widget255# Theme default style is applied to every widget
289class "GtkWidget" style "murrine-default"256class "GtkWidget" style "murrine-default"
290257
@@ -303,6 +270,14 @@
303class "GtkVScrollbar" style "murrine-vscrollbar"270class "GtkVScrollbar" style "murrine-vscrollbar"
304class "GtkHScrollbar" style "murrine-hscrollbar"271class "GtkHScrollbar" style "murrine-hscrollbar"
305272
273class "GtkRadio*" style:highest "murrine-radiocheck" # HACK: override button selection colour
274class "GtkCheck*" style:highest "murrine-radiocheck" # HACK: override button selection colour
275
276# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
277class "MetaFrames" style "metacity-frame"
278#class "GtkWindow" style "metacity-frame"
279
280
306# General matching following, the order is choosen so that the right styles override each other281# General matching following, the order is choosen so that the right styles override each other
307# eg. progressbar needs to be more important then the menu match.282# eg. progressbar needs to be more important then the menu match.
308283
@@ -312,6 +287,8 @@
312widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"287widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"
313widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"288widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"
314widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"289widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"
290widget_class "*<GtkNotebook>*<GtkViewport>" style "murrine-notebook"
291widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "murrine-notebook"
315292
316widget_class "*<GtkButton>" style "murrine-button"293widget_class "*<GtkButton>" style "murrine-button"
317widget_class "*<GtkNotebook>" style "murrine-notebook"294widget_class "*<GtkNotebook>" style "murrine-notebook"
@@ -328,6 +305,7 @@
328widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"305widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
329widget_class "*.<GtkTreeView>*" style "murrine-treeview"306widget_class "*.<GtkTreeView>*" style "murrine-treeview"
330307
308widget_class "*<GtkProgress>" style "murrine-progressbar"
331widget_class "*<GtkProgressBar>" style "murrine-progressbar"309widget_class "*<GtkProgressBar>" style "murrine-progressbar"
332310
333# Treeview header311# Treeview header
@@ -335,8 +313,6 @@
335widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"313widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
336widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"314widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
337widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"315widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
338widget_class "*.<GtkTreeView>*<GtkLabel>*" style "murrine-treeview-header" # DARK: ensure GtkTreeView header text is light
339widget_class "*.<GtkTreeView>*<GtkArrow>*" style:highest "murrine-treeview-header" # DARK: ensure GtkArrows are light
340316
341# Workarounds for Evolution317# Workarounds for Evolution
342widget_class "*.ETable.ECanvas" style "murrine-treeview-header"318widget_class "*.ETable.ECanvas" style "murrine-treeview-header"
@@ -370,9 +346,9 @@
370{346{
371 text[NORMAL] = @fg_color347 text[NORMAL] = @fg_color
372 text[PRELIGHT] = @fg_color348 text[PRELIGHT] = @fg_color
373 text[SELECTED] = @selected_fg_color
374 text[ACTIVE] = @fg_color349 text[ACTIVE] = @fg_color
375 text[INSENSITIVE] = shade (0.17, @fg_color)350 text[SELECTED] = @selected_fg_color
351 text[INSENSITIVE] = shade (0.15, @fg_color)
376}352}
377widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"353widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"
378354
@@ -380,9 +356,9 @@
380{356{
381 text[NORMAL] = @fg_color357 text[NORMAL] = @fg_color
382 text[PRELIGHT] = @selected_fg_color358 text[PRELIGHT] = @selected_fg_color
359 text[ACTIVE] = @fg_color
383 text[SELECTED] = @selected_fg_color360 text[SELECTED] = @selected_fg_color
384 text[ACTIVE] = @fg_color361 text[INSENSITIVE] = shade (0.15, @fg_color)
385 text[INSENSITIVE] = shade (0.17, @fg_color)
386}362}
387363
388widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"364widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"
@@ -396,7 +372,7 @@
396 fg[PRELIGHT] = @text_color372 fg[PRELIGHT] = @text_color
397 fg[ACTIVE] = @selected_fg_color373 fg[ACTIVE] = @selected_fg_color
398 fg[SELECTED] = @selected_fg_color374 fg[SELECTED] = @selected_fg_color
399 fg[INSENSITIVE] = shade (0.17, @fg_color)375 fg[INSENSITIVE] = shade (0.15, @fg_color)
400}376}
401377
402widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"378widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"
@@ -416,13 +392,6 @@
416392
417widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"393widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
418394
419style "murrine-darker"
420{
421 fg[NORMAL] = shade (0.1, @fg_color)
422 fg[ACTIVE] = shade (0.1, @fg_color)
423}
424widget "*auti*IconView*" style : highest "murrine-darker"
425
426# Theme panel elements395# Theme panel elements
427widget "*PanelWidget*" style "murrine-panel"396widget "*PanelWidget*" style "murrine-panel"
428widget "*PanelApplet*" style "murrine-panel"397widget "*PanelApplet*" style "murrine-panel"
429398
=== modified file 'Human/gtk-2.0/gtkrc'
--- Human/gtk-2.0/gtkrc 2010-02-08 09:56:27 +0000
+++ Human/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
@@ -42,6 +42,11 @@
42 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle42 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
43 #WnckTasklist ::fade-overlay-rect = 043 #WnckTasklist ::fade-overlay-rect = 0
4444
45 # The following line hints to gecko (and possibly other appliations)
46 # that the entry should be drawn transparently on the canvas.
47 # Without this, gecko will fill in the background of the entry.
48 GtkEntry::honors-transparent-bg-hint = 1
49
45 #GtkWidget      ::link-color         = @fg_color50 #GtkWidget      ::link-color         = @fg_color
46 #GtkWidget      ::visited-link-color = shade (0.2, @fg_color)51 #GtkWidget      ::visited-link-color = shade (0.2, @fg_color)
4752
@@ -75,15 +80,20 @@
75 engine "murrine" 80 engine "murrine"
76 {81 {
77 animation = TRUE # FALSE = disabled, TRUE = enabled82 animation = TRUE # FALSE = disabled, TRUE = enabled
83 arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
84 #border_colors = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
85 border_shades = { 1.2, 1.0 } # gradient to draw on border
86 #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
87 comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
78 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled88 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
79 contrast = 0.9 # 0.8 for less contrast, more than 1.0 for more contrast on borders89 contrast = 0.9 # 0.8 for less contrast, more than 1.0 for more contrast on borders
80 focus_color = shade (1.5, @selected_bg_color)90 focus_color = shade (1.5, @selected_bg_color)
81 glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl91 glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
82 glow_shade = 1.15 # sets glow amount for buttons or widgets92 glow_shade = 1.1 # sets glow amount for buttons or widgets
83 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) 93 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
84 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}94 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
85 highlight_shade = 1.0 # set highlight amount for buttons or widgets95 highlight_shade = 1.02 # set highlight amount for buttons or widgets
86 lightborder_shade = 0.95 # sets lightborder amount for buttons or widgets96 lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
87 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides97 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
88 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised98 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
89 listviewstyle = 1 # 0 = nothing, 1 = dotted99 listviewstyle = 1 # 0 = nothing, 1 = dotted
@@ -91,16 +101,19 @@
91 menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped101 menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
92 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped102 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
93 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe103 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
104 prelight_shade = 1.02 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
94 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 105 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
95 reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow106 reliefstyle = 3 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
96 rgba = FALSE # FALSE = disabled, TRUE = enabled107 rgba = FALSE # FALSE = disabled, TRUE = enabled
97 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness108 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
98 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles109 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
99 #scrollbar_color = shade (0.9, @bg_color)110 shadow_shades = { 1.0, 1.0 } # draw gradient on shadow of some widgets
100 sliderstyle = 0 # 0 = nothing added, 1 = handles111 sliderstyle = 0 # 0 = nothing added, 1 = handles
101 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = unknown112 spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
102 #profile = NODOKA # engine profile options: CANDIDO, CLEARLOOKS, MIST, MURRINE, NODOKA113 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
114 textstyle = 0 # 0 = normal text, 1 = inset
103 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient115 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
116 trough_shades = { 0.96, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
104 }117 }
105}118}
106119
@@ -125,11 +138,6 @@
125{138{
126 bg[NORMAL] = shade (1.05, @bg_color)139 bg[NORMAL] = shade (1.05, @bg_color)
127 bg[ACTIVE] = shade (0.96, @bg_color)140 bg[ACTIVE] = shade (0.96, @bg_color)
128
129 engine "murrine"
130 {
131 gradient_shades = {1.1,1.06,0.92,0.85} # { 1.1, 1.02, 0.97, 0.93 }
132 }
133}141}
134142
135style "murrine-tasklist" = "murrine-wide"143style "murrine-tasklist" = "murrine-wide"
@@ -151,11 +159,6 @@
151{159{
152 bg[PRELIGHT] = shade (1.02, @selected_bg_color)160 bg[PRELIGHT] = shade (1.02, @selected_bg_color)
153 bg[SELECTED] = shade (1.02, @selected_bg_color)161 bg[SELECTED] = shade (1.02, @selected_bg_color)
154
155 engine "murrine"
156 {
157 highlight_shade = 1.03
158 }
159}162}
160163
161style "murrine-separator-menu-item"164style "murrine-separator-menu-item"
@@ -186,11 +189,6 @@
186 ythickness = 0189 ythickness = 0
187190
188 fg[PRELIGHT] = @selected_fg_color191 fg[PRELIGHT] = @selected_fg_color
189
190 engine "murrine"
191 {
192 highlight_shade = 1.05
193 }
194}192}
195193
196style "murrine-statusbar"194style "murrine-statusbar"
@@ -207,12 +205,7 @@
207205
208style "murrine-scale"206style "murrine-scale"
209{207{
210 GtkRange ::slider-width = 13208 GtkRange::slider-width = 13
211
212 engine "murrine"
213 {
214 highlight_shade = 1.05
215 }
216}209}
217210
218style "murrine-hscale"211style "murrine-hscale"
@@ -225,10 +218,6 @@
225218
226style "murrine-scrollbar"219style "murrine-scrollbar"
227{220{
228 engine "murrine"
229 {
230 highlight_shade = 1.05
231 }
232 bg[SELECTED] = shade (0.8, @bg_color)221 bg[SELECTED] = shade (0.8, @bg_color)
233}222}
234223
@@ -253,7 +242,7 @@
253{242{
254 text[NORMAL] = @selected_fg_color243 text[NORMAL] = @selected_fg_color
255 text[PRELIGHT] = @selected_fg_color244 text[PRELIGHT] = @selected_fg_color
256 bg[SELECTED] = @selected_bg_color # HACK: override button selection colour245 bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
257}246}
258247
259style "murrine-panel"248style "murrine-panel"
260249
=== modified file 'HumanLogin/gtk-2.0/gtkrc'
--- HumanLogin/gtk-2.0/gtkrc 2009-10-13 20:04:33 +0000
+++ HumanLogin/gtk-2.0/gtkrc 2010-02-20 21:35:23 +0000
@@ -1,187 +1,297 @@
1# Ubuntu Human Login theme
2# (c) 2010 Kenneth Wimer <kwwii@ubuntu.com>, James Schriver <jws141@gmail.com>
3# Licensed under the GPL.
4# Requires Murrine GTK Engine v0.91.0
5
1gtk-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"6gtk-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"
27
3style "industrial-default"8style "murrine-default"
4{9{
5 xthickness = 110 ########
6 ythickness = 111 # Style Properties
712 ########
813 GtkButton ::child-displacement-x = 1
9 GtkWidget::interior_focus = 114 GtkButton ::child-displacement-y = 1
10 GtkButton::default_inside_border = { 3, 3, 3, 3 }15 GtkButton ::default-border = { 0, 0, 0, 0 }
11 GtkRange::trough_border = 016 GtkCheckButton ::indicator-size = 14
1217
13 GtkWidget::focus_padding = 118 GtkPaned ::handle-size = 6
1419
15 GtkPaned::handle_size = 720 GtkRange ::trough-border = 2
16 21 GtkRange ::slider-width = 14
17 GtkRange::slider_width = 1522 GtkRange ::stepper-size = 14
18 GtkRange::stepper_size = 1523
19 GtkScrollbar::min_slider_length = 3024 GtkScale ::slider-length = 20
20 GtkCheckButton::indicator_size = 1325 GtkScale ::trough-side-details = 1
21 GtkRadioButton::indicator_size = 1326 GtkScrollbar ::min-slider-length = 30
22 GtkMenuBar::internal-padding = 027
23 GtkMenuBar::shadow-type = GTK_SHADOW_NONE28 GtkMenuBar ::internal-padding = 0
2429 GtkExpander ::expander-size = 16
25 WnckTasklist::fade-opacity = 130 GtkToolbar ::internal-padding = 1
26 WnckTasklist::fade-overlay-rect = 031 GtkTreeView ::expander-size = 14
27 WnckTasklist::fade-loop-time = 232 GtkTreeView ::vertical-separator = 0
2833
29 GtkButton::child_displacement_x = 034 GtkMenu ::horizontal-padding = 0
30 GtkButton::child_displacement_y = 135 GtkMenu ::vertical-padding = 0
3136
32 GtkEntry::progress-border = { 0, 0, 0, 0 }37 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
3338 #WnckTasklist ::fade-overlay-rect = 0
34 GtkMenuItem::selected_shadow_type = GTK_SHADOW_IN39
3540 # The following line hints to gecko (and possibly other appliations)
36 GtkRange::activate-slider = 141 # that the entry should be drawn transparently on the canvas.
3742 # Without this, gecko will fill in the background of the entry.
38 # The following line hints to gecko (and possibly other appliations) 43 GtkEntry::honors-transparent-bg-hint = 1
39 # that the entry should be drawn transparently on the canvas.44
40 # Without this, gecko will fill in the background of the entry. 45 GtkWidget::link-color = "#5E6FFF"
41 GtkEntry::honors-transparent-bg-hint = 146 GtkWidget::visited-link-color = shade (0.2, @fg_color)
4247
4348 xthickness = 1
44 # color definitions49 ythickness = 1
45 bg[NORMAL] = @bg_color50
46 bg[PRELIGHT] = shade (1.1, @bg_color)51 # color definitions
47 bg[ACTIVE] = shade (0.85, @bg_color)52 bg[NORMAL] = @bg_color
48 bg[SELECTED] = mix (0.65, @selected_bg_color, @bg_color)53 bg[PRELIGHT] = shade (1.1, @bg_color)
49 bg[INSENSITIVE] = shade (0.85, @bg_color)54 bg[ACTIVE] = shade (0.85, @bg_color)
5055 bg[SELECTED] = mix (0.65, @selected_bg_color, @bg_color)
51 fg[NORMAL] = @fg_color56 bg[INSENSITIVE] = shade (0.85, @bg_color)
52 fg[PRELIGHT] = @fg_color57
53 fg[ACTIVE] = @fg_color58 fg[NORMAL] = @fg_color
54 fg[SELECTED] = @selected_fg_color59 fg[PRELIGHT] = @fg_color
55 fg[INSENSITIVE] = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]60 fg[ACTIVE] = @fg_color
5661 fg[SELECTED] = @selected_fg_color
57 base[NORMAL] = @base_color62 fg[INSENSITIVE] = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
58 base[PRELIGHT] = @base_color #XXX63
59 base[ACTIVE] = mix (0.45, @selected_bg_color, @base_color) #b6c9cf64 base[NORMAL] = @base_color
60 base[SELECTED] = @selected_bg_color65 base[PRELIGHT] = @base_color #XXX
61 base[INSENSITIVE] = mix (0.95, @base_color, @text_color)66 base[ACTIVE] = mix (0.45, @selected_bg_color, @base_color) #b6c9cf
6267 base[SELECTED] = @selected_bg_color
63 text[NORMAL] = @text_color68 base[INSENSITIVE] = mix (0.95, @base_color, @text_color)
64 text[PRELIGHT] = @text_color #XXX69
65 text[ACTIVE] = @selected_fg_color70 text[NORMAL] = @text_color
66 text[SELECTED] = @selected_fg_color71 text[PRELIGHT] = @text_color #XXX
67 text[INSENSITIVE] = @selected_fg_color72 text[ACTIVE] = @selected_fg_color
6873 text[SELECTED] = @selected_fg_color
69# text[INSENSITIVE] = mix (0.5, @text_color, @base_color)74
7075 engine "murrine"
71# bg[NORMAL] = "#f6f6f6"76 {
72# bg[PRELIGHT] = "#ffffff"77 animation = TRUE # FALSE = disabled, TRUE = enabled
73# fg[PRELIGHT] = "#202020"78 arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
74# bg[ACTIVE] = "#d9d9d9"79 #border_colors = { @selected_bg_color, @selected_bg_color }
75# bg[INSENSITIVE] = "#d9d9d9"80 border_shades = { 1.2, 1.0 } # gradient to draw on border
76# bg[SELECTED] = "#99a6bf"81 #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
77#82 comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
78# base[SELECTED] = "#6484a4"83 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
79# text[SELECTED] = "#ffffff"84 contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
80# #this is selected item without focus:85 #focus_color = @selected_bg_color
81# base[ACTIVE] = "#b6c9cf"86 glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
82# text[INSENSITIVE] = "#757575"87 glow_shade = 1.20 # sets glow amount for buttons or widgets
83# 88 glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
84# #defaults 89 gradient_shades = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
85# #base[NORMAL] = "#b6c9cf"90 highlight_shade = 1.0 # set highlight amount for buttons or widgets
86# #text[NORMAL] = "#000000"91 lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
87#92 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
88 engine "industrial"93 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
89 {94 listviewstyle = 1 # 0 = nothing, 1 = dotted
90 # Set a hint to disable backward compatibility fallbacks.95 menubaritemstyle = 1 # 0 = menuitem look, 1 = button look
91 hint = "use-hints"96 menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
92 }97 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
93}98 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
9499 prelight_shade = 1.2 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
95# Style to apply an exterior forcus to GtkEntry100 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
96style "industrial-exterior-focus"101 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
97{102 rgba = FALSE # FALSE = disabled, TRUE = enabled
98 GtkWidget::interior-focus = 0103 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
99 GtkWidget::focus-line-width = 0104 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
100}105 shadow_shades = { 1.2, 0.8 } # draw gradient on shadow of some widgets
101106 sliderstyle = 0 # 0 = nothing added, 1 = handles
102# Add trough side details to GtkScale107 spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
103style "industrial-scale"108 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
104{109 textstyle = 0 # 0 = normal text, 1 = inset
105 GtkRange::trough-side-details = 1110 toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
111 trough_shades = { 1.05, 1.25 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
112 }
113}
114
115style "murrine-wide"
116{
117 xthickness = 2
118 ythickness = 2
119}
120
121style "murrine-wider"
122{
123 xthickness = 3
124 ythickness = 3
125}
126
127style "murrine-button" = "murrine-wider"
128{
129 bg[NORMAL] = @selected_bg_color
130 bg[PRELIGHT] = shade (1.4, @selected_bg_color)
131 bg[SELECTED] = shade (0.35, @selected_bg_color)
132 bg[ACTIVE] = shade (0.35, @selected_bg_color)
133
134 engine "murrine"
135 {
136 border_shades = {1.2, 1.0} # draw a gradient on the border.
137 border_colors = { @selected_bg_color, @selected_bg_color }
138 glowstyle = 0
139 gradient_shades = {1.1,1.0,1.0,0.7}
140 highlight_shade = 1.0
141 lightborder_shade = 1.0
142 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
143 }
144}
145
146style "murrine-notebook"
147{
148 bg[NORMAL] = shade (1.18, @bg_color)
149 bg[ACTIVE] = shade (1.08, @bg_color)
150}
151
152style "murrine-tasklist" = "murrine-wide"
153{
106}154}
107155
108# Style for the entry progress bar -- ie. change the colors156# Style for the entry progress bar -- ie. change the colors
109style "industrial-entry"157style "murrine-entry"
110{158{
111 xthickness = 2159 xthickness = 2
112 ythickness = 2160 ythickness = 2
113# KEN REMOVED161
114# bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)162 engine "murrine"
115# fg[SELECTED] = @text_color163 {
116}164 border_shades = {1.2, 1.0} # draw a gradient on the border.
117165 border_colors = { @selected_bg_color, @selected_bg_color }
118# generic squared buttons style, used for the tasklist (treeview is in the extra treeview style)166 }
119style "industrial-squared"167}
120{168
121 engine "industrial" 169style "murrine-menu" = "murrine-wider"
122 {170{
123 rounded_buttons = FALSE171 bg[NORMAL] = shade (1.15, @bg_color)
124 }172 fg[PRELIGHT] = @selected_fg_color
125}173}
126174
127style "industrial-wide"175style "murrine-menubar"
128{176{
129 xthickness = 2177 xthickness = 3
130 ythickness = 2178 ythickness = 3
131}
132
133# style to remove the border around the progress bar
134style "industrial-progress"
135{
136 xthickness = 0
137 ythickness = 0
138}
139
140# make scrollbar arrows lighter
141style "industrial-arrows"
142{
143 fg[NORMAL] = mix (0.8, @fg_color, @bg_color)
144}179}
145180
146# menuitems181# menuitems
147style "industrial-menuitem"182style "murrine-menu-item"
148{183{
149 xthickness = 3184 xthickness = 3
150 ythickness = 3185 ythickness = 3
151186
152 bg[PRELIGHT] = @selected_bg_color187 engine "murrine"
153 bg[SELECTED] = @selected_bg_color188 {
154 fg[PRELIGHT] = @selected_fg_color189 border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
155 fg[SELECTED] = @selected_fg_color190 border_shades = { 1.0, .8 } # gradient to draw on border
156}191 glowstyle = 0
157192 gradient_shades = {1.1,1.0,1.0,0.7}
158style "industrial-menubar"193 highlight_shade = 1.0
159{194 lightborder_shade = 1.0
160 xthickness = 3195 roundness = 0
161 ythickness = 3196 }
162}197
163198 bg[PRELIGHT] = @selected_bg_color
164style "industrial-tree-header"199 bg[SELECTED] = @selected_bg_color
165{200 fg[PRELIGHT] = @selected_fg_color
166 engine "industrial" 201 fg[SELECTED] = @selected_fg_color
167 {202}
168 hint = "treeview-header"203
169 }204style "murrine-separator-menu-item"
170 xthickness = 2205{
171 ythickness = 2206}
172}207
173208style "murrine-treeview"
174style "industrial-tooltips"209{
175{210
176 xthickness = 4211 engine "clearlooks"
177 ythickness = 4212 {
178 bg[NORMAL] = @tooltip_bg_color213 hint = "treeview"
179 fg[NORMAL] = @tooltip_fg_color214
180}215 }
181216}
182style "industrial-druid"217
183{218style "murrine-treeview-header" = "murrine-default"
184 bg[SELECTED] = @selected_bg_color219{
220}
221
222style "murrine-frame-title"
223{
224 engine "murrine"
225 {
226 border_shades = {1.2, 1.0} # draw a gradient on the border.
227 border_colors = { @selected_bg_color, @selected_bg_color }
228 }
229}
230
231style "murrine-tooltips" = "murrine-wider"
232{
233 bg[NORMAL] = @tooltip_bg_color
234 fg[NORMAL] = @tooltip_fg_color
235}
236
237
238style "murrine-progressbar"
239{
240 engine "murrine"
241 {
242 border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
243 border_shades = { 1.0, .8 } # gradient to draw on border
244 }
245
246 fg[PRELIGHT] = @selected_fg_color
247}
248
249style "murrine-statusbar"
250{
251}
252
253#Add trough side details to GtkScale
254style "murrine-scale"
255{
256 GtkRange::trough-side-details = 1
257
258 engine "murrine"
259 {
260 border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
261 border_shades = { 1.0, .8 } # gradient to draw on border
262 }
263}
264
265style "murrine-hscale"
266{
267}
268
269style "murrine-vscale"
270{
271}
272
273style "murrine-scrollbar"
274{
275 engine "murrine"
276 {
277 border_colors = { "#464040", "#464040" } # colors used on borders of many widgets
278 border_shades = { 1.0, .8 } # gradient to draw on border
279 }
280
281 bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
282}
283
284style "murrine-hscrollbar"
285{
286}
287
288style "murrine-vscrollbar"
289{
290}
291
292style "murrine-nautilus-location"
293{
294 bg[NORMAL] = @selected_bg_color
185}295}
186296
187style "metacity-frame"297style "metacity-frame"
@@ -204,107 +314,189 @@
204 314
205 # Focused title text color315 # Focused title text color
206 fg[SELECTED] = @selected_fg_color316 fg[SELECTED] = @selected_fg_color
207}317
208318 engine "murrine"
209style "industrial-spinbutton"319 {
210{320 border_shades = {1.2, 1.0} # draw a gradient on the border.
211 engine "industrial"321 border_colors = { @selected_bg_color, @selected_bg_color }
212 {322 }
213 hint = "spinbutton"323}
214 }324
215}325style "murrine-spinbutton" = "murrine-button"
216326{
217style "industrial-comboboxentry"327}
218{328
219 engine "industrial"329style "murrine-comboboxentry"
220 {330{
221 hint = "comboboxentry"331 engine "murrine"
222 }332 {
223}333 border_shades = {1.2, 1.0} # draw a gradient on the border.
224334 border_colors = { @selected_bg_color, @selected_bg_color }
225# default style335 }
226class "GtkWidget" style "industrial-default"336}
227337
228# wide338style "murrine-radiocheck"
229class "GtkNotebook" style "industrial-wide"339{
230class "GtkButton" style "industrial-wide"340 text[NORMAL] = @selected_fg_color
231class "GtkRange" style "industrial-wide"341 text[PRELIGHT] = @selected_fg_color
232class "GtkMenu" style "industrial-wide"342 bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
233class "GtkFrame" style "industrial-wide"343}
234class "GtkStatusbar" style "industrial-wide"344
235class "GtkEntry" style "industrial-entry"345style "murrine-panel"
236346{
237class "GtkEntry" style "industrial-exterior-focus"347 bg[NORMAL] = shade (0.85, @bg_color) # should match bg[NORMAL] of "murrine-menubar"
238class "GtkSpinButton" style "industrial-spinbutton"348}
239class "GtkScale" style "industrial-scale"349
240350#########################################
241class "GtkVScrollbar" style "industrial-arrows"351# Matches
242class "GtkHScrollbar" style "industrial-arrows"352#########################################
243353
244widget_class "*<GtkComboBoxEntry>.*" style "industrial-comboboxentry"354# Theme default style is applied to every widget
245widget_class "*<GtkCombo>.*" style "industrial-comboboxentry"355class "GtkWidget" style "murrine-default"
246356
247# treeview357# Increase the x/ythickness in some widgets
248widget_class "*.<GtkTreeView>.GtkButton" style "industrial-tree-header"358class "GtkToolbar" style "murrine-default"
249widget_class "*.<GtkList>.GtkButton" style "industrial-tree-header"359class "GtkRange" style "murrine-wide"
250widget_class "*.<GtkCList>.GtkButton" style "industrial-tree-header"360class "GtkFrame" style "murrine-wide"
251widget_class "*.<ETree>.*" style "industrial-tree-header"361class "GtkSeparator" style "murrine-wide"
252widget_class "*.<ETable>.*" style "industrial-tree-header"362class "GtkEntry" style "murrine-entry"
253363
254# menuitems and interior364class "GtkSpinButton" style "murrine-spinbutton"
255widget_class "*<GtkMenuItem>*" style "industrial-menuitem"365class "GtkScale" style "murrine-scale"
256366class "GtkVScale" style "murrine-vscale"
257widget_class "*.<GtkProgress>" style "industrial-progress"367class "GtkHScale" style "murrine-hscale"
258368class "GtkScrollbar" style "murrine-scrollbar"
259# druide369class "GtkVScrollbar" style "murrine-vscrollbar"
260widget_class "*GnomeDruidPage*" style "industrial-druid"370class "GtkHScrollbar" style "murrine-hscrollbar"
261371
262widget "gtk-tooltip*" style "industrial-tooltips"372class "GtkRadio*" style:highest "murrine-radiocheck" # HACK: override button selection colour
263373class "GtkCheck*" style:highest "murrine-radiocheck" # HACK: override button selection colour
264widget "*.tasklist-button" style "industrial-squared"374
265375# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
266class "MetaFrames" style "metacity-frame"376class "MetaFrames" style "metacity-frame"
267377#class "GtkWindow" style "metacity-frame"
378
379
380# General matching following, the order is choosen so that the right styles override each other
381# eg. progressbar needs to be more important then the menu match.
382
383# This is not perfect, it could be done better
384# (That is modify *every* widget in the notebook, and change those back that
385# we really don't want changed)
386widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"
387widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"
388widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"
389widget_class "*<GtkNotebook>*<GtkViewport>" style "murrine-notebook"
390widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "murrine-notebook"
391
392widget_class "*<GtkButton>" style "murrine-button"
393widget_class "*<GtkNotebook>" style "murrine-notebook"
394widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
395
396widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
397widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
398
399widget_class "*<GtkMenuBar>*" style "murrine-menubar"
400widget_class "*<GtkMenu>*" style "murrine-menu"
401widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
402widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
403
404widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
405widget_class "*.<GtkTreeView>*" style "murrine-treeview"
406
407widget_class "*<GtkProgress>" style "murrine-progressbar"
408widget_class "*<GtkProgressBar>" style "murrine-progressbar"
409
410# Treeview header
411widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
412widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
413widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
414widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
415
416# Workarounds for Evolution
417widget_class "*.ETable.ECanvas" style "murrine-treeview-header"
418widget_class "*.ETree.ECanvas" style "murrine-treeview-header"
419
420# The window of the tooltip is called "gtk-tooltip"
421################################
422# FIXME:
423# This will not work if one embeds eg. a button into the tooltip.
424# As far as I can tell right now we will need to rework the theme
425# quite a bit to get this working correctly.
426# (It will involve setting different priorities, etc.)
427################################
428widget "gtk-tooltip*" style "murrine-tooltips"
429
430###################################################
431# Special cases and work arounds
432###################################################
433
434# Special case the nautilus-extra-view-widget
435# ToDo: A more generic approach for all applications that have a widget like this.
436widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location"
268437
269# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646438# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
270# Note that the work around assumes that the combobox is _not_ in439# Note that the work around assumes that the combobox is _not_ in
271# appears-as-list mode.440# appears-as-list mode.
441# Similar hack also in the menuitem style.
272# This style does not affect GtkComboBoxEntry, it does have an effect442# This style does not affect GtkComboBoxEntry, it does have an effect
273# on comboboxes in appears-as-list mode though.443# on comboboxes in appears-as-list mode though.
274style "industrial-text-is-fg-color-workaround"444style "murrine-combobox-text-color-workaround"
275{445{
276 text[NORMAL] = @fg_color446 text[NORMAL] = @fg_color
277 text[PRELIGHT] = @fg_color447 text[PRELIGHT] = @fg_color
278 text[SELECTED] = @selected_fg_color448 text[ACTIVE] = @fg_color
279 text[ACTIVE] = @fg_color449 text[SELECTED] = @selected_fg_color
280 text[INSENSITIVE] = darker (@bg_color)450 text[INSENSITIVE] = shade (0.15, @fg_color)
281}451}
282widget_class "*.<GtkComboBox>.<GtkCellView>" style "industrial-text-is-fg-color-workaround"452widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"
283453
284style "industrial-menuitem-text-is-fg-color-workaround"454style "murrine-menuitem-text-is-fg-color-workaround"
285{455{
286 text[NORMAL] = @fg_color456 text[NORMAL] = @fg_color
287 text[PRELIGHT] = @selected_fg_color457 text[PRELIGHT] = @selected_fg_color
458 text[ACTIVE] = @fg_color
288 text[SELECTED] = @selected_fg_color459 text[SELECTED] = @selected_fg_color
289 text[ACTIVE] = @fg_color460 text[INSENSITIVE] = shade (0.15, @fg_color)
290 text[INSENSITIVE] = darker (@bg_color)
291}461}
292widget "*.gtk-combobox-popup-menu.*" style "industrial-menuitem-text-is-fg-color-workaround"462
463widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"
293464
294# Work around the usage of GtkLabel inside GtkListItems to display text.465# Work around the usage of GtkLabel inside GtkListItems to display text.
295# This breaks because the label is shown on a background that is based on the466# This breaks because the label is shown on a background that is based on the
296# base color set.467# base color set.
297style "industrial-fg-is-text-color-workaround"468style "murrine-fg-is-text-color-workaround"
298{469{
299 fg[NORMAL] = @text_color470 fg[NORMAL] = @text_color
300 fg[PRELIGHT] = @text_color471 fg[PRELIGHT] = @text_color
301 fg[ACTIVE] = @selected_fg_color472 fg[ACTIVE] = @selected_fg_color
302 fg[SELECTED] = @selected_fg_color473 fg[SELECTED] = @selected_fg_color
303 fg[INSENSITIVE] = darker (@bg_color)474 fg[INSENSITIVE] = shade (0.15, @fg_color)
304}475}
305widget_class "*<GtkListItem>*" style "industrial-fg-is-text-color-workaround"476
477widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"
478
306# The same problem also exists for GtkCList and GtkCTree479# The same problem also exists for GtkCList and GtkCTree
307# Only match GtkCList and not the parent widgets, because that would also change the headers.480# Only match GtkCList and not the parent widgets, because that would also change the headers.
308widget_class "*<GtkCList>" style "industrial-fg-is-text-color-workaround"481widget_class "*<GtkCList>" style "murrine-fg-is-text-color-workaround"
309482
310483style "murrine-evo-new-button-workaround"
484{
485
486 engine "murrine"
487 {
488 toolbarstyle = 0
489 }
490}
491
492widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
493
494# Theme panel elements
495widget "*PanelWidget*" style "murrine-panel"
496widget "*PanelApplet*" style "murrine-panel"
497widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet
498class "PanelApp*" style "murrine-panel"
499class "PanelToplevel*" style "murrine-panel"
500widget_class "*Mail*" style "murrine-panel"
501widget_class "*notif*" style "murrine-panel"
502widget_class "*Notif*" style "murrine-panel"
311503
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-10 15:44:44 +0000
+++ debian/changelog 2010-02-20 21:35:23 +0000
@@ -1,3 +1,18 @@
1human-theme (0.39) UNRELEASED; urgency=low
2
3 * Visual refresh of Human & Darkroom theme
4 * Documented new Murrine GIT engine options in gtkrc code
5 * Small gtkrc code cleanups/removal of unnecessary colour hacks
6 * Enabled filled arrow type
7 * Modified trough gradient (progressbar & scollbar background)
8 * Various tweaks to widget outline & shadow gradients
9 * Added names (Conn O Griofa & James Schriver) to AUTHORS file
10 * HumanLogin: deprecate industrial engine; border_shades and colors to
11 GtkEntry, ComboboxEntry, Metacity-Frame, buttons; new lighter spinbutton
12 and murrine buttons with gradients (merge from James Schriver)
13
14 -- Conn O Griofa <connogriofa@gmail.com> Sat, 20 Feb 2010 20:41:55 +0000
15
1human-theme (0.38) lucid; urgency=low16human-theme (0.38) lucid; urgency=low
217
3 * merging from vish's changes to fix LP: #51832518 * merging from vish's changes to fix LP: #518325

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: