Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-07 03:49:54 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-08-07 03:49:54 (GMT)
commitc1bcb547e6aac8cca6e8e47d599c645386e7b36f (patch)
tree7ac7974ad6974f2245141f646259b20ff6a05f66
parent9ed1b5bf9b32bbd0f372ea2c4de02643173dac6d (diff)
parent5b69cdc1111bdae1fd2d6dc31d446ee2caa03cc5 (diff)
Merge commit 'v0.81.3' into upstream
-rw-r--r--configure.ac2
-rw-r--r--cursor/sugar/sugar-00.pngbin12624 -> 13118 bytes
-rw-r--r--gtk/theme/gtkrc.em22
-rw-r--r--icons/scalable/actions/Makefile.am1
-rw-r--r--icons/scalable/actions/view-freeform.svg10
-rw-r--r--icons/scalable/emblems/Makefile.am1
-rw-r--r--icons/scalable/emblems/emblem-downloads.svg13
7 files changed, 48 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 66258c4..3a5f752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-artwork],[0.81.1],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.81.3],[],[sugar-artwork])
AM_CONFIG_HEADER(config.h)
diff --git a/cursor/sugar/sugar-00.png b/cursor/sugar/sugar-00.png
index 93552bf..a5daecc 100644
--- a/cursor/sugar/sugar-00.png
+++ b/cursor/sugar/sugar-00.png
Binary files differ
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index c82a54b..3efa6ef 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -181,6 +181,25 @@ style "window-child"
}
}
+
+style "white-bg"
+{
+ bg[NORMAL] = $white
+}
+
+style "white-bg-child"
+{
+ bg[INSENSITIVE] = $white
+ base[INSENSITIVE] = $white
+
+ fg[NORMAL] = $black
+
+ engine "sugar" {
+ parent_fg_color = $black
+ parent_bg_color = $white
+ }
+}
+
style "black-bg"
{
bg[NORMAL] = $black
@@ -693,6 +712,9 @@ widget_class "<GtkWindow>*" style "window-child"
widget_class "*<SugarAlert>" style "black-bg"
widget_class "*<SugarAlert>*" style "black-bg-child"
+widget_class "*<SugarSectionView>" style "white-bg"
+widget_class "*<SugarSectionView>*" style "white-bg-child"
+
# The notebook is very high, so that everything is overriden
# Only the color of the tab labels needs to be modified inside the
diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
index 6848f65..c884544 100644
--- a/icons/scalable/actions/Makefile.am
+++ b/icons/scalable/actions/Makefile.am
@@ -66,6 +66,7 @@ icon_DATA = \
system-shutdown.svg \
tray-hide.svg \
tray-show.svg \
+ view-freeform.svg \
view-fullscreen.svg \
view-list.svg \
view-radial.svg \
diff --git a/icons/scalable/actions/view-freeform.svg b/icons/scalable/actions/view-freeform.svg
new file mode 100644
index 0000000..ce15ebc
--- /dev/null
+++ b/icons/scalable/actions/view-freeform.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 "#666666">
+ <!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55.125 55" height="55px" version="1.1" viewBox="0 0 55.125 55" width="55.125px" 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="view-freeform">
+ <g>
+ <rect fill="&fill_color;" height="14.45" stroke="&stroke_color;" stroke-width="3.5" width="14.447" x="8.064" y="32.034"/>
+ <rect fill="&fill_color;" height="14.45" stroke="&stroke_color;" stroke-width="3.5" width="14.449" x="32.467" y="32.034"/>
+ <rect fill="&fill_color;" height="14.449" stroke="&stroke_color;" stroke-width="3.5" width="14.446" x="20.402" y="8.109"/>
+ </g>
+</g></svg> \ No newline at end of file
diff --git a/icons/scalable/emblems/Makefile.am b/icons/scalable/emblems/Makefile.am
index 3517fa6..1ec547b 100644
--- a/icons/scalable/emblems/Makefile.am
+++ b/icons/scalable/emblems/Makefile.am
@@ -5,6 +5,7 @@ icondir = $(datadir)/icons/sugar/$(iconsize)/$(category)
icon_DATA = \
emblem-busy.svg \
emblem-charging.svg \
+ emblem-downloads.svg \
emblem-favorite.svg \
emblem-locked.svg \
emblem-notification.svg \
diff --git a/icons/scalable/emblems/emblem-downloads.svg b/icons/scalable/emblems/emblem-downloads.svg
new file mode 100644
index 0000000..1218879
--- /dev/null
+++ b/icons/scalable/emblems/emblem-downloads.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 "#666666">
+ <!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 55.884 55.226" height="55.226px" version="1.1" viewBox="0 0 55.884 55.226" width="55.884px" 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="emblem-download">
+ <g id="Cursor_5_">
+ <g>
+ <path d="M45.553,21.607c-1.548,0-2.946,0.631-3.96,1.643l-8.049,8.05L33.543,7.507 c-0.004-1.428-0.549-2.864-1.64-3.959c-2.191-2.185-5.738-2.185-7.922,0c-1.097,1.096-1.639,2.529-1.642,3.961l-0.002,23.789 L14.29,23.25c-1.012-1.015-2.413-1.643-3.96-1.643c-3.094-0.001-5.598,2.511-5.6,5.603c-0.001,1.546,0.631,2.952,1.636,3.962 l15.97,15.972l0,0h0l5.606,5.606l21.573-21.579c1.01-1.011,1.638-2.411,1.641-3.958C51.157,24.115,48.648,21.606,45.553,21.607z" fill="&fill_color;"/>
+ </g>
+ <g>
+ <path d="M45.553,21.607 c-1.548,0-2.946,0.631-3.96,1.643l-8.049,8.05L33.543,7.507c-0.004-1.428-0.549-2.864-1.64-3.959 c-2.191-2.185-5.738-2.185-7.922,0c-1.097,1.096-1.639,2.529-1.642,3.961l-0.002,23.789L14.29,23.25 c-1.012-1.015-2.413-1.643-3.96-1.643c-3.094-0.001-5.598,2.511-5.6,5.603c-0.001,1.546,0.631,2.952,1.636,3.962l15.97,15.972 l0,0h0l5.606,5.606l21.573-21.579c1.01-1.011,1.638-2.411,1.641-3.958C51.157,24.115,48.648,21.606,45.553,21.607z" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+ </g>
+ </g>
+</g></svg> \ No newline at end of file