Changeset 9649

Timestamp:

05/17/08 15:14:34 (3 months ago)

Author:

js

Message:

Don't show events from buttons in advanced menu, only show them when
triggered via the banner right-click menu.

Location:

trunk

Files:

• data/glade/chat_control_popup_menu.glade (modified) (5 diffs)
• src/chat_control.py (modified) (4 diffs)

trunk/data/glade/chat_control_popup_menu.glade

@@ -21 +21 @@
     <child>
       <widget class="GtkImageMenuItem" id="send_file_menuitem">
-        <property name="visible">True</property>
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">Send _File</property>
         <property name="use_underline">True</property>
@@ -36 +36 @@
     <child>
       <widget class="GtkImageMenuItem" id="convert_to_groupchat">
-        <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">Invite _Contacts</property>
         <property name="use_underline">True</property>
@@ -51 +51 @@
     <child>
       <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
-        <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="no_show_all">True</property>
       </widget>
     </child>
@@ -119 +119 @@
     <child>
       <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-        <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="no_show_all">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="information_menuitem">
-        <property name="visible">True</property>
+        <property name="no_show_all">True</property>
         <property name="label">gtk-info</property>
         <property name="use_underline">True</property>
@@ -133 +133 @@
     <child>
       <widget class="GtkImageMenuItem" id="history_menuitem">
-        <property name="visible">True</property>
-        <property name="tooltip" translatable="yes">Click to see past conversations with this contact</property>
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">_History</property>
         <property name="use_underline">True</property>

trunk/src/chat_control.py

@@ -756 +756 @@
         def on_actions_button_clicked(self, widget):
                 '''popup action menu'''
-                menu = self.prepare_context_menu()
+                menu = self.prepare_context_menu(True)
                 menu.show_all()
                 gtkgui_helpers.popup_emoticons_under_button(menu, widget,
@@ -1736 +1736 @@
                 return tab_img
 
-        def prepare_context_menu(self):
+        def prepare_context_menu(self, hide_buttonbar_entries = False):
                 '''sets compact view menuitem active state
                 sets active and sensitivity state for toggle_gpg_menuitem
@@ -1758 +1758 @@
                 information_menuitem = xml.get_widget('information_menuitem')
                 convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat')
+                separatormenuitem1 = xml.get_widget('separatormenuitem1')
+                separatormenuitem2 = xml.get_widget('separatormenuitem2')
+
                 muc_icon = gtkgui_helpers.load_icon('muc_active')
                 if muc_icon:
                         convert_to_gc_menuitem.set_image(muc_icon)
+
+                if not hide_buttonbar_entries:
+                        history_menuitem.show()
+                        send_file_menuitem.show()
+                        information_menuitem.show()
+                        convert_to_gc_menuitem.show()
+                        separatormenuitem1.show()
+                        separatormenuitem2.show()
 
                 ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
@@ -1795 +1806 @@
 
                 # add_to_roster_menuitem
-                if _('Not in Roster') in contact.groups:
+                if not hide_buttonbar_entries and _('Not in Roster') in contact.groups:
                         add_to_roster_menuitem.show()