GNOME Themes

Merge lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu into lp:~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu

  1. gnome-themes-ubuntu
  2. Merge into gnome-themes-ubuntu
Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: not available
Proposed branch: lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu
Merge into: lp:~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu
Diff against target: 5493 lines (+2566/-1250)
12 files modified
Dust Sand/gtk-2.0/gtk-2.0/gtkrc (+798/-0)
Dust Sand/gtk-2.0/gtkrc (+128/-109)
Dust Sand/metacity-1/metacity-theme-1.xml (+5/-5)
Dust/gtk-2.0/gtkrc (+227/-191)
Dust/gtk-2.0/scrollbars/scrollbar.rc (+0/-330)
Dust/gtk-2.0/scrollbars_d/scrollbar.rc (+0/-288)
Dust/metacity-1/metacity-theme-1.xml (+126/-81)
New Wave Dark Menus/gtk-2.0/default-gtkrc (+634/-121)
New Wave/gtk-2.0/gtkrc (+634/-121)
New Wave/index.theme (+0/-1)
debian/changelog (+13/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+17554@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

nome-themes-ubuntu (0.6) lucid; urgency=low

  [ Loïc Minier ]
  * Fix find snippet dropping -x bits to not touch the upstream files (only
    the installed one) and reverse logic to clear the bits of all files except
    *.sh files (only file needing +x in this package).

  [ Andrew Starr-Bochicchio ]
  * Update Dust{-Sand} to r10 from lp:~dusttheme-dev/dusttheme/0.4
   - gnome-panel clock should not be bold (LP: #439191).
   - Text overlaps with icon in window title bar (LP: #371743).
  * Update New Wave to version 0.8.2 (LP:508851).
   - Nautilus focus ring is not visible (LP: #390601).
   - Thumbnails corrupted in Appearance Preferences (LP: #416030).

 -- Andrew Starr-Bochicchio <email address hidden> Sun, 17 Jan 2010 14:21:20 -0500

lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu updated
29. By Andrew Starr-Bochicchio

Update Dust{-Sand} to lp:~dusttheme-dev/dusttheme/0.5

30. By Andrew Starr-Bochicchio

debian/control: Bump Standards-Version to 3.8.4

31. By Andrew Starr-Bochicchio

Close LP: #529811 in changelog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'Dust Sand/gtk-2.0/gtk-2.0'
2=== added file 'Dust Sand/gtk-2.0/gtk-2.0/blank.png'
3Binary files Dust Sand/gtk-2.0/gtk-2.0/blank.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/blank.png 2010-03-01 02:27:14 +0000 differ
4=== added file 'Dust Sand/gtk-2.0/gtk-2.0/gtkrc'
5--- Dust Sand/gtk-2.0/gtk-2.0/gtkrc 1970-01-01 00:00:00 +0000
6+++ Dust Sand/gtk-2.0/gtk-2.0/gtkrc 2010-03-01 02:27:14 +0000
7@@ -0,0 +1,798 @@
8+# Dust theme
9+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
10+# Licensed under the GPL.
11+# Requires Murrine GTK Engine v0.91.0
12+
13+gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
14+
15+style "default"
16+{
17+ xthickness = 1
18+ ythickness = 1
19+
20+ GtkScrolledWindow ::scrollbar-spacing = 0
21+ GtkScrolledWindow ::scrollbar-within-bevel = 0
22+
23+ GtkButton::child-displacement-x = 1
24+ GtkButton::child-displacement-y = 1
25+ GtkButton::default-border = { 0, 0, 0, 0 }
26+
27+ GtkCheckButton::indicator-size = 14
28+
29+ GtkPaned::handle-size = 6
30+
31+ GtkRange::trough-border = 1
32+ GtkRange::slider-width = 12
33+ GtkRange::stepper-size = 12
34+ GtkRange::trough-under-steppers = 1
35+
36+ GtkScale::slider-length = 18
37+ GtkScale::trough-side-details = 1
38+
39+ GtkScrollbar::min-slider-length = 30
40+ GtkMenuBar::internal-padding = 0
41+ GtkExpander::expander-size = 15
42+ GtkToolbar::internal-padding = 1
43+ GtkTreeView::expander-size = 15
44+ GtkTreeView::vertical-separator = 0
45+
46+ GtkMenu::horizontal-padding = 0
47+ GtkMenu::vertical-padding = 0
48+
49+ WnckTasklist::fade-overlay-rect = 0
50+ # The following line hints to gecko (and possibly other appliations)
51+ # that the entry should be drawn transparently on the canvas.
52+ # Without this, gecko will fill in the background of the entry.
53+ GtkEntry::honors-transparent-bg-hint = 1
54+
55+ GtkEntry::progress-border = { 2, 2, 2, 2 }
56+
57+ fg[NORMAL] = @fg_color
58+ fg[PRELIGHT] = @fg_color
59+ fg[SELECTED] = @selected_fg_color
60+ fg[ACTIVE] = @fg_color
61+ fg[INSENSITIVE] = darker (@bg_color)
62+
63+ bg[NORMAL] = @bg_color
64+ bg[PRELIGHT] = shade (1.02, @bg_color)
65+ bg[SELECTED] = @selected_bg_color
66+ bg[INSENSITIVE] = @bg_color
67+ bg[ACTIVE] = shade (0.9, @bg_color)
68+
69+ base[NORMAL] = @base_color
70+ base[PRELIGHT] = shade (0.95, @bg_color)
71+ base[ACTIVE] = mix (0.7, @selected_bg_color, @bg_color)
72+ base[SELECTED] = @selected_bg_color
73+ base[INSENSITIVE] = @bg_color
74+
75+ text[NORMAL] = @text_color
76+ text[PRELIGHT] = @text_color
77+ text[ACTIVE] = @selected_fg_color
78+ text[SELECTED] = @selected_fg_color
79+ text[INSENSITIVE] = darker (@bg_color)
80+
81+engine "murrine"
82+ {
83+ animation = TRUE # FALSE = disabled, TRUE = enabled
84+ arrowstyle = 1
85+ border_shades = { 1.2, 1.0 } # gradient to draw on border
86+# border_colors = { "#E6DDD5", "#E6DDD5" }
87+ colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
88+ comboboxstyle = 0 # colorize the GtkComboBox below the arrow.
89+ contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
90+ #focus_color = @selected_bg_color
91+ glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
92+ glow_shade = 1.20 # 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.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
95+ highlight_shade = 1.0 # set highlight amount for buttons or widgets
96+ lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
97+ lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
98+ listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
99+ listviewstyle = 0 # 0 = nothing, 1 = dotted
100+ menubaritemstyle = 1 # 0 = menuitem look, 1 = button look
101+ menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
102+ menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
103+ menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
104+ prelight_shade = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
105+ progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
106+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
107+ rgba = FALSE # FALSE = disabled, TRUE = enabled
108+ roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
109+ scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
110+ shadow_shades = { 0.8, 2.2 }
111+ sliderstyle = 0 # 0 = nothing added, 1 = handles
112+ spinbuttonstyle = 1
113+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
114+ #textstyle = 1
115+ trough_shades = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
116+ toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
117+ }
118+}
119+
120+style "wide"
121+{
122+ xthickness = 2
123+ ythickness = 2
124+}
125+
126+style "wider"
127+{
128+ xthickness = 3
129+ ythickness = 3
130+}
131+
132+style "dark"
133+{
134+ bg[NORMAL] = @bg_color
135+ bg[SELECTED] = shade(0.9,@selected_bg_color)
136+ bg[PRELIGHT] = shade (0.5, @selected_bg_color)
137+ bg[ACTIVE] = mix (0.5, @selected_bg_color, "#343330")
138+ bg[INSENSITIVE] = "#302F2C"
139+
140+ fg[NORMAL] = mix (0.7, '#ffffef', @fg_color)
141+ fg[PRELIGHT] = mix (0.8, '#ffffef', @fg_color)
142+ fg[SELECTED] = mix (0.8, '#ffffef', @fg_color)
143+ fg[ACTIVE] = mix (0.8, '#ffffef', @fg_color)
144+ fg[INSENSITIVE] = @fg_color
145+
146+}
147+
148+style "button" = "wider"
149+{
150+ bg[NORMAL] = shade (1.10, @bg_color)
151+ bg[PRELIGHT] = mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
152+ bg[ACTIVE] = shade (0.85, @bg_color)
153+
154+ engine "murrine"
155+ {
156+ border_shades = { .9, .7} # draw a gradient on the border.
157+ border_colors = { "#D9D4CC", "#D9D4CC" }
158+ contrast = 1.0
159+ lightborder_shade = 1.06
160+ }
161+}
162+
163+style "entry" {
164+ xthickness = 3
165+ ythickness = 3
166+
167+ bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
168+ fg[SELECTED] = @text_color
169+
170+ engine "murrine" {
171+ focus_color = shade (0.65, @selected_bg_color)
172+ }
173+}
174+
175+style "toolbar-item" = "wide"
176+{
177+ bg[NORMAL] = "#AFA99F" #shade(0.88,@bg_color)
178+ bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
179+ bg[ACTIVE] = "#CFC9BF" #shade(0.6,@bg_color)
180+ bg[SELECTED] = "#AFA99F" #shade(0.88,@bg_color)
181+ bg[INSENSITIVE] = "#AFA99F" #shade(0.88,@bg_color)
182+
183+ engine "murrine"{
184+ }
185+
186+}
187+
188+style "toolbar" = "toolbar-item"
189+{
190+ engine "pixmap"
191+ {
192+ image {
193+ function = BOX
194+ file = "toolbar_light.png"
195+ border = {1,1,1,1}
196+ }
197+ image {
198+ function = HANDLE
199+ overlay_file = "handlebox.png"
200+ overlay_stretch = FALSE
201+ orientation = HORIZONTAL
202+ }
203+ image {
204+ function = HANDLE
205+ overlay_file = "handlebox.png"
206+ overlay_stretch = FALSE
207+ orientation = VERTICAL
208+ }
209+ image
210+ {
211+ function = VLINE
212+ recolorable = TRUE
213+ file = "blank.png"
214+ }
215+ image
216+ {
217+ function = HLINE
218+ recolorable = TRUE
219+ file = "blank.png"
220+ }
221+ }
222+}
223+
224+
225+style "toolbar-sep" = "toolbar-item"
226+{
227+ xthickness = 2
228+}
229+
230+style "dark-toolbar" = "dark"
231+{
232+ xthickness = 2
233+ ythickness = 2
234+ bg[NORMAL] = "#343330"
235+ bg[PRELIGHT] = shade (0.65, @selected_bg_color)
236+ bg[SELECTED] = shade (0.35, @bg_color)
237+ bg[ACTIVE] = shade (0.35, @bg_color)
238+
239+ engine "murrine"
240+ {
241+ border_shades = {1.4, 1.2} # draw a gradient on the border.
242+ border_colors = { "#343330", "#343330" }
243+ glowstyle = 0
244+ gradient_shades = {1.1,1.0,1.0,0.7}
245+ highlight_shade = 1.0
246+ lightborder_shade = 1.0
247+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
248+ }
249+}
250+
251+style "dark-toolbar-sep" = "dark-toolbar"
252+ { xthickness = 2 }
253+
254+
255+style "pixmap-dark-toolbar" = "dark-toolbar"
256+{
257+ # To-do: make the toolbar recolorable, possibly without using pixmaps
258+ # We only like this because of the top line, anyway.
259+ engine "pixmap"{
260+ image {
261+ function = BOX
262+ file = "toolbar_o.png"
263+ border = {1,1,1,1}
264+ }
265+ image
266+ {
267+ function = HANDLE
268+ overlay_file = "handlebox.png"
269+ overlay_stretch = FALSE
270+ orientation = HORIZONTAL
271+ }
272+ image
273+ {
274+ function = HANDLE
275+ overlay_file = "handlebox.png"
276+ overlay_stretch = FALSE
277+ orientation = VERTICAL
278+ }
279+ image
280+ {
281+ function = VLINE
282+ recolorable = TRUE
283+ file = "blank.png"
284+ }
285+ image
286+ {
287+ function = HLINE
288+ recolorable = TRUE
289+ file = "blank.png"
290+ }
291+ }
292+}
293+
294+style "notebook" = "wider"
295+{
296+ bg[NORMAL] = shade (1.0615, @bg_color)
297+ bg[ACTIVE] = shade (0.85, @bg_color)
298+
299+ engine "murrine"
300+ {
301+ contrast = 1.0
302+ lightborder_shade = 1.1
303+ highlight_shade = 1.01
304+ }
305+}
306+
307+style "panel"
308+{
309+ bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
310+ bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
311+ bg[PRELIGHT] = shade(1.0, @selected_bg_color) # panel prelight
312+ bg[ACTIVE] = @selected_bg_color # bottom panel active background
313+ bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background [ ] [ ] (orange)
314+ bg[INSENSITIVE] = shade(0.90, @selected_bg_color) #
315+
316+ fg[NORMAL] = @selected_fg_color # Default text
317+ fg[PRELIGHT] = @selected_fg_color # Prelight
318+ fg[ACTIVE] = @selected_fg_color # Bottom panel active text
319+ fg[SELECTED] = @fg_color # Bottom panel selected window
320+}
321+
322+style "murrine-PanelGtkMenubar"
323+{
324+ bg[NORMAL] = "#2D2519" # top desktop panel menu background color
325+ bg[SELECTED] = darker(@selected_bg_color) # selected item background
326+ fg[NORMAL] = @bg_color # default panel text !
327+ fg[PRELIGHT] = @base_color # text after dropdown menu
328+
329+ font_name = "Bold"
330+
331+ engine "murrine"
332+ {
333+ # Panel Menubar Tab
334+ contrast = 0.75
335+ glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
336+ glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
337+ glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
338+ roundness = 2
339+ }
340+}
341+
342+widget "*clock-applet-button*" style "dark-toolbar"
343+
344+style "menu" = "dark"
345+{
346+ xthickness = 0
347+ ythickness = 0
348+
349+ #Keep it this dark since OOo likes it
350+ bg[NORMAL] = "#343330"
351+ text[NORMAL] = @bg_color
352+ text[PRELIGHT] = @selected_fg_color
353+}
354+
355+style "menu-item" = "dark"
356+{
357+ xthickness = 0
358+ ythickness = 3
359+ engine "murrine"
360+ {
361+ border_shades = { 1.0, .8} # draw a gradient on the border.
362+ border_colors = { "#795145", "#795145" }
363+ glowstyle = 0
364+ gradient_shades = {1.1,1.0,1.0,0.7}
365+ highlight_shade = 1.0
366+ lightborder_shade = 1.0
367+
368+ }
369+}
370+
371+style "separator-menu-item"
372+{
373+ GtkSeparatorMenuItem::horizontal-padding = 2
374+ GtkWidget::wide-separators = 1
375+ GtkWidget::separator-width = 1
376+ GtkWidget::separator-height = 2
377+ xthickness = 4
378+ ythickness = 0
379+ bg[NORMAL] = "#444"
380+}
381+
382+# Based on the default style so that the colors from the button
383+# style are overriden again.
384+style "treeview-header" = "default"
385+{
386+ xthickness = 2
387+ ythickness = 1
388+
389+ bg[NORMAL] = shade(0.9, @bg_color)
390+ bg[PRELIGHT] = shade(1.0, @bg_color)
391+ bg[ACTIVE] = shade(0.8, @bg_color)
392+
393+ GtkWidget::focus-line-width = 0
394+}
395+
396+style "tooltips"
397+{
398+ xthickness = 4
399+ ythickness = 4
400+
401+ bg[NORMAL] = @tooltip_bg_color
402+ fg[NORMAL] = @tooltip_fg_color
403+}
404+
405+style "progressbar"
406+{
407+ xthickness = 0
408+ ythickness = 0
409+
410+ fg[PRELIGHT] = @selected_fg_color
411+
412+}
413+
414+style "pixmap-statusbar"
415+{
416+ ythickness = 3
417+ xthickness = 3
418+
419+ engine "pixmap"
420+ {
421+ image
422+ {
423+ function = RESIZE_GRIP
424+ recolorable = TRUE
425+ detail = "statusbar"
426+ overlay_file = "statusgrip.png"
427+ overlay_border = {0,0,0,0}
428+ overlay_stretch = TRUE
429+ }
430+ image
431+ {
432+ function = SHADOW
433+ shadow = IN
434+ file = "blank.png"
435+ }
436+ image
437+ {
438+ function = SHADOW
439+ shadow = OUT
440+ file = "blank.png"
441+ }
442+ image
443+ {
444+ function = SHADOW
445+ shadow = ETCHED_IN
446+ file = "blank.png"
447+ }
448+ image
449+ {
450+ function = SHADOW
451+ shadow = ETCHED_OUT
452+ file = "blank.png"
453+ }
454+ }
455+}
456+
457+style "comboboxentry" = "wider"
458+{
459+}
460+
461+style "spinbutton"
462+{
463+}
464+
465+style "scale"
466+{
467+ bg[PRELIGHT] = shade(0.9,@bg_color)
468+ engine "murrine"{
469+ roundness = 2
470+ contrast = 1.1
471+ highlight_shade = 1.2
472+ lightborder_shade = 1.1
473+ gradient_shades = {1.0,0.85,0.8,1.0}
474+ reliefstyle = 2
475+ }
476+}
477+
478+style "menubar" = "dark"
479+{
480+ # Static dark color so continuity doesn't break with toolbars
481+ # when color changes
482+ bg[NORMAL] = "#343330"
483+ engine "pixmap"
484+ {
485+ image {
486+ function = BOX
487+ file = "menubar.png"
488+ #border = {1,1,1,1}
489+ stretch = TRUE
490+ }
491+ image {
492+ function = HANDLE
493+ overlay_file = "handlebox.png"
494+ overlay_stretch = FALSE
495+ orientation = HORIZONTAL
496+ }
497+ image {
498+ function = HANDLE
499+ overlay_file = "handlebox.png"
500+ overlay_stretch = FALSE
501+ orientation = VERTICAL
502+ }
503+ }
504+}
505+
506+style "frame"
507+{
508+ #Uncomment for dark statusbars. Breaks some apps. (FIXME: Doesn't work)
509+ #bg[ACTIVE] = shade(0.2,@bg_color)
510+ #fg[NORMAL] = mix (1.5, @fg_color, '#ffffff')
511+ #fg[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
512+}
513+
514+style "frame-title" = "frame"
515+{
516+ fg[NORMAL] = lighter (@fg_color)
517+}
518+
519+# SZ07: This is added to tell the theme how to color checkmarks and radio items that are not in menus.
520+style "radiocheck"
521+{
522+ text[NORMAL] = @selected_fg_color # Color for selected checks/radio items.
523+ text[PRELIGHT] = @selected_fg_color # Color for selected checks/radio items on prelight.
524+
525+ engine "murrine"
526+ {
527+ roundness = 2
528+ contrast = 1.03
529+ highlight_shade = 1.0
530+ lightborder_shade = 1.0
531+ gradient_shades = {1.1,1.0,1.0,0.9}
532+ reliefstyle = 2
533+ }
534+}
535+
536+style "scrollbar"
537+{
538+ engine "murrine"
539+ {
540+ border_shades = { .7, .7} # draw a gradient on the border.
541+ border_colors = { "#D9D4CC", "#D9D4CC" }
542+ glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
543+ glow_shade = 1.1 # sets glow amount for buttons or widgets
544+ glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
545+ gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
546+ highlight_shade = 1.05 # set highlight amount for buttons or widgets
547+ lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
548+ roundness = 4
549+ }
550+
551+
552+ bg[SELECTED] = shade (0.6, @bg_color)
553+}
554+
555+style "hscrollbar"
556+{
557+}
558+
559+style "vscrollbar"
560+{
561+}
562+
563+style "nautilus-location"
564+{
565+ bg[NORMAL] = mix(0.60, @bg_color, @selected_bg_color)
566+}
567+
568+#########################################
569+# Matches
570+#########################################
571+
572+# default style is applied to every widget
573+class "GtkWidget" style "default"
574+
575+# Increase the x/ythickness in some widgets
576+class "GtkRange" style "default"
577+class "GtkFrame" style "frame"
578+class "GtkSeparator" style "wide"
579+class "GtkEntry" style "entry"
580+class "GtkStatusbar" style "pixmap-statusbar"
581+class "GtkMenuBar" style:highest "menubar"
582+class "GtkRadioButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
583+class "GtkCheckButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
584+
585+# Toolbar default: dark
586+#class "*HandleBox" style "pixmap-dark-toolbar"
587+#class "GtkToolbar" style "pixmap-dark-toolbar"
588+#widget_class "*HandleBox" style "pixmap-dark-toolbar"
589+#widget_class "*<GtkToolbar>.*" style "dark-toolbar"
590+
591+# Toolbar default: light
592+class "*HandleBox" style "toolbar"
593+class "GtkToolbar" style "toolbar"
594+widget_class "*HandleBox" style "toolbar"
595+widget_class "*<GtkToolbar>.*" style "toolbar-item"
596+
597+#
598+# Toolbar exceptions:
599+# Browser-type and viewer-type applications get a dark toolbar.
600+# Everything below the toolbar for these apps are the content. This will make
601+# a separation on function (toolbar) and content (client area).
602+#
603+
604+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
605+style "text-is-fg-color-workaround"
606+{
607+ text[NORMAL] = @fg_color
608+ text[PRELIGHT] = @fg_color
609+ text[SELECTED] = @selected_fg_color
610+ text[ACTIVE] = @fg_color
611+ text[INSENSITIVE] = darker (@bg_color)
612+}
613+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
614+
615+style "text-is-fg-color-workaround-dark"
616+{
617+ #Make it work with this theme!
618+ text[NORMAL] = mix (1.5, @fg_color, '#ffffff')
619+ text[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
620+}
621+
622+# Nautilus toolbar
623+widget_class "*Nautilus*Toolbar*" style "pixmap-dark-toolbar"
624+widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar"
625+widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar"
626+widget_class "*Nautilus*Tool*GtkToggleButton" style "dark-toolbar"
627+widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep"
628+widget_class "*Nautilus*Tool*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
629+
630+# Evince/EOG
631+widget_class "*EggEditable*Toolbar*" style "pixmap-dark-toolbar"
632+widget_class "*EggEditable*Toolbar*.*.*.*" style "dark-toolbar"
633+widget_class "*EggEditable*Tool*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
634+
635+widget "*fullscreen-toolbar" style "pixmap-dark-toolbar"
636+widget "*fullscreen-toolbar.*" style "dark-toolbar"
637+widget "*fullscreen-toolbar*.GtkComboBox.GtkCellView" style "text-is-fg-color-workaround-dark"
638+
639+# Epiphany
640+widget_class "*EphyToolbar*" style "pixmap-dark-toolbar"
641+widget_class "*EphyToolbar*.*.*.*" style "dark-toolbar"
642+widget_class "*EphyTool*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
643+
644+# Brasero
645+widget_class "*rasero*Toolbar*" style "pixmap-dark-toolbar"
646+widget_class "*rasero*Toolbar*.*" style "dark-toolbar"
647+widget_class "*rasero*Toolbar*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
648+
649+#gThumb
650+widget_class "*Gth*Toolbar*" style "pixmap-dark-toolbar"
651+widget_class "*Gth*Toolbar*.*" style "dark-toolbar"
652+widget_class "*Gth*Toolbar*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
653+widget_class "*GthFull*" style "pixmap-dark-toolbar" #Doesn't work
654+
655+#Totem
656+widget "*totem*" style "dark"
657+style "totem-sidebar-workaround" {
658+ text[NORMAL] = mix (0.7, '#ffffef', @fg_color)
659+ text[PRELIGHT] = mix (0.8, '#ffffef', @fg_color)
660+}
661+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-sidebar-workaround"
662+
663+class "GtkSpinButton" style "spinbutton"
664+class "GtkScale" style "scale"
665+class "GtkVScale" style "scale"
666+class "GtkHScale" style "scale"
667+class "GtkScrollbar" style "scrollbar"
668+class "GtkVScrollbar" style "vscrollbar"
669+class "GtkHScrollbar" style "hscrollbar"
670+class "GtkButton" style "button"
671+
672+# General matching following, the order is choosen so that the right styles override each other
673+# eg. progressbar needs to be more important then the menu match.
674+
675+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook"
676+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook"
677+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook"
678+widget_class "*<GtkNotebook>" style "notebook"
679+
680+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
681+widget_class "*<GtkCombo>*" style "comboboxentry"
682+
683+widget_class "*<GtkMenuBar>.*" style "menu-item"
684+widget_class "*<GtkMenu>*" style "menu"
685+widget_class "*<GtkMenuItem>" style "menu-item"
686+widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item"
687+widget_class "*<GtkCheckMenuItem>*" style "radiocheck"
688+widget_class "*<GtkRadioMenuItem>*" style "radiocheck"
689+
690+widget_class "*<GtkFrame>" style "frame"
691+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title"
692+
693+widget_class "*<GtkStatusbar>*" style "wider"
694+widget_class "*<GtkProgressBar>" style "progressbar"
695+
696+# Treeview header
697+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview-header"
698+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview-header"
699+widget_class "*.<GtkList>.<GtkButton>" style "treeview-header"
700+widget_class "*.<GtkCList>.<GtkButton>" style "treeview-header"
701+
702+#Panel
703+widget "*PanelWidget*" style "panel"
704+widget "*PanelApplet*" style "panel"
705+widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet
706+class "PanelApp*" style "panel"
707+class "PanelToplevel*" style "panel"
708+
709+# The panel menubar
710+widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar"
711+
712+#XFCE panel
713+widget_class "*notif*" style "panel"
714+widget_class "*Notif*" style "panel"
715+widget_class "*Tray*" style "panel"
716+widget_class "*tray*" style "panel"
717+widget "*Xfce*Panel*" style "panel"
718+class "*Xfce*Panel*" style "panel"
719+
720+widget "gtk-tooltip*" style "tooltips"
721+
722+###################################################
723+# Special cases and work arounds
724+###################################################
725+
726+# Nautilus sidebar
727+widget_class "*NautilusSidePane.GtkFrame" style "pixmap-statusbar"
728+
729+# Workarounds for Evolution
730+widget_class "*.ETable.ECanvas" style "treeview-header"
731+widget_class "*.ETree.ECanvas" style "treeview-header"
732+
733+# Monodevelop uses an OptionPanel widget, which incidentally is dark in our theme.
734+# Undo it:
735+widget "*OptionPanel*" style "button"
736+widget "*optionPanel*" style "button"
737+
738+# Special case the nautilus-extra-view-widget
739+# ToDo: A more generic approach for all applications that have a widget like this.
740+widget "*.nautilus-extra-view-widget" style : highest "nautilus-location"
741+
742+style "menuitem-text-is-fg-color-workaround"
743+{
744+ #text[NORMAL] = @fg_color
745+ #text[PRELIGHT] = @selected_fg_color
746+ #text[SELECTED] = @selected_fg_color
747+ #text[ACTIVE] = @fg_color
748+ #text[INSENSITIVE] = darker (@bg_color)
749+ #Make it work with this theme!
750+ text[NORMAL] = mix (1.5, @fg_color, '#ffffff')
751+ text[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
752+}
753+widget "*.gtk-combobox-popup-menu.*" style "menuitem-text-is-fg-color-workaround"
754+
755+# Work around the usage of GtkLabel inside GtkListItems to display text.
756+# This breaks because the label is shown on a background that is based on the
757+# base color set.
758+style "fg-is-text-color-workaround"
759+{
760+ fg[NORMAL] = @text_color
761+ fg[PRELIGHT] = @text_color
762+ fg[ACTIVE] = @selected_fg_color
763+ fg[SELECTED] = @selected_fg_color
764+ fg[INSENSITIVE] = darker (@bg_color)
765+}
766+widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
767+# The same problem also exists for GtkCList and GtkCTree
768+# Only match GtkCList and not the parent widgets, because that would also change the headers.
769+widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
770+
771+style "evo-new-button-workaround"
772+{
773+ engine "murrine"
774+ {
775+ toolbarstyle = 0
776+ }
777+}
778+
779+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo-new-button-workaround"
780+
781+#Rhythmbox toolbar near the search entry. Use default + wide so that it doesn't turn dark.
782+style "rhythmbox-header" = "default"
783+{
784+ xthickness = 3
785+ ythickness = 3
786+ engine "murrine" {
787+ }
788+}
789+widget "*RBSourceHeader*" style:highest "rhythmbox-header"
790+widget "*HeaderToolbar*" style:highest "rhythmbox-header"
791+widget "*FooterToolbar*" style:highest "rhythmbox-header"
792+
793+widget "*swt*toolbar*" style "default"
794+
795+# RSC: Fix for CPU frequency applet
796+style "applet-text" = "panel"
797+{
798+ fg[NORMAL] = @bg_color
799+}
800+
801+widget_class "*CPUFreqApplet*" style:highest "applet-text"
802+
803+# Firefox specific things:
804+#widget "MozillaGtkWidget*Menu*" style "default"
805+widget "MozillaGtkWidget*Tool*" style "toolbar-item"
806
807=== added file 'Dust Sand/gtk-2.0/gtk-2.0/handlebox.png'
808Binary files Dust Sand/gtk-2.0/gtk-2.0/handlebox.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/handlebox.png 2010-03-01 02:27:14 +0000 differ
809=== added file 'Dust Sand/gtk-2.0/gtk-2.0/menubar.png'
810Binary files Dust Sand/gtk-2.0/gtk-2.0/menubar.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/menubar.png 2010-03-01 02:27:14 +0000 differ
811=== added file 'Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png'
812Binary files Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png 2010-03-01 02:27:14 +0000 differ
813=== added file 'Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png'
814Binary files Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png 2010-03-01 02:27:14 +0000 differ
815=== added file 'Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png'
816Binary files Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png 2010-03-01 02:27:14 +0000 differ
817=== added file 'Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png'
818Binary files Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png 1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png 2010-03-01 02:27:14 +0000 differ
819=== modified file 'Dust Sand/gtk-2.0/gtkrc'
820--- Dust Sand/gtk-2.0/gtkrc 2009-08-08 02:09:42 +0000
821+++ Dust Sand/gtk-2.0/gtkrc 2010-03-01 02:27:14 +0000
822@@ -1,16 +1,16 @@
823-# Dust theme
824-# by Rico Sta. Cruz and Ricardo (Kido) Mariano III
825+# Dust Sand theme
826+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
827+# Licensed under the GPL.
828+# Requires Murrine GTK Engine v0.91.0
829
830 gtk_color_scheme = "fg_color:#323232\nbg_color:#C1BDB5\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#B99573\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
831
832-include "scrollbars/scrollbar.rc"
833-
834 style "default"
835 {
836 xthickness = 1
837 ythickness = 1
838
839- GtkScrolledWindow ::scrollbar-spacing = 0
840+ GtkScrolledWindow ::scrollbar-spacing = 1
841 GtkScrolledWindow ::scrollbar-within-bevel = 0
842
843 GtkButton::child-displacement-x = 1
844@@ -21,9 +21,9 @@
845
846 GtkPaned::handle-size = 6
847
848- GtkRange::trough-border = 1
849- GtkRange::slider-width = 12
850- GtkRange::stepper-size = 12
851+ GtkRange::trough-border = 2
852+ GtkRange::slider-width = 13
853+ GtkRange::stepper-size = 14
854 GtkRange::trough-under-steppers = 1
855
856 GtkScale::slider-length = 18
857@@ -71,33 +71,42 @@
858 text[SELECTED] = @selected_fg_color
859 text[INSENSITIVE] = darker (@bg_color)
860
861- engine "murrine" {
862- #options
863+engine "murrine"
864+ {
865 animation = TRUE # FALSE = disabled, TRUE = enabled
866- colorize_scrollbar = FALSE # FALSE = disabled, TRUE = enabled
867- contrast = 0.8 # 0.8 for less contrast, more than 1.0 for more contrast on borders
868- glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
869- glow_shade = 1.2
870- glowstyle = 2 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
871- gradient_shades = {1.1,1.0,1.0,0.87}
872- gradients = TRUE
873- highlight_shade = 1.0
874- lightborder_shade = 1.1
875+ arrowstyle = 1
876+ border_shades = { 1.2, 1.0 } # gradient to draw on border
877+# border_colors = { "#E6DDD5", "#E6DDD5" }
878+ colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
879+ comboboxstyle = 0 # colorize the GtkComboBox below the arrow.
880+ contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
881+ #focus_color = @selected_bg_color
882+ glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
883+ glow_shade = 1.20 # sets glow amount for buttons or widgets
884+ glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
885+ gradient_shades = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
886+ highlight_shade = 1.0 # set highlight amount for buttons or widgets
887+ lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
888 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
889 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
890- listviewstyle = 1 # 0 = nothing, 1 = dotted
891- menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
892- menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
893+ listviewstyle = 0 # 0 = nothing, 1 = dotted
894+ menubaritemstyle = 1 # 0 = menuitem look, 1 = button look
895+ menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
896 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
897 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
898- progressbarstyle = 1 # 0 = flat, 1 = striped, 2 = blocks
899- reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow
900- rgba = FALSE # FALSE = disabled, TRUE = enabled
901+ prelight_shade = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
902+ progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
903+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
904+ rgba = FALSE # FALSE = disabled, TRUE = enabled
905 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
906- #scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
907+ scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
908+ shadow_shades = { 0.8, 2.2 }
909 sliderstyle = 0 # 0 = nothing added, 1 = handles
910- stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = unknown
911- toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient
912+ spinbuttonstyle = 1
913+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
914+ #textstyle = 1
915+ trough_shades = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
916+ toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
917 }
918 }
919
920@@ -114,13 +123,18 @@
921 }
922
923 style "button" = "wider"
924-{
925- bg[NORMAL] = shade (1.2, @bg_color)
926- bg[PRELIGHT] = shade (0.9, @bg_color) #mix(0.82,shade (1.3, @bg_color),@selected_bg_color)
927+{
928+ bg[NORMAL] = shade (1.10, @bg_color)
929+ bg[PRELIGHT] = shade(1.05, "#dcd8d5")
930 bg[ACTIVE] = shade (0.85, @bg_color)
931
932- engine "murrine"{
933- contrast = 1.5
934+ engine "murrine"
935+ {
936+ border_shades = { .8, .5} # draw a gradient on the border.
937+ #border_colors = { "#C1BDB5", "#D9D4CC" }
938+ border_colors = { @bg_color, @bg_color}
939+ contrast = 1.4
940+ lightborder_shade = 1.06
941 }
942 }
943
944@@ -155,26 +169,26 @@
945 image {
946 function = HANDLE
947 overlay_file = "handlebox.png"
948- overlay_stretch = FALSE
949+ overlay_stretch = FALSE
950 orientation = HORIZONTAL
951 }
952 image {
953 function = HANDLE
954 overlay_file = "handlebox.png"
955- overlay_stretch = FALSE
956+ overlay_stretch = FALSE
957 orientation = VERTICAL
958 }
959- image
960- {
961- function = VLINE
962- recolorable = TRUE
963- file = "blank.png"
964- }
965- image
966- {
967- function = HLINE
968- recolorable = TRUE
969- file = "blank.png"
970+ image
971+ {
972+ function = VLINE
973+ recolorable = TRUE
974+ file = "blank.png"
975+ }
976+ image
977+ {
978+ function = HLINE
979+ recolorable = TRUE
980+ file = "blank.png"
981 }
982 }
983 }
984@@ -200,21 +214,17 @@
985 bg[NORMAL] = shade(0.5, @bg_color)
986 }
987
988-style "notebook-bg" = "wider"
989+style "notebook" = "wider"
990 {
991- bg[NORMAL] = shade (1.05, @bg_color)
992- bg[SELECTED] = shade (1.05, @bg_color)
993- bg[ACTIVE] = shade(0.75,@bg_color)
994-}
995+ bg[NORMAL] = shade (1.0615, @bg_color)
996+ bg[ACTIVE] = shade (0.85, @bg_color)
997
998-style "notebook" = "notebook-bg"
999-{
1000- engine "murrine"{
1001- contrast = 1.1
1002- highlight_shade = 1.2
1003- lightborder_shade = 1.1
1004- gradient_shades = {1.0,0.85,0.8,1.0}
1005- }
1006+ engine "murrine"
1007+ {
1008+ contrast = 1.0
1009+ lightborder_shade = 1.1
1010+ highlight_shade = 1.01
1011+ }
1012 }
1013
1014 style "panel" {
1015@@ -261,15 +271,10 @@
1016 ythickness = 1
1017
1018 bg[NORMAL] = shade(0.9, @bg_color)
1019- bg[PRELIGHT] = shade(1.0, @bg_color)
1020- bg[ACTIVE] = shade(0.8, @bg_color)
1021+ bg[PRELIGHT] = shade(1.0, @bg_color)
1022+ bg[ACTIVE] = shade(0.8, @bg_color)
1023
1024- engine "murrine"{
1025- contrast = 1.1
1026- highlight_shade = 1.2
1027- lightborder_shade = 1.1
1028- gradient_shades = {0.9,0.87,0.85,0.9}
1029- }
1030+ GtkWidget::focus-line-width = 0
1031 }
1032
1033 style "tooltips"
1034@@ -332,7 +337,7 @@
1035 }
1036 }
1037
1038-style "comboboxentry"
1039+style "comboboxentry" = "wider"
1040 {
1041 }
1042
1043@@ -404,15 +409,45 @@
1044 {
1045 text[NORMAL] = @selected_fg_color # Color for selected checks/radio items.
1046 text[PRELIGHT] = @selected_fg_color # Color for selected checks/radio items on prelight.
1047- engine "murrine"{
1048- roundness = 2
1049- contrast = 1.03
1050- highlight_shade = 1.0
1051- lightborder_shade = 1.0
1052- gradient_shades = {1.1,1.0,1.0,0.9}
1053- reliefstyle = 2
1054- }
1055-}
1056+
1057+ engine "murrine"
1058+ {
1059+ roundness = 2
1060+ contrast = 1.03
1061+ highlight_shade = 1.0
1062+ lightborder_shade = 1.0
1063+ gradient_shades = {1.1,1.0,1.0,0.9}
1064+ reliefstyle = 2
1065+ }
1066+}
1067+
1068+style "scrollbar"
1069+{
1070+ engine "murrine"
1071+ {
1072+ border_shades = { .5, .5} # draw a gradient on the border.
1073+ border_colors = { "#D9D4CC", "#D9D4CC" }
1074+ glazestyle = 3 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
1075+ glow_shade = 1.1 # sets glow amount for buttons or widgets
1076+ glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
1077+ gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
1078+ highlight_shade = 1.1 # set highlight amount for buttons or widgets
1079+ lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
1080+ roundness = 5
1081+ }
1082+
1083+
1084+ bg[SELECTED] = shade (0.6, @bg_color)
1085+}
1086+
1087+style "hscrollbar"
1088+{
1089+}
1090+
1091+style "vscrollbar"
1092+{
1093+}
1094+
1095 #########################################
1096 # Matches
1097 #########################################
1098@@ -427,6 +462,8 @@
1099 class "GtkEntry" style "entry"
1100 class "GtkStatusbar" style "pixmap-statusbar"
1101 class "GtkMenuBar" style:highest "menubar"
1102+class "GtkRadioButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
1103+class "GtkCheckButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
1104
1105 class "*HandleBox" style "toolbar"
1106 class "GtkToolbar" style "toolbar"
1107@@ -455,20 +492,21 @@
1108 class "GtkScale" style "scale"
1109 class "GtkVScale" style "scale"
1110 class "GtkHScale" style "scale"
1111-#class "GtkScrollbar" style "scrollbar"
1112+class "GtkScrollbar" style "scrollbar"
1113+class "GtkVScrollbar" style "vscrollbar"
1114+class "GtkHScrollbar" style "hscrollbar"
1115 class "GtkButton" style "button"
1116
1117-class "GtkRadioButton" style:highest "radiocheck" # SZ07: Added for the checkmarks/radio
1118-class "GtkCheckButton" style:highest "radiocheck" # SZ07: Added for the checkmarks/radio
1119-
1120-# General matching following, the order is choosen so that the right styles override each other
1121-# eg. progressbar needs to be more important then the menu match.
1122-
1123-widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook-bg"
1124-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook-bg"
1125-widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook-bg"
1126+# General matching following, the order is choosen so that the right styles override each other
1127+# eg. progressbar needs to be more important then the menu match.
1128+
1129+# General matching following, the order is choosen so that the right styles override each other
1130+# eg. progressbar needs to be more important then the menu match.
1131+
1132+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook"
1133+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook"
1134+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook"
1135 widget_class "*<GtkNotebook>" style "notebook"
1136-
1137 widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
1138 widget_class "*<GtkCombo>*" style "comboboxentry"
1139
1140@@ -507,25 +545,6 @@
1141 widget "*Xfce*Panel*" style "panel"
1142 class "*Xfce*Panel*" style "panel"
1143
1144-# The following lines make panel-menu-applet, slab-main-menu and gimmie applet's text bold. The radius value sets the roundness value of the selected menu-item.
1145-style "bold-panel-menu"
1146-{
1147- font_name = "Bold"
1148-
1149- engine "murrine" {
1150- roundness = 2
1151- }
1152-}
1153-
1154-style "bold-panel-slab"
1155-{
1156- font_name = "Bold"
1157-}
1158-widget "*Panel*slab-main-menu-panel-button*" style "bold-panel-slab"
1159-widget "*gimmie*" style "bold-panel-slab"
1160-widget "*Panel*MenuBar*" style "bold-panel-menu"
1161-widget "*Panel*Clock*" style "bold-panel-menu"
1162-
1163 widget "gtk-tooltip*" style "tooltips"
1164
1165 ###################################################
1166@@ -580,7 +599,7 @@
1167
1168 style "evo-new-button-workaround"
1169 {
1170- engine "clearlooks"
1171+ engine "murrine"
1172 {
1173 toolbarstyle = 0
1174 }
1175@@ -593,7 +612,7 @@
1176 {
1177 xthickness = 3
1178 ythickness = 3
1179- engine "clearlooks" {
1180+ engine "murrine" {
1181 }
1182 }
1183 widget "*RBSourceHeader*" style:highest "rhythmbox-header"
1184
1185=== removed symlink 'Dust Sand/gtk-2.0/scrollbars'
1186=== target was '../../Dust/gtk-2.0/scrollbars/'
1187=== modified file 'Dust Sand/metacity-1/metacity-theme-1.xml'
1188--- Dust Sand/metacity-1/metacity-theme-1.xml 2009-08-08 02:09:42 +0000
1189+++ Dust Sand/metacity-1/metacity-theme-1.xml 2010-03-01 02:27:14 +0000
1190@@ -242,19 +242,19 @@
1191
1192 <!-- menu icon -->
1193 <draw_ops name="button_menu_normal">
1194-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
1195+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
1196 </draw_ops>
1197 <draw_ops name="button_menu_prelight">
1198-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
1199+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
1200 </draw_ops>
1201 <draw_ops name="button_menu_inactive_prelight">
1202-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
1203+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
1204 </draw_ops>
1205 <draw_ops name="button_menu_pressed">
1206-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
1207+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
1208 </draw_ops>
1209 <draw_ops name="button_menu_inactive">
1210-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
1211+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
1212 </draw_ops>
1213
1214
1215
1216=== modified file 'Dust/gtk-2.0/gtkrc'
1217--- Dust/gtk-2.0/gtkrc 2009-10-10 08:32:48 +0000
1218+++ Dust/gtk-2.0/gtkrc 2010-03-01 02:27:14 +0000
1219@@ -1,17 +1,18 @@
1220 # Dust theme
1221-# (c) 2009 Rico Sta. Cruz, Kido Mariano, James Schriver
1222+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
1223 # Licensed under the GPL.
1224-
1225-gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#996B5C\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
1226-
1227-include "scrollbars/scrollbar.rc"
1228+# Requires Murrine GTK Engine v0.91.0
1229+
1230+gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
1231
1232 style "default"
1233 {
1234 xthickness = 1
1235 ythickness = 1
1236
1237- GtkScrolledWindow ::scrollbar-spacing = 0
1238+ GtkWidget::link-color = "#3399ff"
1239+
1240+ GtkScrolledWindow ::scrollbar-spacing = 1
1241 GtkScrolledWindow ::scrollbar-within-bevel = 0
1242
1243 GtkButton::child-displacement-x = 1
1244@@ -22,9 +23,9 @@
1245
1246 GtkPaned::handle-size = 6
1247
1248- GtkRange::trough-border = 1
1249- GtkRange::slider-width = 12
1250- GtkRange::stepper-size = 12
1251+ GtkRange::trough-border = 2
1252+ GtkRange::slider-width = 13
1253+ GtkRange::stepper-size = 14
1254 GtkRange::trough-under-steppers = 1
1255
1256 GtkScale::slider-length = 18
1257@@ -72,33 +73,42 @@
1258 text[SELECTED] = @selected_fg_color
1259 text[INSENSITIVE] = darker (@bg_color)
1260
1261- engine "murrine" {
1262- #options
1263+engine "murrine"
1264+ {
1265 animation = TRUE # FALSE = disabled, TRUE = enabled
1266- colorize_scrollbar = FALSE # FALSE = disabled, TRUE = enabled
1267- contrast = 0.8 # 0.8 for less contrast, more than 1.0 for more contrast on borders
1268- glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
1269- glow_shade = 1.2
1270- glowstyle = 2 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
1271- gradient_shades = {1.1,1.0,1.0,0.87}
1272- gradients = TRUE
1273- highlight_shade = 1.0
1274- lightborder_shade = 1.1
1275+ arrowstyle = 1
1276+ border_shades = { 1.2, 1.0 } # gradient to draw on border
1277+# border_colors = { "#E6DDD5", "#E6DDD5" }
1278+ colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
1279+ comboboxstyle = 0 # colorize the GtkComboBox below the arrow.
1280+ contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
1281+ #focus_color = @selected_bg_color
1282+ glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
1283+ glow_shade = 1.20 # sets glow amount for buttons or widgets
1284+ glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
1285+ gradient_shades = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
1286+ highlight_shade = 1.0 # set highlight amount for buttons or widgets
1287+ lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
1288 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
1289 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
1290- listviewstyle = 1 # 0 = nothing, 1 = dotted
1291- menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
1292- menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
1293+ listviewstyle = 0 # 0 = nothing, 1 = dotted
1294+ menubaritemstyle = 1 # 0 = menuitem look, 1 = button look
1295+ menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
1296 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
1297 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
1298- progressbarstyle = 1 # 0 = flat, 1 = striped, 2 = blocks
1299- reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow
1300- rgba = FALSE # FALSE = disabled, TRUE = enabled
1301+ prelight_shade = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
1302+ progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
1303+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
1304+ rgba = FALSE # FALSE = disabled, TRUE = enabled
1305 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
1306- #scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
1307+ scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
1308+ shadow_shades = { 0.8, 2.2 }
1309 sliderstyle = 0 # 0 = nothing added, 1 = handles
1310- stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = unknown
1311- toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient
1312+ spinbuttonstyle = 1
1313+ stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
1314+ #textstyle = 1
1315+ trough_shades = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
1316+ toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient
1317 }
1318 }
1319
1320@@ -131,12 +141,18 @@
1321 }
1322
1323 style "button" = "wider"
1324-{
1325- bg[NORMAL] = shade (1.15, @bg_color)
1326- bg[PRELIGHT] = shade (1.03, @bg_color) #mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
1327+{
1328+ bg[NORMAL] = shade (1.10, @bg_color)
1329+ bg[PRELIGHT] = mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
1330 bg[ACTIVE] = shade (0.85, @bg_color)
1331- engine "murrine"{
1332- contrast = 1.5
1333+
1334+ engine "murrine"
1335+ {
1336+ border_shades = { .8, .5} # draw a gradient on the border.
1337+ #border_colors = { "#D9D4CC", "#D9D4CC" }
1338+ border_colors = { @bg_color, @bg_color}
1339+ contrast = 1.4
1340+ lightborder_shade = 1.06
1341 }
1342 }
1343
1344@@ -152,7 +168,7 @@
1345 }
1346 }
1347
1348-style "toolbar-item" = "wide"
1349+style "toolbar-item" = "button"
1350 {
1351 bg[NORMAL] = "#AFA99F" #shade(0.88,@bg_color)
1352 bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
1353@@ -167,37 +183,11 @@
1354
1355 style "toolbar" = "toolbar-item"
1356 {
1357- engine "pixmap"
1358- {
1359- image {
1360- function = BOX
1361- file = "toolbar_light.png"
1362- border = {1,1,1,1}
1363- }
1364- image {
1365- function = HANDLE
1366- overlay_file = "handlebox.png"
1367- overlay_stretch = FALSE
1368- orientation = HORIZONTAL
1369- }
1370- image {
1371- function = HANDLE
1372- overlay_file = "handlebox.png"
1373- overlay_stretch = FALSE
1374- orientation = VERTICAL
1375- }
1376- image
1377- {
1378- function = VLINE
1379- recolorable = TRUE
1380- file = "blank.png"
1381- }
1382- image
1383- {
1384- function = HLINE
1385- recolorable = TRUE
1386- file = "blank.png"
1387- }
1388+ xthickness = 1
1389+ ythickness = 1
1390+ engine "murrine"{
1391+ gradient_shades = { 1.00, 0.94, 0.94, 0.85 }
1392+ contrast = 1.15
1393 }
1394 }
1395
1396@@ -209,14 +199,23 @@
1397
1398 style "dark-toolbar" = "dark"
1399 {
1400- xthickness = 2
1401- ythickness = 2
1402+ xthickness = 3
1403+ ythickness = 3
1404 bg[NORMAL] = "#343330"
1405- bg[PRELIGHT] = mix (0.25, @selected_bg_color, "#343330")
1406- bg[SELECTED] = mix (0.25, @selected_bg_color, "#343330")#shade(0.2,@bg_color))
1407- bg[ACTIVE] = mix (0.5, @selected_bg_color, "#343330")
1408-
1409- engine "murrine"{
1410+ bg[PRELIGHT] = shade (0.65, @selected_bg_color)
1411+ bg[SELECTED] = shade (0.35, @bg_color)
1412+ bg[ACTIVE] = shade (0.35, @bg_color)
1413+
1414+ engine "murrine"
1415+ {
1416+ border_shades = {1.3, 1.1} # draw a gradient on the border.
1417+ border_colors = { "#343330", "#343330" }
1418+ glowstyle = 4
1419+ gradient_shades = {1.05,1.0,1.0,0.9}
1420+ highlight_shade = 1.1
1421+ lightborder_shade = 1.05
1422+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
1423+ contrast = 1.4
1424 }
1425 }
1426
1427@@ -226,6 +225,8 @@
1428
1429 style "pixmap-dark-toolbar" = "dark-toolbar"
1430 {
1431+ xthickness = 1
1432+ ythickness = 1
1433 # To-do: make the toolbar recolorable, possibly without using pixmaps
1434 # We only like this because of the top line, anyway.
1435 engine "pixmap"{
1436@@ -248,42 +249,73 @@
1437 overlay_stretch = FALSE
1438 orientation = VERTICAL
1439 }
1440- image
1441- {
1442- function = VLINE
1443- recolorable = TRUE
1444- file = "blank.png"
1445- }
1446- image
1447- {
1448- function = HLINE
1449- recolorable = TRUE
1450- file = "blank.png"
1451- }
1452- }
1453-}
1454-
1455-style "notebook-bg" = "wider"
1456-{
1457- bg[NORMAL] = shade (1.05, @bg_color)
1458- bg[ACTIVE] = shade(0.75,@bg_color)
1459-}
1460-
1461-style "notebook" = "notebook-bg"
1462-{
1463- engine "murrine"{
1464- contrast = 1.1
1465- highlight_shade = 1.2
1466- lightborder_shade = 1.1
1467- gradient_shades = {1.0,0.85,0.8,1.0}
1468- }
1469-}
1470-
1471-style "panel" = "dark" {
1472- bg[NORMAL] = "#2C2B29"
1473- engine "murrine" {
1474- }
1475-}
1476+ image
1477+ {
1478+ function = VLINE
1479+ recolorable = TRUE
1480+ file = "blank.png"
1481+ }
1482+ image
1483+ {
1484+ function = HLINE
1485+ recolorable = TRUE
1486+ file = "blank.png"
1487+ }
1488+ }
1489+}
1490+
1491+style "notebook" = "wider"
1492+{
1493+ bg[NORMAL] = shade (1.0615, @bg_color)
1494+ bg[ACTIVE] = shade (0.85, @bg_color)
1495+
1496+ engine "murrine"
1497+ {
1498+ contrast = 1.0
1499+ lightborder_shade = 1.1
1500+ highlight_shade = 1.01
1501+ }
1502+}
1503+
1504+style "panel"
1505+{
1506+ #bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
1507+ #bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
1508+ bg[NORMAL] = "#343330"
1509+ bg[PRELIGHT] = shade(1.0, @selected_bg_color) # panel prelight
1510+ bg[ACTIVE] = @selected_bg_color # bottom panel active background
1511+ bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background [ ] [ ] (orange)
1512+ bg[INSENSITIVE] = shade(0.90, @selected_bg_color) #
1513+
1514+ fg[NORMAL] = @selected_fg_color # Default text
1515+ fg[PRELIGHT] = @selected_fg_color # Prelight
1516+ fg[ACTIVE] = @selected_fg_color # Bottom panel active text
1517+ fg[SELECTED] = @fg_color # Bottom panel selected window
1518+
1519+}
1520+
1521+style "murrine-PanelGtkMenubar"
1522+{
1523+ #bg[NORMAL] = "#2D2519" # top desktop panel menu background color
1524+ bg[NORMAL] = "#343330"
1525+ bg[SELECTED] = darker(@selected_bg_color) # selected item background
1526+ fg[NORMAL] = @bg_color # default panel text !
1527+ fg[PRELIGHT] = @base_color # text after dropdown menu
1528+
1529+ #font_name = "Bold"
1530+
1531+ engine "murrine"
1532+ {
1533+ # Panel Menubar Tab
1534+ contrast = 0.75
1535+ glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
1536+ glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
1537+ glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
1538+ #roundness = 2
1539+ }
1540+}
1541+
1542+widget "*clock-applet-button*" style "dark-toolbar"
1543
1544 style "menu" = "dark"
1545 {
1546@@ -291,7 +323,7 @@
1547 ythickness = 0
1548
1549 #Keep it this dark since OOo likes it
1550- bg[NORMAL] = "#302F2C"
1551+ bg[NORMAL] = "#343330"
1552 text[NORMAL] = @bg_color
1553 text[PRELIGHT] = @selected_fg_color
1554 }
1555@@ -300,12 +332,15 @@
1556 {
1557 xthickness = 0
1558 ythickness = 3
1559- engine "murrine" {
1560- glowstyle = 0
1561- roundness = 0
1562- highlight_shade = 1.0
1563- lightborder_shade = 1.0
1564- gradient_shades = {1.1,1.0,1.0,0.7}
1565+ engine "murrine"
1566+ {
1567+ border_shades = { 1.0, .8} # draw a gradient on the border.
1568+ border_colors = { "#795145", "#795145" }
1569+ glowstyle = 0
1570+ gradient_shades = {1.1,1.0,1.0,0.7}
1571+ highlight_shade = 1.0
1572+ lightborder_shade = 1.0
1573+ roundness = 0
1574 }
1575 }
1576
1577@@ -324,19 +359,14 @@
1578 # style are overriden again.
1579 style "treeview-header" = "default"
1580 {
1581- xthickness = 1
1582+ xthickness = 2
1583 ythickness = 1
1584
1585- bg[NORMAL] = shade(0.9, @bg_color)
1586- bg[PRELIGHT] = shade(1.0, @bg_color)
1587- bg[ACTIVE] = shade(0.8, @bg_color)
1588+ bg[NORMAL] = shade(0.9, @bg_color)
1589+ bg[PRELIGHT] = shade(1.0, @bg_color)
1590+ bg[ACTIVE] = shade(0.8, @bg_color)
1591
1592- engine "murrine"{
1593- contrast = 1.1
1594- highlight_shade = 1.2
1595- lightborder_shade = 1.1
1596- gradient_shades = {0.9,0.87,0.85,0.9}
1597- }
1598+ GtkWidget::focus-line-width = 0
1599 }
1600
1601 style "tooltips"
1602@@ -400,7 +430,7 @@
1603 }
1604 }
1605
1606-style "comboboxentry"
1607+style "comboboxentry" = "wider"
1608 {
1609 }
1610
1611@@ -426,6 +456,8 @@
1612 # Static dark color so continuity doesn't break with toolbars
1613 # when color changes
1614 bg[NORMAL] = "#343330"
1615+ text[NORMAL] = @bg_color # Menubar text (OOo) # Menubar text (OOo)
1616+
1617 engine "pixmap"
1618 {
1619 image {
1620@@ -467,14 +499,43 @@
1621 {
1622 text[NORMAL] = @selected_fg_color # Color for selected checks/radio items.
1623 text[PRELIGHT] = @selected_fg_color # Color for selected checks/radio items on prelight.
1624- engine "murrine"{
1625- roundness = 2
1626- contrast = 1.03
1627- highlight_shade = 1.0
1628- lightborder_shade = 1.0
1629- gradient_shades = {1.1,1.0,1.0,0.9}
1630- reliefstyle = 2
1631- }
1632+
1633+ engine "murrine"
1634+ {
1635+ roundness = 2
1636+ contrast = 1.03
1637+ highlight_shade = 1.0
1638+ lightborder_shade = 1.0
1639+ gradient_shades = {1.1,1.0,1.0,0.9}
1640+ reliefstyle = 2
1641+ }
1642+}
1643+
1644+style "scrollbar"
1645+{
1646+ engine "murrine"
1647+ {
1648+ border_shades = { .5, .5} # draw a gradient on the border.
1649+ border_colors = { "#D9D4CC", "#D9D4CC" }
1650+ glazestyle = 3 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
1651+ glow_shade = 1.1 # sets glow amount for buttons or widgets
1652+ glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
1653+ gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
1654+ highlight_shade = 1.1 # set highlight amount for buttons or widgets
1655+ lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
1656+ roundness = 5
1657+ }
1658+
1659+
1660+ bg[SELECTED] = shade (0.6, @bg_color)
1661+}
1662+
1663+style "hscrollbar"
1664+{
1665+}
1666+
1667+style "vscrollbar"
1668+{
1669 }
1670
1671 style "nautilus-location"
1672@@ -496,8 +557,8 @@
1673 class "GtkEntry" style "entry"
1674 class "GtkStatusbar" style "pixmap-statusbar"
1675 class "GtkMenuBar" style:highest "menubar"
1676-class "GtkRadioButton" style:highest "radiocheck" # SZ07: Added for the checkmarks/radio
1677-class "GtkCheckButton" style:highest "radiocheck" # SZ07: Added for the checkmarks/radio
1678+class "GtkRadioButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
1679+class "GtkCheckButton" style "radiocheck" # SZ07: Added for the checkmarks/radio
1680
1681 # Toolbar default: dark
1682 #class "*HandleBox" style "pixmap-dark-toolbar"
1683@@ -571,26 +632,36 @@
1684
1685 #Totem
1686 widget "*totem*" style "dark"
1687-style "totem-sidebar-workaround" {
1688+style "totem-dark" {
1689 text[NORMAL] = mix (0.7, '#ffffef', @fg_color)
1690 text[PRELIGHT] = mix (0.8, '#ffffef', @fg_color)
1691+ engine "murrine"
1692+ {
1693+ border_colors = { "#343330", "#343330" }
1694+ }
1695 }
1696-widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-sidebar-workaround"
1697+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-dark"
1698+widget "*tmw_main_pane*GtkButton*" style "totem-dark" #Doesn't work
1699+widget "*tmw_main_pane*GtkToolButton" style "totem-dark"
1700+widget "*tmw_main_pane*GtkToggleButton" style "totem-dark"
1701+
1702
1703 class "GtkSpinButton" style "spinbutton"
1704 class "GtkScale" style "scale"
1705 class "GtkVScale" style "scale"
1706 class "GtkHScale" style "scale"
1707-#class "GtkScrollbar" style "scrollbar"
1708+class "GtkScrollbar" style "scrollbar"
1709+class "GtkVScrollbar" style "vscrollbar"
1710+class "GtkHScrollbar" style "hscrollbar"
1711 class "GtkButton" style "button"
1712
1713 # General matching following, the order is choosen so that the right styles override each other
1714 # eg. progressbar needs to be more important then the menu match.
1715
1716-widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook-bg"
1717-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook-bg"
1718-widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook-bg"
1719-widget_class "*<GtkNotebook>" style "notebook"
1720+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook"
1721+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook"
1722+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook"
1723+widget_class "*<GtkNotebook>" style "notebook"
1724
1725 widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
1726 widget_class "*<GtkCombo>*" style "comboboxentry"
1727@@ -599,6 +670,8 @@
1728 widget_class "*<GtkMenu>*" style "menu"
1729 widget_class "*<GtkMenuItem>" style "menu-item"
1730 widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item"
1731+widget_class "*<GtkCheckMenuItem>*" style "radiocheck"
1732+widget_class "*<GtkRadioMenuItem>*" style "radiocheck"
1733
1734 widget_class "*<GtkFrame>" style "frame"
1735 widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title"
1736@@ -612,15 +685,15 @@
1737 widget_class "*.<GtkList>.<GtkButton>" style "treeview-header"
1738 widget_class "*.<GtkCList>.<GtkButton>" style "treeview-header"
1739
1740-# Panel stuff
1741-widget "*PanelWidget*" style "panel"
1742-widget "*PanelApplet*" style "panel"
1743-widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet
1744-class "PanelApp*" style "panel"
1745-class "PanelToplevel*" style "panel"
1746-widget_class "*Panel*<GtkMenuBar>*" style:highest "panel" # The panel menubar
1747-widget "*TomboyTray*" style "panel" # Workaround for Tomboy
1748-widget "*TomboyApplet*" style "panel"
1749+#Panel
1750+widget "*PanelWidget*" style "panel"
1751+widget "*PanelApplet*" style "panel"
1752+widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet
1753+class "PanelApp*" style "panel"
1754+class "PanelToplevel*" style "panel"
1755+
1756+# The panel menubar
1757+widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar"
1758
1759 #XFCE panel
1760 widget_class "*notif*" style "panel"
1761@@ -630,25 +703,6 @@
1762 widget "*Xfce*Panel*" style "panel"
1763 class "*Xfce*Panel*" style "panel"
1764
1765-# The following lines make panel-menu-applet, slab-main-menu and gimmie applet's text bold. The radius value sets the roundness value of the selected menu-item.
1766-style "bold-panel-menu"
1767-{
1768- font_name = "Bold"
1769-
1770- engine "murrine" {
1771- roundness = 2
1772- }
1773-}
1774-
1775-style "bold-panel-slab"
1776-{
1777- font_name = "Bold"
1778-}
1779-widget "*Panel*slab-main-menu-panel-button*" style "bold-panel-slab"
1780-widget "*gimmie*" style "bold-panel-slab"
1781-widget "*Panel*MenuBar*" style "bold-panel-menu"
1782-widget "*Panel*Clock*" style "bold-panel-menu"
1783-
1784 widget "gtk-tooltip*" style "tooltips"
1785
1786 ###################################################
1787@@ -733,23 +787,5 @@
1788 widget_class "*CPUFreqApplet*" style:highest "applet-text"
1789
1790 # Firefox specific things:
1791-#widget "MozillaGtkWidget*Frame*" style "default"
1792+#widget "MozillaGtkWidget*Menu*" style "default"
1793 widget "MozillaGtkWidget*Tool*" style "toolbar-item"
1794-
1795-style "dialog" = "dark"
1796-{
1797- bg[NORMAL] = mix(0.4, @selected_bg_color, shade(0.7, @bg_color))
1798- fg[NORMAL] = shade(0.5, @fg_color)
1799- text[NORMAL] = shade(0.5, @text_color)
1800-}
1801-style "dialog-button" = "dark"
1802-{
1803- bg[NORMAL] = shade(0.15, @bg_color)
1804- bg[PRELIGHT] = shade(0.18, @bg_color)
1805-}
1806-
1807-# Dialog boxes...?
1808-# widget_class "*Dialog*" style "dialog"
1809-# widget_class "*Dialog*.*" style "dialog"
1810-# widget_class "*Dialog*.*Button*" style "dialog-button"
1811-
1812
1813=== added file 'Dust/gtk-2.0/panel-bg-dark.png'
1814Binary files Dust/gtk-2.0/panel-bg-dark.png 1970-01-01 00:00:00 +0000 and Dust/gtk-2.0/panel-bg-dark.png 2010-03-01 02:27:14 +0000 differ
1815=== removed directory 'Dust/gtk-2.0/scrollbars'
1816=== removed file 'Dust/gtk-2.0/scrollbars/scrollbar.rc'
1817--- Dust/gtk-2.0/scrollbars/scrollbar.rc 2009-08-08 02:07:09 +0000
1818+++ Dust/gtk-2.0/scrollbars/scrollbar.rc 1970-01-01 00:00:00 +0000
1819@@ -1,330 +0,0 @@
1820-################################################################################
1821-# SCROLLBAR
1822-################################################################################
1823-
1824-style "scrollbar"
1825-{
1826- # The values I set here have to do with the relative size of three graphic elements
1827- # I have used: the slider, the arrow box, and the trough. They all have the same width
1828- # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it
1829- # places the sliders inside the trough with a default 1 pixel border on either side of the slider,
1830- # so that the trough has its width stretched by an additional two pixels(?). Setting the
1831- # trough border makes the arrow box sit on top of the trough squarely, by making sure that
1832- # the trough stays the same width as the arrowbox(?). I could be totally wrong here.
1833- GtkRange::trough_border = 0
1834- GtkRange::slider_width = 17
1835-
1836- # This sets the size of the steppers (arrow buttons on the end of the scrollbar).
1837- # The image I am using is 15x15 pixels, and if I dont set this a one pixel line
1838- # gets cut off of the top of the "up" stepper.
1839- GtkRange::stepper_size = 17
1840-
1841- # Set a minimum length for the slider. Since I set the border on the slider
1842- # image to 15 pixels on either end of the slider I want the min length to be
1843- # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller
1844- # than 30 pixels.
1845- GtkScrollbar::min_slider_length = 30
1846-
1847- engine "pixmap"
1848- {
1849- # Horizontal slider background
1850- image
1851- {
1852- function = BOX
1853- recolorable = TRUE
1854- detail = "trough"
1855- file = "scrollbars/trough-scrollbar-horiz.png"
1856- border = { 30, 30, 0, 0 }
1857- stretch = TRUE
1858- orientation = HORIZONTAL
1859- }
1860-
1861- # Vertical slider background
1862- image
1863- {
1864- function = BOX
1865- recolorable = TRUE
1866- detail = "trough"
1867- file = "scrollbars/trough-scrollbar-vert.png"
1868- border = { 0, 0, 30, 30 }
1869- stretch = TRUE
1870- orientation = VERTICAL
1871- }
1872-
1873- # Normal horizontal slider
1874- image
1875- {
1876- function = SLIDER
1877- recolorable = TRUE
1878- state = NORMAL
1879- file = "scrollbars/slider-horiz.png"
1880- border = { 15, 15, 6, 6 }
1881- stretch = TRUE
1882- orientation = HORIZONTAL
1883- }
1884-
1885- # Horizontal slider (active)
1886- image
1887- {
1888- function = SLIDER
1889- recolorable = TRUE
1890- state = ACTIVE
1891- file = "scrollbars/slider-horiz-prelight.png"
1892- border = { 15, 15, 6, 6 }
1893- stretch = TRUE
1894- orientation = HORIZONTAL
1895- }
1896-
1897- # Horizontal slider (mouse over)
1898- image
1899- {
1900- function = SLIDER
1901- recolorable = TRUE
1902- state = PRELIGHT
1903- file = "scrollbars/slider-horiz-prelight.png"
1904- border = { 15, 15, 6, 6 }
1905- stretch = TRUE
1906- orientation = HORIZONTAL
1907- }
1908-
1909- # Horizontal slider (Insesitive)
1910- image
1911- {
1912- function = SLIDER
1913- recolorable = TRUE
1914- state = INSENSITIVE
1915- file = "scrollbars/slider-horiz.png"
1916- border = { 15, 15, 6, 6 }
1917- stretch = TRUE
1918- orientation = HORIZONTAL
1919- }
1920-
1921- # Normal vertical slider
1922- image
1923- {
1924- function = SLIDER
1925- recolorable = TRUE
1926- state = NORMAL
1927- file = "scrollbars/slider-vert.png"
1928- border = { 6, 6, 15, 15 }
1929- stretch = TRUE
1930- orientation = VERTICAL
1931- }
1932-
1933- # Vertical slider (Active)
1934- image
1935- {
1936- function = SLIDER
1937- recolorable = TRUE
1938- state = ACTIVE
1939- file = "scrollbars/slider-vert.png"
1940- border = { 6, 6, 15, 15 }
1941- stretch = TRUE
1942- orientation = VERTICAL
1943- }
1944-
1945- # Vertical slider (mouse over)
1946- image
1947- {
1948- function = SLIDER
1949- recolorable = TRUE
1950- state = PRELIGHT
1951- file = "scrollbars/slider-vert-prelight.png"
1952- border = { 6, 6, 15, 15 }
1953- stretch = TRUE
1954- orientation = VERTICAL
1955- }
1956-
1957- # Vertical slider (Insesitive)
1958- image
1959- {
1960- function = SLIDER
1961- recolorable = TRUE
1962- state = INSENSITIVE
1963- file = "scrollbars/slider-vert-prelight.png"
1964- border = { 6, 6, 15, 15 }
1965- stretch = TRUE
1966- orientation = VERTICAL
1967- }
1968-
1969-################################################################################
1970-# SCROLLBAR STEPPERS
1971-################################################################################
1972-
1973- # Up
1974- image
1975- {
1976- function = STEPPER
1977- recolorable = TRUE
1978- state = NORMAL
1979- file = "scrollbars/stepper-up.png"
1980- #border = { 2, 2, 2, 2 }
1981- stretch = TRUE
1982- arrow_direction = UP
1983- }
1984- image
1985- {
1986- function = STEPPER
1987- recolorable = TRUE
1988- state = PRELIGHT
1989- file = "scrollbars/stepper-up.png"
1990- #border = { 12, 2, 2, 9 }
1991- stretch = TRUE
1992- arrow_direction = UP
1993- }
1994- image
1995- {
1996- function = STEPPER
1997- recolorable = TRUE
1998- state = ACTIVE
1999- file = "scrollbars/stepper-up.png"
2000- #border = { 12, 2, 2, 9 }
2001- stretch = TRUE
2002- arrow_direction = UP
2003- }
2004- image
2005- {
2006- function = STEPPER
2007- recolorable = TRUE
2008- state = INSENSITIVE
2009- file = "scrollbars/stepper-up.png"
2010- #border = { 12, 2, 2, 9 }
2011- stretch = TRUE
2012- arrow_direction = UP
2013- }
2014-
2015- ######### DOWN ############
2016-
2017-
2018- image
2019- {
2020- function = STEPPER
2021- recolorable = TRUE
2022- state = NORMAL
2023- file = "scrollbars/stepper-down.png"
2024- #border = { 12, 2, 10, 2 }
2025- stretch = TRUE
2026- arrow_direction = DOWN
2027- }
2028- image
2029- {
2030- function = STEPPER
2031- recolorable = TRUE
2032- state = PRELIGHT
2033- file = "scrollbars/stepper-down.png"
2034- #border = { 12, 2, 10, 2 }
2035- stretch = TRUE
2036- arrow_direction = DOWN
2037- }
2038- image
2039- {
2040- function = STEPPER
2041- recolorable = TRUE
2042- state = ACTIVE
2043- file = "scrollbars/stepper-down.png"
2044- #border = { 12, 2, 10, 2 }
2045- stretch = TRUE
2046- arrow_direction = DOWN
2047- }
2048- image
2049- {
2050- function = STEPPER
2051- recolorable = TRUE
2052- state = INSENSITIVE
2053- file = "scrollbars/stepper-down.png"
2054- #border = { 12, 2, 10, 2 }
2055- stretch = TRUE
2056- arrow_direction = DOWN
2057- }
2058-
2059-############ RIGHT ################
2060-
2061- image
2062- {
2063- function = STEPPER
2064- recolorable = TRUE
2065- state = NORMAL
2066- file = "scrollbars/stepper-right.png"
2067- #border = { 2, 9, 2, 13 }
2068- stretch = TRUE
2069- arrow_direction = RIGHT
2070- }
2071- image
2072- {
2073- function = STEPPER
2074- recolorable = TRUE
2075- state = PRELIGHT
2076- file = "scrollbars/stepper-right.png"
2077- #border = { 2, 9, 2, 13 }
2078- stretch = TRUE
2079- arrow_direction = RIGHT
2080- }
2081- image
2082- {
2083- function = STEPPER
2084- recolorable = TRUE
2085- state = ACTIVE
2086- file = "scrollbars/stepper-right.png"
2087- #border = { 2, 9, 2, 13 }
2088- stretch = TRUE
2089- arrow_direction = RIGHT
2090- }
2091- image
2092- {
2093- function = STEPPER
2094- recolorable = TRUE
2095- state = INSENSITIVE
2096- file = "scrollbars/stepper-right.png"
2097- #border = { 2, 9, 2, 13 }
2098- stretch = TRUE
2099- arrow_direction = RIGHT
2100- }
2101-
2102-############### LEFT ###################
2103-
2104-
2105- image
2106- {
2107- function = STEPPER
2108- recolorable = TRUE
2109- state = NORMAL
2110- file = "scrollbars/stepper-left.png"
2111- #border = { 2, 9, 2, 13 }
2112- stretch = TRUE
2113- arrow_direction = LEFT
2114- }
2115- image
2116- {
2117- function = STEPPER
2118- recolorable = TRUE
2119- state = PRELIGHT
2120- file = "scrollbars/stepper-left.png"
2121- #border = { 2, 9, 2, 13 }
2122- stretch = TRUE
2123- arrow_direction = LEFT
2124- }
2125- image
2126- {
2127- function = STEPPER
2128- recolorable = TRUE
2129- state = ACTIVE
2130- file = "scrollbars/stepper-left.png"
2131- #border = { 2, 9, 2, 13 }
2132- stretch = TRUE
2133- arrow_direction = LEFT
2134- }
2135- image
2136- {
2137- function = STEPPER
2138- recolorable = TRUE
2139- state = INSENSITIVE
2140- file = "scrollbars/stepper-left.png"
2141- #border = { 2, 9, 2, 13 }
2142- stretch = TRUE
2143- arrow_direction = LEFT
2144- }
2145- }
2146-}
2147-class "GtkScrollbar" style "scrollbar"
2148-class "GtkHScrollbar" style "scrollbar"
2149-class "GtkVScrollbar" style "scrollbar"
2150
2151=== removed file 'Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png'
2152Binary files Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png 1970-01-01 00:00:00 +0000 differ
2153=== removed file 'Dust/gtk-2.0/scrollbars/slider-horiz.png'
2154Binary files Dust/gtk-2.0/scrollbars/slider-horiz.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-horiz.png 1970-01-01 00:00:00 +0000 differ
2155=== removed file 'Dust/gtk-2.0/scrollbars/slider-vert-prelight.png'
2156Binary files Dust/gtk-2.0/scrollbars/slider-vert-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-vert-prelight.png 1970-01-01 00:00:00 +0000 differ
2157=== removed file 'Dust/gtk-2.0/scrollbars/slider-vert.png'
2158Binary files Dust/gtk-2.0/scrollbars/slider-vert.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-vert.png 1970-01-01 00:00:00 +0000 differ
2159=== removed file 'Dust/gtk-2.0/scrollbars/stepper-down.png'
2160Binary files Dust/gtk-2.0/scrollbars/stepper-down.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-down.png 1970-01-01 00:00:00 +0000 differ
2161=== removed file 'Dust/gtk-2.0/scrollbars/stepper-left.png'
2162Binary files Dust/gtk-2.0/scrollbars/stepper-left.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-left.png 1970-01-01 00:00:00 +0000 differ
2163=== removed file 'Dust/gtk-2.0/scrollbars/stepper-right.png'
2164Binary files Dust/gtk-2.0/scrollbars/stepper-right.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-right.png 1970-01-01 00:00:00 +0000 differ
2165=== removed file 'Dust/gtk-2.0/scrollbars/stepper-up.png'
2166Binary files Dust/gtk-2.0/scrollbars/stepper-up.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-up.png 1970-01-01 00:00:00 +0000 differ
2167=== removed file 'Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png'
2168Binary files Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png 1970-01-01 00:00:00 +0000 differ
2169=== removed file 'Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png'
2170Binary files Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png 1970-01-01 00:00:00 +0000 differ
2171=== removed directory 'Dust/gtk-2.0/scrollbars_d'
2172=== removed file 'Dust/gtk-2.0/scrollbars_d/scrollbar.rc'
2173--- Dust/gtk-2.0/scrollbars_d/scrollbar.rc 2009-08-08 02:07:09 +0000
2174+++ Dust/gtk-2.0/scrollbars_d/scrollbar.rc 1970-01-01 00:00:00 +0000
2175@@ -1,288 +0,0 @@
2176-############################# scROLLBAR ####################
2177-
2178-style "scrollbar" = "default"
2179-{
2180- GtkRange::trough_border = 0
2181- GtkRange::slider_width = 15
2182- GtkRange::stepper_size = 19
2183-
2184- engine "pixmap"
2185- {
2186- image
2187- {
2188- function = BOX
2189- recolorable = TRUE
2190- detail = "trough"
2191- file = "scrollbars/trough-scrollbar-horiz.png"
2192- border = { 0, 0, 5, 5 }
2193- stretch = TRUE
2194- orientation = HORIZONTAL
2195- }
2196- image
2197- {
2198- function = BOX
2199- recolorable = TRUE
2200- detail = "trough"
2201- file = "scrollbars/trough-scrollbar-vert.png"
2202- border = { 5, 5, 0, 0 }
2203- stretch = TRUE
2204- orientation = VERTICAL
2205- }
2206-
2207-###########x SLIDERS ##################x
2208-
2209- image
2210- {
2211- function = SLIDER
2212- recolorable = TRUE
2213- state = NORMAL
2214- file = "scrollbars/slider-horiz.png"
2215- border = { 5, 5, 0, 0 }
2216- stretch = TRUE
2217- orientation = HORIZONTAL
2218- }
2219- image
2220- {
2221- function = SLIDER
2222- recolorable = TRUE
2223- state = ACTIVE
2224- shadow = IN
2225- file = "scrollbars/slider-horiz.png"
2226- border = { 5, 5, 0, 0 }
2227- stretch = TRUE
2228- orientation = HORIZONTAL
2229-
2230- }
2231- image
2232- {
2233- function = SLIDER
2234- recolorable = TRUE
2235- state = PRELIGHT
2236- file = "scrollbars/slider-horiz-prelight.png"
2237- border = { 5, 5, 0, 0 }
2238- stretch = TRUE
2239- orientation = HORIZONTAL
2240-
2241- }
2242- image
2243- {
2244- function = SLIDER
2245- recolorable = TRUE
2246- state = INSENSITIVE
2247- file = "scrollbars/slider-horiz-insens.png"
2248- border = { 5, 5, 0, 0 }
2249- stretch = TRUE
2250- orientation = HORIZONTAL
2251-
2252- }
2253-
2254-#############x verticals################xx
2255-
2256- image
2257- {
2258- function = SLIDER
2259- recolorable = TRUE
2260- state = NORMAL
2261- file = "scrollbars/slider-vert.png"
2262- border = { 0, 0, 5, 5 }
2263- stretch = TRUE
2264- orientation = VERTICAL
2265-
2266- }
2267- image
2268- {
2269- function = SLIDER
2270- recolorable = TRUE
2271- state = ACTIVE
2272- shadow = IN
2273- file = "scrollbars/slider-vert.png"
2274- border = { 0, 0, 5, 5 }
2275- stretch = TRUE
2276- orientation = VERTICAL
2277-
2278- }
2279- image
2280- {
2281- function = SLIDER
2282- recolorable = TRUE
2283- state = PRELIGHT
2284- file = "scrollbars/slider-vert-prelight.png"
2285- border = { 0, 0, 5, 5 }
2286- stretch = TRUE
2287- orientation = VERTICAL
2288-
2289- }
2290- image
2291- {
2292- function = SLIDER
2293- recolorable = TRUE
2294- state = INSENSITIVE
2295- file = "scrollbars/slider-vert-insens.png"
2296- border = { 0, 0, 5, 5 }
2297- stretch = TRUE
2298- orientation = VERTICAL
2299-
2300- }
2301-
2302-###########x END SLIDERS ##################x
2303-
2304-########### Steppers ######################
2305-#### UP #######
2306- image
2307- {
2308- function = STEPPER
2309- recolorable = TRUE
2310- state = NORMAL
2311- file = "scrollbars/stepper-up.png"
2312- stretch = TRUE
2313- arrow_direction = UP
2314- }
2315- image
2316- {
2317- function = STEPPER
2318- recolorable = TRUE
2319- state = PRELIGHT
2320- file = "scrollbars/stepper-up-prelight.png"
2321- stretch = TRUE
2322- arrow_direction = UP
2323- }
2324- image
2325- {
2326- function = STEPPER
2327- recolorable = TRUE
2328- state = ACTIVE
2329- file = "scrollbars/stepper-up-prelight.png"
2330- stretch = TRUE
2331- arrow_direction = UP
2332- }
2333- image
2334- {
2335- function = STEPPER
2336- recolorable = TRUE
2337- state = INSENSITIVE
2338- file = "scrollbars/stepper-up-insens.png"
2339- stretch = TRUE
2340- arrow_direction = UP
2341- }
2342-
2343- ######### DOWN ############
2344-
2345- image
2346- {
2347- function = STEPPER
2348- recolorable = TRUE
2349- state = NORMAL
2350- file = "scrollbars/stepper-down.png"
2351- stretch = TRUE
2352- arrow_direction = DOWN
2353- }
2354- image
2355- {
2356- function = STEPPER
2357- recolorable = TRUE
2358- state = PRELIGHT
2359- file = "scrollbars/stepper-down-prelight.png"
2360- stretch = TRUE
2361- arrow_direction = DOWN
2362- }
2363- image
2364- {
2365- function = STEPPER
2366- recolorable = TRUE
2367- state = ACTIVE
2368- file = "scrollbars/stepper-down-prelight.png"
2369- stretch = TRUE
2370- arrow_direction = DOWN
2371- }
2372- image
2373- {
2374- function = STEPPER
2375- recolorable = TRUE
2376- state = INSENSITIVE
2377- file = "scrollbars/stepper-down-insens.png"
2378- stretch = TRUE
2379- arrow_direction = DOWN
2380- }
2381-
2382-############ RIGHT ################
2383-
2384- image
2385- {
2386- function = STEPPER
2387- recolorable = TRUE
2388- state = NORMAL
2389- file = "scrollbars/stepper-right.png"
2390- stretch = TRUE
2391- arrow_direction = RIGHT
2392- }
2393- image
2394- {
2395- function = STEPPER
2396- recolorable = TRUE
2397- state = PRELIGHT
2398- file = "scrollbars/stepper-right-prelight.png"
2399- stretch = TRUE
2400- arrow_direction = RIGHT
2401- }
2402- image
2403- {
2404- function = STEPPER
2405- recolorable = TRUE
2406- state = ACTIVE
2407- file = "scrollbars/stepper-right-prelight.png"
2408- stretch = TRUE
2409- arrow_direction = RIGHT
2410- }
2411- image
2412- {
2413- function = STEPPER
2414- recolorable = TRUE
2415- state = INSENSITIVE
2416- file = "scrollbars/stepper-right-insens.png"
2417- stretch = TRUE
2418- arrow_direction = RIGHT
2419- }
2420-
2421-############### LEFT ###################
2422-
2423- image
2424- {
2425- function = STEPPER
2426- recolorable = TRUE
2427- state = NORMAL
2428- file = "scrollbars/stepper-left.png"
2429- stretch = TRUE
2430- arrow_direction = LEFT
2431- }
2432- image
2433- {
2434- function = STEPPER
2435- recolorable = TRUE
2436- state = PRELIGHT
2437- file = "scrollbars/stepper-left-prelight.png"
2438- stretch = TRUE
2439- arrow_direction = LEFT
2440- }
2441- image
2442- {
2443- function = STEPPER
2444- recolorable = TRUE
2445- state = ACTIVE
2446- file = "scrollbars/stepper-left-prelight.png"
2447- stretch = TRUE
2448- arrow_direction = LEFT
2449- }
2450- image
2451- {
2452- function = STEPPER
2453- recolorable = TRUE
2454- state = INSENSITIVE
2455- file = "scrollbars/stepper-left-insens.png"
2456- stretch = TRUE
2457- arrow_direction = LEFT
2458- }
2459- }
2460-}
2461-class "GtkScrollbar" style "scrollbar"
2462-class "GtkHScrollbar" style "scrollbar"
2463-class "GtkVScrollbar" style "scrollbar"
2464
2465=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png'
2466Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png 1970-01-01 00:00:00 +0000 differ
2467=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png'
2468Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png 1970-01-01 00:00:00 +0000 differ
2469=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz.png'
2470Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz.png 1970-01-01 00:00:00 +0000 differ
2471=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png'
2472Binary files Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png 1970-01-01 00:00:00 +0000 differ
2473=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png'
2474Binary files Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png 1970-01-01 00:00:00 +0000 differ
2475=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert.png'
2476Binary files Dust/gtk-2.0/scrollbars_d/slider-vert.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert.png 1970-01-01 00:00:00 +0000 differ
2477=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png'
2478Binary files Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png 1970-01-01 00:00:00 +0000 differ
2479=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png'
2480Binary files Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png 1970-01-01 00:00:00 +0000 differ
2481=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down.png'
2482Binary files Dust/gtk-2.0/scrollbars_d/stepper-down.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down.png 1970-01-01 00:00:00 +0000 differ
2483=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png'
2484Binary files Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png 1970-01-01 00:00:00 +0000 differ
2485=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png'
2486Binary files Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png 1970-01-01 00:00:00 +0000 differ
2487=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left.png'
2488Binary files Dust/gtk-2.0/scrollbars_d/stepper-left.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left.png 1970-01-01 00:00:00 +0000 differ
2489=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png'
2490Binary files Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png 1970-01-01 00:00:00 +0000 differ
2491=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png'
2492Binary files Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png 1970-01-01 00:00:00 +0000 differ
2493=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right.png'
2494Binary files Dust/gtk-2.0/scrollbars_d/stepper-right.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right.png 1970-01-01 00:00:00 +0000 differ
2495=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png'
2496Binary files Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png 1970-01-01 00:00:00 +0000 differ
2497=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png'
2498Binary files Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png 1970-01-01 00:00:00 +0000 differ
2499=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up.png'
2500Binary files Dust/gtk-2.0/scrollbars_d/stepper-up.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up.png 1970-01-01 00:00:00 +0000 differ
2501=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png'
2502Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png 1970-01-01 00:00:00 +0000 differ
2503=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png'
2504Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png 1970-01-01 00:00:00 +0000 differ
2505=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png'
2506Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png 2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png 1970-01-01 00:00:00 +0000 differ
2507=== removed file 'Dust/gtk-2.0/toolbar_light.png'
2508Binary files Dust/gtk-2.0/toolbar_light.png 2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/toolbar_light.png 1970-01-01 00:00:00 +0000 differ
2509=== modified file 'Dust/metacity-1/metacity-theme-1.xml'
2510--- Dust/metacity-1/metacity-theme-1.xml 2009-08-08 02:07:09 +0000
2511+++ Dust/metacity-1/metacity-theme-1.xml 2010-03-01 02:27:14 +0000
2512@@ -2,28 +2,27 @@
2513
2514 <metacity_theme>
2515 <info>
2516- <name>Dust</name>
2517+ <name>Dust Earth</name>
2518 <author>Kido Mariano, Rico Sta. Cruz</author>
2519 <copyright>GPL</copyright>
2520 <date>Jul 28, 2008</date>
2521 <description>Metacity theme</description>
2522- <!-- Based on the Elegant Brit theme (though now really far away from it :P) -->
2523 </info>
2524
2525
2526 <!--
2527 General window layout (geometric stuff)
2528 -->
2529-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true">
2530- <distance name="left_width" value="1"/>
2531- <distance name="right_width" value="1"/>
2532+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true">
2533+ <distance name="left_width" value="6"/>
2534+ <distance name="right_width" value="6"/>
2535 <distance name="bottom_height" value="4"/>
2536- <distance name="left_titlebar_edge" value="2"/>
2537- <distance name="right_titlebar_edge" value="1"/>
2538+ <distance name="left_titlebar_edge" value="6"/>
2539+ <distance name="right_titlebar_edge" value="6"/>
2540 <distance name="button_width" value="28"/>
2541 <distance name="button_height" value="20"/>
2542 <distance name="title_vertical_pad" value="1"/>
2543- <border name="title_border" left="2" right="2" top="3" bottom="3"/>
2544+ <border name="title_border" left="2" right="2" top="3" bottom="0"/>
2545 <border name="button_border" left="0" right="0" top="2" bottom="1"/>
2546 </frame_geometry>
2547
2548@@ -47,13 +46,27 @@
2549 -->
2550
2551 <draw_ops name="draw_title_text_normal">
2552- <title x="1" y="(((height - title_height) / 2) `max` 2) + 1" color="#1F1E1B"/>
2553- <title x="0" y="(((height - title_height) / 2) `max` 2)" color="#FFFFFF"/>
2554-</draw_ops>
2555-
2556-<draw_ops name="draw_title_text_inactive">
2557- <title x="0" y="(((height - title_height) / 2) `max` 2)" color="#727262"/>
2558-</draw_ops>
2559+ <title x="1" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
2560+ <title x="0" y="(height - title_height) / 2" color="#FFFFFF"/>
2561+</draw_ops>
2562+
2563+<draw_ops name="draw_title_text_inactive">
2564+ <title x="0" y="(height - title_height) / 2" color="#727262"/>
2565+</draw_ops>
2566+
2567+<!--Centered titlebar text--><!--
2568+<draw_ops name="draw_title_text_normal">
2569+ <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
2570+ <title x="(width-title_width)/2 + mini_icon_width + 3" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
2571+ <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#FFFFFF"/>
2572+</draw_ops>
2573+
2574+<draw_ops name="draw_title_text_inactive">
2575+ <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height" alpha="0.5"/>
2576+ <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#727262"/>
2577+</draw_ops>-->
2578+
2579+
2580
2581 <!--
2582 Construct titlebar from rectangles instead so we can pick up the GTK theme
2583@@ -61,29 +74,35 @@
2584
2585 <draw_ops name="draw_title">
2586 <!-- Background gradient -->
2587- <gradient type="vertical" x="0" y="0" width="width+9" height="height">
2588+ <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
2589 <!--<color value="#80594D"/>-->
2590- <color value="shade/gtk:bg[SELECTED]/0.7"/>
2591- <!--Static colors to mach static menubar and all-->
2592- <!--color value="#3F3E39" /-->
2593+ <color value="shade/gtk:bg[SELECTED]/0.8"/>
2594+ <!--Static colors to match static menubar and all-->
2595+ <color value="#3F3E39" />
2596 <color value="#3A3936" />
2597 <color value="#373633" />
2598- <!--color value="shade/gtk:bg[NORMAL]/0.29" />
2599- <color value="shade/gtk:bg[NORMAL]/0.27" />
2600- <color value="shade/gtk:bg[NORMAL]/0.25" /-->
2601 <color value="#343330" />
2602- <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
2603 </gradient>
2604
2605- <!-- Topmost dark line -->
2606- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
2607+ <!-- Topmost dark line (not static is shade:0.30) -->
2608+ <line color="#403F3A" x1="0" x2="width" y1="0" y2="0"/>
2609
2610 <!-- Darkening of the left arch -->
2611- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="4" y1="1" y2="1"/>
2612- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="2" y1="2" y2="2"/>
2613- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="3" y2="3"/>
2614- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="4" y2="4"/>
2615- <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="0" y1="5" y2="20"/>
2616+ <line color="#403F3A" x1="0" x2="4" y1="1" y2="1"/>
2617+ <line color="#403F3A" x1="0" x2="2" y1="2" y2="2"/>
2618+ <line color="#403F3A" x1="0" x2="1" y1="3" y2="3"/>
2619+ <line color="#403F3A" x1="0" x2="1" y1="4" y2="4"/>
2620+ <line color="#403F3A" x1="0" x2="0" y1="5" y2="20"/>
2621+
2622+ <!-- Sides -->
2623+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
2624+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2625+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2626+ </gradient>
2627+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
2628+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2629+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2630+ </gradient>
2631
2632 <!-- Top highlight -->
2633 <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
2634@@ -100,7 +119,9 @@
2635 <tint color="#ffffff" alpha="0.12" x="1" y="8" width="1" height="1"/>
2636 <tint color="#ffffff" alpha="0.09" x="1" y="9" width="1" height="1"/>
2637 <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/>
2638- <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
2639+ <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
2640+
2641+ <tint color="#ffffff" alpha="0.15" x="4" y="1" width="1" height="height"/>
2642
2643 <!-- Upper-right highlight -->
2644 <!-- Same as above. -->
2645@@ -115,39 +136,51 @@
2646 <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/>
2647 <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/>
2648
2649+ <tint color="#ffffff" alpha="0.15" x="width-5" y="1" width="1" height="height"/>
2650+
2651 </draw_ops>
2652
2653 <draw_ops name="draw_title_inactive">
2654 <!-- Background gradient -->
2655 <gradient type="vertical" x="0" y="0" width="width+9" height="height">
2656- <color value="#393835" />
2657+ <color value="#3A3936" />
2658 <color value="#343330" />
2659 </gradient>
2660
2661 <!-- Topmost dark line -->
2662- <line color="shade/gtk:bg[NORMAL]/0.25" x1="1" x2="width-2" y1="0" y2="0"/>
2663+ <line color="#343330" x1="1" x2="width-2" y1="0" y2="0"/>
2664 <!-- Top highlight -->
2665 <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/>
2666
2667- <!-- Lower-left highlight -->
2668- <line color="shade/gtk:bg[NORMAL]/0.33" x1="3" x2 ="4" y1="2" y2="2" />
2669- <line color="shade/gtk:bg[NORMAL]/0.32" x1="2" x2 ="2" y1="3" y2="4" />
2670-
2671- <!-- Lower-left higlight fade -->
2672- <gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
2673- <color value="shade/gtk:bg[NORMAL]/0.30"/>
2674- <color value="shade/gtk:bg[NORMAL]/0.25"/>
2675- </gradient>
2676+ <!-- Sides -->
2677+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
2678+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2679+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2680+ </gradient>
2681+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
2682+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2683+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2684+ </gradient>
2685+
2686+ <!-- Upper left highlight -->
2687+ <!--line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
2688+ <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" /-->
2689+
2690+ <!-- Upper left higlight fade -->
2691+ <!--gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
2692+ <color value="#403F3A"/>
2693+ <color value="#343330"/>
2694+ </gradient-->
2695
2696 <!-- Upper right highlight -->
2697- <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-5" x2 ="width-4" y1="2" y2="2" />
2698- <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-3" x2 ="width-3" y1="3" y2="4" />
2699+ <!--line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
2700+ <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" /-->
2701
2702- <!-- Lower-left higlight fade -->
2703- <gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
2704- <color value="shade/gtk:bg[NORMAL]/0.30"/>
2705- <color value="shade/gtk:bg[NORMAL]/0.25"/>
2706- </gradient>
2707+ <!-- Upper right higlight fade -->
2708+ <!--gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
2709+ <color value="#403F3A"/>
2710+ <color value="#343330"/>
2711+ </gradient-->
2712 </draw_ops>
2713
2714 <draw_ops name="draw_title_maximized">
2715@@ -155,15 +188,10 @@
2716 <gradient type="vertical" x="0" y="0" width="width+9" height="height">
2717 <!--<color value="#80594D"/>-->
2718 <color value="shade/gtk:bg[SELECTED]/0.6"/>
2719- <!--Static colors to mach static menubar and all-->
2720- <color value="#3F3E39" />
2721- <color value="#3A3936" />
2722- <color value="#373633" />
2723- <!--color value="shade/gtk:bg[NORMAL]/0.29" />
2724+ <color value="shade/gtk:bg[NORMAL]/0.29" />
2725 <color value="shade/gtk:bg[NORMAL]/0.27" />
2726- <color value="shade/gtk:bg[NORMAL]/0.25" /-->
2727- <color value="#343330" />
2728- <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
2729+ <color value="shade/gtk:bg[NORMAL]/0.25" />
2730+ <color value="shade/gtk:bg[NORMAL]/0.24" />
2731 </gradient>
2732
2733 <!-- Topmost dark line -->
2734@@ -179,8 +207,8 @@
2735 <!-- Background gradient -->
2736 <gradient type="vertical" x="0" y="0" width="width+9" height="height">
2737 <!--<color value="#80594D"/>-->
2738- <color value="#3A3936" />
2739- <color value="#343330" />
2740+ <color value="shade/gtk:bg[NORMAL]/0.27" />
2741+ <color value="shade/gtk:bg[NORMAL]/0.24" />
2742 </gradient>
2743
2744 <!-- Topmost dark line -->
2745@@ -196,23 +224,40 @@
2746 The frame around windows
2747 -->
2748
2749-<draw_ops name="draw_frame">
2750- <rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
2751- <!-- RSC: Subtle gradient on left/right edges to match the menubar -->
2752- <gradient type="vertical" x="0" y="0" width="width" height="100">
2753- <color value="shade/gtk:bg[NORMAL]/0.25"/>
2754- <color value="shade/gtk:bg[NORMAL]/0.15"/>
2755- <color value="shade/gtk:bg[NORMAL]/0.25"/>
2756- </gradient>
2757-</draw_ops>
2758-
2759-<!--Borderless only: make bottom border less apparent. We can do this now since our statusbars are light.-->
2760+<draw_ops name="left_edge">
2761+ <gradient type="horizontal" x="0" y="0" width="width" height="height">
2762+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2763+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2764+ </gradient>
2765+ <tint color="#ffffff" alpha="0.15" x="width-2" y="0" width="1" height="height"/>
2766+</draw_ops>
2767+
2768+<draw_ops name="right_edge">
2769+ <gradient type="horizontal" x="0" y="0" width="width" height="height">
2770+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2771+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2772+ </gradient>
2773+ <tint color="#ffffff" alpha="0.15" x="1" y="0" width="1" height="height"/>
2774+</draw_ops>
2775+
2776 <draw_ops name="bottom_edge">
2777- <rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
2778- <gradient type="vertical" x="1" y="height-6" width="width-2" height="5">
2779- <color value="shade/gtk:bg[NORMAL]/0.85"/>
2780+ <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
2781+
2782+ <!-- Sides -->
2783+
2784+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
2785+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
2786+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2787+ </gradient>
2788+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
2789+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
2790 <color value="shade/gtk:bg[NORMAL]/0.5"/>
2791 </gradient>
2792+
2793+ <!-- White corner arches -->
2794+
2795+ <tint color="#343330" alpha="0.55" x="0" y="height-1" width="width" height="1"/>
2796+
2797 </draw_ops>
2798
2799
2800@@ -315,8 +360,8 @@
2801 <frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
2802 <piece position="title" draw_ops="draw_title_text_normal"/>
2803 <piece position="titlebar" draw_ops="draw_title"/>
2804- <piece position="left_edge" draw_ops="draw_frame"/>
2805- <piece position="right_edge" draw_ops="draw_frame"/>
2806+ <piece position="left_edge" draw_ops="left_edge"/>
2807+ <piece position="right_edge" draw_ops="right_edge"/>
2808 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2809 <button function="close" state="normal" draw_ops="button_close_normal"/>
2810 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
2811@@ -335,8 +380,8 @@
2812 <frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
2813 <piece position="title" draw_ops="draw_title_text_inactive"/>
2814 <piece position="titlebar" draw_ops="draw_title_inactive"/>
2815- <piece position="left_edge" draw_ops="draw_frame"/>
2816- <piece position="right_edge" draw_ops="draw_frame"/>
2817+ <piece position="left_edge" draw_ops="left_edge"/>
2818+ <piece position="right_edge" draw_ops="right_edge"/>
2819 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2820 <button function="close" state="normal" draw_ops="button_close_inactive"/>
2821 <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
2822@@ -355,8 +400,8 @@
2823 <frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
2824 <piece position="title" draw_ops="draw_title_text_normal"/>
2825 <piece position="titlebar" draw_ops="draw_title_maximized"/>
2826- <piece position="left_edge" draw_ops="draw_frame"/>
2827- <piece position="right_edge" draw_ops="draw_frame"/>
2828+ <piece position="left_edge" draw_ops="left_edge"/>
2829+ <piece position="right_edge" draw_ops="right_edge"/>
2830 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2831 <button function="close" state="normal" draw_ops="button_close_normal"/>
2832 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
2833@@ -375,8 +420,8 @@
2834 <frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
2835 <piece position="title" draw_ops="draw_title_text_inactive"/>
2836 <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
2837- <piece position="left_edge" draw_ops="draw_frame"/>
2838- <piece position="right_edge" draw_ops="draw_frame"/>
2839+ <piece position="left_edge" draw_ops="left_edge"/>
2840+ <piece position="right_edge" draw_ops="right_edge"/>
2841 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2842 <button function="close" state="normal" draw_ops="button_close_inactive"/>
2843 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
2844
2845=== modified file 'New Wave Dark Menus/gtk-2.0/default-gtkrc'
2846--- New Wave Dark Menus/gtk-2.0/default-gtkrc 2009-08-08 02:20:59 +0000
2847+++ New Wave Dark Menus/gtk-2.0/default-gtkrc 2010-03-01 02:27:15 +0000
2848@@ -1,7 +1,7 @@
2849 #
2850-#==========================================
2851-# New Wave Pixmap Theme
2852-#==========================================
2853+#==================================================================
2854+# New Wave Pixmap Theme
2855+#==================================================================
2856 #
2857 #
2858 # Based on: Ubuntu Human-Clearlooks
2859@@ -12,20 +12,24 @@
2860 # Former Authors:
2861 # Giuseppe Pennisi <giupenni78@gmail.com>
2862 #
2863-# Feel free to modify and share!
2864-# Licensed under Creative Commons 3.0 Attribution-Noncommercial-Share Alike
2865+# Licensed under Creative Commons 3.0 Attribution-Share Alike
2866+
2867+# You MUST attribute the derivative themes as:
2868+# "Based on the New Wave theme created by Anton Kerezov (dilomo)"
2869+# as well as provide a link to the original.
2870+#==================================================================
2871 #
2872 #---NWC-START---#
2873-# Version: 0.8.1 [29/07/09]
2874+# Version: 0.8.2 [12/12/2009]
2875
2876
2877 # Default color values used in Appearance Manager
2878-gtk_color_scheme = "fg_color: #101010\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #1A1A1A\nselected_bg_color: #FF8F4C\nselected_fg_color: #1A1A1A\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#330606"
2879-# so that we can use pulsation on windows that need attention
2880-gtk-enable-animations = 1
2881-# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1sec intervals)
2882+gtk_color_scheme = "fg_color: #1A1A1A\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #171717\nselected_bg_color:#FFB886\nselected_fg_color: #1D1D1D\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#452222"
2883+gtk-enable-animations = 1 # so that we can use pulsation on windows that need attention
2884+# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1 sec. intervals)
2885 gtk-tooltip-timeout = 970
2886
2887+
2888 #---NWC-END---#
2889
2890 #=========================================================
2891@@ -35,7 +39,7 @@
2892 {
2893 xthickness = 1
2894 ythickness = 1
2895-
2896+
2897 #=========================================================
2898 # General Style Properties
2899 #=========================================================
2900@@ -68,7 +72,7 @@
2901 # These lines enable the New Wave Configurator to modify them. Do not remove or change!
2902
2903 GtkScrollbar ::has-backward-stepper = 1
2904- GtkScrollbar ::has-forward-stepper = 1
2905+ GtkScrollbar ::has-forward-stepper = 1
2906 GtkScrollbar ::has-secondary-backward-stepper = 0
2907 GtkScrollbar ::has-secondary-forward-stepper = 0
2908 #---NWC-END---#
2909@@ -83,6 +87,7 @@
2910 GtkMenu ::vertical-padding = 1
2911 GtkMenu ::horizontal-offset = -1
2912
2913+
2914 GtkExpander ::expander-size = 16
2915
2916 GtkToolbar ::internal-padding = 2
2917@@ -98,14 +103,31 @@
2918
2919 GtkProgressBar ::shadow-type = GTK_SHADOW_NONE
2920
2921+
2922+ #benzea: dilomo: BOX
2923+ #benzea: and the detail string is one of a couple
2924+
2925+ #benzea: "infobar-info",
2926+ #benzea: "infobar-warning",
2927+ #benzea: "infobar-question",
2928+ #benzea: "infobar-error",
2929+ #benzea: "infobar"
2930+
2931 #---NWC-START---#
2932+ #Values used in the New Wave Configurator
2933+
2934 GtkWidget ::cursor-aspect-ratio = 0.05
2935-
2936+
2937 # This is the pulsating rect that appears on newly launched apps
2938 WnckTasklist ::fade-overlay-rect = 1
2939 WnckTasklist ::fade-opacity = 0.6
2940
2941- NautilusIconContainer::highlight_alpha= 145
2942+ NautilusIconContainer::highlight_alpha= 120
2943+
2944+ # The rect. when you drag the mouse to select several files
2945+ NautilusIconContainer::selection_box_color = "#EF9D6E"
2946+ NautilusIconContainer::selection_box_alpha = 60
2947+
2948 #---NWC-END---#
2949
2950 fg[NORMAL] = @fg_color
2951@@ -116,14 +138,14 @@
2952
2953 bg[NORMAL] = @bg_color
2954 bg[PRELIGHT] = shade (1.02, @bg_color)
2955- bg[SELECTED] = mix (0.25, @fg_color, @selected_bg_color)
2956+ bg[SELECTED] = @selected_bg_color #mix (0.25, @fg_color, @selected_bg_color)
2957 bg[INSENSITIVE] = @bg_color
2958 bg[ACTIVE] = shade (0.9, @bg_color)
2959
2960 base[NORMAL] = @base_color
2961 base[PRELIGHT] = shade (0.95, @bg_color)
2962 base[ACTIVE] = shade (0.90, @bg_color)
2963- base[SELECTED] = mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
2964+ base[SELECTED] = @selected_bg_color #mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
2965 base[INSENSITIVE] = @bg_color
2966
2967 text[NORMAL] = @text_color
2968@@ -132,9 +154,76 @@
2969 text[SELECTED] = @selected_fg_color
2970 text[INSENSITIVE] = darker (@bg_color)
2971
2972+ # Colors for the GtkInfobar themeing if you
2973+ # don't want to theme them with images
2974+
2975+ #color["error_bg_color"] = "black"
2976+ #color["error_fg_color"] = "white"
2977+
2978+ #color["info_bg_color"] = "#9EDDFF"
2979+ #color["info_fg_color"] = "#ffffff"
2980+
2981+ #color["warning_bg_color"] = "black"
2982+ #color["warning_fg_color"] = "white"
2983+
2984+ #color["question_bg_color"] = "black"
2985+ #color["question_fg_color"] = "white"
2986+
2987+ #color["other_bg_color"] = "black"
2988+ #color["other_fg_color"] = "white"
2989+
2990
2991 engine "pixmap"
2992 {
2993+ # Info Bar
2994+
2995+ image
2996+ {
2997+ function = BOX
2998+ recolorable = TRUE
2999+ detail = "infobar-info"
3000+ file = "Images/Others/nautilus-infobar-overlay.png"
3001+ border = { 2, 2, 2, 3}
3002+ stretch = TRUE
3003+ }
3004+
3005+ image
3006+ {
3007+ function = BOX
3008+ recolorable = TRUE
3009+ detail = "infobar-warning"
3010+ file = "Images/Others/nautilus-infobar-overlay-warning.png"
3011+ border = { 2, 2, 2, 3}
3012+ stretch = TRUE
3013+ }
3014+ image
3015+ {
3016+ function = BOX
3017+ recolorable = TRUE
3018+ detail = "infobar-error"
3019+ file = "Images/Others/nautilus-infobar-overlay-error.png"
3020+ border = { 2, 2, 2, 3}
3021+ stretch = TRUE
3022+ }
3023+ image
3024+ {
3025+ function = BOX
3026+ recolorable = TRUE
3027+ detail = "infobar-question"
3028+ file = "Images/Others/nautilus-infobar-overlay-question.png"
3029+ border = { 2, 2, 2, 3}
3030+ stretch = TRUE
3031+ }
3032+
3033+ image
3034+ {
3035+ function = BOX
3036+ recolorable = TRUE
3037+ detail = "infobar"
3038+ file = "Images/Others/nautilus-infobar-overlay.png"
3039+ border = { 2, 2, 2, 3}
3040+ stretch = TRUE
3041+ }
3042
3043 # Shadows
3044
3045@@ -184,7 +273,7 @@
3046 shadow = IN
3047 recolorable = TRUE
3048 file = "Images/Frame-Gap/frame-in.png"
3049- border ={ 4, 4, 4,3}
3050+ border ={ 3, 3, 3, 3}
3051 stretch = TRUE
3052 gap_start_file = "Images/Frame-Gap/frame-gapstart-in.png"
3053 gap_start_border = { 4, 0, 4, 0}
3054@@ -201,12 +290,12 @@
3055 shadow = OUT
3056 recolorable = TRUE
3057 file = "Images/Frame-Gap/frame-out.png"
3058- border = { 4, 4, 4, 4}
3059+ border = { 4, 4, 3, 4}
3060 stretch = TRUE
3061 gap_start_file = "Images/Frame-Gap/frame-gapstart-out.png"
3062- gap_start_border = { 4, 0, 4, 0}
3063+ gap_start_border = { 3, 0, 2, 0}
3064 gap_end_file = "Images/Frame-Gap/frame-gapend-out.png"
3065- gap_end_border = { 0, 4, 4, 0}
3066+ gap_end_border = { 0, 3, 2, 0}
3067 gap_side = TOP
3068 }
3069
3070@@ -281,7 +370,7 @@
3071 orientation = HORIZONTAL
3072 }
3073
3074- ## vertical handle
3075+ ## Vertical handle
3076 image
3077 {
3078 function = HANDLE
3079@@ -334,17 +423,17 @@
3080 function = HLINE
3081 recolorable = TRUE
3082 file = "Images/Lines/line-h.png"
3083- #border = { 1, 1, 0, 1 }
3084+ border = { 12, 12, 0, 1 }
3085 stretch = TRUE
3086 }
3087
3088- #@author:dilomo@ focus image used on buttons any derivatives (check box, combo and so on) Now obsolate!
3089+ #@author:dilomo@ Focus image used on button's derivatives (check box, combo and so on)
3090 image
3091 {
3092 function = FOCUS
3093 recolorable = TRUE
3094 file = "Images/Others/focus.png"
3095- border = { 2, 2, 2, 2 }
3096+ border = { 6, 6, 6, 6 }
3097 stretch = TRUE
3098 }
3099
3100@@ -866,7 +955,8 @@
3101 ythickness = 3
3102 }
3103
3104-
3105+style "empty"
3106+{}
3107
3108
3109 #=========================================================
3110@@ -876,45 +966,154 @@
3111 #=========================================================
3112
3113
3114-
3115+# @author:dilomo@ This has to fix the Appearance manager crash
3116 style "newwave-window" = "newwave-wide"
3117-{
3118- engine "pixmap"
3119- {
3120- image
3121- {
3122- function = FLAT_BOX
3123- file = "Images/Others/null.png"
3124- border = {2, 2, 2, 2}
3125- detail = "base"
3126- #stretch = TRUE
3127-
3128- }
3129- }
3130+{
3131+ bg_pixmap[NORMAL] = "Images/Others/null.png"
3132 }
3133
3134-# Fix issues with Gedit in the statusbar
3135-style "newwave-frame" #= "newwave-wide"
3136+
3137+style "newwave-frame" = "newwave-wide"
3138 {
3139-# engine "pixmap"
3140+ # engine "pixmap"
3141 # {
3142 # image
3143 # {
3144 # function = SHADOW
3145 # file = "Images/Others/frame.png"
3146- # border = {1, 1, 1, 1}
3147+ ## border = {1, 1, 1, 1}
3148 # stretch = TRUE
3149-#
3150+
3151 # }
3152 # }
3153 }
3154
3155+
3156+# Fix ugly frames with Gedit in the statusbar
3157+style "newwave-frame-gedit"
3158+{
3159+ engine "pixmap"
3160+ {
3161+ image
3162+ {
3163+
3164+ function = SHADOW
3165+ file = "Images/Others/null.png"
3166+ #border = {1, 1, 1, 1}
3167+ #stretch = TRUE
3168+
3169+ }
3170+ }
3171+}
3172+
3173+style "newwave-frame-panel"
3174+{
3175+ engine "pixmap"
3176+ {
3177+ image
3178+ {
3179+
3180+ function = SHADOW
3181+ file = "Images/Shadows/shadow-etched-out-panel.png"
3182+ border = {2, 2, 2, 2}
3183+ #stretch = TRUE
3184+
3185+ }
3186+ }
3187+}
3188+
3189+# Cool but the selected state is rather ugly and cannot be themed properly
3190+style "newwave-desktop-icon"
3191+{
3192+#1 for activate
3193+NautilusIconContainer::frame_text = 1
3194+NautilusIconContainer::light_info_color = "#DADADA"
3195+NautilusIconContainer::dark_info_color = "#101010"
3196+NautilusIconContainer::prelight_icon_render_mode = 1
3197+NautilusIconContainer::activate_prelight_icon_label = 1
3198+
3199+base[NORMAL] = "black"
3200+base[PRELIGHT] = "black"
3201+base[SELECTED] = "black" #"#7C3320"
3202+base[ACTIVE] = "white"
3203+
3204+text[NORMAL] = "white"
3205+text[PRELIGHT] = "white"
3206+text[SELECTED] = "white"
3207+NautilusIconContainer::normal_alpha = 60
3208+NautilusIconContainer::prelight_alpha = 80
3209+NautilusIconContainer::highlight_alpha = 90
3210+}
3211+
3212+style "newwave-desktop-icon-focus"
3213+{
3214+ engine "pixmap"
3215+ {
3216+ image
3217+ {
3218+ function = FOCUS
3219+ recolorable = TRUE
3220+ file = "Images/Others/focus.png"
3221+ border = { 2, 2, 2, 2 }
3222+ stretch = TRUE
3223+ }
3224+ }
3225+}
3226+
3227+#widget_class "*DesktopIcon*" style "newwave-desktop-icon"
3228+
3229+
3230+#=========================================================
3231+# Icon View
3232+#=========================================================
3233+
3234+# Theme the iconview selected items
3235+style "newwave-iconview"
3236+{
3237+ #GtkIconView::selection-box-color = "black"
3238+ #GtkIconView::selection-box-alpha = 60
3239+
3240+ engine "pixmap"
3241+ {
3242+ image
3243+ {
3244+ function = FLAT_BOX
3245+ recolorable = TRUE
3246+ file = "Images/Others/iconview-item.png"
3247+ border = {3, 3, 3, 3 }
3248+ stretch = TRUE
3249+ }
3250+
3251+ }
3252+}
3253+
3254+widget_class "*IconView" style "newwave-iconview"
3255+
3256+
3257+
3258+#=========================================================
3259+# Assistant (Wizard windows)
3260+#=========================================================
3261+
3262+# Theme properly the assistant
3263+style "newwave-assistant"
3264+{
3265+ bg[SELECTED] ="#9A9A9A"#"#484848"
3266+ fg[SELECTED] ="#F3F3F3"# "#ECECEC"
3267+}
3268+
3269+widget_class "*Assistant*" style "newwave-assistant"
3270+
3271+
3272+
3273 #=========================================================
3274 # Buttons
3275 #=========================================================
3276
3277 style "newwave-button" = "newwave-wider"
3278 {
3279+ #xthickness = 4
3280+ #ythickness = 4
3281
3282 bg[NORMAL] = shade (0.98, @bg_color)
3283 bg[PRELIGHT] = shade (1.04, @bg_color)
3284@@ -931,12 +1130,12 @@
3285 GtkButton::child_displacement_y = 1
3286
3287 # Increase because focus padding is zero
3288- GtkButton::inner-border = {2, 2, 2, 2}
3289+ GtkButton::inner-border = {2, 2,2, 2}
3290
3291 # Use to show glow around default buttons
3292 GtkButton::default-border = { 3, 3, 3, 3}
3293 GtkButton::default-outside-border = { 3, 3, 3, 3}
3294-
3295+ #GtkWidget::draw-border = {3,3,3,3}
3296
3297 engine "pixmap"
3298 {
3299@@ -959,8 +1158,9 @@
3300 function = BOX
3301 state = NORMAL
3302 shadow = OUT
3303+
3304 file = "Images/Buttons/button-normal.png"
3305- border ={ 4, 4, 4, 4 }
3306+ border = {4, 4, 4, 4}
3307 stretch = TRUE
3308 }
3309
3310@@ -969,6 +1169,7 @@
3311 {
3312 function = BOX
3313 state = NORMAL
3314+ #shadow = IN
3315 detail = "buttondefault"
3316 file = "Images/Buttons/button-default.png"
3317 border ={ 4, 4, 4, 4 }
3318@@ -981,7 +1182,7 @@
3319 function = BOX
3320 state = ACTIVE
3321 file = "Images/Buttons/button-pressed.png"
3322- border = { 4, 4, 4, 4 }
3323+ border ={4, 4, 4, 4}
3324 stretch = TRUE
3325 }
3326
3327@@ -995,7 +1196,7 @@
3328 recolorable = TRUE
3329 shadow = IN
3330 file = "Images/Buttons/button-pressed-prelight.png"
3331- border = { 4, 4, 4, 4 }
3332+ border = {4, 4, 4, 4}
3333 stretch = TRUE
3334 }
3335 #@author:dilomo@ prelight used on normal buttons
3336@@ -1006,7 +1207,7 @@
3337 recolorable = TRUE
3338 shadow = OUT
3339 file = "Images/Buttons/button-prelight.png"
3340- border = { 4, 4, 4, 4 }
3341+ border = {4, 4, 4, 4}
3342 stretch = TRUE
3343 }
3344
3345@@ -1016,7 +1217,7 @@
3346 state = INSENSITIVE
3347 shadow = IN
3348 file = "Images/Buttons/button-insensitive-in.png"
3349- border = { 4, 4, 4, 4 }
3350+ border = {4, 4, 4, 4}
3351 stretch = TRUE
3352 }
3353
3354@@ -1026,14 +1227,23 @@
3355 state = INSENSITIVE
3356 shadow = OUT
3357 file = "Images/Buttons/button-insensitive.png"
3358- border = { 4, 4, 4, 4 }
3359+ border = {4, 4, 4, 4}
3360+ stretch = TRUE
3361+ }
3362+ image
3363+ {
3364+ function = BOX
3365+ state = INSENSITIVE
3366+ #shadow = IN
3367+ detail = "buttondefault"
3368+ file = "Images/Buttons/button-default-insensitive.png"
3369+ border ={4, 4, 4, 4}
3370 stretch = TRUE
3371 }
3372
3373
3374 }
3375 }
3376-
3377 #=========================================================
3378 # Progressbar
3379 #=========================================================
3380@@ -1041,7 +1251,12 @@
3381 {
3382 xthickness = 1
3383 ythickness = 1
3384-
3385+
3386+ fg[NORMAL] = "#555555"
3387+ fg[ACTIVE] = "#555555"
3388+ fg[SELECTED] = "#555555"
3389+ fg[PRELIGHT] = "#360000"
3390+
3391 engine "pixmap"
3392 {
3393 image
3394@@ -1333,8 +1548,6 @@
3395 overlay_stretch = FALSE
3396 }
3397
3398-
3399-
3400 # Overlay image
3401 image
3402 {
3403@@ -2012,7 +2225,7 @@
3404 }
3405
3406
3407- # Steppers - right
3408+ # Steppers OO - right
3409 #=============================
3410 image
3411 {
3412@@ -2063,7 +2276,7 @@
3413 }
3414
3415
3416- # Steppers - left
3417+ # Steppers OO - left
3418 #=============================
3419 image
3420 {
3421@@ -2149,7 +2362,6 @@
3422 }
3423 class "GtkScrolledWindow" style "newwave-scrolledwindow"
3424
3425-
3426 #=========================================================
3427 # Toolbar
3428 #=========================================================
3429@@ -2157,7 +2369,7 @@
3430 {
3431 xthickness = 2
3432 ythickness = 3
3433-
3434+
3435 engine "pixmap"
3436 {
3437
3438@@ -2178,6 +2390,8 @@
3439 stretch = TRUE
3440 }
3441 }
3442+
3443+
3444 }
3445 style "newwave-toolbar-handle"
3446 {
3447@@ -2272,6 +2486,7 @@
3448
3449 style "newwave-toolbuttons" = "newwave-button"
3450 {
3451+
3452 engine "pixmap" {
3453
3454
3455@@ -2551,7 +2766,7 @@
3456 GtkSpinButton::page-size = 0
3457 GtkWidget::interior_focus = 0
3458 GtkWidget::internal-padding = 3
3459- GtkSpinButton::shadow-type = GTK_SHADOW_IN
3460+ #GtkEntry::inner-border = {0, 0, 1, 1}
3461
3462 engine "pixmap"
3463 {
3464@@ -2668,33 +2883,25 @@
3465
3466 # Spin - entry (textbox)
3467 #=============================
3468- image
3469+
3470+ image
3471 {
3472 function = FOCUS
3473 recolorable = TRUE
3474+ detail = "entry"
3475 file = "Images/Spin/text-entry-focus.png"
3476 border = { 2, 2, 3, 3}
3477 stretch = TRUE
3478 }
3479
3480- image
3481- {
3482- function = BOX
3483- recolorable = TRUE
3484- shadow = IN
3485- state = NORMAL
3486- detail = "entry"
3487- file = "Images/Spin/text-entry.png"
3488- border = { 2 , 2 ,3 ,3 }
3489- stretch = TRUE
3490- }
3491+
3492
3493- image
3494+ image
3495 {
3496 function = SHADOW
3497+ shadow = IN
3498 state = NORMAL
3499- shadow = IN
3500- recolorable = TRUE
3501+ recolorable = FALSE
3502 detail = "entry"
3503 file = "Images/Spin/text-entry.png"
3504 border = { 2, 2, 2, 2}
3505@@ -2714,6 +2921,7 @@
3506 {
3507 # Makes the button of the combo to have interior focus
3508 GtkButton::interior_focus = 0
3509+ GtkButton::inner-border = {1, 1, 1, 1}
3510
3511 engine "pixmap"
3512 {
3513@@ -2899,9 +3107,7 @@
3514 #@author:dilomo@ Disable outer focus glow because it look ugly in comboboxes and spins
3515 GtkWidget::interior_focus = 0
3516 GtkEntry::inner-border = {2, 2, 1, 1}
3517-
3518
3519-
3520 engine "pixmap"
3521 {
3522
3523@@ -2983,6 +3189,8 @@
3524
3525 style "newwave-panel-entry" = "newwave-entry"
3526 {
3527+ #base[NORMAL] = "#CECECE"
3528+
3529 engine "pixmap"
3530 {
3531
3532@@ -3054,9 +3262,228 @@
3533 }
3534 }
3535 }
3536-# Match the entries that might appear in the gnome panel as well as the dictionary applet
3537-widget_class "*Panel*Entry*" style :highest "newwave-panel-entry"
3538-widget_class "*GdictApp*Entry*" style :highest "newwave-panel-entry"
3539+
3540+style "newwave-panel-entry-blue" = "newwave-entry"
3541+{
3542+ engine "pixmap"
3543+ {
3544+
3545+ # i'm unsure about these
3546+ image
3547+ {
3548+ function = BOX
3549+ recolorable = TRUE
3550+ shadow = IN
3551+ state = NORMAL
3552+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
3553+ border = { 3,3,4,3 }
3554+ stretch = TRUE
3555+ }
3556+ image
3557+ {
3558+ function = BOX
3559+ recolorable = TRUE
3560+ shadow = OUT
3561+ state = NORMAL
3562+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
3563+ border = { 3,3,4,3 }
3564+ stretch = TRUE
3565+ }
3566+ image
3567+ {
3568+ function = BOX
3569+ recolorable = TRUE
3570+ shadow = OUT
3571+ state = ACTIVE
3572+ file = "Images/Shadows/entry-focus-panel-blue.png"
3573+ border = { 2,2,2,2 }
3574+ stretch = TRUE
3575+ }
3576+ image
3577+ {
3578+ function = BOX
3579+ recolorable = TRUE
3580+ shadow = IN
3581+ state = INSENSITIVE
3582+ file = "Images/Shadows/entry-focus-panel-blue.png"
3583+ border = { 2,2,2,2 }
3584+ stretch = TRUE
3585+ }
3586+
3587+
3588+ # Glow image when selected
3589+ image
3590+ {
3591+ function = FOCUS
3592+ recolorable = TRUE
3593+ detail = "entry"
3594+ file = "Images/Shadows/entry-focus-panel-blue.png"
3595+ border = {3, 3, 4, 3}
3596+ stretch = TRUE
3597+ }
3598+
3599+ # the actual textbox in normal state
3600+ image
3601+ {
3602+ function = SHADOW
3603+ detail = "entry"
3604+ shadow = IN
3605+ state = NORMAL
3606+ recolorable = FALSE
3607+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
3608+ border = { 2,2,2,2 }
3609+ stretch = TRUE
3610+ }
3611+ }
3612+}
3613+
3614+style "newwave-panel-entry-nopixmap" = "newwave-entry"
3615+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
3616+ engine "pixmap"
3617+ {
3618+
3619+ # i'm unsure about these
3620+ image
3621+ {
3622+ function = BOX
3623+ recolorable = TRUE
3624+ shadow = IN
3625+ state = NORMAL
3626+ file = "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
3627+ border = { 3,3,4,3 }
3628+ stretch = TRUE
3629+ }
3630+ image
3631+ {
3632+ function = BOX
3633+ recolorable = TRUE
3634+ shadow = OUT
3635+ state = NORMAL
3636+ file = "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
3637+ border = { 3,3,4,3 }
3638+ stretch = TRUE
3639+ }
3640+ image
3641+ {
3642+ function = BOX
3643+ recolorable = TRUE
3644+ shadow = OUT
3645+ state = ACTIVE
3646+ file = "Images/Shadows/entry-focus-panel-nopixmap.png"
3647+ border = { 2,2,2,2 }
3648+ stretch = TRUE
3649+ }
3650+ image
3651+ {
3652+ function = BOX
3653+ recolorable = TRUE
3654+ shadow = IN
3655+ state = INSENSITIVE
3656+ file = "Images/Shadows/entry-focus-panel-nopixmap.png"
3657+ border = { 2,2,2,2 }
3658+ stretch = TRUE
3659+ }
3660+
3661+
3662+ # Glow image when selected
3663+ image
3664+ {
3665+ function = FOCUS
3666+ recolorable = TRUE
3667+ detail = "entry"
3668+ file = "Images/Shadows/entry-focus-panel-nopixmap.png"
3669+ border = {3, 3, 4, 3}
3670+ stretch = TRUE
3671+ }
3672+
3673+ # the actual textbox in normal state
3674+ image
3675+ {
3676+ function = SHADOW
3677+ detail = "entry"
3678+ shadow = IN
3679+ state = NORMAL
3680+ recolorable = FALSE
3681+ file = "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
3682+ border = { 2,2,2,2 }
3683+ stretch = TRUE
3684+ }
3685+ }
3686+}
3687+
3688+style "newwave-panel-entry-noir" = "newwave-entry"
3689+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
3690+ engine "pixmap"
3691+ {
3692+
3693+ # i'm unsure about these
3694+ image
3695+ {
3696+ function = BOX
3697+ recolorable = TRUE
3698+ shadow = IN
3699+ state = NORMAL
3700+ file = "Images/Shadows/entry-shadow-in-panel-noir.png"
3701+ border = { 3,3,4,3 }
3702+ stretch = TRUE
3703+ }
3704+ image
3705+ {
3706+ function = BOX
3707+ recolorable = TRUE
3708+ shadow = OUT
3709+ state = NORMAL
3710+ file = "Images/Shadows/entry-shadow-in-panel-noir.png"
3711+ border = { 3,3,4,3 }
3712+ stretch = TRUE
3713+ }
3714+ image
3715+ {
3716+ function = BOX
3717+ recolorable = TRUE
3718+ shadow = OUT
3719+ state = ACTIVE
3720+ file = "Images/Shadows/entry-focus-panel-noir.png"
3721+ border = { 2,2,2,2 }
3722+ stretch = TRUE
3723+ }
3724+ image
3725+ {
3726+ function = BOX
3727+ recolorable = TRUE
3728+ shadow = IN
3729+ state = INSENSITIVE
3730+ file = "Images/Shadows/entry-focus-panel-noir.png"
3731+ border = { 2,2,2,2 }
3732+ stretch = TRUE
3733+ }
3734+
3735+
3736+ # Glow image when selected
3737+ image
3738+ {
3739+ function = FOCUS
3740+ recolorable = TRUE
3741+ detail = "entry"
3742+ file = "Images/Shadows/entry-focus-panel-noir.png"
3743+ border = {3, 3, 4, 3}
3744+ stretch = TRUE
3745+ }
3746+
3747+ # the actual textbox in normal state
3748+ image
3749+ {
3750+ function = SHADOW
3751+ detail = "entry"
3752+ shadow = IN
3753+ state = NORMAL
3754+ recolorable = FALSE
3755+ file = "Images/Shadows/entry-shadow-in-panel-noir.png"
3756+ border = { 2,2,2,2 }
3757+ stretch = TRUE
3758+ }
3759+ }
3760+}
3761
3762 #=========================================================
3763 # Task list
3764@@ -3430,6 +3857,16 @@
3765 file = "Images/Tree/selected-active.png"
3766 stretch = TRUE
3767 }
3768+
3769+ image
3770+ {
3771+ function = SHADOW
3772+ shadow = IN
3773+ recolorable = TRUE
3774+ file = "Images/Tree/shadow-in.png"
3775+ border = { 2, 2, 3, 2}
3776+ stretch = TRUE
3777+ }
3778 }
3779 }
3780
3781@@ -3667,7 +4104,7 @@
3782 recolorable = TRUE
3783 detail = "tab"
3784 file = "Images/Tabs/tab-top-active.png"
3785- border = { 3, 3, 5, 1}
3786+ border = { 3, 3,10, 1}
3787 stretch = TRUE
3788 gap_side = BOTTOM
3789 }
3790@@ -3824,6 +4261,13 @@
3791 ythickness = 0
3792
3793 bg[NORMAL] = @bg_color
3794+
3795+ fg[NORMAL] = "#404040"
3796+ fg[PRELIGHT] = "#262626"
3797+ fg[INSENSITIVE] = "#4D4D4D"
3798+ text[NORMAL] = "#404040"
3799+ text[PRELIGHT] = "#262626"
3800+ text[INSENSITIVE] = "#4D4D4D"
3801 #fg[ACTIVE] = shade (0.8, @bg_color)
3802 #text[NORMAL] = shade (0.8, @bg_color)
3803
3804@@ -3853,7 +4297,7 @@
3805 #}
3806 }
3807
3808-style "newwave-hscale"
3809+style "newwave-hscale" = "newwave-scale"
3810 {
3811 #engine "clearlooks"
3812 #{
3813@@ -3861,7 +4305,7 @@
3814 #}
3815 }
3816
3817-style "newwave-vscale"
3818+style "newwave-vscale" = "newwave-scale"
3819 {
3820 #engine "clearlooks"
3821 #{
3822@@ -4022,7 +4466,7 @@
3823 #---NWC-START---#
3824
3825 #widget_class "*Fix*MenuBar*" style :highest "newwave-menubar-light"
3826-
3827+#1A1A1A
3828 #---NWC-END---#
3829
3830 style "newwave-menu-notop"
3831@@ -4030,12 +4474,12 @@
3832 xthickness = 1
3833 ythickness = 3
3834
3835- bg[NORMAL] = "#F7F7F7"
3836-
3837- base[NORMAL] = "#F7F7F7"
3838-
3839- fg[NORMAL] = shade(0.3, "#696969")
3840- fg[PRELIGHT] = @text_color
3841+ bg[NORMAL] = "#F2F2F2"
3842+
3843+ base[NORMAL] = "#F2F2F2" #"#F7F7F7"
3844+
3845+ fg[NORMAL] = "#171717" #shade(0.3, "#696969")
3846+ fg[PRELIGHT] = "#141414"
3847 fg[ACTIVE] = @text_color
3848 fg[SELECTED] = @text_color
3849
3850@@ -4342,15 +4786,62 @@
3851 #@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
3852 bg[ACTIVE] = shade(1.02, "#696969") #bg[ACTIVE] = shade(2.5, "#424242")
3853 #@autho:gp@ Improve consistency between active-menu-item and menu-background.
3854- bg[SELECTED] = shade ( 1.60, @bg_color) #bg[SELECTED] = shade(3.2, "#424242")
3855+ bg[SELECTED] = "#989594" #bg[SELECTED] = shade(3.2, "#424242")
3856
3857 bg_pixmap[NORMAL] = "Images/Panel/PanelBarLong.png"
3858
3859 }
3860
3861-style "panel-nopixmap" = "panel"
3862+style "panel-nopixmap" = "newwave-default"
3863 {
3864- bg_pixmap[NORMAL] = "Images/Others/null.png"
3865+ fg[NORMAL] = shade(0.97, @bg_color) #mix(0.70, lighter(@selected_bg_color), @bg_color)
3866+ fg[PRELIGHT] =@text_color # lighter(mix(0.90, lighter(@selected_bg_color), @bg_color))
3867+ #@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
3868+ fg[ACTIVE] = @base_color # @text_color # lighter(mix(0.50, lighter(@selected_bg_color), @bg_color))
3869+
3870+ # @author:dilomo@
3871+ #dark color from v0.1 : "#4C4D4E"
3872+ #dark color from v0.1.1 : "#424242"
3873+ bg[NORMAL] = "#3a3a3a" #This is dark gray
3874+ # @author:gp@ Same color as item selected of taskbar menu.
3875+ bg[PRELIGHT] = shade ( 1.60, @bg_color) #shade(3.0, "#424242")
3876+ #@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
3877+ bg[ACTIVE] = shade(1.02, "#696969") #bg[ACTIVE] = shade(2.5, "#424242")
3878+ #@autho:gp@ Improve consistency between active-menu-item and menu-background.
3879+ bg[SELECTED] = "#989594" #bg[SELECTED] = shade(3.2, "#424242")
3880+}
3881+
3882+# Extra panel themes for the New Wave Configurator
3883+style "panel-light" = "panel"
3884+{
3885+ fg[NORMAL] = "#2B2B2B"
3886+ fg[PRELIGHT] = "#000000"
3887+ fg[ACTIVE] = @fg_color
3888+
3889+ bg[NORMAL] = "#E8E8E8"
3890+ bg[INSENSITIVE] = "#E8E8E8"
3891+ bg[ACTIVE] = "#E8E8E8"
3892+ bg[SELECTED] = "#E8E8E8"
3893+ bg[PRELIGHT] = "#E8E8E8"
3894+
3895+ bg_pixmap[NORMAL] = "Images/Panel/PanelBarLongLight.png"
3896+}
3897+
3898+style "panel-black" = "panel"
3899+{
3900+ fg[NORMAL] = "#BFBFBF"
3901+ fg[PRELIGHT] = "#000000"
3902+
3903+ bg[NORMAL] = "#212121"
3904+ bg[INSENSITIVE] = "#212121"
3905+}
3906+
3907+style "panel-blue" = "panel"
3908+{
3909+ fg[NORMAL] = shade(0.97, @bg_color)
3910+
3911+ bg[NORMAL] = "#3D6490"
3912+ bg[SELECTED] = "#99A4AB"
3913 }
3914
3915 #=========================================================
3916@@ -4444,6 +4935,10 @@
3917 {
3918 bg[NORMAL] = "#E5D0C3"
3919 bg[INSENSITIVE] ="#E5D0C3"
3920+
3921+ fg[NORMAL] = "#2F2F2F"
3922+ text[NORMAL] = "#2F2F2F"
3923+ text[PRELIGHT] = "#292929"
3924 engine "pixmap" {
3925
3926 image
3927@@ -4471,6 +4966,7 @@
3928 }
3929 }
3930 }
3931+# Not used
3932 style "newwave-nautilus-location-text"
3933 {
3934 bg[NORMAL] = mix(0.70, shade (1.05,"#696969"), @bg_color)
3935@@ -4510,18 +5006,17 @@
3936 bg[NORMAL] = "#696969"
3937 }
3938
3939-# @author:dilomo@ This has to fix the Appearance manager crash
3940-#style "newwave-window"
3941+style "newwave-radiocheck" = "newwave-default"
3942+{
3943+ text[PRELIGHT] = @base_color # Text on Mouseover
3944+}
3945+
3946+
3947+#style "newwave-infobar"
3948 #{
3949-# bg_pixmap[NORMAL] = "Images/Others/null.png"
3950+#error_bg_color = "#000000"
3951 #}
3952-
3953-style "newwave-radiocheck" = "newwave-default"
3954-{
3955- text[PRELIGHT] = @base_color # Text on Mouseover
3956-}
3957-
3958-
3959+#class "GtkInfoBar" style "newwave-infobar"
3960
3961
3962 #=========================================================
3963@@ -4556,7 +5051,7 @@
3964 class "GtkOldEditable" style "newwave-entry"
3965 class "GtkToolbar" style "newwave-toolbar"
3966 class "GtkRange" style "newwave-range"
3967-class "GtkSpinButton" style : highest "newwave-spinbutton"
3968+class "GtkSpinButton" style "newwave-spinbutton"
3969 class "GtkScale" style "newwave-scale"
3970 class "GtkVScale" style "newwave-vscale"
3971 class "GtkHScale" style "newwave-hscale"
3972@@ -4586,11 +5081,11 @@
3973 widget_class "*<GtkButton>" style "newwave-button"
3974 widget_class "*<GtkLinkButton>" style : highest "newwave-toolbuttons"
3975 widget_class "*<GtkNotebook>" style "newwave-notebook"
3976-widget_class "*<GtkStatusbar>*" style "newwave-statusbar"
3977+# : highest needed for nautilus and other apps to have all gray text
3978+widget_class "*<GtkStatusbar>*" style : highest "newwave-statusbar"
3979
3980
3981 widget_class "*<GtkComboBoxEntry>*" style "newwave-comboboxentry"
3982-# TODO : compat testing
3983 widget_class "*<GtkCombo>*" style "newwave-comboboxentry"
3984 widget_class "*<GtkMenu>*" style "newwave-menu"
3985 class "*GtkMenubar*.<GtkMenu>" style : highest "newwave-menu-notop"
3986@@ -4609,9 +5104,8 @@
3987 widget_class "*GtkMenuToolButton*" style : highest "newwave-toolbuttons"
3988 widget_class "*GtkToolbar*Button" style : highest "newwave-toolbuttons"
3989
3990-widget_class "<SpinButton>" style : highest "newwave-spinbutton"
3991-widget_class "*GtkSpinButton*.*Entry*" style : highest "newwave-spinbutton"
3992-
3993+widget_class "*<SpinButton>*" style : highest "newwave-spinbutton"
3994+widget_class "*<GtkSpinButton>*" style : highest "newwave-spinbutton"
3995
3996
3997 # @author:dilomo@ Here "*<GtkMenu>.<GtkMenuItem>*" GtkMenu is used
3998@@ -4623,7 +5117,11 @@
3999 widget_class "*<GtkSeparatorMenuItem>*" style "newwave-separator-menu-item"
4000
4001 widget_class "*.<GtkFrame>.<GtkLabel>" style "newwave-frame-title"
4002-widget_class "*.<GtkFrame>.*" style "newwave-frame"
4003+widget_class "*.<GtkFrame>*" style "newwave-frame"
4004+widget_class "*Gedit*.<GtkFrame>*" style "newwave-frame-gedit"
4005+# make frame of system monitor look better
4006+widget_class "*PanelApplet*.<GtkFrame>*" style "newwave-frame-panel"
4007+widget_class "*Gedit*.*Notify*" style "newwave-tooltips"
4008 widget_class "*.<GtkTreeView>*" style "newwave-treeview"
4009 widget_class "*.GtkFrame.GtkScrolledWindow.GtkTreeView" style "newwave-treeview"
4010
4011@@ -4668,7 +5166,7 @@
4012 # Special case the nautilus-extra-view-widget
4013 # ToDo: A more generic approach for all applications that have a widget like this.
4014 widget "*.nautilus-extra-view-widget*" style : highest "newwave-nautilus-location"
4015-widget "*.nautilus-extra-view-widget" style : highest "newwave-nautilus-location"
4016+widget "*.nautilus-extra-view-widget" style : highest "newwave-nautilus-location"
4017
4018 #widget_class "*MozillaGtkWidget*MenuBar*" style :highest "newwave-menubar"#-mozilla"
4019 #widget "MozillaGtkWidget*Menu*" style :highest "newwave-menu-item-mozilla"
4020@@ -4730,6 +5228,17 @@
4021 }
4022 }
4023
4024+style "nautilus-splitter"
4025+{
4026+
4027+ bg[NORMAL] = "#ffffff"
4028+ bg[PRELIGHT] = "#ECECEC"
4029+ engine "mist" {}
4030+}
4031+
4032+#widget "NautilusNavigationWindow.*.NautilusHorizontalSplitter" style "nautilus-splitter"
4033+
4034+
4035 style "newwave-nautilus-sidebar-handles"
4036 {
4037 engine "pixmap"
4038@@ -4777,6 +5286,7 @@
4039 }
4040
4041 widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.GtkNotebook.*" style "newwave-nautilus-sidebar"
4042+widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.*" style "newwave-nautilus-sidebar"
4043 #widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.*" style "newwave-nautilus-sidebar-handles"
4044 widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.GtkNotebook.*Tree*" style "newwave-treeview-nautilus-sidebar"
4045
4046@@ -4785,7 +5295,8 @@
4047 {
4048 #bg[NORMAL] = "##FFE68D"
4049 #base[NORMAL] = "#FF9E9E"
4050- bg_pixmap[NORMAL] = "Images/MenuMenubar/combomenu.png"
4051+ #bg_pixmap
4052+
4053 }
4054 #widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.*FM*View.*" style "newwave-nautilus-filemanager"
4055
4056@@ -4855,7 +5366,6 @@
4057 widget "*.gtk-combobox-popup-menu" style :highest "newwave-popupmenu-workaround"
4058
4059
4060-
4061 # Work around the usage of GtkLabel inside GtkListItems to display text.
4062 # This breaks because the label is shown on a background that is based on the
4063 # base color set.
4064@@ -4968,10 +5478,12 @@
4065 #=========================================================
4066 # Panel Matches
4067 #=========================================================
4068-
4069-
4070-
4071-class "*Mail*" style "panel"
4072+#---NWC-START---#
4073+# Match the entries that might appear in the gnome panel as well as the dictionary applet
4074+widget_class "*Panel*Entry*" style "newwave-panel-entry"
4075+widget_class "*GdictApp*Entry*" style "newwave-panel-entry"
4076+
4077+class "*Panel*Mail*" style "panel"
4078 class "*Tray*" style "panel"
4079 class "*tray*" style "panel"
4080 widget_class "*Tray*" style "panel"
4081@@ -4986,7 +5498,8 @@
4082 widget "*PanelApplet*" style "panel"
4083 class "PanelApp*" style "panel"
4084 class "PanelToplevel*" style "panel"
4085-widget_class "*Mail*" style "panel"
4086+# use this to fix Evolution proiblem
4087+widget_class "*Panel*Mail*" style "panel"
4088 widget_class "*Netstatus*" style "panel"
4089 widget_class "*Tomboy*Tray*" style "panel"
4090 widget "*fast-user-switch*" style "panel"
4091@@ -5001,7 +5514,7 @@
4092 #(TODO:) Fixed with larger image but if the drawer is
4093 #bigger than the image the ugly repeating will appear
4094 #
4095-#widget_class "*DrawerApplet*" style "panel-nopixmap"
4096+#widget_class "*DrawerApplet*" style "panel"
4097
4098 widget_class "*Panel*GtkToggleButton" style "newwave-panelbuttons"
4099 widget "*.tasklist-button" style "newwave-panelbuttons"
4100@@ -5009,7 +5522,7 @@
4101 widget_class "*Xfce*Panel*.GtkToggleButton" style "newwave-panelbuttons"
4102 widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "newwave-panelbuttons"
4103
4104-
4105 # @author:dilomo@ Only testing this as it is alpha software.
4106 #widget "*.globalmenu-applet-eventbox" style : highest "panel"
4107
4108+#---NWC-END---#
4109
4110=== modified file 'New Wave/gtk-2.0/Images/Buttons/button-prelight.png'
4111Binary files New Wave/gtk-2.0/Images/Buttons/button-prelight.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Buttons/button-prelight.png 2010-03-01 02:27:14 +0000 differ
4112=== modified file 'New Wave/gtk-2.0/Images/Lines/line-h.png'
4113Binary files New Wave/gtk-2.0/Images/Lines/line-h.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Lines/line-h.png 2010-03-01 02:27:14 +0000 differ
4114=== modified file 'New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png'
4115Binary files New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png 2010-03-01 02:27:14 +0000 differ
4116=== modified file 'New Wave/gtk-2.0/Images/Others/focus.png'
4117Binary files New Wave/gtk-2.0/Images/Others/focus.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Others/focus.png 2010-03-01 02:27:14 +0000 differ
4118=== added file 'New Wave/gtk-2.0/Images/Others/frame-panel.png'
4119Binary files New Wave/gtk-2.0/Images/Others/frame-panel.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/frame-panel.png 2010-03-01 02:27:14 +0000 differ
4120=== added file 'New Wave/gtk-2.0/Images/Others/iconview-item.png'
4121Binary files New Wave/gtk-2.0/Images/Others/iconview-item.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/iconview-item.png 2010-03-01 02:27:14 +0000 differ
4122=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png'
4123Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png 2010-03-01 02:27:14 +0000 differ
4124=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png'
4125Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png 2010-03-01 02:27:14 +0000 differ
4126=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png'
4127Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png 2010-03-01 02:27:14 +0000 differ
4128=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png'
4129Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png 2010-03-01 02:27:14 +0000 differ
4130=== added file 'New Wave/gtk-2.0/Images/Others/windowbg.png'
4131Binary files New Wave/gtk-2.0/Images/Others/windowbg.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/windowbg.png 2010-03-01 02:27:14 +0000 differ
4132=== added file 'New Wave/gtk-2.0/Images/Others/windtop.png'
4133Binary files New Wave/gtk-2.0/Images/Others/windtop.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/windtop.png 2010-03-01 02:27:14 +0000 differ
4134=== added file 'New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png'
4135Binary files New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png 2010-03-01 02:27:14 +0000 differ
4136=== modified file 'New Wave/gtk-2.0/Images/Panel/p-active-prelight.png'
4137Binary files New Wave/gtk-2.0/Images/Panel/p-active-prelight.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-active-prelight.png 2010-03-01 02:27:14 +0000 differ
4138=== modified file 'New Wave/gtk-2.0/Images/Panel/p-active.png'
4139Binary files New Wave/gtk-2.0/Images/Panel/p-active.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-active.png 2010-03-01 02:27:14 +0000 differ
4140=== modified file 'New Wave/gtk-2.0/Images/Panel/p-prelight.png'
4141Binary files New Wave/gtk-2.0/Images/Panel/p-prelight.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-prelight.png 2010-03-01 02:27:14 +0000 differ
4142=== modified file 'New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png'
4143Binary files New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png 2010-03-01 02:27:14 +0000 differ
4144=== added file 'New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png'
4145Binary files New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png 2010-03-01 02:27:14 +0000 differ
4146=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png'
4147Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png 2010-03-01 02:27:14 +0000 differ
4148=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png'
4149Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png 2010-03-01 02:27:14 +0000 differ
4150=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png'
4151Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png 2010-03-01 02:27:14 +0000 differ
4152=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png'
4153Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png 2010-03-01 02:27:14 +0000 differ
4154=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png'
4155Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png 2010-03-01 02:27:15 +0000 differ
4156=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png'
4157Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png 2010-03-01 02:27:15 +0000 differ
4158=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png'
4159Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png 2010-03-01 02:27:15 +0000 differ
4160=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png'
4161Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png 2010-03-01 02:27:15 +0000 differ
4162=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png'
4163Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png 2010-03-01 02:27:15 +0000 differ
4164=== added file 'New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png'
4165Binary files New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png 2010-03-01 02:27:15 +0000 differ
4166=== modified file 'New Wave/gtk-2.0/Images/Spin/spin-down-bg.png'
4167Binary files New Wave/gtk-2.0/Images/Spin/spin-down-bg.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/spin-down-bg.png 2010-03-01 02:27:15 +0000 differ
4168=== modified file 'New Wave/gtk-2.0/Images/Spin/spin-up-bg.png'
4169Binary files New Wave/gtk-2.0/Images/Spin/spin-up-bg.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/spin-up-bg.png 2010-03-01 02:27:15 +0000 differ
4170=== modified file 'New Wave/gtk-2.0/Images/Spin/text-entry.png' (properties changed: +x to -x)
4171Binary files New Wave/gtk-2.0/Images/Spin/text-entry.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/text-entry.png 2010-03-01 02:27:15 +0000 differ
4172=== modified file 'New Wave/gtk-2.0/Images/Tabs/tab-top-active.png'
4173Binary files New Wave/gtk-2.0/Images/Tabs/tab-top-active.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Tabs/tab-top-active.png 2010-03-01 02:27:15 +0000 differ
4174=== modified file 'New Wave/gtk-2.0/Images/Tree/selected-active.png'
4175Binary files New Wave/gtk-2.0/Images/Tree/selected-active.png 2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Tree/selected-active.png 2010-03-01 02:27:15 +0000 differ
4176=== added file 'New Wave/gtk-2.0/Images/Tree/shadow-in.png'
4177Binary files New Wave/gtk-2.0/Images/Tree/shadow-in.png 1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Tree/shadow-in.png 2010-03-01 02:27:15 +0000 differ
4178=== modified file 'New Wave/gtk-2.0/gtkrc'
4179--- New Wave/gtk-2.0/gtkrc 2009-08-08 02:13:58 +0000
4180+++ New Wave/gtk-2.0/gtkrc 2010-03-01 02:27:14 +0000
4181@@ -1,7 +1,7 @@
4182 #
4183-#==========================================
4184-# New Wave Pixmap Theme
4185-#==========================================
4186+#==================================================================
4187+# New Wave Pixmap Theme
4188+#==================================================================
4189 #
4190 #
4191 # Based on: Ubuntu Human-Clearlooks
4192@@ -12,20 +12,24 @@
4193 # Former Authors:
4194 # Giuseppe Pennisi <giupenni78@gmail.com>
4195 #
4196-# Feel free to modify and share!
4197-# Licensed under Creative Commons 3.0 Attribution-Noncommercial-Share Alike
4198+# Licensed under Creative Commons 3.0 Attribution-Share Alike
4199+
4200+# You MUST attribute the derivative themes as:
4201+# "Based on the New Wave theme created by Anton Kerezov (dilomo)"
4202+# as well as provide a link to the original.
4203+#==================================================================
4204 #
4205 #---NWC-START---#
4206-# Version: 0.8.1 [29/07/09]
4207+# Version: 0.8.2 [12/12/2009]
4208
4209
4210 # Default color values used in Appearance Manager
4211-gtk_color_scheme = "fg_color: #101010\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #1A1A1A\nselected_bg_color: #FF8F4C\nselected_fg_color: #1A1A1A\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#330606"
4212-# so that we can use pulsation on windows that need attention
4213-gtk-enable-animations = 1
4214-# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1sec intervals)
4215+gtk_color_scheme = "fg_color: #1A1A1A\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #171717\nselected_bg_color:#FFB886\nselected_fg_color: #1D1D1D\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#452222"
4216+gtk-enable-animations = 1 # so that we can use pulsation on windows that need attention
4217+# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1 sec. intervals)
4218 gtk-tooltip-timeout = 970
4219
4220+
4221 #---NWC-END---#
4222
4223 #=========================================================
4224@@ -35,7 +39,7 @@
4225 {
4226 xthickness = 1
4227 ythickness = 1
4228-
4229+
4230 #=========================================================
4231 # General Style Properties
4232 #=========================================================
4233@@ -68,7 +72,7 @@
4234 # These lines enable the New Wave Configurator to modify them. Do not remove or change!
4235
4236 GtkScrollbar ::has-backward-stepper = 1
4237- GtkScrollbar ::has-forward-stepper = 1
4238+ GtkScrollbar ::has-forward-stepper = 1
4239 GtkScrollbar ::has-secondary-backward-stepper = 0
4240 GtkScrollbar ::has-secondary-forward-stepper = 0
4241 #---NWC-END---#
4242@@ -83,6 +87,7 @@
4243 GtkMenu ::vertical-padding = 1
4244 GtkMenu ::horizontal-offset = -1
4245
4246+
4247 GtkExpander ::expander-size = 16
4248
4249 GtkToolbar ::internal-padding = 2
4250@@ -98,14 +103,31 @@
4251
4252 GtkProgressBar ::shadow-type = GTK_SHADOW_NONE
4253
4254+
4255+ #benzea: dilomo: BOX
4256+ #benzea: and the detail string is one of a couple
4257+
4258+ #benzea: "infobar-info",
4259+ #benzea: "infobar-warning",
4260+ #benzea: "infobar-question",
4261+ #benzea: "infobar-error",
4262+ #benzea: "infobar"
4263+
4264 #---NWC-START---#
4265+ #Values used in the New Wave Configurator
4266+
4267 GtkWidget ::cursor-aspect-ratio = 0.05
4268-
4269+
4270 # This is the pulsating rect that appears on newly launched apps
4271 WnckTasklist ::fade-overlay-rect = 1
4272 WnckTasklist ::fade-opacity = 0.6
4273
4274- NautilusIconContainer::highlight_alpha= 145
4275+ NautilusIconContainer::highlight_alpha= 120
4276+
4277+ # The rect. when you drag the mouse to select several files
4278+ NautilusIconContainer::selection_box_color = "#EF9D6E"
4279+ NautilusIconContainer::selection_box_alpha = 60
4280+
4281 #---NWC-END---#
4282
4283 fg[NORMAL] = @fg_color
4284@@ -116,14 +138,14 @@
4285
4286 bg[NORMAL] = @bg_color
4287 bg[PRELIGHT] = shade (1.02, @bg_color)
4288- bg[SELECTED] = mix (0.25, @fg_color, @selected_bg_color)
4289+ bg[SELECTED] = @selected_bg_color #mix (0.25, @fg_color, @selected_bg_color)
4290 bg[INSENSITIVE] = @bg_color
4291 bg[ACTIVE] = shade (0.9, @bg_color)
4292
4293 base[NORMAL] = @base_color
4294 base[PRELIGHT] = shade (0.95, @bg_color)
4295 base[ACTIVE] = shade (0.90, @bg_color)
4296- base[SELECTED] = mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
4297+ base[SELECTED] = @selected_bg_color #mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
4298 base[INSENSITIVE] = @bg_color
4299
4300 text[NORMAL] = @text_color
4301@@ -132,9 +154,76 @@
4302 text[SELECTED] = @selected_fg_color
4303 text[INSENSITIVE] = darker (@bg_color)
4304
4305+ # Colors for the GtkInfobar themeing if you
4306+ # don't want to theme them with images
4307+
4308+ #color["error_bg_color"] = "black"
4309+ #color["error_fg_color"] = "white"
4310+
4311+ #color["info_bg_color"] = "#9EDDFF"
4312+ #color["info_fg_color"] = "#ffffff"
4313+
4314+ #color["warning_bg_color"] = "black"
4315+ #color["warning_fg_color"] = "white"
4316+
4317+ #color["question_bg_color"] = "black"
4318+ #color["question_fg_color"] = "white"
4319+
4320+ #color["other_bg_color"] = "black"
4321+ #color["other_fg_color"] = "white"
4322+
4323
4324 engine "pixmap"
4325 {
4326+ # Info Bar
4327+
4328+ image
4329+ {
4330+ function = BOX
4331+ recolorable = TRUE
4332+ detail = "infobar-info"
4333+ file = "Images/Others/nautilus-infobar-overlay.png"
4334+ border = { 2, 2, 2, 3}
4335+ stretch = TRUE
4336+ }
4337+
4338+ image
4339+ {
4340+ function = BOX
4341+ recolorable = TRUE
4342+ detail = "infobar-warning"
4343+ file = "Images/Others/nautilus-infobar-overlay-warning.png"
4344+ border = { 2, 2, 2, 3}
4345+ stretch = TRUE
4346+ }
4347+ image
4348+ {
4349+ function = BOX
4350+ recolorable = TRUE
4351+ detail = "infobar-error"
4352+ file = "Images/Others/nautilus-infobar-overlay-error.png"
4353+ border = { 2, 2, 2, 3}
4354+ stretch = TRUE
4355+ }
4356+ image
4357+ {
4358+ function = BOX
4359+ recolorable = TRUE
4360+ detail = "infobar-question"
4361+ file = "Images/Others/nautilus-infobar-overlay-question.png"
4362+ border = { 2, 2, 2, 3}
4363+ stretch = TRUE
4364+ }
4365+
4366+ image
4367+ {
4368+ function = BOX
4369+ recolorable = TRUE
4370+ detail = "infobar"
4371+ file = "Images/Others/nautilus-infobar-overlay.png"
4372+ border = { 2, 2, 2, 3}
4373+ stretch = TRUE
4374+ }
4375
4376 # Shadows
4377
4378@@ -184,7 +273,7 @@
4379 shadow = IN
4380 recolorable = TRUE
4381 file = "Images/Frame-Gap/frame-in.png"
4382- border ={ 4, 4, 4,3}
4383+ border ={ 3, 3, 3, 3}
4384 stretch = TRUE
4385 gap_start_file = "Images/Frame-Gap/frame-gapstart-in.png"
4386 gap_start_border = { 4, 0, 4, 0}
4387@@ -201,12 +290,12 @@
4388 shadow = OUT
4389 recolorable = TRUE
4390 file = "Images/Frame-Gap/frame-out.png"
4391- border = { 4, 4, 4, 4}
4392+ border = { 4, 4, 3, 4}
4393 stretch = TRUE
4394 gap_start_file = "Images/Frame-Gap/frame-gapstart-out.png"
4395- gap_start_border = { 4, 0, 4, 0}
4396+ gap_start_border = { 3, 0, 2, 0}
4397 gap_end_file = "Images/Frame-Gap/frame-gapend-out.png"
4398- gap_end_border = { 0, 4, 4, 0}
4399+ gap_end_border = { 0, 3, 2, 0}
4400 gap_side = TOP
4401 }
4402
4403@@ -281,7 +370,7 @@
4404 orientation = HORIZONTAL
4405 }
4406
4407- ## vertical handle
4408+ ## Vertical handle
4409 image
4410 {
4411 function = HANDLE
4412@@ -334,17 +423,17 @@
4413 function = HLINE
4414 recolorable = TRUE
4415 file = "Images/Lines/line-h.png"
4416- #border = { 1, 1, 0, 1 }
4417+ border = { 12, 12, 0, 1 }
4418 stretch = TRUE
4419 }
4420
4421- #@author:dilomo@ focus image used on buttons any derivatives (check box, combo and so on) Now obsolate!
4422+ #@author:dilomo@ Focus image used on button's derivatives (check box, combo and so on)
4423 image
4424 {
4425 function = FOCUS
4426 recolorable = TRUE
4427 file = "Images/Others/focus.png"
4428- border = { 2, 2, 2, 2 }
4429+ border = { 6, 6, 6, 6 }
4430 stretch = TRUE
4431 }
4432
4433@@ -866,7 +955,8 @@
4434 ythickness = 3
4435 }
4436
4437-
4438+style "empty"
4439+{}
4440
4441
4442 #=========================================================
4443@@ -876,45 +966,154 @@
4444 #=========================================================
4445
4446
4447-
4448+# @author:dilomo@ This has to fix the Appearance manager crash
4449 style "newwave-window" = "newwave-wide"
4450-{
4451- engine "pixmap"
4452- {
4453- image
4454- {
4455- function = FLAT_BOX
4456- file = "Images/Others/null.png"
4457- border = {2, 2, 2, 2}
4458- detail = "base"
4459- #stretch = TRUE
4460-
4461- }
4462- }
4463+{
4464+ bg_pixmap[NORMAL] = "Images/Others/null.png"
4465 }
4466
4467-# Fix issues with Gedit in the statusbar
4468-style "newwave-frame" #= "newwave-wide"
4469+
4470+style "newwave-frame" = "newwave-wide"
4471 {
4472-# engine "pixmap"
4473+ # engine "pixmap"
4474 # {
4475 # image
4476 # {
4477 # function = SHADOW
4478 # file = "Images/Others/frame.png"
4479- # border = {1, 1, 1, 1}
4480+ ## border = {1, 1, 1, 1}
4481 # stretch = TRUE
4482-#
4483+
4484 # }
4485 # }
4486 }
4487
4488+
4489+# Fix ugly frames with Gedit in the statusbar
4490+style "newwave-frame-gedit"
4491+{
4492+ engine "pixmap"
4493+ {
4494+ image
4495+ {
4496+
4497+ function = SHADOW
4498+ file = "Images/Others/null.png"
4499+ #border = {1, 1, 1, 1}
4500+ #stretch = TRUE
4501+
4502+ }
4503+ }
4504+}
4505+
4506+style "newwave-frame-panel"
4507+{
4508+ engine "pixmap"
4509+ {
4510+ image
4511+ {
4512+
4513+ function = SHADOW
4514+ file = "Images/Shadows/shadow-etched-out-panel.png"
4515+ border = {2, 2, 2, 2}
4516+ #stretch = TRUE
4517+
4518+ }
4519+ }
4520+}
4521+
4522+# Cool but the selected state is rather ugly and cannot be themed properly
4523+style "newwave-desktop-icon"
4524+{
4525+#1 for activate
4526+NautilusIconContainer::frame_text = 1
4527+NautilusIconContainer::light_info_color = "#DADADA"
4528+NautilusIconContainer::dark_info_color = "#101010"
4529+NautilusIconContainer::prelight_icon_render_mode = 1
4530+NautilusIconContainer::activate_prelight_icon_label = 1
4531+
4532+base[NORMAL] = "black"
4533+base[PRELIGHT] = "black"
4534+base[SELECTED] = "black" #"#7C3320"
4535+base[ACTIVE] = "white"
4536+
4537+text[NORMAL] = "white"
4538+text[PRELIGHT] = "white"
4539+text[SELECTED] = "white"
4540+NautilusIconContainer::normal_alpha = 60
4541+NautilusIconContainer::prelight_alpha = 80
4542+NautilusIconContainer::highlight_alpha = 90
4543+}
4544+
4545+style "newwave-desktop-icon-focus"
4546+{
4547+ engine "pixmap"
4548+ {
4549+ image
4550+ {
4551+ function = FOCUS
4552+ recolorable = TRUE
4553+ file = "Images/Others/focus.png"
4554+ border = { 2, 2, 2, 2 }
4555+ stretch = TRUE
4556+ }
4557+ }
4558+}
4559+
4560+#widget_class "*DesktopIcon*" style "newwave-desktop-icon"
4561+
4562+
4563+#=========================================================
4564+# Icon View
4565+#=========================================================
4566+
4567+# Theme the iconview selected items
4568+style "newwave-iconview"
4569+{
4570+ #GtkIconView::selection-box-color = "black"
4571+ #GtkIconView::selection-box-alpha = 60
4572+
4573+ engine "pixmap"
4574+ {
4575+ image
4576+ {
4577+ function = FLAT_BOX
4578+ recolorable = TRUE
4579+ file = "Images/Others/iconview-item.png"
4580+ border = {3, 3, 3, 3 }
4581+ stretch = TRUE
4582+ }
4583+
4584+ }
4585+}
4586+
4587+widget_class "*IconView" style "newwave-iconview"
4588+
4589+
4590+
4591+#=========================================================
4592+# Assistant (Wizard windows)
4593+#=========================================================
4594+
4595+# Theme properly the assistant
4596+style "newwave-assistant"
4597+{
4598+ bg[SELECTED] ="#9A9A9A"#"#484848"
4599+ fg[SELECTED] ="#F3F3F3"# "#ECECEC"
4600+}
4601+
4602+widget_class "*Assistant*" style "newwave-assistant"
4603+
4604+
4605+
4606 #=========================================================
4607 # Buttons
4608 #=========================================================
4609
4610 style "newwave-button" = "newwave-wider"
4611 {
4612+ #xthickness = 4
4613+ #ythickness = 4
4614
4615 bg[NORMAL] = shade (0.98, @bg_color)
4616 bg[PRELIGHT] = shade (1.04, @bg_color)
4617@@ -931,12 +1130,12 @@
4618 GtkButton::child_displacement_y = 1
4619
4620 # Increase because focus padding is zero
4621- GtkButton::inner-border = {2, 2, 2, 2}
4622+ GtkButton::inner-border = {2, 2,2, 2}
4623
4624 # Use to show glow around default buttons
4625 GtkButton::default-border = { 3, 3, 3, 3}
4626 GtkButton::default-outside-border = { 3, 3, 3, 3}
4627-
4628+ #GtkWidget::draw-border = {3,3,3,3}
4629
4630 engine "pixmap"
4631 {
4632@@ -959,8 +1158,9 @@
4633 function = BOX
4634 state = NORMAL
4635 shadow = OUT
4636+
4637 file = "Images/Buttons/button-normal.png"
4638- border ={ 4, 4, 4, 4 }
4639+ border = {4, 4, 4, 4}
4640 stretch = TRUE
4641 }
4642
4643@@ -969,6 +1169,7 @@
4644 {
4645 function = BOX
4646 state = NORMAL
4647+ #shadow = IN
4648 detail = "buttondefault"
4649 file = "Images/Buttons/button-default.png"
4650 border ={ 4, 4, 4, 4 }
4651@@ -981,7 +1182,7 @@
4652 function = BOX
4653 state = ACTIVE
4654 file = "Images/Buttons/button-pressed.png"
4655- border = { 4, 4, 4, 4 }
4656+ border ={4, 4, 4, 4}
4657 stretch = TRUE
4658 }
4659
4660@@ -995,7 +1196,7 @@
4661 recolorable = TRUE
4662 shadow = IN
4663 file = "Images/Buttons/button-pressed-prelight.png"
4664- border = { 4, 4, 4, 4 }
4665+ border = {4, 4, 4, 4}
4666 stretch = TRUE
4667 }
4668 #@author:dilomo@ prelight used on normal buttons
4669@@ -1006,7 +1207,7 @@
4670 recolorable = TRUE
4671 shadow = OUT
4672 file = "Images/Buttons/button-prelight.png"
4673- border = { 4, 4, 4, 4 }
4674+ border = {4, 4, 4, 4}
4675 stretch = TRUE
4676 }
4677
4678@@ -1016,7 +1217,7 @@
4679 state = INSENSITIVE
4680 shadow = IN
4681 file = "Images/Buttons/button-insensitive-in.png"
4682- border = { 4, 4, 4, 4 }
4683+ border = {4, 4, 4, 4}
4684 stretch = TRUE
4685 }
4686
4687@@ -1026,14 +1227,23 @@
4688 state = INSENSITIVE
4689 shadow = OUT
4690 file = "Images/Buttons/button-insensitive.png"
4691- border = { 4, 4, 4, 4 }
4692+ border = {4, 4, 4, 4}
4693+ stretch = TRUE
4694+ }
4695+ image
4696+ {
4697+ function = BOX
4698+ state = INSENSITIVE
4699+ #shadow = IN
4700+ detail = "buttondefault"
4701+ file = "Images/Buttons/button-default-insensitive.png"
4702+ border ={4, 4, 4, 4}
4703 stretch = TRUE
4704 }
4705
4706
4707 }
4708 }
4709-
4710 #=========================================================
4711 # Progressbar
4712 #=========================================================
4713@@ -1041,7 +1251,12 @@
4714 {
4715 xthickness = 1
4716 ythickness = 1
4717-
4718+
4719+ fg[NORMAL] = "#555555"
4720+ fg[ACTIVE] = "#555555"
4721+ fg[SELECTED] = "#555555"
4722+ fg[PRELIGHT] = "#360000"
4723+
4724 engine "pixmap"
4725 {
4726 image
4727@@ -1333,8 +1548,6 @@
4728 overlay_stretch = FALSE
4729 }
4730
4731-
4732-
4733 # Overlay image
4734 image
4735 {
4736@@ -2012,7 +2225,7 @@
4737 }
4738
4739
4740- # Steppers - right
4741+ # Steppers OO - right
4742 #=============================
4743 image
4744 {
4745@@ -2063,7 +2276,7 @@
4746 }
4747
4748
4749- # Steppers - left
4750+ # Steppers OO - left
4751 #=============================
4752 image
4753 {
4754@@ -2149,7 +2362,6 @@
4755 }
4756 class "GtkScrolledWindow" style "newwave-scrolledwindow"
4757
4758-
4759 #=========================================================
4760 # Toolbar
4761 #=========================================================
4762@@ -2157,7 +2369,7 @@
4763 {
4764 xthickness = 2
4765 ythickness = 3
4766-
4767+
4768 engine "pixmap"
4769 {
4770
4771@@ -2178,6 +2390,8 @@
4772 stretch = TRUE
4773 }
4774 }
4775+
4776+
4777 }
4778 style "newwave-toolbar-handle"
4779 {
4780@@ -2272,6 +2486,7 @@
4781
4782 style "newwave-toolbuttons" = "newwave-button"
4783 {
4784+
4785 engine "pixmap" {
4786
4787
4788@@ -2551,7 +2766,7 @@
4789 GtkSpinButton::page-size = 0
4790 GtkWidget::interior_focus = 0
4791 GtkWidget::internal-padding = 3
4792- GtkSpinButton::shadow-type = GTK_SHADOW_IN
4793+ #GtkEntry::inner-border = {0, 0, 1, 1}
4794
4795 engine "pixmap"
4796 {
4797@@ -2668,33 +2883,25 @@
4798
4799 # Spin - entry (textbox)
4800 #=============================
4801- image
4802+
4803+ image
4804 {
4805 function = FOCUS
4806 recolorable = TRUE
4807+ detail = "entry"
4808 file = "Images/Spin/text-entry-focus.png"
4809 border = { 2, 2, 3, 3}
4810 stretch = TRUE
4811 }
4812
4813- image
4814- {
4815- function = BOX
4816- recolorable = TRUE
4817- shadow = IN
4818- state = NORMAL
4819- detail = "entry"
4820- file = "Images/Spin/text-entry.png"
4821- border = { 2 , 2 ,3 ,3 }
4822- stretch = TRUE
4823- }
4824+
4825
4826- image
4827+ image
4828 {
4829 function = SHADOW
4830+ shadow = IN
4831 state = NORMAL
4832- shadow = IN
4833- recolorable = TRUE
4834+ recolorable = FALSE
4835 detail = "entry"
4836 file = "Images/Spin/text-entry.png"
4837 border = { 2, 2, 2, 2}
4838@@ -2714,6 +2921,7 @@
4839 {
4840 # Makes the button of the combo to have interior focus
4841 GtkButton::interior_focus = 0
4842+ GtkButton::inner-border = {1, 1, 1, 1}
4843
4844 engine "pixmap"
4845 {
4846@@ -2899,9 +3107,7 @@
4847 #@author:dilomo@ Disable outer focus glow because it look ugly in comboboxes and spins
4848 GtkWidget::interior_focus = 0
4849 GtkEntry::inner-border = {2, 2, 1, 1}
4850-
4851
4852-
4853 engine "pixmap"
4854 {
4855
4856@@ -2983,6 +3189,8 @@
4857
4858 style "newwave-panel-entry" = "newwave-entry"
4859 {
4860+ #base[NORMAL] = "#CECECE"
4861+
4862 engine "pixmap"
4863 {
4864
4865@@ -3054,9 +3262,228 @@
4866 }
4867 }
4868 }
4869-# Match the entries that might appear in the gnome panel as well as the dictionary applet
4870-widget_class "*Panel*Entry*" style :highest "newwave-panel-entry"
4871-widget_class "*GdictApp*Entry*" style :highest "newwave-panel-entry"
4872+
4873+style "newwave-panel-entry-blue" = "newwave-entry"
4874+{
4875+ engine "pixmap"
4876+ {
4877+
4878+ # i'm unsure about these
4879+ image
4880+ {
4881+ function = BOX
4882+ recolorable = TRUE
4883+ shadow = IN
4884+ state = NORMAL
4885+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
4886+ border = { 3,3,4,3 }
4887+ stretch = TRUE
4888+ }
4889+ image
4890+ {
4891+ function = BOX
4892+ recolorable = TRUE
4893+ shadow = OUT
4894+ state = NORMAL
4895+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
4896+ border = { 3,3,4,3 }
4897+ stretch = TRUE
4898+ }
4899+ image
4900+ {
4901+ function = BOX
4902+ recolorable = TRUE
4903+ shadow = OUT
4904+ state = ACTIVE
4905+ file = "Images/Shadows/entry-focus-panel-blue.png"
4906+ border = { 2,2,2,2 }
4907+ stretch = TRUE
4908+ }
4909+ image
4910+ {
4911+ function = BOX
4912+ recolorable = TRUE
4913+ shadow = IN
4914+ state = INSENSITIVE
4915+ file = "Images/Shadows/entry-focus-panel-blue.png"
4916+ border = { 2,2,2,2 }
4917+ stretch = TRUE
4918+ }
4919+
4920+
4921+ # Glow image when selected
4922+ image
4923+ {
4924+ function = FOCUS
4925+ recolorable = TRUE
4926+ detail = "entry"
4927+ file = "Images/Shadows/entry-focus-panel-blue.png"
4928+ border = {3, 3, 4, 3}
4929+ stretch = TRUE
4930+ }
4931+
4932+ # the actual textbox in normal state
4933+ image
4934+ {
4935+ function = SHADOW
4936+ detail = "entry"
4937+ shadow = IN
4938+ state = NORMAL
4939+ recolorable = FALSE
4940+ file = "Images/Shadows/entry-shadow-in-panel-blue.png"
4941+ border = { 2,2,2,2 }
4942+ stretch = TRUE
4943+ }
4944+ }
4945+}
4946+
4947+style "newwave-panel-entry-nopixmap" = "newwave-entry"
4948+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
4949+ engine "pixmap"
4950+ {
4951+
4952+ # i'm unsure about these
4953+ image
4954+ {
4955+ function = BOX
4956+ recolorable = TRUE
4957+ shadow = IN
4958+ state = NORMAL
4959+ file = "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
4960+ border = { 3,3,4,3 }
4961+ stretch = TRUE
4962+ }
4963+ image
4964+ {
4965+ function = BOX
4966+ recolorable = TRUE
4967+ shadow = OUT
4968+ state = NORMAL
4969+ file = "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
4970+ border = { 3,3,4,3 }
4971+ stretch = TRUE
4972+ }
4973+ image
4974+ {
4975+ function = BOX
4976+ recolorable = TRUE
4977+ shadow = OUT
4978+ state = ACTIVE
4979+ file = "Images/Shadows/entry-focus-panel-nopixmap.png"
4980+ border = { 2,2,2,2 }
4981+ stretch = TRUE
4982+ }
4983+ image
4984+ {
4985+ function = BOX
4986+ recolorable = TRUE
4987+ shadow = IN
4988+ state = INSENSITIVE
4989+ file = "Images/Shadows/entry-focus-panel-nopixmap.png"
4990+ border = { 2,2,2,2 }
4991+ stretch = TRUE
4992+ }
4993+
4994+
4995+ # Glow image when selected
4996+ image
4997+ {
4998+ function = FOCUS
4999+ recolorable = TRUE
5000+ detail = "entry"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches