Add a test for the new size icons

6 files changed, 44 insertions, 6 deletions

diff --git a/art/icon-theme/index.theme.in b/art/icon-theme/index.theme.in
index 6436b24..5878fc8 100755
--- a/art/icon-theme/index.theme.in
+++ b/art/icon-theme/index.theme.in
@@ -3,13 +3,20 @@ _Name=OLPC
 _Comment=Default OLPC Theme
 Inherits=gnome
 
-Directories=16x16/stock/emoticons,scalable/stock,scalable/object,scalable/device,scalable/control
+Directories=16x16/stock/emoticons,scalable/stock,scalable/object,scalable/device,scalable/control,scalable/actions
 
 [16x16/stock/emoticons]
 Size=16
 Context=Stock
 Type=Fixed
 
+[scalable/actions]
+Size=55
+MinSize=32
+MaxSize=256
+Context=Actions
+Type=Scalable
+
 [scalable/stock]
 Size=50
 MinSize=32
@@ -21,19 +28,19 @@ Type=Scalable
 Size=50
 MinSize=32
 MaxSize=256
-Context=Stock
+Context=Object
 Type=Scalable
 
 [scalable/device]
 Size=50
 MinSize=32
 MaxSize=256
-Context=Stock
+Context=Device
 Type=Scalable
 
 [scalable/control]
 Size=50
 MinSize=32
 MaxSize=256
-Context=Stock
+Context=Control
 Type=Scalable
diff --git a/art/icon-theme/scalable/Makefile.am b/art/icon-theme/scalable/Makefile.am
index bfcd6b2..2d1f15e 100644
--- a/art/icon-theme/scalable/Makefile.am
+++ b/art/icon-theme/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = control device object stock
+SUBDIRS = actions control device object stock
diff --git a/art/icon-theme/scalable/actions/Makefile.am b/art/icon-theme/scalable/actions/Makefile.am
new file mode 100644
index 0000000..810b9df
--- /dev/null
+++ b/art/icon-theme/scalable/actions/Makefile.am
@@ -0,0 +1,8 @@
+iconsize=scalable
+category=actions
+icondir = $(datadir)/icons/olpc/$(iconsize)/$(category)
+
+icon_DATA =				\
+	text-format-bold.svg
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/art/icon-theme/scalable/actions/text-format-bold.svg b/art/icon-theme/scalable/actions/text-format-bold.svg
new file mode 100644
index 0000000..8c0433d
--- /dev/null
+++ b/art/icon-theme/scalable/actions/text-format-bold.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [

+	<!ENTITY ns_svg "http://www.w3.org/2000/svg">

+	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">

+	<!ENTITY stroke_color "#FFFFFF">

+]>

+<svg  version="1.1" id="Icon" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="31.32" height="31.32" viewBox="-4 0 31.32 31.32"

+	 overflow="visible" enable-background="new 0 0 31.32 31.328" xml:space="preserve">

+<g>

+	<path d="M0,3.564C0,1.276,1.717,0,3.564,0h8.404c5.412,0,8.8,3.344,8.8,8.184c0,3.213-2.244,5.104-3.74,5.984

+		c3.828,0.748,6.292,3.783,6.292,7.699c0,4.973-3.212,9.461-10.912,9.461H3.564C1.717,31.328,0,30.052,0,27.764V3.564z

+		 M7.129,12.232h3.256c2.023,0,3.256-1.013,3.256-2.949s-1.188-2.948-3.256-2.948H7.129V12.232z M7.129,24.992h4.488

+		c2.375,0,4.312-0.836,4.312-3.213c0-2.375-2.2-3.211-4.312-3.211H7.129V24.992z" stroke="&stroke_color;" fill="&stroke_color;"/>

+</g>

+</svg>

diff --git a/configure.in b/configure.in
index 32edb3a..7414c67 100644
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,7 @@ art/icon-theme/16x16/Makefile
 art/icon-theme/16x16/stock/Makefile
 art/icon-theme/16x16/stock/emoticons/Makefile
 art/icon-theme/scalable/Makefile
+art/icon-theme/scalable/actions/Makefile
 art/icon-theme/scalable/control/Makefile
 art/icon-theme/scalable/device/Makefile
 art/icon-theme/scalable/stock/Makefile
diff --git a/gtk/theme/gtkrc b/gtk/theme/gtkrc
index a5326b3..4a0e1d2 100644
--- a/gtk/theme/gtkrc
+++ b/gtk/theme/gtkrc
@@ -1,10 +1,16 @@
 style "default"
 {
-    bg[NORMAL] = "#262626"
+    bg[NORMAL] = "#BFBFBF"
 
     engine "sugar"
     {
     }
 }
 
+style "toolbar"
+{
+    bg[NORMAL] = "#262626"
+}
+
 class "GtkWidget" style "default"
+class "GtkToolbar" style "toolbar"