Merge branch 'master' of git://git.sugarlabs.org/sugar-artwork/mainlineHEADmaster

27 files changed, 306 insertions, 36 deletions

diff --git a/autogen.sh b/autogen.sh
index 9bd6fd0..d09dc6a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 autoreconf -i
-./configure "$@"
+./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 22209bf..3295310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,18 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.85.2],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.92.0],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
 
+AM_MAINTAINER_MODE
 AM_DISABLE_STATIC
 
 PKG_PROG_PKG_CONFIG([0.19])
 
+GNOME_COMPILE_WARNINGS(maximum)
+
 AC_PROG_CC
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
@@ -20,12 +23,7 @@ if test -z "$ICON_SLICER"; then
 fi
 
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
-	          AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
-
-GDK_PIXBUF2_CFLAGS=`$PKG_CONFIG --cflags gdk-pixbuf-2.0`
-GDK_PIXBUF2_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
-AC_SUBST(GDK_PIXBUF2_CFLAGS)
-AC_SUBST(GDK_PIXBUF2_LIBS)
+	          AC_MSG_ERROR([GTK+-2.0 is required to compile sugar-artwork]))
 
 PKG_CHECK_MODULES(ENGINE, gtk+-2.0 >= 2.0 gobject-2.0 >= 2.0 cairo >= 0.1.1)
 
diff --git a/gtk/engine/Makefile.am b/gtk/engine/Makefile.am
index eb720ff..d23508a 100644
--- a/gtk/engine/Makefile.am
+++ b/gtk/engine/Makefile.am
@@ -1,7 +1,4 @@
 INCLUDES = \
