GladeModelButton: improve editor

2 files changed, 59 insertions, 67 deletions

diff --git a/plugins/gtk+/glade-model-button-editor.ui b/plugins/gtk+/glade-model-button-editor.ui
index f2f95f83..595422eb 100644
--- a/plugins/gtk+/glade-model-button-editor.ui
+++ b/plugins/gtk+/glade-model-button-editor.ui
@@ -73,156 +73,149 @@ Author: Matthias Clasen <mclasen@redhat.com>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="width">2</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="action_name_editor">
+          <object class="GladePropertyLabel" id="text_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">action-name</property>
+            <property name="property_name">text</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">4</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">4</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="text_label">
+          <object class="GladePropertyLabel" id="menu_name_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">text</property>
+            <property name="property_name">menu-name</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">2</property>
+            <property name="top_attach">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="text_editor">
+          <object class="GladePropertyLabel" id="action_target_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">text</property>
+            <property name="property_name">action-target</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
+            <property name="left_attach">0</property>
             <property name="top_attach">3</property>
-            <property name="width">4</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="menu_name_label">
+          <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">menu-name</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>
+            <property name="top_attach">6</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="menu_name_editor">
+          <object class="GladePropertyShell" id="action_name_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">False</property>
-            <property name="property_name">menu-name</property>
+            <property name="property_name">action-name</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="width">4</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="inverted_editor">
+          <object class="GladePropertyShell" id="action_target_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">False</property>
-            <property name="property_name">inverted</property>
-            <property name="editor_type">GladeEpropCheck</property>
+            <property name="property_name">action-target</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">4</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="centered_label">
+          <object class="GladePropertyShell" id="text_editor">
             <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">centered</property>
+            <property name="property_name">text</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
+            <property name="width">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="centered_editor">
+          <object class="GladePropertyShell" id="menu_name_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">False</property>
-            <property name="property_name">centered</property>
+            <property name="property_name">menu-name</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-            <property name="width">4</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">5</property>
+            <property name="width">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="icon_label">
+          <object class="GladePropertyShell" id="icon_editor">
             <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>
+            <property name="left_attach">1</property>
+            <property name="top_attach">6</property>
+            <property name="width">5</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="icon_editor">
+          <object class="GladePropertyShell" id="inverted_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">False</property>
-            <property name="property_name">icon</property>
+            <property name="property_name">inverted</property>
+            <property name="editor_type">GladeEpropCheck</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
+            <property name="left_attach">1</property>
             <property name="top_attach">7</property>
-            <property name="width">4</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="iconic_label">
+          <object class="GladePropertyShell" id="centered_editor">
             <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>
+            <property name="property_name">centered</property>
+            <property name="editor_type">GladeEpropCheck</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">2</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">7</property>
           </packing>
         </child>
         <child>
@@ -231,19 +224,17 @@ Author: Matthias Clasen <mclasen@redhat.com>
             <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">8</property>
-            <property name="width">4</property>
+            <property name="left_attach">3</property>
+            <property name="top_attach">7</property>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <placeholder/>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -254,17 +245,17 @@ Author: Matthias Clasen <mclasen@redhat.com>
     <child-editors>
       <editor id="embed"/>
       <editor id="action_name_label"/>
-      <editor id="action_name_editor"/>
       <editor id="text_label"/>
-      <editor id="text_editor"/>
       <editor id="menu_name_label"/>
+      <editor id="action_target_label"/>
+      <editor id="icon_label"/>
+      <editor id="action_name_editor"/>
+      <editor id="action_target_editor"/>
+      <editor id="text_editor"/>
       <editor id="menu_name_editor"/>
+      <editor id="icon_editor"/>
       <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>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index f386f024..422b50e2 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -3575,6 +3575,7 @@
           <property id="role" disabled="True"/>
           <property id="active" disabled="True"/>
           <property id="action-name" custom-layout="True"/>
+          <property id="action-target" custom-layout="True"/>
           <property id="text" translatable="True" custom-layout="True"/>
           <property id="icon" custom-layout="True" create-type="GThemedIcon"/>
           <property id="iconic" custom-layout="True"/>