X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-chat-window.ui;h=7ac2403ade04a52af738902af10c67b9d54715fa;hp=32bf89cc0848201f2026b2d5db2444e89c417444;hb=15aa6a83ff96fad9f959762f2b57646f9e735cd1;hpb=940d0e9778828657a6ffbcadd35a8a84d706ac70

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 32bf89cc..7ac2403a 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -31,12 +31,19 @@
             <property name="label" translatable="yes">_Favorite Chat Room</property>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleAction" id="menu_conv_always_urgent">
+            <property name="name">menu_conv_always_urgent</property>
+            <property name="label" translatable="yes">Notify for All Messages</property>
+          </object>
+        </child>
         <child>
           <object class="GtkToggleAction" id="menu_conv_toggle_contacts">
             <property name="name">menu_conv_toggle_contacts</property>
             <property name="active">TRUE</property>
             <property name="label" translatable="yes">_Show Contact List</property>
           </object>
+          <accelerator key="F9" modifiers=""/>
         </child>
         <child>
           <object class="GtkAction" id="menu_conv_invite_participant">
@@ -44,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>
@@ -111,19 +130,26 @@
           </object>
           <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK"/>
         </child>
+        <child>
+          <object class="GtkAction" id="menu_tabs_undo_close_tab">
+            <property name="name">menu_tabs_undo_close_tab</property>
+            <property name="label" translatable="yes">_Undo Close Tab</property>
+          </object>
+          <accelerator key="t" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+        </child>
         <child>
           <object class="GtkAction" id="menu_tabs_left">
             <property name="name">menu_tabs_left</property>
             <property name="label" translatable="yes">Move Tab _Left</property>
           </object>
-          <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
+          <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="menu_tabs_right">
             <property name="name">menu_tabs_right</property>
             <property name="label" translatable="yes">Move Tab _Right</property>
           </object>
-          <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
+          <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="menu_tabs_detach">
@@ -150,15 +176,20 @@
             <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"/>
+          <menuitem action="menu_conv_always_urgent"/>
           <menuitem action="menu_conv_toggle_contacts"/>
           <menuitem action="menu_conv_invite_participant"/>
           <separator/>
@@ -175,6 +206,7 @@
         <menu action="menu_tabs">
           <menuitem action="menu_tabs_prev"/>
           <menuitem action="menu_tabs_next"/>
+          <menuitem action="menu_tabs_undo_close_tab"/>
           <separator/>
           <menuitem action="menu_tabs_left"/>
           <menuitem action="menu_tabs_right"/>
@@ -182,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">350</property>
-    <property name="default_height">250</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>