[gedit/wip/redesign: 3/9] Set headerbar as titlebar

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 814450b59c93e03a59b6a0aaad0ddaf4b46735b5
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat May 4 23:05:40 2013 +0200

    Set headerbar as titlebar

 gedit/gedit-window.ui |  206 ++++++++++++++++++++++++------------------------
 1 files changed, 103 insertions(+), 103 deletions(-)
---
diff --git a/gedit/gedit-window.ui b/gedit/gedit-window.ui
index 7623bfc..4fce183 100644
--- a/gedit/gedit-window.ui
+++ b/gedit/gedit-window.ui
@@ -59,150 +59,150 @@
     <property name="has_focus">False</property>
     <property name="is_focus">False</property>
     <property name="hide_titlebar_when_maximized">True</property>
-    <child>
-      <object class="GtkBox" id="main_box">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkHeaderBar" id="headerbar">
+          <object class="GtkBox" id="open_box">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
             <child>
-              <object class="GtkBox" id="open_box">
+              <object class="GtkButton" id="open_button">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="valign">center</property>
+                <property name="label" translatable="yes">Open</property>
+                <property name="tooltip_text" translatable="yes">Open a file</property>
+                <property name="action_name">win.open</property>
                 <style>
-                  <class name="linked"/>
+                  <class name="text-button"/>
                 </style>
-                <child>
-                  <object class="GtkButton" id="open_button">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Open</property>
-                    <property name="tooltip_text" translatable="yes">Open a file</property>
-                    <property name="action_name">win.open</property>
-                    <style>
-                      <class name="text-button"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GeditOpenMenuButton" id="open_menu">
-                    <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes">Open a recently used file</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                  </object>
-                </child>
               </object>
-              <packing>
-                <property name="pack_type">start</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkButton" id="new_tab_button">
+              <object class="GeditOpenMenuButton" id="open_menu">
                 <property name="visible">True</property>
-                <property name="valign">center</property>
-                <property name="tooltip_text" translatable="yes">Create a new document</property>
-                <property name="action_name">win.new_tab</property>
+                <property name="tooltip_text" translatable="yes">Open a recently used file</property>
                 <style>
                   <class name="image-button"/>
                 </style>
-                <child>
-                  <object class="GtkImage" id="new_tab_image">
-                    <property name="visible">True</property>
-                    <property name="icon_size">1</property>
-                    <property name="icon_name">tab-new-symbolic</property>
-                  </object>
-                </child>
               </object>
-              <packing>
-                <property name="pack_type">start</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="new_tab_button">
+            <property name="visible">True</property>
+            <property name="valign">center</property>
+            <property name="tooltip_text" translatable="yes">Create a new document</property>
+            <property name="action_name">win.new_tab</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="new_tab_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">tab-new-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="save_button">
+            <property name="visible">True</property>
+            <property name="valign">center</property>
+            <property name="tooltip_text" translatable="yes">Save the current file</property>
+            <property name="action_name">win.save</property>
+            <style>
+              <class name="image-button"/>
+            </style>
             <child>
-              <object class="GtkButton" id="save_button">
+              <object class="GtkImage" id="save_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-save-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="save_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="find_button">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
-                <property name="tooltip_text" translatable="yes">Save the current file</property>
-                <property name="action_name">win.save</property>
+                <property name="tooltip_text" translatable="yes">Search for text</property>
+                <property name="action_name">win.find</property>
                 <style>
                   <class name="image-button"/>
                 </style>
                 <child>
-                  <object class="GtkImage" id="save_image">
+                  <object class="GtkImage" id="find_image">
                     <property name="visible">True</property>
                     <property name="icon_size">1</property>
-                    <property name="icon_name">document-save-symbolic</property>
+                    <property name="icon_name">edit-find-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack_type">start</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkBox" id="save_box">
+              <object class="GtkMenuButton" id="find_menu">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="valign">center</property>
+                <property name="menu_model">search-menu</property>
                 <style>
-                  <class name="linked"/>
+                  <class name="image-button"/>
                 </style>
-                <child>
-                  <object class="GtkButton" id="find_button">
-                    <property name="visible">True</property>
-                    <property name="valign">center</property>
-                    <property name="tooltip_text" translatable="yes">Search for text</property>
-                    <property name="action_name">win.find</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage" id="find_image">
-                        <property name="visible">True</property>
-                        <property name="icon_size">1</property>
-                        <property name="icon_name">edit-find-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="find_menu">
-                    <property name="visible">True</property>
-                    <property name="menu_model">search-menu</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                  </object>
-                </child>
               </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkMenuButton" id="gear_button">
+            <property name="visible">True</property>
+            <property name="valign">center</property>
+            <property name="menu_model">gear-menu</property>
+            <style>
+              <class name="image-button"/>
+            </style>
             <child>
-              <object class="GtkMenuButton" id="gear_button">
+              <object class="GtkImage" id="gear_image">
                 <property name="visible">True</property>
-                <property name="valign">center</property>
-                <property name="menu_model">gear-menu</property>
-                <style>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkImage" id="gear_image">
-                    <property name="visible">True</property>
-                    <property name="icon_size">1</property>
-                    <property name="icon_name">emblem-system-symbolic</property>
-                  </object>
-                </child>
+                <property name="icon_size">1</property>
+                <property name="icon_name">emblem-system-symbolic</property>
               </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
             </child>
           </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
         </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="hpaned">
             <property name="visible">True</property>