[glade] GladeWindowEditor: Touchup UI

[Tristan Van Berkom <tvb src gnome org>]

commit fb0d83cb9b1cdf06ba4aadd272a8a4ebe36f660c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun May 12 18:33:38 2013 +0900

    GladeWindowEditor: Touchup UI

 plugins/gtk+/glade-window-editor.ui |  338 ++++++++++++++++++-----------------
 1 files changed, 173 insertions(+), 165 deletions(-)
---
diff --git a/plugins/gtk+/glade-window-editor.ui b/plugins/gtk+/glade-window-editor.ui
index 123ac36..3bfe0fa 100644
--- a/plugins/gtk+/glade-window-editor.ui
+++ b/plugins/gtk+/glade-window-editor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="glade">
-  <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gladeui 0.0 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <template class="GladeWindowEditor" parent="GladeEditorSkeleton">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -43,124 +43,6 @@
           </packing>
         </child>
         <child>
-          <object class="GladePropertyLabel" id="type_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">type</property>
-            <property name="custom_text" translatable="yes">Type:</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="type_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">type</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="type_hint_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">type-hint</property>
-            <property name="custom_text" translatable="yes">Hint:</property>
-          </object>
-          <packing>
-            <property name="left_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="type_hint_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">type-hint</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="position_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">window-position</property>
-            <property name="custom_text" translatable="yes">Position:</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="gravity_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">gravity</property>
-            <property name="custom_text" translatable="yes">Gravity:</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="position_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">window-position</property>
-          </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="gravity_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">gravity</property>
-          </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GladePropertyLabel" id="groups_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -170,7 +52,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">4</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -184,7 +66,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">4</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -200,7 +82,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">5</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -216,7 +98,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -230,7 +112,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">5</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -244,7 +126,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -259,7 +141,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">7</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -273,7 +155,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">7</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -288,7 +170,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
+            <property name="top_attach">8</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -302,7 +184,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
+            <property name="top_attach">8</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -320,7 +202,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
+            <property name="top_attach">9</property>
             <property name="width">6</property>
             <property name="height">1</property>
           </packing>
@@ -336,7 +218,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
+            <property name="top_attach">10</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -350,7 +232,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
+            <property name="top_attach">10</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -377,7 +259,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">13</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -405,7 +287,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
+            <property name="top_attach">12</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -419,7 +301,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
+            <property name="top_attach">12</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -433,7 +315,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">13</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -448,7 +330,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">14</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -463,7 +345,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
+            <property name="top_attach">15</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -477,7 +359,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">14</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -491,7 +373,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
+            <property name="top_attach">15</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -509,7 +391,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
+            <property name="top_attach">16</property>
             <property name="width">6</property>
             <property name="height">1</property>
           </packing>
@@ -524,7 +406,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">11</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -540,7 +422,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">11</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -556,7 +438,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -571,7 +453,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -587,7 +469,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -603,7 +485,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
+            <property name="top_attach">19</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -618,7 +500,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -633,7 +515,7 @@
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -648,7 +530,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
+            <property name="top_attach">19</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -663,7 +545,7 @@
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">20</property>
+            <property name="top_attach">19</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -679,7 +561,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -694,7 +576,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -716,10 +598,136 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
+          <object class="GtkGrid" id="top_grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GladePropertyLabel" id="type_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">type</property>
+                <property name="custom_text" translatable="yes">Type:</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="GladePropertyLabel" id="type_hint_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">type-hint</property>
+                <property name="custom_text" translatable="yes">Hint:</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="type_editor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">type</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="GladePropertyShell" id="type_hint_editor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">type-hint</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="position_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">window-position</property>
+                <property name="custom_text" translatable="yes">Position:</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GladePropertyLabel" id="gravity_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">gravity</property>
+                <property name="custom_text" translatable="yes">Gravity:</property>
+              </object>
+              <packing>
+                <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="GladePropertyShell" id="position_editor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">window-position</property>
+              </object>
+              <packing>
+                <property name="left_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="gravity_editor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">False</property>
+                <property name="property_name">gravity</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
+            <property name="width">6</property>
+            <property name="height">1</property>
+          </packing>
         </child>
         <child>
           <placeholder/>
@@ -754,14 +762,6 @@
     </child>
     <child-editors>
       <editor id="embed"/>
-      <editor id="type_label"/>
-      <editor id="type_editor"/>
-      <editor id="type_hint_label"/>
-      <editor id="type_hint_editor"/>
-      <editor id="position_label"/>
-      <editor id="gravity_label"/>
-      <editor id="position_editor"/>
-      <editor id="gravity_editor"/>
       <editor id="groups_label"/>
       <editor id="groups_editor"/>
       <editor id="transient_for_label"/>
@@ -794,6 +794,14 @@
       <editor id="skip_pager_editor"/>
       <editor id="accept_focus_editor"/>
       <editor id="focus_on_map_editor"/>
+      <editor id="type_label"/>
+      <editor id="type_hint_label"/>
+      <editor id="type_editor"/>
+      <editor id="type_hint_editor"/>
+      <editor id="position_label"/>
+      <editor id="gravity_label"/>
+      <editor id="position_editor"/>
+      <editor id="gravity_editor"/>
     </child-editors>
   </template>
 </interface>