1 files changed, 176 insertions, 57 deletions
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 7e41961f5..0dea20869 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -11,24 +11,37 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="menuhangup">
-            <property name="icon_name">call-stop</property>
-            <property name="name">menuhangup</property>
-            <property name="label" translatable="yes">Hang up</property>
+          <object class="GtkAction" id="menufullscreen">
+            <property name="stock_id">gtk-fullscreen</property>
+            <property name="name">menufullscreen</property>
+          </object>
+          <accelerator key="F11"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit">
+            <property name="name">edit</property>
+            <property name="label" translatable="yes">_Edit</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="menuredial">
-            <property name="stock_id">gtk-refresh</property>
-            <property name="name">menuredial</property>
-            <property name="label" translatable="yes">Redial</property>
-            <property name="sensitive">False</property>
+          <object class="GtkAction" id="menumicrophone">
+            <property name="label" translatable="yes">_Microphone</property>
+            <property name="name">menumicrophone</property>
+            <property name="icon_name">gnome-stock-mic</property>
           </object>
         </child>
         <child>
-          <object class="GtkToggleAction" id="menusidebar">
-            <property name="name">menusidebar</property>
-            <property name="label" translatable="yes">_Sidebar</property>
+          <object class="GtkAction" id="menucamera">
+            <property name="label" translatable="yes">_Camera</property>
+            <property name="name">menucamera</property>
+            <property name="icon_name">camera-web</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menusettings">
+            <property name="stock_id">gtk-preferences</property>
+            <property name="name">menusettings</property>
+            <property name="label" translatable="yes">_Settings</property>
           </object>
         </child>
         <child>
@@ -38,11 +51,36 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="menufullscreen">
-            <property name="stock_id">gtk-fullscreen</property>
-            <property name="name">menufullscreen</property>
+          <object class="GtkAction" id="help">
+            <property name="name">help</property>
+            <property name="label" translatable="yes">_Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menucontents">
+            <property name="stock_id">gtk-help</property>
+            <property name="name">menucontents</property>
+            <property name="label" translatable="yes">_Contents</property>
+          </object>
+          <accelerator key="F1" modifiers=""/>
+        </child>
+        <child>
+          <object class="GtkAction" id="menudebug">
+            <property name="name">menudebug</property>
+            <property name="label" translatable="yes">_Debug</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuabout">
+            <property name="stock_id">gtk-about</property>
+            <property name="name">menuabout</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menupreviewswap">
+            <property name="name">menupreviewswap</property>
+            <property name="label" translatable="yes">Swap camera</property>
           </object>
-          <accelerator key="F11"/>
         </child>
         <child>
           <object class="GtkAction" id="menupreviewminimise">
@@ -67,22 +105,29 @@
     <ui>
       <menubar name="menubar1">
         <menu action="call">
-          <menuitem action="menuhangup"/>
-          <menuitem action="menuredial"/>
-        </menu>
-        <menu action="view">
           <menuitem action="menufullscreen"/>
-          <menuitem action="menusidebar"/>
+        </menu>
+        <menu action="edit">
+          <menu action="menumicrophone"/>
+          <menu action="menucamera"/>
+          <menuitem name="menusettings" action="menusettings"/>
+        </menu>
+        <menu action="help">
+          <menuitem name="menucontents" action="menucontents"/>
+          <menuitem name="menudebug" action="menudebug"/>
+          <menuitem name="menuabout" action="menuabout"/>
         </menu>
       </menubar>
       <popup name="video-popup">
           <menuitem name="menufullscreen" action="menufullscreen"/>
       </popup>
       <popup name="preview-menu">
+          <menuitem name="menupreviewswap" action="menupreviewswap"/>
           <menuitem name="menupreviewminimise" action="menupreviewminimise"/>
           <menuitem name="menupreviewdisable" action="menupreviewdisable"/>
       </popup>
       <popup name="preview-hidden-menu">
+          <menuitem name="menupreviewswap" action="menupreviewswap"/>
           <menuitem name="menupreviewmaximise" action="menupreviewmaximise"/>
           <menuitem name="menupreviewdisable" action="menupreviewdisable"/>
       </popup>
@@ -105,57 +150,68 @@
             	<class name="primary-toolbar"/>
             </style>
             <child>
-              <object class="GtkToolButton" id="hangup">
+              <object class="GtkToolItem" id="toolitem1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkImage" id="remote_user_avatar_toolbar">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="draw">False</property>
                 <property name="visible">True</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">Hang up</property>
-                <property name="icon_name">call-stop</property>
-                <property name="tooltip_text" translatable="yes">Hang up current call</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="redial">
+              <object class="GtkToolItem" id="toolitem2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="remote_user_name_toolbar">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolbar_space1">
                 <property name="visible">True</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">Redial</property>
-                <property name="stock_id">gtk-refresh</property>
-                <property name="sensitive">False</property>
-                <property name="tooltip_text" translatable="yes">Call the contact again</property>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="expand">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
+              <object class="GtkToolButton" id="hangup">
                 <property name="visible">True</property>
+                <property name="label" translatable="yes">Hang up</property>
+                <property name="icon_name">call-stop</property>
+                <property name="tooltip_text" translatable="yes">Hang up current call</property>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="microphone">
-                <property name="visible">True</property>
-                <property name="active">True</property>
-                <property name="label" translatable="yes">Send Audio</property>
-                <property name="icon_name">gnome-stock-mic</property>
-                <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+              <object class="GtkToolButton" id="videocall">
+                <property name="label" translatable="yes">Video call</property>
+                <property name="icon_name">camera-web</property>
+                <property name="tooltip_text" translatable="yes">Start a video call</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="camera">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Send Video</property>
-                <property name="icon_name">camera-web</property>
-                <property name="sensitive">False</property>
-                <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+              <object class="GtkToolButton" id="audiocall">
+                <property name="label" translatable="yes">Call</property>
+                <property name="icon_name">call-start</property>
+                <property name="tooltip_text" translatable="yes">Start an audio call</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
@@ -165,7 +221,7 @@
               <object class="GtkToggleToolButton" id="dialpad">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Show dialpad</property>
-                <property name="icon_name">accessories-calculator</property>
+                <property name="icon_name">input-dialpad</property>
                 <property name="tooltip_text" translatable="yes">Display the dialpad</property>
               </object>
               <packing>
@@ -188,24 +244,87 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="pane">
+          <object class="GtkHBox" id="pane">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="position">3</property>
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar">
+          <object class="GtkHBox" id="bottom_toolbar">
             <property name="visible">True</property>
-            <property name="spacing">2</property>
+            <property name="homogeneous">False</property>
+            <child>
+              <object class="GtkToggleToolButton" id="camera">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Send Video</property>
+                <property name="icon_name">camera-web</property>
+                <property name="sensitive">False</property>
+                <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolitem3">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkVolumeButton" id="volume">
+                    <property name="visible">True</property>
+                    <property name="value">1.0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton" id="microphone">
+                <property name="visible">True</property>
+                <property name="active">True</property>
+                <property name="label" translatable="yes">Send Audio</property>
+                <property name="icon_name">gnome-stock-mic</property>
+                <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolbar_space2">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolitem4">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="status_label">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton2">
+                <property name="draw">False</property>
+                <property name="visible">True</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>