]> Pileus Git - ~andy/gtk/blobdiff - demos/gtk-demo/images.c
Use gtk_box_new() instead gtk_[v|h]box_new()
[~andy/gtk] / demos / gtk-demo / images.c
index e34e8496b9a7bd07600eadf2bc64ca53cab12922..acd382f75795e8f88cccfa1b75fcb9d937d68e46 100644 (file)
@@ -12,8 +12,8 @@
  * application binary can be self-contained.
  */
 
-#include <config.h>
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -31,14 +31,14 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
   GtkWidget *image;
 
   image = GTK_WIDGET (data);
-  
+
   pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
   /* Avoid displaying random memory contents, since the pixbuf
    * isn't filled in yet.
    */
   gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-  
+
   gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }
 
@@ -51,7 +51,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               gpointer    data)
 {
   GtkWidget *image;
-  
+
   image = GTK_WIDGET (data);
 
   /* We know the pixbuf inside the GtkImage has changed, but the image
@@ -61,7 +61,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
    * the pixbuf on the display, then we could queue a draw for only
    * the updated area of the image.
    */
-  
+
   gtk_widget_queue_draw (image);
 }
 
@@ -71,24 +71,24 @@ progressive_timeout (gpointer data)
   GtkWidget *image;
 
   image = GTK_WIDGET (data);
-  
+
   /* This shows off fully-paranoid error handling, so looks scary.
    * You could factor out the error handling code into a nice separate
    * function to make things nicer.
    */
-  
+
   if (image_stream)
     {
       size_t bytes_read;
       guchar buf[256];
       GError *error = NULL;
-      
+
       bytes_read = fread (buf, 1, 256, image_stream);
 
       if (ferror (image_stream))
        {
          GtkWidget *dialog;
-         
+
          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_MESSAGE_ERROR,
@@ -103,7 +103,7 @@ progressive_timeout (gpointer data)
          image_stream = NULL;
 
          gtk_widget_show (dialog);
-         
+
          load_timeout = 0;
 
          return FALSE; /* uninstall the timeout */
@@ -114,7 +114,7 @@ progressive_timeout (gpointer data)
                                    &error))
        {
          GtkWidget *dialog;
-         
+
          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_MESSAGE_ERROR,
@@ -123,13 +123,13 @@ progressive_timeout (gpointer data)
                                           error->message);
 
          g_error_free (error);
-         
+
          g_signal_connect (dialog, "response",
                            G_CALLBACK (gtk_widget_destroy), NULL);
 
          fclose (image_stream);
          image_stream = NULL;
-         
+
          gtk_widget_show (dialog);
 
          load_timeout = 0;
@@ -151,29 +151,29 @@ progressive_timeout (gpointer data)
                                        &error))
            {
              GtkWidget *dialog;
-             
+
              dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                               GTK_DIALOG_DESTROY_WITH_PARENT,
                                               GTK_MESSAGE_ERROR,
                                               GTK_BUTTONS_CLOSE,
                                               "Failed to load image: %s",
                                               error->message);
-             
+
              g_error_free (error);
-             
+
              g_signal_connect (dialog, "response",
                                G_CALLBACK (gtk_widget_destroy), NULL);
-             
+
              gtk_widget_show (dialog);
 
              g_object_unref (pixbuf_loader);
              pixbuf_loader = NULL;
-             
+
              load_timeout = 0;
-             
+
              return FALSE; /* uninstall the timeout */
            }
-         
+
          g_object_unref (pixbuf_loader);
          pixbuf_loader = NULL;
        }
