GladeButtonEditor: Many touchups in the UI, added extension point for embedding additional properties.

1 files changed, 98 insertions, 55 deletions

diff --git a/plugins/gtk+/glade-button-editor.ui b/plugins/gtk+/glade-button-editor.ui
index 980e238e..0d4bcdc2 100644
--- a/plugins/gtk+/glade-button-editor.ui
+++ b/plugins/gtk+/glade-button-editor.ui
@@ -38,7 +38,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkGrid" id="grid1">
+      <object class="GtkGrid" id="attributes_grid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
@@ -46,145 +46,169 @@
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label2">
+          <object class="GladePropertyLabel" id="propertylabel8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="label" translatable="yes">Child alignments</property>
+            <property name="property_name">response-id</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">4</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="propertylabel3">
+          <object class="GladePropertyShell" id="propertyshell12">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="property_name">xalign</property>
-            <property name="custom_text" translatable="yes">Horizontal:</property>
+            <property name="property_name">response-id</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="propertylabel4">
+          <object class="GladePropertyLabel" id="propertylabel7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="property_name">yalign</property>
-            <property name="custom_text" translatable="yes">Vertical:</property>
+            <property name="property_name">relief</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="propertyshell9">
+          <object class="GladePropertyShell" id="propertyshell11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">xalign</property>
+            <property name="property_name">relief</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
+            <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="propertyshell10">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">yalign</property>
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="label" translatable="yes">Child alignments:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="propertylabel3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="property_name">xalign</property>
+            <property name="custom_text" translatable="yes">Horizontal:</property>
           </object>
           <packing>
-            <property name="left_attach">3</property>
+            <property name="left_attach">0</property>
             <property name="top_attach">3</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="propertylabel7">
+          <object class="GladePropertyLabel" id="propertylabel4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">relief</property>
+            <property name="halign">end</property>
+            <property name="property_name">yalign</property>
+            <property name="custom_text" translatable="yes">Vertical:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="top_attach">4</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="propertyshell11">
+          <object class="GladePropertyShell" id="propertyshell9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">relief</property>
+            <property name="property_name">xalign</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="top_attach">3</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="propertyshell13">
+          <object class="GladePropertyShell" id="propertyshell10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">focus-on-click</property>
-            <property name="editor_type">GladeEpropCheck</property>
+            <property name="property_name">yalign</property>
           </object>
           <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="propertylabel8">
+          <object class="GladePropertyShell" id="propertyshell13">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">response-id</property>
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="property_name">focus-on-click</property>
+            <property name="editor_type">GladeEpropCheck</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">5</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladePropertyShell" id="propertyshell12">
+          <object class="GtkBox" id="attributes_port">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="property_name">response-id</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">3</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">6</property>
+            <property name="width">2</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
           <placeholder/>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -193,6 +217,23 @@
       </packing>
     </child>
     <child>
+      <object class="GtkLabel" id="label3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="valign">center</property>
+        <property name="label" translatable="yes">Button Content</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -207,6 +248,7 @@
               <object class="GtkFrame" id="standard">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">10</property>
                 <property name="margin_top">4</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
@@ -231,10 +273,11 @@
                           <object class="GtkGrid" id="stock_frame">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin_left">24</property>
                             <property name="margin_top">6</property>
                             <property name="hexpand">True</property>
-                            <property name="row_spacing">4</property>
+                            <property name="row_spacing">6</property>
+                            <property name="column_spacing">6</property>
                             <child>
                               <object class="GladePropertyLabel" id="propertylabel1">
                                 <property name="visible">True</property>
@@ -340,11 +383,11 @@
                           <object class="GtkGrid" id="label_frame">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin_left">24</property>
                             <property name="margin_top">6</property>
                             <property name="hexpand">True</property>
-                            <property name="row_spacing">4</property>
-                            <property name="column_spacing">2</property>
+                            <property name="row_spacing">6</property>
+                            <property name="column_spacing">6</property>
                             <child>
                               <object class="GladePropertyShell" id="propertyshell3">
                                 <property name="visible">True</property>
@@ -502,7 +545,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="margin_left">4</property>
+                <property name="margin_left">12</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
@@ -524,20 +567,20 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">False</property>
-        <property name="position">3</property>
+        <property name="position">4</property>
       </packing>
     </child>
     <child-editors>
       <editor id="embed"/>
+      <editor id="propertylabel8"/>
+      <editor id="propertyshell12"/>
+      <editor id="propertylabel7"/>
+      <editor id="propertyshell11"/>
       <editor id="propertylabel3"/>
       <editor id="propertylabel4"/>
       <editor id="propertyshell9"/>
       <editor id="propertyshell10"/>
-      <editor id="propertylabel7"/>
-      <editor id="propertyshell11"/>
       <editor id="propertyshell13"/>
-      <editor id="propertylabel8"/>
-      <editor id="propertyshell12"/>
       <editor id="propertylabel1"/>
       <editor id="propertylabel2"/>
       <editor id="propertyshell2"/>