Merge branch 'change-audio'

[empathy.git] / src / empathy-call-window.ui

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 5ad7399b9b4d86e305cc83b4c591a69a88df73e9..88127e1adfa3f38f6123859f8e0e0bb566e3f10f 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -18,61 +18,48 @@
           </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="edit">
+            <property name="name">edit</property>
+            <property name="label" translatable="yes">_Edit</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="camera">
-            <property name="name">camera</property>
-            <property name="label" translatable="yes">V_ideo</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="GtkRadioAction" id="action_camera_off">
-            <property name="name">action_camera_off</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Video Off</property>
-            <property name="draw_as_radio">True</property>
-            <property name="value">0</property>
-            <property name="current-value">0</property>
+          <object class="GtkAction" id="view">
+            <property name="name">view</property>
+            <property name="label" translatable="yes">_View</property>
           </object>
         </child>
         <child>
-          <object class="GtkRadioAction" id="action_camera_preview">
-            <property name="name">action_camera_preview</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Video Preview</property>
-            <property name="draw_as_radio">True</property>
-            <property name="group">action_camera_off</property>
-            <property name="value">1</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="GtkRadioAction" id="action_camera_on">
-            <property name="name">action_camera_on</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Video On</property>
-            <property name="draw_as_radio">True</property>
-            <property name="group">action_camera_off</property>
-            <property name="value">2</property>
+          <object class="GtkAction" id="menupreviewminimise">
+            <property name="name">menupreviewminimise</property>
+            <property name="label" translatable="yes">Minimise me</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="view">
-            <property name="name">view</property>
-            <property name="label" translatable="yes">_View</property>
+          <object class="GtkAction" id="menupreviewmaximise">
+            <property name="name">menupreviewmaximise</property>
+            <property name="label" translatable="yes">Maximise me</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="menufullscreen">
-            <property name="stock_id">gtk-fullscreen</property>
-            <property name="name">menufullscreen</property>
+          <object class="GtkAction" id="menupreviewdisable">
+            <property name="name">menupreviewdisable</property>
+            <property name="label" translatable="yes">Disable camera</property>
           </object>
-          <accelerator key="F11"/>
         </child>
       </object>
     </child>
@@ -80,12 +67,9 @@
       <menubar name="menubar1">
         <menu action="call">
           <menuitem action="menuhangup"/>
-          <menuitem action="menuredial"/>
         </menu>
-        <menu action="camera">
-          <menuitem action="action_camera_off"/>
-          <menuitem action="action_camera_preview"/>
-          <menuitem action="action_camera_on"/>
+        <menu action="edit">
+          <menu action="menumicrophone"/>
         </menu>
         <menu action="view">
           <menuitem action="menufullscreen"/>
@@ -94,6 +78,14 @@
       <popup name="video-popup">
           <menuitem name="menufullscreen" action="menufullscreen"/>
       </popup>
+      <popup name="preview-menu">
+          <menuitem name="menupreviewminimise" action="menupreviewminimise"/>
+          <menuitem name="menupreviewdisable" action="menupreviewdisable"/>
+      </popup>
+      <popup name="preview-hidden-menu">
+          <menuitem name="menupreviewmaximise" action="menupreviewmaximise"/>
+          <menuitem name="menupreviewdisable" action="menupreviewdisable"/>
+      </popup>
     </ui>
   </object>
       <object class="GtkVBox" id="call_window_vbox">
@@ -109,89 +101,83 @@
         <child>
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
+            <style>
+               <class name="primary-toolbar"/>
+            </style>
             <child>
-              <object class="GtkToolButton" id="hangup">
+              <object class="GtkToolItem" id="toolitem1">
                 <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>
+                <child>
+                  <object class="GtkImage" id="remote_user_avatar_toolbar">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="redial">
+              <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">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>
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
+              <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>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="microphone">
+              <object class="GtkToolItem" id="toolbar_space1">
                 <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="homogeneous">True</property>
+                <property name="expand">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="camera_separator">
+              <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="camera_off">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Camera Off</property>
-                <property name="sensitive">True</property>
-                <property name="tooltip_text" translatable="yes">Disable camera and stop sending video</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_preview">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Preview</property>
-                <property name="icon_name">avatar-default</property>
-                <property name="sensitive">True</property>
-                <property name="tooltip_text" translatable="yes">Enable camera but don't send video</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>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="camera_on">
+              <object class="GtkToggleToolButton" id="dialpad">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Camera On</property>
-                <property name="icon_name">camera-web</property>
-                <property name="sensitive">False</property>
-                <property name="tooltip_text" translatable="yes">Enable camera and send video</property>
+                <property name="label" translatable="yes">Show dialpad</property>
+                <property name="icon_name">accessories-calculator</property>
+                <property name="tooltip_text" translatable="yes">Display the dialpad</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
@@ -213,24 +199,76 @@
           </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="GtkToolbar" id="bottom_toolbar">
             <property name="visible">True</property>
-            <property name="spacing">2</property>
+            <style>
+              <class name="bottom-toolbar"/>
+            </style>
+            <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="homogeneous">True</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="homogeneous">True</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="homogeneous">True</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>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>