[glade] Slightly touching up activatable / button editors.

[Tristan Van Berkom <tvb src gnome org>]

commit 2dd2203cd60eaf415e44edd6e60b19597f5f78bc
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Apr 14 17:02:39 2013 +0900

    Slightly touching up activatable / button editors.

 plugins/gtk+/glade-activatable-editor.ui | 181 +++++++++++++++----------------
 plugins/gtk+/glade-button-editor.ui      | 121 +++++++++++----------
 2 files changed, 151 insertions(+), 151 deletions(-)
---
diff --git a/plugins/gtk+/glade-activatable-editor.ui b/plugins/gtk+/glade-activatable-editor.ui
index bb11eee..985b15d 100644
--- a/plugins/gtk+/glade-activatable-editor.ui
+++ b/plugins/gtk+/glade-activatable-editor.ui
@@ -19,114 +19,113 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame1">
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="margin_top">6</property>
+        <property name="row_spacing">4</property>
         <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GladePropertyLabel" id="propertylabel1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">12</property>
-            <property name="margin_top">6</property>
-            <property name="row_spacing">4</property>
-            <child>
-              <object class="GladePropertyLabel" id="propertylabel1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="visible_window">False</property>
-                <property name="property_name">related-action</property>
-              </object>
-              <packing>
-                <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="propertyshell1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="property_name">related-action</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GladePropertyLabel" id="propertylabel2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="visible_window">False</property>
-                <property name="property_name">use-action-appearance</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GladePropertyShell" id="propertyshell2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="property_name">use-action-appearance</property>
-              </object>
-              <packing>
-                <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="propertylabel3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="visible_window">False</property>
-                <property name="property_name">action-name</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="GladePropertyShell" id="propertyshell3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="property_name">action-name</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
+            <property name="property_name">related-action</property>
           </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
         </child>
-        <child type="label">
+        <child>
+          <object class="GladePropertyShell" id="propertyshell1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="property_name">related-action</property>
+          </object>
+          <packing>
+            <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="propertylabel2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="property_name">use-action-appearance</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="GladePropertyShell" id="propertyshell2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="property_name">use-action-appearance</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</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="margin_left">12</property>
+            <property name="property_name">action-name</property>
+          </object>
+          <packing>
+            <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="GladePropertyShell" id="propertyshell3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="property_name">action-name</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkLabel" id="label1">
             <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">Activatable / Actionable</property>
             <property name="use_markup">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
           </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
         </child>
       </object>
       <packing>
diff --git a/plugins/gtk+/glade-button-editor.ui b/plugins/gtk+/glade-button-editor.ui
index 095e6b2..63d6658 100644
--- a/plugins/gtk+/glade-button-editor.ui
+++ b/plugins/gtk+/glade-button-editor.ui
@@ -20,6 +20,24 @@
       </packing>
     </child>
     <child>
+      <object class="GtkLabel" id="label1">
+        <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 Appearance</property>
+        <property name="use_markup">True</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -67,7 +85,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
                                 <property name="property_name">stock</property>
                               </object>
                               <packing>
@@ -82,7 +99,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
                                 <property name="property_name">image-position</property>
                               </object>
                               <packing>
@@ -156,121 +172,115 @@
                             <property name="margin_top">6</property>
                             <property name="hexpand">True</property>
                             <property name="row_spacing">4</property>
+                            <property name="column_spacing">2</property>
                             <child>
-                              <object class="GladePropertyLabel" id="propertylabel3">
+                              <object class="GladePropertyShell" id="propertyshell3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
+                                <property name="hexpand">True</property>
                                 <property name="property_name">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
+                                <property name="width">4</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyShell" id="propertyshell3">
+                              <object class="GladePropertyLabel" id="propertylabel5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="property_name">label</property>
+                                <property name="halign">start</property>
+                                <property name="hexpand">False</property>
+                                <property name="property_name">image</property>
+                                <property name="custom_text" translatable="yes">Image:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left_attach">2</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="GladePropertyShell" id="propertyshell5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
-                                <property name="property_name">use-underline</property>
+                                <property name="hexpand">True</property>
+                                <property name="property_name">image</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
+                                <property name="left_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyShell" id="propertyshell4">
+                              <object class="GladePropertyShell" id="propertyshell6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
-                                <property name="property_name">use-underline</property>
+                                <property name="property_name">image-position</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left_attach">3</property>
+                                <property name="top_attach">2</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyLabel" id="propertylabel5">
+                              <object class="GladePropertyLabel" id="propertylabel6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="halign">start</property>
                                 <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
-                                <property name="property_name">image</property>
+                                <property name="property_name">image-position</property>
+                                <property name="custom_text" translatable="yes">Position:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
+                                <property name="left_attach">2</property>
                                 <property name="top_attach">2</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyShell" id="propertyshell5">
+                              <object class="GladePropertyShell" id="propertyshell4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="property_name">image</property>
+                                <property name="halign">start</property>
+                                <property name="hexpand">False</property>
+                                <property name="property_name">use-underline</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
+                                <property name="top_attach">1</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyLabel" id="propertylabel6">
+                              <object class="GladePropertyLabel" id="propertylabel4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">False</property>
-                                <property name="visible_window">False</property>
-                                <property name="property_name">image-position</property>
+                                <property name="property_name">use-underline</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
+                                <property name="top_attach">1</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GladePropertyShell" id="propertyshell6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="property_name">image-position</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </child>
                           </object>
                         </child>
@@ -336,38 +346,29 @@
             </child>
           </object>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Button Appearance</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
+        <child type="label_item">
+          <placeholder/>
         </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">False</property>
-        <property name="position">1</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child-editors>
       <editor id="embed"/>
       <editor id="propertylabel1"/>
-      <editor id="propertyshell1"/>
       <editor id="propertylabel2"/>
       <editor id="propertyshell2"/>
-      <editor id="propertylabel3"/>
+      <editor id="propertyshell1"/>
       <editor id="propertyshell3"/>
-      <editor id="propertylabel4"/>
-      <editor id="propertyshell4"/>
       <editor id="propertylabel5"/>
       <editor id="propertyshell5"/>
-      <editor id="propertylabel6"/>
       <editor id="propertyshell6"/>
+      <editor id="propertylabel6"/>
+      <editor id="propertyshell4"/>
+      <editor id="propertylabel4"/>
     </child-editors>
   </template>
 </interface>