Merge branch 'change-audio'

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

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 6a86da7219e3b6f0053cf5a0c00e0685dbe8e3b0..b21a07bac5483846a710eb2d99553ffb06229d6a 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -41,6 +41,14 @@
             <property name="label" translatable="yes">_Add Contact…</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="chat_search_contacts">
+            <property name="stock_id">gtk-find</property>
+            <property name="name">chat_search_contacts</property>
+            <property name="label" translatable="yes">_Search for Contacts…</property>
+          </object>
+          <accelerator key="f" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+        </child>
         <child>
           <object class="GtkAction" id="view_show_ft_manager">
             <property name="icon-name">document-send</property>
@@ -61,6 +69,13 @@
             <property name="label" translatable="yes">Show P_rotocols</property>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleAction" id="view_balance_show_in_roster">
+            <property name="name">view_balance_show_in_roster</property>
+            <property name="label" translatable="yes">Credit Balance</property>
+            <property name="visible">False</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="view_show_map">
             <property name="name">view_show_map</property>
@@ -83,7 +98,7 @@
         <child>
           <object class="GtkAction" id="edit_context">
             <property name="name">edit_context</property>
-            <property name="label" translatable="yes">Context</property>
+            <property name="label" translatable="no">Context</property>
           </object>
         </child>
         <child>
@@ -99,6 +114,12 @@
             <property name="label" translatable="yes">_Personal Information</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="edit_blocked_contacts">
+            <property name="name">edit_blocked_contacts</property>
+            <property name="label" translatable="yes">_Blocked Contacts</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="edit_preferences">
             <property name="stock_id">gtk-preferences</property>
@@ -111,6 +132,7 @@
             <property name="name">edit_search_contacts</property>
             <property name="label" translatable="yes">Find in Contact _List</property>
           </object>
+          <accelerator key="f" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="view">
@@ -232,6 +254,7 @@
           <menuitem action="chat_new_call"/>
           <separator/>
           <menuitem action="chat_add_contact"/>
+          <menuitem action="chat_search_contacts"/>
           <separator/>
           <menuitem action="chat_quit"/>
         </menu>
@@ -240,14 +263,18 @@
           <separator name="edit_context_separator"/>
           <menuitem action="edit_accounts"/>
           <menuitem action="edit_personal_information"/>
+          <menuitem action="edit_search_contacts"/>
+          <menuitem action="edit_blocked_contacts"/>
           <separator/>
           <menuitem action="edit_preferences"/>
-          <menuitem action="edit_search_contacts"/>
         </menu>
         <menu action="view">
           <menuitem action="view_show_offline"/>
           <menuitem action="view_show_protocols"/>
           <separator/>
+          <menuitem action="view_balance_show_in_roster"/>
+          <placeholder name="view_balance_placeholder"/>
+          <separator/>
           <menuitem action="view_sort_by_name"/>
           <menuitem action="view_sort_by_status"/>
           <separator/>
@@ -289,6 +316,9 @@
           <object class="GtkToolbar" id="presence_toolbar">
             <property name="visible">True</property>
             <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -297,7 +327,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="errors_vbox">
+          <object class="GtkVBox" id="balance_vbox">
+            <property name="spacing">3</property>
             <child>
               <placeholder/>
             </child>
@@ -308,6 +339,30 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkVBox" id="errors_vbox">
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="auth_vbox">
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
@@ -340,7 +395,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">3</property>
+            <property name="position">5</property>
           </packing>
         </child>
       </object>