-	-DGTK_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED \
-	-DG_DISABLE_DEPRECATED \
 	$(ENGINE_CFLAGS) $(WARN_CFLAGS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
diff --git a/gtk/engine/sugar-style.c b/gtk/engine/sugar-style.c
index 443a708..b81fe69 100644
--- a/gtk/engine/sugar-style.c
+++ b/gtk/engine/sugar-style.c
@@ -389,8 +389,12 @@ sugar_style_draw_box (GtkStyle       *style,
         SugarInfo info;
         sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
 
-        /* Fill the background with bg_color. */
-        sugar_fill_background (cr, &info);
+        /* Fill the background as it is initilized to base[NORMAL].
+         * Relevant GTK+ bug: http://bugzilla.gnome.org/show_bug.cgi?id=513471
+         * The fill only happens if no hint has been added by some application
+         * that is faking GTK+ widgets. */
+        if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+            sugar_fill_background (cr, &info);
 
         info.cont_edges = info.ltr ? EDGE_LEFT : EDGE_RIGHT;
         sugar_remove_corners (&info.corners, info.cont_edges);
@@ -444,7 +448,8 @@ sugar_style_draw_box (GtkStyle       *style,
                 info.state = GTK_STATE_INSENSITIVE;
 
             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
-            sugar_fill_background (cr, &info);
+            if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+                sugar_fill_background (cr, &info);
             sugar_draw_progressbar_trough (cr, &info);
         }
     } else if (DETAIL ("bar")) {
@@ -641,7 +646,8 @@ sugar_style_draw_shadow (GtkStyle       *style,
         }
 
         /* Fill the background with bg_color. */
-        sugar_fill_background (cr, &info);
+        if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+            sugar_fill_background (cr, &info);
         sugar_draw_entry (cr, &info);
     } else {
         gdouble line_width;
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index f7b7129..69dccd9 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -131,6 +131,10 @@ style "default"
     GtkExpander::expander-spacing = 2     # XXX
 
     GtkTreeView::expander-size = 24
+
+    # we have to disable focus border for GtkTreeView, see #1261
+    GtkTreeView::interior-focus = 1
+    GtkTreeView::focus-line-width = 0
     
     GtkArrow::arrow-size = 1.0
 
@@ -145,6 +149,11 @@ style "default"
     GtkButtonBox::child-internal-pad-x = 0
     GtkButtonBox::child-internal-pad-y = 0
 
+    # The following line hints to gecko (and possibly other appliations)
+    # that the entry should be drawn transparently on the canvas.
+    # Without this, gecko will fill in the background of the entry.
+    GtkEntry::honors-transparent-bg-hint = 1
+
     engine "sugar" {
         line_width = $line_width
         thick_line_width = $thick_line_width
@@ -267,8 +276,8 @@ style "menu"
 
     ${# This is just the exact reverse of what is going on inside GTK+ ...}
     GtkMenu::scroll-arrow-vlength = $(my_floor(subcell_size/0.7 + 2*thickness))
-    GtkMenu::horizontal-padding = 0
-    GtkMenu::vertical-padding   = 0
+    GtkMenu::horizontal-padding = $thickness
+    GtkMenu::vertical-padding   = $thickness
     # This means the outline of the submenu overlaps with a palette.
     # However in the case of two normal menus, they are next to each other.
     # It is not possible to be smarter about this, because the style comes from
@@ -276,12 +285,21 @@ style "menu"
     GtkMenu::horizontal-offset  = 0
     GtkMenu::vertical-offset    = 0
 
+    xthickness = 0
+    ythickness = 0
+}
+
+style "palette" = "menu"
+{
     xthickness = $thickness
     ythickness = $thickness
 }
 
 style "palette-menu" = "menu"
 {
+    GtkMenu::horizontal-padding = 0
+    GtkMenu::vertical-padding   = 0
+
     xthickness = 0
     ythickness = $subcell_size
 }
@@ -755,9 +773,9 @@ widget_class "*<GtkNotebook>.<GtkBox>.<GtkLabel>"    style "notebook-tab"
 
 # SugarPalette and Menu
 widget_class "*<GtkMenu>"               style "menu"
-widget_class "<SugarPalette>"           style "menu"
-widget_class "<SugarPalette>.*"         style "menu-child"
-widget_class "<SugarPalette>*<GtkMenu>" style "palette-menu"
+widget_class "<SugarPaletteWindow>"           style "palette"
+widget_class "<SugarPaletteWindow>.*"         style "menu-child"
+widget_class "<SugarPaletteWindow>*<GtkMenu>" style "palette-menu"
 widget_class "*<GtkMenuShell>.*"        style "menu-child"
 
 # SugarFrameWindow
@@ -774,7 +792,7 @@ widget_class "<GtkWindow>*<GtkNotebook>*"   style "groupbox-panel-child"
 widget_class "<GtkWindow>*<GtkNotebook>"    style "notebook-panel"
 
 
-widget_class "<SugarPalette>*<SugarGroupBox>*"   style "groupbox-palette-child"
+widget_class "<SugarPaletteWindow>*<SugarGroupBox>*"   style "groupbox-palette-child"
 
 
 # SugarToolbox
diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
index 085ac28..9df018b 100644
--- a/icons/scalable/actions/Makefile.am
+++ b/icons/scalable/actions/Makefile.am
@@ -39,7 +39,7 @@ icon_DATA =						\
 	go-next.svg					\
 	go-previous-paired.svg				\
 	go-previous.svg					\
-	go-right.svg					\	
+	go-right.svg					\
 	go-up.svg					\
 	insert-image.svg				\
 	insert-table.svg				\
@@ -88,15 +88,18 @@ icon_DATA =						\
 	transfer-to.svg					\
 	transfer-to-text-uri-list.svg			\
 	transfer-to-text-x-generic.svg			\
-	transfer-to-video-x-generic.svg			\		
+	transfer-to-video-x-generic.svg			\
 	view-box.svg					\
+	view-created.svg				\
 	view-details.svg				\
 	view-freeform.svg				\
 	view-fullscreen.svg				\
+	view-lastedit.svg				\
 	view-list.svg					\
 	view-radial.svg					\
 	view-refresh.svg				\
 	view-return.svg					\
+	view-size.svg					\
 	view-spiral.svg					\
 	view-source.svg					\
 	view-triangle.svg				\
diff --git a/icons/scalable/actions/go-home.svg b/icons/scalable/actions/go-home.svg
index 4e5955f..c8db077 100644
--- a/icons/scalable/actions/go-home.svg
+++ b/icons/scalable/actions/go-home.svg
@@ -1,10 +1,11 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#4C4D4F">
-	<!ENTITY fill_color "#fff">
-]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" stroke="&stroke_color;" fill="&fill_color;">
- <g id="go-home">
-   <path d="M 27.5 2.96256 L 1.4755 30.4005 L 7.48131 30.4005 L 7.55256 52.0374 L 48.59 51.9662 L 48.4221 30.2792 L 53.5245 30.3293 L 42.8832 19.1246 L 42.8936 5.27163 L 34.8637 5.26122 L 34.8997 10.5775 L 27.5 2.96256 Z " stroke="none" stroke-width="2.25" />
-   <path d="M 15.8232 32.9243 L 25.2899 32.9243 L 25.2899 52.0052 L 15.8232 52.0052 Z " fill="&stroke_color;" stroke="none" stroke-width="2.25" />
-   <path d="M 31.6038 32.5574 L 41.6199 32.5574 L 41.6199 42.3946 L 31.6038 42.3946 Z " fill="&stroke_color;" stroke="none" stroke-width="2.25" />
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
+  <g id="go-home">
+    <path d="M 27.5 15.96256 L 8.48131 32.4005 L 8.55256 48.0374 L 17 48.0052 L 17 30.9243 L 26 30.9243 L 26 48.0052 L 47.59 48.0052 L 47.4221 32.2792 Z M 31.5 30.9243 l 8 0 l 0 8 l -8 0 Z" stroke="none" fill="&fill_color;" stroke-linecap="round" stroke-width="3.5" />
+    <path d="M 5.48131 27.4005 L 27.5 8.96256 L 38.8997 18.0775 L 38.8637 9.26122 L 42.8936 9.27163 L 42.8832 21.3246 L 50.4221 27.2792" stroke="&fill_color;" fill="none" stroke-linecap="round" stroke-width="4.5" />
+  </g>
 </svg>
diff --git a/icons/scalable/actions/system-search.svg b/icons/scalable/actions/system-search.svg
index 7b19fe5..f132175 100644
--- a/icons/scalable/actions/system-search.svg
+++ b/icons/scalable/actions/system-search.svg
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>

 <!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->

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

+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+        <!ENTITY stroke_color "#010101">
+        <!ENTITY fill_color "#FFFFFF">
+]>
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

 	 width="22.156px" height="22.156px" viewBox="0 0 22.156 22.156" enable-background="new 0 0 22.156 22.156" xml:space="preserve">

 <g>

-	<path fill="none" stroke="#4C4D4F" stroke-width="3.5" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47

+	<path fill="none" stroke="&fill_color;" stroke-width="2" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47
 		c4.121,0,7.466-3.345,7.466-7.47c0-4.123-3.345-7.466-7.466-7.466C5.092,1.75,1.75,5.093,1.75,9.216z"/>

-	<line fill="none" stroke="#4C4D4F" stroke-width="3.5" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/>

+	<line fill="none" stroke="&fill_color;" stroke-width="2" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/>
 </g>

 </svg>

diff --git a/icons/scalable/actions/view-created.svg b/icons/scalable/actions/view-created.svg
new file mode 100644
index 0000000..577aceb
--- /dev/null
+++ b/icons/scalable/actions/view-created.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#000000">
+  <!ENTITY stroke_color "#FFFFFF">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
+	<defs>
+		<mask id="Mask" maskUnits="userSpaceOnUse" x="0" y="0" width="55" height="55">
+            <rect x="0" y="0" width="55" height="55" fill="#FFFFFF" stroke="none"/>
+			<circle cx="21.5" cy="16" r="1.75" style="fill:#000000;;stroke:none"/>
+			<circle cx="21.5" cy="39" r="1.75" style="fill:#000000;;stroke:none"/>
+			<circle cx="10" cy="27.5" r="1.75" style="fill:#000000;;stroke:none"/>
+			<circle cx="33" cy="27.5" r="1.75" style="fill:#000000;;stroke:none"/>
+            <line x1="21.5" y1="27.5" x2="28.5" y2="17" stroke="#000000" stroke-width="2.5" stroke-linecap="round"/>
+            <line x1="21.5" y1="27.5" x2="29" y2="32.5" stroke="#000000" stroke-width="2.5" stroke-linecap="round"/>
+		</mask>
+	</defs>
+    <circle cx="21" cy="27" r="15" style="fill:&stroke_color;;stroke:&stroke_color;;stroke-width:3.5" mask="url(#Mask)"/>
+    <path d="M 46 17 l 7 7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+    <path d="M 46 38 l 7 -7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+</svg>
diff --git a/icons/scalable/actions/view-lastedit.svg b/icons/scalable/actions/view-lastedit.svg
new file mode 100644
index 0000000..fe26710
--- /dev/null
+++ b/icons/scalable/actions/view-lastedit.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#000000">
+  <!ENTITY stroke_color "#FFFFFF">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
+	<defs>
+		<mask id="Mask" maskUnits="userSpaceOnUse" x="0" y="0" width="55" height="55">
+            <rect x="0" y="0" width="55" height="55" fill="#FFFFFF" stroke="none"/>
+            <line x1="11" y1="19" x2="16" y2="19" stroke="#000000" stroke-width="2.5"/>
+            <line x1="18" y1="19" x2="22" y2="19" stroke="#000000" stroke-width="2.5"/>
+            <line x1="11" y1="24" x2="13" y2="24" stroke="#000000" stroke-width="2.5"/>
+            <line x1="15" y1="24" x2="18" y2="24" stroke="#000000" stroke-width="2.5"/>
+            <line x1="11" y1="29" x2="14" y2="29" stroke="#000000" stroke-width="2.5"/>
+            <path d="M 17 35 l 2 -6 l 19 -19 l 4 3 l -19 19 z" fill="#000000" stroke="#000000" stroke-width="3"/>
+		</mask>
+	</defs>
+    <rect x="8" y="14" width="25" height="27" style="fill:&stroke_color;;stroke:&stroke_color;;stroke-width:3.5" mask="url(#Mask)"/>
+    <path d="M 17 35 l 1 -5 l 4 3 z" fill="&stroke_color;" stroke="none"/>
+    <path d="M 17 35 m 2 -6 l 19 -19 l 4 3 l -19 19 z" fill="&stroke_color;" stroke="none"/>
+    <path d="M 46 17 l 7 7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+    <path d="M 46 38 l 7 -7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+</svg>
diff --git a/icons/scalable/actions/view-size.svg b/icons/scalable/actions/view-size.svg
new file mode 100644
index 0000000..70ddb55
--- /dev/null
+++ b/icons/scalable/actions/view-size.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#000000">
+  <!ENTITY stroke_color "#FFFFFF">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
+    <line x1="5" y1="15" x2="38" y2="15" stroke="&stroke_color;" stroke-width="3.5"/>
+    <line x1="10.5" y1="23" x2="32.5" y2="23" stroke="&stroke_color;" stroke-width="3.5"/>
+    <line x1="15" y1="31" x2="28" y2="31" stroke="&stroke_color;" stroke-width="3.5"/>
+    <line x1="19.5" y1="39" x2="23.5" y2="39" stroke="&stroke_color;" stroke-width="3.5"/>
+    <path d="M 46 17 l 7 7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+    <path d="M 46 38 l 7 -7 l -14 0 z" fill="&stroke_color;" stroke="none"/>
+</svg>
diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
index 3f6dc64..8c165e6 100644
--- a/icons/scalable/device/Makefile.am
+++ b/icons/scalable/device/Makefile.am
@@ -43,9 +43,18 @@ icon_DATA =				\
 	drive.svg			\
 	drive-harddisk.svg		\
 	drive-harddisk-usb.svg		\
+	media.svg			\
+	media-optical.svg		\
 	media-disk.svg			\
 	media-flash-sd.svg		\
 	microphone.svg			\
+	network-adhoc-1-connected.svg	\
+	network-adhoc-1.svg		\
+	network-adhoc-6-connected.svg	\
+	network-adhoc-6.svg		\
+	network-adhoc-11-connected.svg	\
+	network-adhoc-11.svg		\
+	network-gsm.svg			\
 	network-mesh.svg		\
 	network-mesh.icon		\
 	network-wired.svg		\
@@ -74,6 +83,7 @@ icon_DATA =				\
 	network-wireless-connected-100.svg	\
 	network-wireless-connected-100.icon	\
 	printer.svg			\
+	school-server.svg			\
 	speaker-000.svg			\
 	speaker-033.svg			\
 	speaker-066.svg			\
@@ -81,7 +91,9 @@ icon_DATA =				\
 	speaker-muted-000.svg		\
 	speaker-muted-033.svg		\
 	speaker-muted-066.svg		\
-	speaker-muted-100.svg		
+	speaker-muted-100.svg		\
+	touchpad-capacitive.svg		\
+	touchpad-resistive.svg
 
 EXTRA_DIST = $(icon_DATA)
 
diff --git a/icons/scalable/device/media-optical.svg b/icons/scalable/device/media-optical.svg
new file mode 100644
index 0000000..3aac21a
--- /dev/null
+++ b/icons/scalable/device/media-optical.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="media-disk">
+	<path d="M27.378,5C14.956,5,4.875,15.099,4.875,27.502   C4.875,39.921,14.956,50,27.378,50c12.411,0,22.496-10.079,22.496-22.498C49.875,15.099,39.79,5,27.378,5z M27.377,34.52   c-3.875,0-7.023-3.146-7.023-7.02c0-3.87,3.147-7.021,7.023-7.021c3.871,0,7.017,3.152,7.017,7.021   C34.394,31.374,31.249,34.52,27.377,34.52z" display="inline" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/device/media.svg b/icons/scalable/device/media.svg
new file mode 100644
index 0000000..2fd43a1
--- /dev/null
+++ b/icons/scalable/device/media.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="media-flash-usb">
+	<g display="inline">
+		<path d="M15.885,16.723c-6.641,0-12.023,5.385-12.023,12.025    c0,6.639,5.383,12.023,12.023,12.023h0.014h27.259V16.723H15.899" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/>
+		<rect fill="&fill_color;" height="14.182" stroke="&stroke_color;" stroke-width="3.5" width="9.14" x="43.722" y="21.731"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/device/network-adhoc-1-connected.svg b/icons/scalable/device/network-adhoc-1-connected.svg
new file mode 100644
index 0000000..8365879
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-1-connected.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-1-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="27.5" fill="&stroke_color;" r="4"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-1.svg b/icons/scalable/device/network-adhoc-1.svg
new file mode 100644
index 0000000..0848527
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-1">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="27.5" fill="&stroke_color;" r="4"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-11-connected.svg b/icons/scalable/device/network-adhoc-11-connected.svg
new file mode 100644
index 0000000..167ad02
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-11-connected.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-11-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="20.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="26.5" fill="&stroke_color;"/>
+     <rect height="4" width="12" x="21.375" y="32.5" fill="&stroke_color;"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-11.svg b/icons/scalable/device/network-adhoc-11.svg
new file mode 100644
index 0000000..762bea0
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-11.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-11">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="20.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="26.5" fill="&stroke_color;"/>
+     <rect height="4" width="12" x="21.375" y="32.5" fill="&stroke_color;"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-6-connected.svg b/icons/scalable/device/network-adhoc-6-connected.svg
new file mode 100644
index 0000000..56b0934
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-6-connected.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-6-connected">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="24.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="30.5" fill="&stroke_color;"/>
+     <path d="M9.471,45.697    c-9.958-9.958-9.959-26.104,0-36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+     <path d="M45.533,9.635    c9.959,9.958,9.958,26.104,0,36.062" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-adhoc-6.svg b/icons/scalable/device/network-adhoc-6.svg
new file mode 100644
index 0000000..18df8fb
--- /dev/null
+++ b/icons/scalable/device/network-adhoc-6.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+   <g display="inline" id="network-adhoc-6">
+     <circle cx="27.375" cy="27.5" fill="&fill_color;" r="19.0" stroke="&stroke_color;" stroke-width="4"/>
+     <circle cx="27.375" cy="24.5" fill="&stroke_color;" r="4"/>
+     <rect height="4" width="12" x="21.375" y="30.5" fill="&stroke_color;"/>
+   </g>
+</svg>
diff --git a/icons/scalable/device/network-gsm.svg b/icons/scalable/device/network-gsm.svg
new file mode 100644
index 0000000..9d7a533
--- /dev/null
+++ b/icons/scalable/device/network-gsm.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#666666">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 56.167 55" height="55px" version="1.1" viewBox="0 0 56.167 55" width="56.167px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="network-gsm">
+	<g>
+		<path d="M13.759,11.28    v28.937h0.002c0,0.004-0.002,0.008-0.002,0.014c0,7.05,5.715,12.763,12.764,12.763c7.047,0,12.762-5.713,12.762-12.763v-0.014    V11.28H13.759z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+		<rect fill="&stroke_color;" height="9.702" width="14.063" x="19.43" y="16.902"/>
+		
+			<line fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="39.286" x2="39.286" y1="11.28" y2="1.993"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/device/school-server.svg b/icons/scalable/device/school-server.svg
new file mode 100644
index 0000000..28a854d
--- /dev/null
+++ b/icons/scalable/device/school-server.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
+    <path d="M10,50 S8,50 8,48 L8,35 L27.5,24 L47,35 L47,48 S47,50 45,50 z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="1.75"/>
+    <path d="M33,50 L33,39 S33,37 31,37 L24,37 S22,37 22,39 L22,50 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="1.75"/>
+    <path d="M20,23.5 L20,10 L35,10 L35,23.5 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="3.5"/>
+    <line x1="6" y1="33.5" x2="27.5" y2="21.5" stroke="&stroke_color;" stroke-width="6.75" stroke-linecap="round"/>
+    <line x1="49" y1="33.5" x2="27.5" y2="21.5" stroke="&stroke_color;" stroke-width="6.75" stroke-linecap="round"/>
+    <line x1="6" y1="33.5" x2="27.5" y2="21.5" stroke="&fill_color;" stroke-width="3.5" stroke-linecap="round"/>
+    <line x1="49" y1="33.5" x2="27.5" y2="21.5" stroke="&fill_color;" stroke-width="3.5" stroke-linecap="round"/>
+    <path d="M20,23.7 L20,10 L35,10 L35,23.7 z" fill="&fill_color;" stroke="none" stroke-width="2"/>
+    <path d="M18,9.25 L27.5,3.25 L37,9.25 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="2.25"/>
+    <circle cx="27.5" cy="15.5" r="3.25" fill="&stroke_color;" stroke="none" stroke-width="2"/>
+    <path d="M24.25,19.25 L24.25,15.5 L30.75,15.5 L30.75,19.25 z" fill="&stroke_color;" stroke="none" stroke-width="2"/>
+    <line x1="24.25" y1="19" x2="30.75" y2="19" stroke="&stroke_color;" stroke-width="2.5" stroke-linecap="round"/>
+    <circle cx="27.5" cy="20.5" r="1.25" fill="&stroke_color;" stroke="none" stroke-width="2"/>
+</svg>
diff --git a/icons/scalable/device/touchpad-capacitive.svg b/icons/scalable/device/touchpad-capacitive.svg
new file mode 100644
index 0000000..1ffdf85
--- /dev/null
+++ b/icons/scalable/device/touchpad-capacitive.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+      <!ENTITY stroke_color "#010101">
+      <!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g
+   transform="translate(0,-15.65)">
+<path
+   d="m 2.934,28.664 0,18.209 49.391,0 0,-18.209 -49.391,0 z M 36,45.833 l -17,0 0,-16.129 17,0 0,16.129 z"
+   fill="&fill_color;"
+   stroke="&stroke_color;"
+   style="stroke-width:2" />
+</g>
+<path
+   d="m 22.817123,49.135003 c 0,0 -3.23492,-8.766448 -3.243008,-9.837791 -0.0135,-1.797291 -2.398098,-2.342156 -2.398098,-2.342156 0,0 -0.621319,-2.249376 0,-2.770053 0.656117,-0.549837 2.934483,-0.629824 3.735004,0.330634 l 2.413094,2.895211 0,-12.75 c 0,0 0.888891,-1.589214 1.643962,-1.454545 0.745806,0.133019 1.356038,1.454545 1.356038,1.454545 l 0,10.5 0,-4.5 c 0,0 0.947828,-0.746067 1.5,-0.75 0.552172,-0.0039 1.5,0.75 1.5,0.75 l 0,4.5 0,-3.75 c 0,0 0.675747,-0.758712 1.5,-0.75 0.824253,0.0087 1.5,0.568182 1.5,0.568182 l 0,3.931818 0,-3 c 0,0 0.857274,-0.33549 1.5,-0.375 0.526597,-0.03237 1.448303,0.97351 1.5,1.575 0.220672,2.567514 0.969363,5.350927 0.823983,7.574377 -0.100086,1.53071 -0.67874,8.199778 -2.212713,8.199778 l -11.118262,0 z"
+   fill="&fill_color;"
+   stroke="&stroke_color;"
+   style="stroke-width:1.5;" />
+</svg>
diff --git a/icons/scalable/device/touchpad-resistive.svg b/icons/scalable/device/touchpad-resistive.svg
new file mode 100644
index 0000000..0af470b
--- /dev/null
+++ b/icons/scalable/device/touchpad-resistive.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+      <!ENTITY stroke_color "#010101">
+      <!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g
+   transform="translate(0,-15.6)">
+<path
+   d="m 2.934,28.664 0,18.209 49.391,0 0,-18.209 -49.391,0 z"
+   fill="&fill_color;"
+   stroke="&stroke_color;"
+   style="stroke-width:2" />
+</g><path
+   d="m 10.113335,17.999995 c 4.481574,10.248626 12.299223,4.823443 18.006668,1.48 3.636065,-2.130021 10.421669,1.48 10.421669,1.48"
+   fill="none"
+   stroke="&stroke_color;"
+   style="stroke-width:2;stroke-linecap:round" /><path
+   d="m 46.742465,8.1381941 -5.095999,6.7474989 -1.044001,1.3585 -1.7375,4.133 c -0.023,0.052 -0.009,0.1115 0.0345,0.1475 0.0445,0.036 0.1055,0.042 0.1535,0.01 l 3.913,-2.5185 c 0.0055,-0.004 0.0055,-0.0135 0.011,-0.0215 0.0325,-0.0245 0.071,-0.046 0.098,-0.081 0.0015,-10e-4 0.017,-0.0205 0.017,-0.0245 l 0.9155,-1.1355 2.7345,-3.527 4.005501,-5.1644989 c 0.011,-0.0115 0.0745,-0.1015 0.0745,-0.1015 0.048,-0.0805 0.074,-0.1725 0.074,-0.278 0,-0.0305 0,-0.059 -0.006,-0.088 -0.0435,-0.3815 -0.357501,-0.841 -0.819501,-1.2065 -0.4615,-0.364 -0.9845,-0.5615 -1.364,-0.517 -0.163,0.021 -0.3945,0.1875 -0.3945,0.1875 l -1.5695,2.0795 z"
+   fill="&fill_color;"
+   stroke="&stroke_color;"
+   style="stroke-width:1.5" />
+</svg>
diff --git a/icons/scalable/status/Makefile.am b/icons/scalable/status/Makefile.am
index 9ec1684..c977c22 100644
--- a/icons/scalable/status/Makefile.am
+++ b/icons/scalable/status/Makefile.am
@@ -7,6 +7,8 @@ icon_DATA =			\
 	audio-volume-low.svg	\
 	audio-volume-medium.svg	\
 	audio-volume-muted.svg	\
+	data-download.svg	\
+	data-upload.svg		\
 	image-missing.svg
 
 EXTRA_DIST = $(icon_DATA)
diff --git a/icons/scalable/status/data-download.svg b/icons/scalable/status/data-download.svg
new file mode 100644
index 0000000..f9ebab9
--- /dev/null
+++ b/icons/scalable/status/data-download.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg  PUBLIC "-//W3C//DTD SVG 1.1//EN"  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+    <polyline points="14,27.5 27.5,42 41,27.5 34,27.5 34,16 21,16 21,27.5" style="fill:&fill_color;;stroke:none"/>
+</svg>
\ No newline at end of file
diff --git a/icons/scalable/status/data-upload.svg b/icons/scalable/status/data-upload.svg
new file mode 100644
index 0000000..7365fe3
--- /dev/null
+++ b/icons/scalable/status/data-upload.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg  PUBLIC "-//W3C//DTD SVG 1.1//EN"  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+    <polyline points="14,27.5 27.5,13 41,27.5 34,27.5 34,39 21,39 21,27.5" style="fill:&fill_color;;stroke:none"/>
+</svg>
\ No newline at end of file