Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-artwork/mainline

6 files changed, 38 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 6896229..9acb07c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ test/torturetest
 test/torture_*
 test/exported_*
 .DS_Store
+gtk/theme/sugar-100.gtkrc
+gtk/theme/sugar-72.gtkrc
diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
index 6e9abe9..cf950d9 100644
--- a/icons/scalable/device/Makefile.am
+++ b/icons/scalable/device/Makefile.am
@@ -41,6 +41,8 @@ icon_DATA =				\
 	camera.svg			\
 	computer.svg			\
 	computer-xo.svg			\
+	drive.svg			\
+	drive-harddisk.svg		\
 	drive-harddisk-usb.svg		\
 	media-disk.svg			\
 	media-flash-sd.svg		\
diff --git a/icons/scalable/device/drive-harddisk.svg b/icons/scalable/device/drive-harddisk.svg
new file mode 100644
index 0000000..2fd43a1
--- /dev/null
+++ b/icons/scalable/device/drive-harddisk.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/drive.svg b/icons/scalable/device/drive.svg
new file mode 100644
index 0000000..2fd43a1
--- /dev/null
+++ b/icons/scalable/device/drive.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/mimetypes/Makefile.am b/icons/scalable/mimetypes/Makefile.am
index 706e224..c49169c 100644
--- a/icons/scalable/mimetypes/Makefile.am
+++ b/icons/scalable/mimetypes/Makefile.am
@@ -4,6 +4,7 @@ icondir = $(datadir)/icons/sugar/$(iconsize)/$(category)
 
 icon_DATA =					\
 	application-octet-stream.svg		\
+	application-x-generic.svg		\
 	application-x-squeak-project.svg	\
 	audio-x-generic.svg			\
 	image-x-generic.svg			\
diff --git a/icons/scalable/mimetypes/application-x-generic.svg b/icons/scalable/mimetypes/application-x-generic.svg
new file mode 100644
index 0000000..c094044
--- /dev/null
+++ b/icons/scalable/mimetypes/application-x-generic.svg
@@ -0,0 +1,15 @@
+<?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="clipping-data">
+	<g>
+		<g>
+			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
+			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
+		</g>
+	</g>
+	<rect fill="&stroke_color;" height="5.5" width="5.5" x="16.441" y="34.625"/>
+	<rect fill="&stroke_color;" height="5.5" width="5.5" x="21.941" y="29.125"/>
+	<rect fill="&stroke_color;" height="5.5" width="5.5" x="27.441" y="34.625"/>
+	<rect fill="&stroke_color;" height="5.5" width="5.5" x="32.941" y="29.125"/>
+</g></svg>
\ No newline at end of file