[dia/zbrown/gresource-icons: 6/12] Menu icons as gresources

[Zander <zbrown src gnome org>]

commit e258d36230068a126cbd0d05be26e8ccaff041d8
Author: Zander Brown <zbrown gnome org>
Date:   Sun Feb 10 23:23:31 2019 +0000

    Menu icons as gresources

 app/dia.gresource.xml                              |   6 ++++++
 .../layer-add.png => icons/dia-layer-add.png}      | Bin
 .../dia-layer-move-above.png}                      | Bin
 .../dia-layer-move-below.png}                      | Bin
 .../dia-layer-rename.png}                          | Bin
 app/{pixmaps/layers.png => icons/dia-layers.png}   | Bin
 app/{pixmaps/ungroup.png => icons/dia-ungroup.png} | Bin
 app/menus.c                                        |  23 ++++++++-------------
 app/pixmaps/meson.build                            |  10 ---------
 app/pixmaps/selectable-empty.png                   | Bin 156 -> 0 bytes
 app/pixmaps/selectable.png                         | Bin 188 -> 0 bytes
 11 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/app/dia.gresource.xml b/app/dia.gresource.xml
index 4012bf7a..5578993d 100644
--- a/app/dia.gresource.xml
+++ b/app/dia.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/org/gnome/Dia">
     <file>icons/org.gnome.Dia.png</file>
     <file>icons/dia-group.png</file>
+    <file>icons/dia-ungroup.png</file>
     <file>icons/dia-grid-on.png</file>
     <file>icons/dia-grid-off.png</file>
     <file>icons/dia-connectable.png</file>
@@ -11,5 +12,10 @@
     <file>icons/dia-visible-empty.png</file>
     <file>icons/dia-mainpoints-on.png</file>
     <file>icons/dia-mainpoints-off.png</file>
+    <file>icons/dia-layers.png</file>
+    <file>icons/dia-layer-add.png</file>
+    <file>icons/dia-layer-rename.png</file>
+    <file>icons/dia-layer-move-above.png</file>
+    <file>icons/dia-layer-move-below.png</file>
   </gresource>
 </gresources>
\ No newline at end of file
diff --git a/app/pixmaps/layer-add.png b/app/icons/dia-layer-add.png
similarity index 100%
rename from app/pixmaps/layer-add.png
rename to app/icons/dia-layer-add.png
diff --git a/app/pixmaps/objects-layer-above.png b/app/icons/dia-layer-move-above.png
similarity index 100%
rename from app/pixmaps/objects-layer-above.png
rename to app/icons/dia-layer-move-above.png
diff --git a/app/pixmaps/objects-layer-below.png b/app/icons/dia-layer-move-below.png
similarity index 100%
rename from app/pixmaps/objects-layer-below.png
rename to app/icons/dia-layer-move-below.png
diff --git a/app/pixmaps/layer-rename.png b/app/icons/dia-layer-rename.png
similarity index 100%
rename from app/pixmaps/layer-rename.png
rename to app/icons/dia-layer-rename.png
diff --git a/app/pixmaps/layers.png b/app/icons/dia-layers.png
similarity index 100%
rename from app/pixmaps/layers.png
rename to app/icons/dia-layers.png
diff --git a/app/pixmaps/ungroup.png b/app/icons/dia-ungroup.png
similarity index 100%
rename from app/pixmaps/ungroup.png
rename to app/icons/dia-ungroup.png
diff --git a/app/menus.c b/app/menus.c
index 5afdc1aa..df066af1 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -788,18 +788,12 @@ add_plugin_actions (GtkUIManager *ui_manager, const gchar *base_path)
 }
 
 static void
-_add_stock_icon (GtkIconFactory *factory, const char *name, const guint8 *data, const size_t size)
+_add_stock_icon_name (GtkIconFactory *factory, const char *name, const gchar *icon)
 {
   GdkPixbuf      *pixbuf;
   GtkIconSet     *set;
-  GError         *err = NULL;
 
-  pixbuf = gdk_pixbuf_new_from_inline (size, data, FALSE, &err);
-  if (err) {
-    g_warning ("%s", err->message);
-    g_error_free (err);
-    err = NULL;
-  }
+  pixbuf = pixbuf_from_resource (g_strdup_printf ("/org/gnome/Dia/icons/%s.png", icon));
   set = gtk_icon_set_new_from_pixbuf (pixbuf);
   gtk_icon_factory_add (factory, name, set);
   g_object_unref (pixbuf);
@@ -813,13 +807,14 @@ register_stock_icons (void)
 
   factory = gtk_icon_factory_new ();
 
-  _add_stock_icon (factory, DIA_STOCK_UNGROUP, dia_ungroup_icon, sizeof(dia_ungroup_icon));
+  _add_stock_icon_name (factory, DIA_STOCK_GROUP, "dia-group");
+  _add_stock_icon_name (factory, DIA_STOCK_UNGROUP, "dia-ungroup");
 
-  _add_stock_icon (factory, DIA_STOCK_LAYER_ADD, dia_layer_add_icon, sizeof(dia_layer_add_icon));
-  _add_stock_icon (factory, DIA_STOCK_LAYER_RENAME, dia_layer_rename_icon, sizeof(dia_layer_rename_icon));
-  _add_stock_icon (factory, DIA_STOCK_OBJECTS_LAYER_ABOVE, dia_objects_layer_above_icon, 
sizeof(dia_objects_layer_above_icon));
-  _add_stock_icon (factory, DIA_STOCK_OBJECTS_LAYER_BELOW, dia_objects_layer_below_icon, 
sizeof(dia_objects_layer_below_icon));
-  _add_stock_icon (factory, DIA_STOCK_LAYERS, dia_layers_icon, sizeof(dia_layers_icon));
+  _add_stock_icon_name (factory, DIA_STOCK_LAYER_ADD, "dia-layer-add");
+  _add_stock_icon_name (factory, DIA_STOCK_LAYER_RENAME, "dia-layer-rename");
+  _add_stock_icon_name (factory, DIA_STOCK_OBJECTS_LAYER_ABOVE, "dia-layer-move-above");
+  _add_stock_icon_name (factory, DIA_STOCK_OBJECTS_LAYER_BELOW, "dia-layer-move-below");
+  _add_stock_icon_name (factory, DIA_STOCK_LAYERS, "dia-layers");
 
   gtk_icon_factory_add_default (factory);
   g_object_unref (factory);
diff --git a/app/pixmaps/meson.build b/app/pixmaps/meson.build
index 2014e44b..df8c4553 100644
--- a/app/pixmaps/meson.build
+++ b/app/pixmaps/meson.build
@@ -1,14 +1,4 @@
 icons = [
-    'selectable.png',
-    'selectable-empty.png',
-    'ungroup.png',
-
-    'objects-layer-above.png',
-    'objects-layer-below.png',
-    'layers.png',
-    'layer-add.png',
-    'layer-rename.png',
-
     'cursor-create.png',
     'cursor-hand-open.png',
     'cursor-hand-closed.png',