From 9292586f9037921a30f91b557504c11bf24f95ca Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Fri, 16 Jan 2009 11:10:18 +0000 Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-artwork/mainline Conflicts: icons/scalable/actions/Makefile.am --- diff --git a/gtk/engine/sugar-info.c b/gtk/engine/sugar-info.c index b4313a7..b4bf9c5 100644 --- a/gtk/engine/sugar-info.c +++ b/gtk/engine/sugar-info.c @@ -191,7 +191,10 @@ sugar_fill_arrow_info (SugarArrowInfo *arrow_info, arrow_info->filled_triangle = FALSE; /* If the background is black, then we draw a solid triangle. */ - color = &info->style->bg[GTK_STATE_NORMAL]; + if (info->rc_style->color_flags & SUGAR_COLOR_BG) + color = &info->rc_style->colors[SUGAR_COLOR_BG]; + else + color = &info->style->bg[GTK_STATE_NORMAL]; if (color->red == 0 && color->green == 0 && color->blue == 0) arrow_info->filled_triangle = TRUE; } diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em index 5a4078f..f22a3e8 100644 --- a/gtk/theme/gtkrc.em +++ b/gtk/theme/gtkrc.em @@ -822,6 +822,7 @@ widget_class "*." style "hscrollbar-scrolled-w # Toolbar widget_class "**" style "toolbutton" +widget_class "**" style "toolbutton" widget_class "**" style "separatortoolbutton" widget_class "*" style "toolbar" diff --git a/icons/scalable/actions/transfer-from-application-octet-stream.svg b/icons/scalable/actions/transfer-from-application-octet-stream.svg new file mode 100644 index 0000000..1228c14 --- /dev/null +++ b/icons/scalable/actions/transfer-from-application-octet-stream.svg @@ -0,0 +1,18 @@ + + +]> + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from-audio-x-generic.svg b/icons/scalable/actions/transfer-from-audio-x-generic.svg new file mode 100644 index 0000000..489989d --- /dev/null +++ b/icons/scalable/actions/transfer-from-audio-x-generic.svg @@ -0,0 +1,17 @@ + + +]> + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from-image-x-generic.svg b/icons/scalable/actions/transfer-from-image-x-generic.svg new file mode 100644 index 0000000..b1b485f --- /dev/null +++ b/icons/scalable/actions/transfer-from-image-x-generic.svg @@ -0,0 +1,16 @@ + + +]> + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from-text-uri-list.svg b/icons/scalable/actions/transfer-from-text-uri-list.svg new file mode 100644 index 0000000..d6f83c6 --- /dev/null +++ b/icons/scalable/actions/transfer-from-text-uri-list.svg @@ -0,0 +1,23 @@ + + +]> + + + + + + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from-text-x-generic.svg b/icons/scalable/actions/transfer-from-text-x-generic.svg new file mode 100644 index 0000000..f789579 --- /dev/null +++ b/icons/scalable/actions/transfer-from-text-x-generic.svg @@ -0,0 +1,17 @@ + + +]> + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from-video-x-generic.svg b/icons/scalable/actions/transfer-from-video-x-generic.svg new file mode 100644 index 0000000..ef09227 --- /dev/null +++ b/icons/scalable/actions/transfer-from-video-x-generic.svg @@ -0,0 +1,20 @@ + + +]> + + + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-from.svg b/icons/scalable/actions/transfer-from.svg new file mode 100644 index 0000000..79668c1 --- /dev/null +++ b/icons/scalable/actions/transfer-from.svg @@ -0,0 +1,8 @@ + + +]> + + + + \ No newline at end of file diff --git a/icons/scalable/actions/transfer-to-application-octet-stream.svg b/icons/scalable/actions/transfer-to-application-octet-stream.svg new file mode 100644 index 0000000..f2642f4 --- /dev/null +++ b/icons/scalable/actions/transfer-to-application-octet-stream.svg @@ -0,0 +1,18 @@ + + +]> + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to-audio-x-generic.svg b/icons/scalable/actions/transfer-to-audio-x-generic.svg new file mode 100644 index 0000000..6fbddc6 --- /dev/null +++ b/icons/scalable/actions/transfer-to-audio-x-generic.svg @@ -0,0 +1,17 @@ + + +]> + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to-image-x-generic.svg b/icons/scalable/actions/transfer-to-image-x-generic.svg new file mode 100644 index 0000000..d261c8a --- /dev/null +++ b/icons/scalable/actions/transfer-to-image-x-generic.svg @@ -0,0 +1,16 @@ + + +]> + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to-text-uri-list.svg b/icons/scalable/actions/transfer-to-text-uri-list.svg new file mode 100644 index 0000000..624fdbe --- /dev/null +++ b/icons/scalable/actions/transfer-to-text-uri-list.svg @@ -0,0 +1,23 @@ + + +]> + + + + + + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to-text-x-generic.svg b/icons/scalable/actions/transfer-to-text-x-generic.svg new file mode 100644 index 0000000..cd878a5 --- /dev/null +++ b/icons/scalable/actions/transfer-to-text-x-generic.svg @@ -0,0 +1,17 @@ + + +]> + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to-video-x-generic.svg b/icons/scalable/actions/transfer-to-video-x-generic.svg new file mode 100644 index 0000000..2ba759f --- /dev/null +++ b/icons/scalable/actions/transfer-to-video-x-generic.svg @@ -0,0 +1,20 @@ + + +]> + + + + + + + + + + + + + + + + diff --git a/icons/scalable/actions/transfer-to.svg b/icons/scalable/actions/transfer-to.svg new file mode 100644 index 0000000..bb9b3a0 --- /dev/null +++ b/icons/scalable/actions/transfer-to.svg @@ -0,0 +1,8 @@ + + +]> + + + + \ No newline at end of file diff --git a/icons/scalable/control/Makefile.am b/icons/scalable/control/Makefile.am index e194cdb..965423f 100644 --- a/icons/scalable/control/Makefile.am +++ b/icons/scalable/control/Makefile.am @@ -3,7 +3,8 @@ category=control icondir = $(datadir)/icons/sugar/$(iconsize)/$(category) icon_DATA = \ - control-popup-arrow.svg + control-popup-arrow.svg \ + color-preview.svg EXTRA_DIST = $(icon_DATA) diff --git a/icons/scalable/control/color-preview.svg b/icons/scalable/control/color-preview.svg new file mode 100644 index 0000000..c33f554 --- /dev/null +++ b/icons/scalable/control/color-preview.svg @@ -0,0 +1,17 @@ + + +]> + + + + + + + + + + + + + \ No newline at end of file -- cgit v0.9.1