@@ -182,9 +182,9 @@ progressive_timeout (gpointer data)
     {
       gchar *filename;
       gchar *error_message = NULL;
-      GError *error = NULL; 
+      GError *error = NULL;
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */
@@ -196,7 +196,7 @@ progressive_timeout (gpointer data)
        }
       else
        {
-         image_stream = fopen (filename, "r");
+         image_stream = g_fopen (filename, "rb");
          g_free (filename);
 
          if (!image_stream)
@@ -207,7 +207,7 @@ progressive_timeout (gpointer data)
       if (image_stream == NULL)
        {
          GtkWidget *dialog;
-         
+
          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_MESSAGE_ERROR,
@@ -217,7 +217,7 @@ progressive_timeout (gpointer data)
 
          g_signal_connect (dialog, "response",
                            G_CALLBACK (gtk_widget_destroy), NULL);
-         
+
          gtk_widget_show (dialog);
 
          load_timeout = 0;
@@ -231,13 +231,13 @@ progressive_timeout (gpointer data)
          g_object_unref (pixbuf_loader);
          pixbuf_loader = NULL;
        }
-      
+
       pixbuf_loader = gdk_pixbuf_loader_new ();
-      
-      g_signal_connect (pixbuf_loader, "area_prepared",
+
+      g_signal_connect (pixbuf_loader, "area-prepared",
                        G_CALLBACK (progressive_prepared_callback), image);
-      
-      g_signal_connect (pixbuf_loader, "area_updated",
+
+      g_signal_connect (pixbuf_loader, "area-updated",
                        G_CALLBACK (progressive_updated_callback), image);
     }
 
@@ -255,13 +255,13 @@ start_progressive_loading (GtkWidget *image)
    * The timeout simply simulates a slow data source by inserting
    * pauses in the reading process.
    */
-  load_timeout = g_timeout_add (150,
+  load_timeout = gdk_threads_add_timeout (150,
                                progressive_timeout,
                                image);
 }
 
 static void
-cleanup_callback (GtkObject *object,
+cleanup_callback (GObject   *object,
                  gpointer   data)
 {
   if (load_timeout)
@@ -269,7 +269,7 @@ cleanup_callback (GtkObject *object,
       g_source_remove (load_timeout);
       load_timeout = 0;
     }
-  
+
   if (pixbuf_loader)
     {
       gdk_pixbuf_loader_close (pixbuf_loader, NULL);
@@ -289,7 +289,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
   GtkContainer *container = user_data;
   GList *list;
   GList *tmp;
-  
+
   list = gtk_container_get_children (container);
 
   tmp = list;
@@ -299,13 +299,13 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
       if (GTK_WIDGET (tmp->data) != togglebutton)
         gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
                                   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-      
+
       tmp = tmp->next;
     }
 
   g_list_free (list);
 }
-  
+
 
 GtkWidget *
 do_images (GtkWidget *do_widget)
@@ -317,9 +317,10 @@ do_images (GtkWidget *do_widget)
   GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
+  GIcon     *gicon;
   GError *error = NULL;
   char *filename;
-  
+
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -334,7 +335,7 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -342,7 +343,7 @@ do_images (GtkWidget *do_widget)
       gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       /* The alignment keeps the frame from growing when users resize
@@ -352,7 +353,7 @@ do_images (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (align), frame);
       gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
-      /* demo_find_file() looks in the the current directory first,
+      /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
        * in the location where the file is installed.
        */
@@ -373,7 +374,7 @@ do_images (GtkWidget *do_widget)
           * be displayed instead.
           */
          GtkWidget *dialog;
-         
+
          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_MESSAGE_ERROR,
@@ -381,13 +382,13 @@ do_images (GtkWidget *do_widget)
                                           "Unable to open image file 'gtk-logo-rgb.gif': %s",
                                           error->message);
          g_error_free (error);
-         
+
          g_signal_connect (dialog, "response",
                            G_CALLBACK (gtk_widget_destroy), NULL);
-         
+
          gtk_widget_show (dialog);
        }
-         
+
       image = gtk_image_new_from_pixbuf (pixbuf);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
@@ -399,7 +400,7 @@ do_images (GtkWidget *do_widget)
       gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       /* The alignment keeps the frame from growing when users resize
@@ -414,16 +415,36 @@ do_images (GtkWidget *do_widget)
       g_free (filename);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
-      
+
+      /* Symbolic icon */
+
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                           "<u>Symbolic themed icon</u>");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
+
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Progressive */
-      
-      
+
+
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       /* The alignment keeps the frame from growing when users resize
@@ -450,7 +471,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }