Disable some model button properties

Disable the ::icon and ::iconic properties until there
is a proper editor for GIcons.

2 files changed, 7 insertions, 51 deletions

diff --git a/plugins/gtk+/glade-model-button-editor.ui b/plugins/gtk+/glade-model-button-editor.ui
index fc97d721..7d50b93b 100644
--- a/plugins/gtk+/glade-model-button-editor.ui
+++ b/plugins/gtk+/glade-model-button-editor.ui
@@ -119,47 +119,6 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </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">4</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">4</property>
-            <property name="width">4</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>
-            <property name="editor_type">GladeEpropCheck</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">4</property>
-          </packing>
-        </child>
-        <child>
           <object class="GladePropertyLabel" id="menu_name_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -169,7 +128,7 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">4</property>
             <property name="width">2</property>
           </packing>
         </child>
@@ -182,7 +141,7 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">4</property>
             <property name="width">4</property>
           </packing>
         </child>
@@ -196,7 +155,7 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">5</property>
             <property name="width">4</property>
           </packing>
         </child>
@@ -210,7 +169,7 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">6</property>
             <property name="width">2</property>
           </packing>
         </child>
@@ -223,7 +182,7 @@ Author: Matthias Clasen <mclasen@redhat.com>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">6</property>
             <property name="width">4</property>
           </packing>
         </child>
@@ -240,9 +199,6 @@ Author: Matthias Clasen <mclasen@redhat.com>
       <editor id="action_name_editor"/>
       <editor id="text_label"/>
       <editor id="text_editor"/>
-      <editor id="icon_label"/>
-      <editor id="icon_editor"/>
-      <editor id="iconic_editor"/>
       <editor id="menu_name_label"/>
       <editor id="menu_name_editor"/>
       <editor id="inverted_editor"/>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index fff1cccd..26d2d289 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -3428,8 +3428,8 @@
           <property id="active" disabled="True"/>
           <property id="action-name" custom-layout="True"/>
           <property id="text" translatable="True" custom-layout="True"/>
-          <property id="icon" create-type="GThemedIcon" custom-layout="True"/>
-          <property id="iconic" custom-layout="True"/>
+          <property id="icon" disabled="True"/>
+          <property id="iconic" disabled="True"/>
           <property id="menu-name" custom-layout="True"/>
           <property id="inverted" custom-layout="True"/>
           <property id="centered" custom-layout="True"/>