[totem] main: Update controls popup layout

[Bastien Nocera <hadess src gnome org>]

commit 32787c5781b85064b84f65a4442ad1822b90c754
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Apr 30 14:01:58 2013 +0200

    main: Update controls popup layout
    
    Following Jakub's comments.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699246

 data/controls.ui   |  225 +++++++++++++++++----------------------------------
 src/totem-object.c |    4 +-
 2 files changed, 76 insertions(+), 153 deletions(-)
---
diff --git a/data/controls.ui b/data/controls.ui
index 00e3619..24f2ce1 100644
--- a/data/controls.ui
+++ b/data/controls.ui
@@ -7,126 +7,39 @@
       <object class="GtkToolbar" id="toolbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="show_arrow">False</property>
+        <property name="border_width">8</property>
         <child>
-          <object class="GtkToolItem" id="toolbutton">
+          <object class="GtkToolItem" id="controls_toolbutton">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkBox" id="box2">
+              <object class="GtkBox" id="controls_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox" id="top_row">
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolItem" id="slider_toolbutton">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox" id="bottom_row">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">8</property>
+                <property name="spacing">4</property>
+                <child>
+                  <object class="BaconTimeLabel" id="time_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkBox" id="left_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="center_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkBox" id="controls_box">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="fullscreen_box">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkButton" id="fullscreen_button">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="focus_on_click">False</property>
-                                <property name="tooltip_text" translatable="yes">Fullscreen</property>
-                                <property name="action_name">app.fullscreen</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="fullscreen_accessible">
-                                    <property name="AtkObject::accessible-name" 
translatable="yes">Fullscreen</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="right_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <child>
-                          <object class="GtkVolumeButton" id="volume_button">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="relief">normal</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="use_symbolic">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -135,50 +48,28 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="bottom_row">
+                  <object class="GtkScale" id="seek_scale">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="draw_value">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="BaconTimeLabel" id="time_rem_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="BaconTimeLabel" id="time_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScale" id="seek_scale">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="draw_value">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="BaconTimeLabel" id="time_rem_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="remaining">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="remaining">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -186,7 +77,41 @@
           </object>
           <packing>
             <property name="expand">True</property>
-            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolButton" id="fullscreen_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Fullscreen</property>
+            <property name="action_name">app.fullscreen</property>
+            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolItem" id="volume_toolbutton">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkVolumeButton" id="volume_button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <property name="orientation">vertical</property>
+                <property name="use_symbolic">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
           </packing>
         </child>
       </object>
diff --git a/src/totem-object.c b/src/totem-object.c
index d3e3013..b79f853 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -3766,10 +3766,8 @@ totem_callback_connect (TotemObject *totem)
 
        /* Fullscreen button */
        item = g_object_get_data (totem->controls, "fullscreen_button");
-       image = gtk_image_new ();
-       gtk_button_set_image (GTK_BUTTON (item), image);
        g_object_bind_property_full (totem, "fullscreen",
-                                    image, "icon-name",
+                                    item, "icon-name",
                                     G_BINDING_SYNC_CREATE,
                                     fullscreen_button_image_sync,
                                     NULL, NULL, NULL);