From bc473257c7ded972075a2fff5190919828797102 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 1 Feb 2013 21:56:36 +0100 Subject: [PATCH] gtk-demo: Replace logo with a transparent one That way, we don't have to make it transparent in all the demos. --- demos/gtk-demo/Makefile.am | 2 +- demos/gtk-demo/appwindow.c | 19 ++++++------------- demos/gtk-demo/demo.gresource.xml | 8 ++++---- demos/gtk-demo/gtk-logo-old.png | Bin 0 -> 5895 bytes demos/gtk-demo/gtk-logo-rgb.gif | Bin 6427 -> 0 bytes demos/gtk-demo/images.c | 2 +- demos/gtk-demo/main.c | 10 +++------- demos/gtk-demo/textview.c | 2 +- 8 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 demos/gtk-demo/gtk-logo-old.png delete mode 100644 demos/gtk-demo/gtk-logo-rgb.gif diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 01a438759f..ad38a3ed0f 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -126,7 +126,7 @@ RESOURCES= $(demos) \ gnu-keys.png \ gtk-logo-24.png \ gtk-logo-48.png \ - gtk-logo-rgb.gif \ + gtk-logo-old.png \ css_accordion.css \ css_basics.css \ css_multiplebgs.css \ diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c index e076075dd7..849a3f1bc8 100644 --- a/demos/gtk-demo/appwindow.c +++ b/demos/gtk-demo/appwindow.c @@ -80,7 +80,7 @@ static void about_cb (GtkAction *action, GtkWidget *window) { - GdkPixbuf *pixbuf, *transparent; + GdkPixbuf *pixbuf; const gchar *authors[] = { "Peter Mattis", @@ -98,11 +98,9 @@ about_cb (GtkAction *action, NULL }; - pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-rgb.gif", NULL); + pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-old.png", NULL); /* We asser the existence of the pixbuf as we load it from a custom resource. */ g_assert (pixbuf); - transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); - g_object_unref (pixbuf); gtk_show_about_dialog (GTK_WINDOW (window), "program-name", "GTK+ Code Demos", @@ -117,11 +115,11 @@ about_cb (GtkAction *action, "comments", "Program to demonstrate GTK+ functions.", "authors", authors, "documenters", documentors, - "logo", transparent, + "logo", pixbuf, "title", "About GTK+ Code Demos", NULL); - g_object_unref (transparent); + g_object_unref (pixbuf); } typedef struct @@ -303,7 +301,6 @@ register_stock_icons (void) GdkPixbuf *pixbuf; GtkIconFactory *factory; GtkIconSet *icon_set; - GdkPixbuf *transparent; static GtkStockItem items[] = { { "demo-gtk-logo", @@ -320,18 +317,14 @@ register_stock_icons (void) factory = gtk_icon_factory_new (); gtk_icon_factory_add_default (factory); - pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-rgb.gif", NULL); + pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-old.png", NULL); /* We assert the existence of the pixbuf as we load it from a custom resource. */ g_assert (pixbuf); - /* The gtk-logo-rgb icon has a white background, make it transparent */ - transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); - - icon_set = gtk_icon_set_new_from_pixbuf (transparent); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set); gtk_icon_set_unref (icon_set); g_object_unref (pixbuf); - g_object_unref (transparent); /* Drop our reference to the factory, GTK will hold a reference. */ g_object_unref (factory); diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml index 7e60c3553a..18d6732c99 100644 --- a/demos/gtk-demo/demo.gresource.xml +++ b/demos/gtk-demo/demo.gresource.xml @@ -1,7 +1,7 @@ - gtk-logo-rgb.gif + gtk-logo-old.png gtk-logo-24.png @@ -10,7 +10,7 @@ menus.ui - gtk-logo-rgb.gif + gtk-logo-old.png demo.ui @@ -58,7 +58,7 @@ alphatest.png floppybuddy.gif - gtk-logo-rgb.gif + gtk-logo-old.png apple-red.png @@ -122,6 +122,6 @@ floppybuddy.gif - gtk-logo-rgb.gif + gtk-logo-old.png diff --git a/demos/gtk-demo/gtk-logo-old.png b/demos/gtk-demo/gtk-logo-old.png new file mode 100644 index 0000000000000000000000000000000000000000..e6037ae8b8109d12dceeeb3909a9b9c70ab82df2 GIT binary patch literal 5895 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 diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c index d29ea97adb..4065ee54c7 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -361,7 +361,7 @@ do_images (GtkWidget *do_widget) gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); - pixbuf = gdk_pixbuf_new_from_resource ("/images/gtk-logo-rgb.gif", NULL); + pixbuf = gdk_pixbuf_new_from_resource ("/images/gtk-logo-old.png", NULL); /* The image loading must work, we ensure that the resources are valid. */ g_assert (pixbuf); diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index fe0260b606..8bf1014787 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -850,19 +850,15 @@ create_tree (void) static void setup_default_icon (void) { - GdkPixbuf *pixbuf, *transparent; + GdkPixbuf *pixbuf; - pixbuf = gdk_pixbuf_new_from_resource ("/gtk-logo-rgb.gif", NULL); + pixbuf = gdk_pixbuf_new_from_resource ("/gtk-logo-old.png", NULL); /* We load a resource, so we can guarantee that loading it is successful */ g_assert (pixbuf); - /* The gtk-logo-rgb icon has a white background, make it transparent */ - transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); - - gtk_window_set_default_icon (transparent); + gtk_window_set_default_icon (pixbuf); g_object_unref (pixbuf); - g_object_unref (transparent); } int diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c index c401790803..2bb6e2866d 100644 --- a/demos/gtk-demo/textview.c +++ b/demos/gtk-demo/textview.c @@ -131,7 +131,7 @@ insert_text (GtkTextBuffer *buffer) GdkPixbuf *pixbuf; GdkPixbuf *scaled; - pixbuf = gdk_pixbuf_new_from_resource ("/textview/gtk-logo-rgb.gif", NULL); + pixbuf = gdk_pixbuf_new_from_resource ("/textview/gtk-logo-old.png", NULL); g_assert (pixbuf); scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);