Move should_create_salut_account to local-xmpp-assistant-widget

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

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 8c0d5777e6520bfce8a8485c7f2014ed3dfcfe94..924bab6f4e64f678b50bd371b26cff5943c0329f 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -11,17 +11,11 @@
           </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>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="menusidebar">
-            <property name="name">menusidebar</property>
-            <property name="label" translatable="yes">_Sidebar</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">
@@ -36,6 +30,20 @@
             <property name="icon_name">gnome-stock-mic</property>
           </object>
         </child>
+        <child>
+          <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>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -43,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">
@@ -72,24 +105,29 @@
     <ui>
       <menubar name="menubar1">
         <menu action="call">
-          <menuitem action="menuhangup"/>
+          <menuitem action="menufullscreen"/>
         </menu>
         <menu action="edit">
           <menu action="menumicrophone"/>
+          <menu action="menucamera"/>
+          <menuitem name="menusettings" action="menusettings"/>
         </menu>
-        <menu action="view">
-          <menuitem action="menufullscreen"/>
-          <menuitem action="menusidebar"/>
+        <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>
@@ -183,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>
@@ -206,26 +244,18 @@
           </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="GtkToolbar" id="bottom_toolbar">
+          <object class="GtkHBox" id="bottom_toolbar">
             <property name="visible">True</property>
-            <style>
-              <class name="bottom-toolbar"/>
-            </style>
+            <property name="homogeneous">False</property>
             <child>
               <object class="GtkToggleToolButton" id="camera">
                 <property name="visible">True</property>
@@ -235,7 +265,8 @@
                 <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
@@ -249,7 +280,8 @@
                 </child>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
@@ -261,7 +293,8 @@
                 <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
@@ -281,6 +314,16 @@
                   </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>
@@ -345,11 +388,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>
 
@@ -376,11 +416,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>
 
@@ -406,11 +442,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>
 
@@ -437,11 +469,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>
 
@@ -467,11 +495,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>
 
@@ -498,11 +522,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>
 
@@ -527,11 +547,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>
 
@@ -543,11 +559,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>
 
@@ -575,11 +587,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>
 
@@ -604,11 +612,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>
 
@@ -620,11 +624,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>
 
@@ -693,11 +693,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>
 
@@ -724,11 +721,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>
 
@@ -753,11 +746,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>
 
@@ -784,11 +773,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>
 
@@ -813,11 +798,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>
 
@@ -844,11 +825,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>
 
@@ -873,11 +850,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>
 
@@ -889,11 +862,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>
 
@@ -920,11 +889,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>
 
@@ -949,11 +914,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>
 
@@ -965,11 +926,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>