Merge branch 'debug'

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

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 73b49a5db16c608fa9546c06e42b74913187e0c9..f914979f61db5633367429991611436cbff9ae8f 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -19,10 +19,10 @@
           <accelerator key="N" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
-          <object class="GtkAction" id="chat_history">
+          <object class="GtkAction" id="view_history">
             <property name="icon-name">document-open-recent</property>
-            <property name="name">chat_history</property>
-            <property name="label" translatable="yes">_View Previous Conversations</property>
+            <property name="name">view_history</property>
+            <property name="label" translatable="yes">_Previous Conversations</property>
           </object>
           <accelerator key="F3" modifiers=""/>
         </child>
@@ -34,12 +34,25 @@
           </object>
         </child>
         <child>
-          <object class="GtkToggleAction" id="chat_show_offline">
-            <property name="name">chat_show_offline</property>
-            <property name="label" translatable="yes">Show _Offline Contacts</property>
+          <object class="GtkAction" id="view_show_ft_manager">
+            <property name="icon-name">document-send</property>
+            <property name="name">view_show_ft_manager</property>
+            <property name="label" translatable="yes">_File Transfers</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_show_offline">
+            <property name="name">view_show_offline</property>
+            <property name="label" translatable="yes">_Offline Contacts</property>
           </object>
           <accelerator key="H" modifiers="GDK_CONTROL_MASK"/>
         </child>
+        <child>
+          <object class="GtkAction" id="view_show_map">
+            <property name="name">view_show_map</property>
+            <property name="label" translatable="yes">Contacts on a _Map</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="chat_quit">
             <property name="stock_id">gtk-quit</property>
@@ -79,6 +92,12 @@
             <property name="label" translatable="yes">_Preferences</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="view">
+            <property name="name">view</property>
+            <property name="label" translatable="yes">_View</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="room">
             <property name="name">room</property>
@@ -137,12 +156,9 @@
       <menubar name="menubar">
         <menu action="chat">
           <menuitem action="chat_new_message"/>
-          <menuitem action="chat_history"/>
           <separator/>
           <menuitem action="chat_add_contact"/>
           <separator/>
-          <menuitem action="chat_show_offline"/>
-          <separator/>
           <menuitem action="chat_quit"/>
         </menu>
         <menu action="edit">
@@ -153,6 +169,13 @@
           <separator/>
           <menuitem action="edit_preferences"/>
         </menu>
+        <menu action="view">
+          <menuitem action="view_show_offline"/>
+          <separator/>
+          <menuitem action="view_history"/>
+          <menuitem action="view_show_ft_manager"/>
+          <menuitem action="view_show_map"/>
+        </menu>
         <menu action="room">
           <menuitem action="room_join_new"/>
           <menuitem action="room_join_favorites"/>