[gnome-themes-standard] Use a flat toolbar style

[Cosimo Cecchi <cosimoc src gnome org>]

commit 95a6dfee45d849e620bf3ee91a7f76ca73992822
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jun 25 21:27:14 2012 -0400

    Use a flat toolbar style

 themes/Adwaita/gtk-2.0/Makefile.am                 |    8 +--
 themes/Adwaita/gtk-2.0/Toolbar/toolbar.png         |  Bin 3048 -> 0 bytes
 .../Adwaita/gtk-2.0/Toolbar/toolbutton-normal.png  |  Bin 3158 -> 0 bytes
 .../gtk-2.0/Toolbar/toolbutton-prelight.png        |  Bin 329 -> 0 bytes
 .../Adwaita/gtk-2.0/Toolbar/toolbutton-pressed.png |  Bin 3254 -> 0 bytes
 .../Adwaita/gtk-2.0/Toolbar/toolbutton-toggled.png |  Bin 3254 -> 0 bytes
 themes/Adwaita/gtk-2.0/gtkrc                       |   92 ++++++-------------
 7 files changed, 30 insertions(+), 70 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 770a8fc..4f2bb43 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -5,7 +5,7 @@ theme_DATA = gtkrc
 
 asset_dirs = "Arrows" "Buttons" "Check-Radio" "Entry" "Expanders" \
 	"Handles" "Lines" "Menu-Menubar" "Others" "ProgressBar" \
-	"Range" "Scrollbars" "Shadows" "Spin" "Tabs" "Toolbar"
+	"Range" "Scrollbars" "Shadows" "Spin" "Tabs"
 asset_data =
 	Arrows/arrow-down-insens.png \
 	Arrows/arrow-down.png \
@@ -88,12 +88,6 @@ asset_data =
 	Tabs/tab-left-active.png \
 	Tabs/tab-right-active.png \
 	Tabs/tab-top-active.png
-	Toolbar/toolbar.png \
-	Toolbar/toolbutton-normal.png \
-	Toolbar/toolbutton-prelight.png \
-	Toolbar/toolbutton-pressed.png \
-	Toolbar/toolbutton-toggled.png
-
 install-data-local:
 	for dir in $(asset_dirs); do \
 		for file in `cd $(srcdir)/$$dir && find . -maxdepth 1 \( -name "*.png" \)`; do \
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index a8125df..e910ae9 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -16,7 +16,8 @@ style "default"
 	GtkWidget::new-tooltip-style	= 1 # Needed?
 	GtkMenuBar::window-dragging	= 1
 	GtkToolbar::window-dragging	= 1
-	GtkToolbar::internal-padding	= 5
+	GtkToolbar::internal-padding	= 4
+        GtkToolButton::icon-spacing     = 4
 
 	GtkSeparatorMenuItem::horizontal-padding = 3
 	GtkSeparatorMenuItem::wide-separators = 1
@@ -46,6 +47,7 @@ style "default"
 	GtkStatusbar::shadow_type	= GTK_SHADOW_NONE
 	GtkSpinButton::shadow_type 	= GTK_SHADOW_NONE
 	GtkMenuBar::shadow-type		= GTK_SHADOW_NONE
+	GtkToolbar::shadow-type		= GTK_SHADOW_NONE
 	GtkMenuBar::internal-padding	= 0	#( every window is misaligned for the sake of menus ):
 	GtkMenu::horizontal-padding	= 0
 	GtkMenu::vertical-padding	= 0
@@ -748,19 +750,6 @@ style "menubar_item"
 	fg[PRELIGHT]	= @text_color
 }
 
-style "toolbar"
-{
-	engine "pixmap"
-	{
-		image
-		{
-			function	= BOX
-			file		= "Toolbar/toolbar.png"
-			stretch		= TRUE
-    		}
- 	}
-}
-
 style "button"
 {
 	xthickness	= 4
@@ -803,48 +792,6 @@ style "button"
   }
 }
 
-style "toolbuttons"
-{
-	ythickness	= 1
-	GtkWidget::focus_padding = 2
-
-	engine "pixmap" {
-      
-image
-		{
-			function        		= BOX
-			state				= NORMAL
-			file            		= "Toolbar/toolbutton-normal.png"
-			border          		= { 4, 4, 4, 4 }
-			stretch         		= TRUE
-		}
-image
-		{
-			function        		= BOX
-			state				= PRELIGHT
-			file            		= "Toolbar/toolbutton-prelight.png"
-			border          		= { 4, 4, 4, 4 }
-			stretch         		= TRUE
-		}
-image
-		{
-			function        		= BOX
-			state				= ACTIVE
-			file            		= "Toolbar/toolbutton-pressed.png"
-			border          		= { 4, 4, 4, 4 }
-			stretch         		= TRUE
-		}  
-image
-		{
-			function        		= BOX
-			state				= INSENSITIVE
-			file            		= "Toolbar/toolbutton-normal.png"
-			border          		= { 4, 4, 4, 4 }
-			stretch         		= TRUE
-		}  
-	}
-}
-
 style "entry"
 {
 	xthickness	= 3
@@ -1117,6 +1064,31 @@ style "notebook"
   }
 }
 
+style "handlebox"
+{
+  engine "pixmap"
+  {
+    image
+    {
+      function                  = BOX
+      file			= "Others/null.png"
+      border			= { 4, 4, 4, 4 }
+      stretch			= TRUE
+      detail                    = "handlebox_bin"
+      shadow                    = IN
+    }
+    image
+    {
+      function                  = BOX
+      file			= "Others/null.png"
+      border			= { 4, 4, 4, 4 }
+      stretch			= TRUE
+      detail                    = "handlebox_bin"
+      shadow                    = OUT
+    }
+  }
+}
+
 style "range"
 {	
   engine "pixmap" 
@@ -1364,14 +1336,8 @@ widget_class "*<GtkMenuBar>*"			style "menubar"
 widget_class "*<GtkMenu>*"			style "menu"
 widget_class "*<GtkMenuItem>*"			style "menu_item"
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menubar_item"
-widget_class "*Nautilus*ToolBar*"	style "toolbar"
-widget_class "*HandleBox"		style "toolbar"
-widget_class "*BonoboDockItem"		style "toolbar"
-widget_class "*HandleBox"		style "toolbar"
-widget_class "*<GtkToolbar>"		style "toolbar"
+widget_class "*HandleBox"               style "handlebox"
 widget_class "*.<GtkTreeView>*"		style "treeview"
-widget_class "*Tool*GtkToggleButton"	style "toolbuttons"
-widget_class "*Tool*GtkButton"		style "toolbuttons"
 
 widget_class "*Chrom*Button*"		style "button"