Changeset 9649 for trunk/src/chat_control.py

Timestamp:

05/17/08 15:14:34 (6 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.

Files:

• trunk/src/chat_control.py (modified) (4 diffs)

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()