From 538d987eb2e525e957caf9b05e6233ed7541c1d8 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu, 7 Jul 2011 08:30:47 +0100
Subject: CallWindow: only show one button to control the camera

Having three buttons to control the camera clutters the
UI. Displaying the video preview but not sending video is
not very useful, and we'll add a way of sending video without
displaying the preview by clicking on the preview itself.

https://bugzilla.gnome.org/show_bug.cgi?id=611789
---
 src/empathy-call-window.ui | 79 ++--------------------------------------------
 1 file changed, 3 insertions(+), 76 deletions(-)

(limited to 'src/empathy-call-window.ui')

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 0d32677f9..f078bb4cd 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -31,43 +31,6 @@
             <property name="label" translatable="yes">_Dialpad</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="camera">
-            <property name="name">camera</property>
-            <property name="label" translatable="yes">V_ideo</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>
-        </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>
-        </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>
-        </child>
         <child>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -90,11 +53,6 @@
           <menuitem action="menuredial"/>
           <menuitem action="menudialpad"/>
         </menu>
-        <menu action="camera">
-          <menuitem action="action_camera_off"/>
-          <menuitem action="action_camera_preview"/>
-          <menuitem action="action_camera_on"/>
-        </menu>
         <menu action="view">
           <menuitem action="menufullscreen"/>
         </menu>
@@ -166,43 +124,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="camera_separator">
-                <property name="visible">True</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>
-              <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>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="camera_on">
+              <object class="GtkToggleToolButton" id="camera">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Camera On</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">Enable camera and send video</property>
+                <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
-- 
cgit v1.2.3