[gnome-builder/wip/chergert/headerbar] workbench: move search bar to the right

[Christian Hergert <chergert src gnome org>]

commit 9fa9d82a5e5feeb11d2bf9467caebf51e1859006
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jun 20 18:48:31 2016 -0700

    workbench: move search bar to the right

 libide/search/ide-omni-search-entry.c        |    4 +-
 libide/workbench/ide-workbench-header-bar.ui |   57 +++++++++++++------------
 2 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/libide/search/ide-omni-search-entry.c b/libide/search/ide-omni-search-entry.c
index 74e786c..26841d4 100644
--- a/libide/search/ide-omni-search-entry.c
+++ b/libide/search/ide-omni-search-entry.c
@@ -359,7 +359,7 @@ static void
 ide_omni_search_entry_init (IdeOmniSearchEntry *self)
 {
   g_object_set (self,
-                "max-width-chars", 50,
+                "max-width-chars", 30,
                 "primary-icon-name", "edit-find-symbolic",
                 "primary-icon-activatable", FALSE,
                 "primary-icon-sensitive", FALSE,
@@ -369,7 +369,7 @@ ide_omni_search_entry_init (IdeOmniSearchEntry *self)
                                 "modal", FALSE,
                                 "position", GTK_POS_BOTTOM,
                                 "relative-to", self,
-                                "width-request", 500,
+                                "width-request", 400,
                                 NULL);
 
   g_signal_connect_object (self->popover,
diff --git a/libide/workbench/ide-workbench-header-bar.ui b/libide/workbench/ide-workbench-header-bar.ui
index 22fe4db..4954686 100644
--- a/libide/workbench/ide-workbench-header-bar.ui
+++ b/libide/workbench/ide-workbench-header-bar.ui
@@ -14,39 +14,42 @@
         <property name="position">1</property>
       </packing>
     </child>
-    <child type="title">
-      <object class="IdeOmniSearchEntry" id="search_entry">
-        <property name="tooltip-text" translatable="yes">Search for files. Shortcut: Ctrl + .</property>
-        <property name="hexpand">true</property>
-        <property name="margin-end">6</property>
-        <property name="margin-start">6</property>
-        <property name="visible">true</property>
-      </object>
-    </child>
     <child>
-      <object class="GtkMenuButton" id="menu_button">
-        <property name="tooltip-text" translatable="yes">Drops down a list of file operations</property>
-        <property name="focus-on-click">false</property>
+      <object class="EggPriorityBox" id="right_box">
+        <property name="hexpand">true</property>
+        <property name="spacing">30</property>
         <property name="visible">true</property>
-        <style>
-          <class name="image-button"/>
-        </style>
         <child>
-          <object class="GtkImage">
-            <property name="icon-name">open-menu-symbolic</property>
+          <object class="GtkMenuButton" id="menu_button">
+            <property name="tooltip-text" translatable="yes">Show workbench menu</property>
+            <property name="focus-on-click">false</property>
             <property name="visible">true</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage">
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="visible">true</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">end</property>
+            <property name="priority">-100000</property>
+          </packing>
+        </child>
+        <child>
+          <object class="IdeOmniSearchEntry" id="search_entry">
+            <property name="hexpand">true</property>
+            <property name="placeholder-text" translatable="yes">Press Ctrl+. to search</property>
+            <property name="visible">true</property>
+          </object>
+          <packing>
+            <property name="priority">0</property>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="pack-type">end</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="EggPriorityBox" id="right_box">
-        <property name="hexpand">true</property>
-        <property name="visible">true</property>
       </object>
       <packing>
         <property name="pack-type">end</property>