main: Merge controls.ui into totem.ui

3 files changed, 185 insertions, 185 deletions

diff --git a/data/controls.ui b/data/controls.ui
deleted file mode 100644
index a9b1b59e4..000000000
--- a/data/controls.ui
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Dec 16 08:54:54 2013 -->
-<interface>
-  <!-- interface-requires gtk+ 3.11 -->
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">0</property>
-        <property name="opacity">0.86</property>
-        <style>
-          <class name="osd"/>
-          <class name="bottom"/>
-        </style>
-        <child>
-          <object class="GtkToolItem" id="controls_toolbutton">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkBox" id="controls_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <style>
-                  <class name="linked"/>
-                </style>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">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">0</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="margin_start">16</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>
-                    <property name="restrict-to-fill-level">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>
-                    <property name="margin_end">16</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="homogeneous">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="box_toolbutton">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkBox" id="box2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkMenuButton" id="go_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="relief">normal</property>
-                    <property name="valign">center</property>
-                    <property name="use-popover">True</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage" id="go_button_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">go-jump-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="volume_toolbutton">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkBox" id="box1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</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="valign">center</property>
-                    <property name="icons">audio-volume-muted-symbolic
-audio-volume-high-symbolic
-audio-volume-low-symbolic
-audio-volume-medium-symbolic</property>
-                    <property name="use_symbolic">True</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/data/meson.build b/data/meson.build
index 3bd9ac254..3462b90dd 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -37,7 +37,6 @@ else
 endif
 
 ui_files = files(
-  'controls.ui',
   'playlist.ui',
   'shortcuts.ui',
   'totem.ui',
diff --git a/data/totem.ui b/data/totem.ui
index a8921e5fb..afcdae2e0 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -210,6 +210,191 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkToolbar" id="toolbar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="border_width">0</property>
+                    <property name="opacity">0.86</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="valign">end</property>
+                    <style>
+                      <class name="osd"/>
+                      <class name="bottom"/>
+                      </style>
+                    <child>
+                      <object class="GtkToolItem" id="controls_toolbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkBox" id="controls_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <style>
+                              <class name="linked"/>
+                              </style>
+                            <child>
+                              <placeholder/>
+                              </child>
+                            </object>
+                          </child>
+                        </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">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">0</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="margin_start">16</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>
+                                <property name="restrict-to-fill-level">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>
+                                <property name="margin_end">16</property>
+                                </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                                </packing>
+                              </child>
+                            </object>
+                          </child>
+                        </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="homogeneous">False</property>
+                        </packing>
+                      </child>
+                    <child>
+                      <object class="GtkToolItem" id="box_toolbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkBox" id="box2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkMenuButton" id="go_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="relief">normal</property>
+                                <property name="valign">center</property>
+                                <property name="use-popover">True</property>
+                                <style>
+                                  <class name="image-button"/>
+                                  </style>
+                                <child>
+                                  <object class="GtkImage" id="go_button_image">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="icon_name">go-jump-symbolic</property>
+                                    </object>
+                                  </child>
+                                </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                                </packing>
+                              </child>
+                            </object>
+                          </child>
+                        </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                        </packing>
+                      </child>
+                    <child>
+                      <object class="GtkToolItem" id="volume_toolbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkBox" id="box1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</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="valign">center</property>
+                                <property name="icons">audio-volume-muted-symbolic
+                                  audio-volume-high-symbolic
+                                  audio-volume-low-symbolic
+                                  audio-volume-medium-symbolic</property>
+                                <property name="use_symbolic">True</property>
+                                <style>
+                                  <class name="image-button"/>
+                                  </style>
+                                </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                                </packing>
+                              </child>
+                            </object>
+                          </child>
+                        </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                        </packing>
+                      </child>
+                    </object>
+                    <packing>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">2</property>
+                      <property name="width">3</property>
+                      <property name="height">1</property>
+                    </packing>
+                  </child>
               </object>
             </child>
           </object>