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

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 924bab6f..133f4ca4 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -39,7 +39,7 @@
         </child>
         <child>
           <object class="GtkAction" id="menusettings">
-            <property name="stock_id">gtk-preferences</property>
+            <property name="stock_id">preferences-desktop</property>
             <property name="name">menusettings</property>
             <property name="label" translatable="yes">_Settings</property>
           </object>
@@ -70,6 +70,18 @@
             <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>
@@ -114,7 +126,10 @@
         </menu>
         <menu action="help">
           <menuitem name="menucontents" action="menucontents"/>
-          <menuitem name="menudebug" action="menudebug"/>
+          <menu name="menudebug" action="menudebug">
+            <menuitem action="menudebuggst"/>
+            <menuitem action="menudebugtp"/>
+          </menu>
           <menuitem name="menuabout" action="menuabout"/>
         </menu>
       </menubar>
@@ -164,27 +179,37 @@
                 <property name="draw">False</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
+
               <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 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>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="toolbar_space1">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-              </packing>
+              <packing> <property name="expand">True</property></packing>
             </child>
             <child>
               <object class="GtkToolButton" id="hangup">
@@ -193,9 +218,6 @@
                 <property name="icon_name">call-stop</property>
                 <property name="tooltip_text" translatable="yes">Hang up current call</property>
               </object>
-              <packing>
-                <property name="homogeneous">False</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="videocall">
@@ -203,9 +225,6 @@
                 <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="GtkToolButton" id="audiocall">
@@ -213,9 +232,6 @@
                 <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="dialpad">
@@ -224,9 +240,6 @@
                 <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>
@@ -253,52 +266,60 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="bottom_toolbar">
+          <object class="GtkToolbar" id="bottom_toolbar">
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="show_arrow">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">
+              <object class="GtkToolItem" id="toolitem_group">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkVolumeButton" id="volume">
+                  <object class="GtkBox" id="button_group">
+                    <property name="orientation">horizontal</property>
+                    <property name="spacing">0</property>
                     <property name="visible">True</property>
-                    <property name="value">1.0</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>
-              <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">
+              <object class="GtkSeparatorToolItem" id="toolbutton2">
+                <property name="draw">False</property>
                 <property name="visible">True</property>
               </object>
               <packing>
@@ -311,25 +332,13 @@
                 <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>
-              <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>
-            <property name="position">4</property>
-          </packing>
         </child>
       </object>