X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-call-window.ui;h=133f4ca4ff685efb29af516d3cf3d4fca9f8e832;hp=3a460ed688c348a7a141d075171a3be7c6f28fa9;hb=f2d81bc778ae11d5518d9b054ce230fc90d37c82;hpb=6bc173c8f3606c87ff0ba0be84140ac72a4b243c

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 3a460ed6..133f4ca4 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -11,97 +11,141 @@
           </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="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="menudialpad">
-            <property name="name">menudialpad</property>
-            <property name="label" translatable="yes">_Dialpad</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="GtkAction" id="camera">
-            <property name="name">camera</property>
-            <property name="label" translatable="yes">V_ideo</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="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="menusettings">
+            <property name="stock_id">preferences-desktop</property>
+            <property name="name">menusettings</property>
+            <property name="label" translatable="yes">_Settings</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="view">
+            <property name="name">view</property>
+            <property name="label" translatable="yes">_View</property>
           </object>
         </child>
         <child>
-          <object class="GtkRadioAction" id="action_camera_on">
-            <property name="name">action_camera_on</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</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="help">
+            <property name="name">help</property>
+            <property name="label" translatable="yes">_Help</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="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="menufullscreen">
-            <property name="stock_id">gtk-fullscreen</property>
-            <property name="name">menufullscreen</property>
+          <object class="GtkAction" id="menudebug">
+            <property name="name">menudebug</property>
+            <property name="label" translatable="yes">_Debug</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menudebuggst">
+            <property name="name">menudebuggst</property>
+            <property name="label" translatable="yes">_GStreamer</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menudebugtp">
+            <property name="name">menudebugtp</property>
+            <property name="label" translatable="yes">_Telepathy</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>
+        </child>
+        <child>
+          <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="menupreviewmaximise">
+            <property name="name">menupreviewmaximise</property>
+            <property name="label" translatable="yes">Maximise me</property>
+          </object>
+        </child>
+        <child>
+          <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>
     <ui>
       <menubar name="menubar1">
         <menu action="call">
-          <menuitem action="menuhangup"/>
-          <menuitem action="menuredial"/>
-          <menuitem action="menudialpad"/>
+          <menuitem action="menufullscreen"/>
         </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 action="menucamera"/>
+          <menuitem name="menusettings" action="menusettings"/>
         </menu>
-        <menu action="view">
-          <menuitem action="menufullscreen"/>
+        <menu action="help">
+          <menuitem name="menucontents" action="menucontents"/>
+          <menu name="menudebug" action="menudebug">
+            <menuitem action="menudebuggst"/>
+            <menuitem action="menudebugtp"/>
+          </menu>
+          <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>
     </ui>
   </object>
       <object class="GtkVBox" id="call_window_vbox">
@@ -121,92 +165,81 @@
             	<class name="primary-toolbar"/>
             </style>
             <child>
-              <object class="GtkToolButton" id="hangup">
-                <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="toolitem1">
                 <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>
+                <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="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="draw">False</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="microphone">
+
+              <object class="GtkToolItem" id="toolitem2">
                 <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>
+                <child>
+                  <object class="GtkVBox" id="uservbox">
+                  <child>
+                    <object class="GtkLabel" id="remote_user_name_toolbar">
+                      <property name="visible">True</property>
+                      <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                      <property name="xalign">0</property>
+                    </object>
+                    <packing>
+                      <property name="fill">False</property>
+                    </packing>
+                  </child>
+                  <child>
+                    <object class="GtkLabel" id="remote_user_status_toolbar">
+                      <property name="visible">True</property>
+                      <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                      <property name="xalign">0</property>
+                    </object>
+                    <packing>
+                      <property name="fill">False</property>
+                    </packing>
+                  </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
+              <packing> <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>
-              </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">input-dialpad</property>
+                <property name="tooltip_text" translatable="yes">Display the dialpad</property>
               </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
           </object>
           <packing>
@@ -224,29 +257,88 @@
           </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>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkToolItem" id="toolitem_group">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkBox" id="button_group">
+                    <property name="orientation">horizontal</property>
+                    <property name="spacing">0</property>
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkToggleButton" id="camera">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+                        <child>
+                          <object class="GtkImage" id="camera_icon">
+                            <property name="visible">True</property>
+                            <property name="icon_name">camera-web-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkVolumeButton" id="volume">
+                        <property name="visible">True</property>
+                        <property name="value">1.0</property>
+                        <property name="relief">normal</property>
+                        <property name="use_symbolic">True</property>
+                        <property name="size">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="microphone">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+                        <child>
+                          <object class="GtkImage" id="microphone_icon">
+                            <property name="visible">True</property>
+                            <property name="icon_name">audio-input-microphone-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton2">
+                <property name="draw">False</property>
+                <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>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">4</property>
-          </packing>
         </child>
       </object>
 
@@ -305,11 +397,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="video">
+        <object class="GtkGrid" id="video">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -336,11 +425,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -366,11 +451,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -397,11 +478,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -427,11 +504,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -458,11 +531,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -487,11 +556,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -503,11 +568,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -535,11 +596,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -564,11 +621,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -580,11 +633,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">4</property>
-              <property name="bottom_attach">5</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -653,11 +702,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="audio">
+        <object class="GtkGrid" id="audio">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -684,11 +730,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -713,11 +755,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -744,11 +782,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -773,11 +807,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -804,11 +834,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -833,11 +859,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -849,11 +871,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">2</property>
-              <property name="bottom_attach">3</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -880,11 +898,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -909,11 +923,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -925,11 +935,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>