From 4c3cbe3591b295fe9974a0a2fcf7e80e95377072 Mon Sep 17 00:00:00 2001
From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
Date: Mon, 30 Jul 2018 17:19:07 -0300
Subject: GladeModelButton: enable icon/iconic properties

---
 plugins/gtk+/glade-model-button-editor.ui | 68 +++++++++++++++++++++++++++++--
 plugins/gtk+/gtk+.xml.in                  |  4 +-
 2 files changed, 67 insertions(+), 5 deletions(-)

(limited to 'plugins/gtk+')

diff --git a/plugins/gtk+/glade-model-button-editor.ui b/plugins/gtk+/glade-model-button-editor.ui
index 7d50b93b..f2f95f83 100644
--- a/plugins/gtk+/glade-model-button-editor.ui
+++ b/plugins/gtk+/glade-model-button-editor.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 
+<!-- Generated with glade 3.22.0 
 
 libgladegtk - Glade UI Designer Gtk+ support plugin
 Copyright (C) 2014 Red Hat, Inc.
@@ -43,7 +43,6 @@ Author: Matthias Clasen <mclasen@redhat.com>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -61,7 +60,6 @@ Author: Matthias Clasen <mclasen@redhat.com>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -186,6 +184,66 @@ Author: Matthias Clasen <mclasen@redhat.com>
             <property name="width">4</property>
           </packing>
         </child>
+        <child>
+          <object class="GladePropertyLabel" id="icon_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">icon</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">7</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="icon_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">icon</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">7</property>
+            <property name="width">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="iconic_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">iconic</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">8</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="iconic_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">iconic</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">8</property>
+            <property name="width">4</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -204,6 +262,10 @@ Author: Matthias Clasen <mclasen@redhat.com>
       <editor id="inverted_editor"/>
       <editor id="centered_label"/>
       <editor id="centered_editor"/>
+      <editor id="icon_label"/>
+      <editor id="icon_editor"/>
+      <editor id="iconic_label"/>
+      <editor id="iconic_editor"/>
     </child-editors>
   </template>
 </interface>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 1e3a5b7f..f386f024 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -3576,8 +3576,8 @@
           <property id="active" disabled="True"/>
           <property id="action-name" custom-layout="True"/>
           <property id="text" translatable="True" custom-layout="True"/>
-          <property id="icon" disabled="True"/>
-          <property id="iconic" disabled="True"/>
+          <property id="icon" custom-layout="True" create-type="GThemedIcon"/>
+          <property id="iconic" custom-layout="True"/>
           <property id="menu-name" custom-layout="True"/>
           <property id="inverted" custom-layout="True"/>
           <property id="centered" custom-layout="True"/>
-- 
cgit v1.2.3