[gtk/matthiasc/for-master] gtk-demo: Tweak images demo



commit a3c9f8594a55a0385970944155542f35f77393dc
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 2 22:43:44 2020 -0500

    gtk-demo: Tweak images demo
    
    Use our own logo instead of the gtk3-demo one, and
    tweak the headings to refledct what we show.

 demos/gtk-demo/demo.gresource.xml | 1 +
 demos/gtk-demo/images.c           | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index 17388f4fbb..32b830a67b 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -234,6 +234,7 @@
     <file>alphatest.png</file>
     <file>floppybuddy.gif</file>
     <file>gtk-logo.webm</file>
+    <file alias="org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
   </gresource>
   <gresource prefix="/video-player">
     <file>bbb.png</file>
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index aec8412776..39b01103b2 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -347,7 +347,7 @@ do_images (GtkWidget *do_widget)
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_box_append (GTK_BOX (hbox), vbox);
 
-      label = gtk_label_new ("Image loaded from a file");
+      label = gtk_label_new ("Image from a resource");
       gtk_widget_add_css_class (label, "heading");
       gtk_box_append (GTK_BOX (vbox), label);
 
@@ -356,7 +356,7 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_append (GTK_BOX (vbox), frame);
 
-      image = gtk_image_new_from_icon_name ("gtk3-demo");
+      image = gtk_image_new_from_resource ("/images/org.gtk.Demo4.svg");
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
 
       gtk_frame_set_child (GTK_FRAME (frame), image);
@@ -364,7 +364,7 @@ do_images (GtkWidget *do_widget)
 
       /* Animation */
 
-      label = gtk_label_new ("Animation loaded from a file");
+      label = gtk_label_new ("Animation from a resource");
       gtk_widget_add_css_class (label, "heading");
       gtk_box_append (GTK_BOX (vbox), label);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]