Changeset 7472

Timestamp:

11/18/06 22:25:03 (2 years ago)

Author:

asterix

Message:

handle popup-menu event, so that Menu button AND shift+F10 both works.

Location:

trunk

Files:

• data/glade/roster_window.glade (modified) (1 diff)
• src/gtkgui_helpers.py (modified) (1 diff)
• src/roster_window.py (modified) (2 diffs)

trunk/data/glade/roster_window.glade

@@ -27 +27 @@
   <signal name="key_press_event" handler="on_roster_window_key_press_event" last_modification_time="Tue, 20 Sep 2005 19:26:27 GMT"/>
   <signal name="focus_out_event" handler="on_roster_window_focus_out_event" last_modification_time="Tue, 08 Nov 2005 14:01:01 GMT"/>
+  <signal name="popup_menu" handler="on_roster_window_popup_menu" last_modification_time="Sat, 18 Nov 2006 21:12:06 GMT"/>
 
   <child>

trunk/src/gtkgui_helpers.py

@@ -659 +659 @@
         '''mouse or keyboard caused the event?'''
         if event.type == gtk.gdk.KEY_PRESS:
-                event_button = 0 # no event.button so pass 0
-        else: # BUTTON_PRESS event, so pass event.button
-                event_button = event.button
-
-        return event_button
+                return 0 # no event.button so pass 0
+        # BUTTON_PRESS event, so pass event.button
+        return event.button
 
 def destroy_widget(widget):

trunk/src/roster_window.py

@@ -2361 +2361 @@
                 '''when a key is pressed in the treeviews'''
                 self.tooltip.hide_tooltip()
-                if event.keyval == gtk.keysyms.Menu:
-                        self.show_treeview_menu(event)
-                        return True
-                elif event.keyval == gtk.keysyms.Escape:
+                if event.keyval == gtk.keysyms.Escape:
                         self.tree.get_selection().unselect_all()
                 elif event.keyval == gtk.keysyms.F2:
@@ -3181 +3178 @@
                                 self.tooltip.hide_tooltip()
                                 self.window.hide()
+
+        def on_roster_window_popup_menu(self, widget):
+                event = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
+                self.show_treeview_menu(event)
 
         def quit_gtkgui_interface(self):