use a single window, with tabs

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

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index ef2011895ffa413fedac4b8b8c9afef4428fe2c4..7ac2403ade04a52af738902af10c67b9d54715fa 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -51,6 +51,18 @@
             <property name="label" translatable="yes">Invite _Participant…</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="menu_conv_join_chat">
+            <property name="name">menu_conv_join_chat</property>
+            <property name="label" translatable="yes">_Join Chat</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menu_conv_leave_chat">
+            <property name="name">menu_conv_leave_chat</property>
+            <property name="label" translatable="yes">Le_ave Chat</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="menu_conv_close">
             <property name="stock_id">gtk-close</property>
@@ -164,12 +176,16 @@
             <property name="stock_id">gtk-about</property>
             <property name="name">menu_help_about</property>
           </object>
+          <accelerator key="F2" modifiers=""/>
         </child>
       </object>
     </child>
     <ui>
       <menubar name="chats_menubar">
         <menu action="menu_conv">
+          <menuitem action="menu_conv_join_chat"/>
+          <menuitem action="menu_conv_leave_chat"/>
+          <separator/>
           <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
           <menuitem action="menu_conv_favorite"/>
@@ -198,32 +214,28 @@
         </menu>
         <menu action="menu_help">
           <menuitem action="menu_help_contents"/>
-          <menuitem action="menu_help_about"/>
         </menu>
       </menubar>
     </ui>
   </object>
-  <object class="GtkWindow" id="chat_window">
-    <property name="title" translatable="yes">Chat</property>
-    <property name="role">chat</property>
-    <property name="default_width">580</property>
-    <property name="default_height">480</property>
+  <object class="GtkBox" id="main_box">
+    <property name="can_focus">False</property>
+    <property name="orientation">horizontal</property>
+    <property name="visible">True</property>
+
+<child>
+  <object class="GtkVBox" id="chat_vbox">
+    <property name="visible">True</property>
     <child>
-      <object class="GtkVBox" id="chat_vbox">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkMenuBar" constructor="ui_manager" id="chats_menubar">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
+      <placeholder/>
     </child>
   </object>
+  <packing>
+    <property name="expand">True</property>
+    <property name="fill">True</property>
+    <property name="position">1</property>
+  </packing>
+
+</child>
+</object>
 </interface>