From 95aecffced78f4136fa19f008ef97a222a343c2d Mon Sep 17 00:00:00 2001 From: Gary Martin Date: Mon, 28 Mar 2011 13:18:28 +0000 Subject: Merge branch 'master' of git://git.sugarlabs.org/sugar-artwork/mainline --- 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 "*.." style "notebook-tab" # SugarPalette and Menu widget_class "*" style "menu" -widget_class "" style "menu" -widget_class ".*" style "menu-child" -widget_class "*" style "palette-menu" +widget_class "" style "palette" +widget_class ".*" style "menu-child" +widget_class "*" style "palette-menu" widget_class "*.*" style "menu-child" # SugarFrameWindow @@ -774,7 +792,7 @@ widget_class "**" style "groupbox-panel-child" widget_class "*" style "notebook-panel" -widget_class "**" style "groupbox-palette-child" +widget_class "**" 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 @@ - - -]> - - - - - + + + +]> + + + + + 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 @@ - + + +]> - - + 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 @@ + + + +]> + + + + + + + + + + + + + + + + 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 @@ + + + +]> + + + + + + + + + + + + + + + + + + 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 @@ + + + +]> + + + + + + + + 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 @@ + + +]> + + \ 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 @@ + + +]> + + + + + \ 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 @@ + + +]> + + + + + + + + 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 @@ + + +]> + + + + + + 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 @@ + + +]> + + + + + + + + + + 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 @@ + + +]> + + + + + + + + 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 @@ + + +]> + + + + + + + + + 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 @@ + + +]> + + + + + + + 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 @@ + + +]> + + + + + + + \ 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 @@ + + + +]> + + + + + + + + + + + + + + + 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 @@ + + +]> + + + + + 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 @@ + + +]> + + + + 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 @@ + + + +]> + + + \ 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 @@ + + + +]> + + + \ No newline at end of file -- cgit v0.9.1