Add a "display" option.

	* tests/testicontheme.c: Add a "display" option.

diff --git a/ChangeLog b/ChangeLog
index e04e49c0524d6255aaa4d58553388c5c83a74450..0bc5d4220a4d30e424508b57b5339b133ab3de17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
        * gtk/gtkiconcache.c: The glue code to mmap an icon cache
        file and manage the information it contains.
 
+       * tests/testicontheme.c: Add a "display" option.
+
 2004-10-19  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testicontheme.c: Set the locale, tidy up output.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e04e49c0524d6255aaa4d58553388c5c83a74450..0bc5d4220a4d30e424508b57b5339b133ab3de17 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -24,6 +24,8 @@
        * gtk/gtkiconcache.c: The glue code to mmap an icon cache
        file and manage the information it contains.
 
+       * tests/testicontheme.c: Add a "display" option.
+
 2004-10-19  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testicontheme.c: Set the locale, tidy up output.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e04e49c0524d6255aaa4d58553388c5c83a74450..0bc5d4220a4d30e424508b57b5339b133ab3de17 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -24,6 +24,8 @@
        * gtk/gtkiconcache.c: The glue code to mmap an icon cache
        file and manage the information it contains.
 
+       * tests/testicontheme.c: Add a "display" option.
+
 2004-10-19  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testicontheme.c: Set the locale, tidy up output.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e04e49c0524d6255aaa4d58553388c5c83a74450..0bc5d4220a4d30e424508b57b5339b133ab3de17 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -24,6 +24,8 @@
        * gtk/gtkiconcache.c: The glue code to mmap an icon cache
        file and manage the information it contains.
 
+       * tests/testicontheme.c: Add a "display" option.
+
 2004-10-19  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testicontheme.c: Set the locale, tidy up output.

diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index cf9018aca74f0dc9bce35faf37dafd22a959d613..dafc2ecba994ce6f7432129ac982f12df059c0a6 100644 (file)
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -1,5 +1,4 @@
-#include <config.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
@@ -9,7 +8,10 @@ usage (void)
 {
   g_print ("usage: test-icon-theme lookup <theme name> <icon name> [size]]\n"
           " or\n"
-          "usage: test-icon-theme list <theme name> [context]\n");
+          "usage: test-icon-theme list <theme name> [context]\n"
+          " or\n"
+          "usage: test-icon-theme display <theme name> <icon name> [size]\n"
+          );
 }
 
 
@@ -28,8 +30,7 @@ main (int argc, char *argv[])
   int size = 48;
   int i;
   
-  g_type_init ();
-  setlocale (LC_ALL, "");
+  gtk_init (&argc, &argv);
 
   if (argc < 3)
     {
@@ -43,7 +44,37 @@ main (int argc, char *argv[])
   
   gtk_icon_theme_set_custom_theme (icon_theme, themename);
 
-  if (strcmp (argv[1], "list") == 0)
+  if (strcmp (argv[1], "display") == 0)
+    {
+      GtkWidget *window, *image;
+      GtkIconSize size;
+      GdkPixbuf *pixbuf;
+
+      if (argc < 4)
+       {
+         g_object_unref (icon_theme);
+         usage ();
+         return 1;
+       }
+      
+      if (argc >= 5)
+       size = atoi (argv[4]);
+      else 
+       size = GTK_ICON_SIZE_BUTTON;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#if 1
+      pixbuf = gtk_icon_theme_load_icon (icon_theme, argv[3], size, 0, NULL);
+      image = gtk_image_new_from_pixbuf (pixbuf);
+#else
+      image = gtk_image_new_from_icon_name (argv[3], size); 
+#endif
+      gtk_container_add (GTK_CONTAINER (window), image);
+      gtk_widget_show_all (window);
+      
+      gtk_main ();
+    }
+  else if (strcmp (argv[1], "list") == 0)
     {
       if (argc >= 4)
        context = argv[3];