diff --git a/plugins/gtkgui/groupchat_window.py b/plugins/gtkgui/groupchat_window.py index f4b66a9a1..4475a2fc5 100644 --- a/plugins/gtkgui/groupchat_window.py +++ b/plugins/gtkgui/groupchat_window.py @@ -476,7 +476,7 @@ class Groupchat_window(Chat): widget.get_selection().unselect_all() return False - def on_list_treeview_key_release_event(self, widget, event): + def on_list_treeview_key_press_event(self, widget, event): if event.type == gtk.gdk.KEY_RELEASE: if event.keyval == gtk.keysyms.Escape: widget.get_selection().unselect_all() diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade index 8aa4b4aba..900f940ff 100644 --- a/plugins/gtkgui/gtkgui.glade +++ b/plugins/gtkgui/gtkgui.glade @@ -288,7 +288,7 @@ - + @@ -7065,7 +7065,7 @@ Custom - + @@ -8402,59 +8402,24 @@ Custom - - 6 + True False - 5 + 0 - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -8464,46 +8429,50 @@ Custom - + True - False - 5 + + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + + + True + False + 5 - - - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + + + True + True + True + True + 0 + + True + * + False 0 @@ -8513,29 +8482,19 @@ Custom - + True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - - + gtk-add + True + GTK_RELIEF_NORMAL + True + 0 - True - True + False + False @@ -8545,6 +8504,33 @@ Custom False + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + + 0 + True + True + + diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py index c70cadb74..773c62ff7 100644 --- a/plugins/gtkgui/roster_window.py +++ b/plugins/gtkgui/roster_window.py @@ -595,7 +595,7 @@ class Roster_window: self.contacts[account][jid] = [user1] self.add_user_to_roster(jid, account) - def on_roster_treeview_key_release_event(self, widget, event): + def on_roster_treeview_key_press_event(self, widget, event): """when a key is pressed in the treeviews""" if event.keyval == gtk.keysyms.Escape: self.tree.get_selection().unselect_all() @@ -625,9 +625,9 @@ class Roster_window: return False def on_roster_treeview_button_press_event(self, widget, event): - """popup user's group's or agent menu""" + """popup contact's , group's or agent's menu""" if event.type == gtk.gdk.BUTTON_PRESS: - if event.button == 3: + if event.button == 3: # Right click try: path, column, x, y = self.tree.get_path_at_pos(int(event.x), \ int(event.y)) @@ -645,8 +645,9 @@ class Roster_window: self.mk_menu_user(event, iter) elif type == 'account': self.mk_menu_account(event, iter) - return True - if event.button == 1: + #return True + return False + if event.button == 1: # Left click try: path, column, x, y = self.tree.get_path_at_pos(int(event.x), \ int(event.y)) @@ -893,7 +894,6 @@ class Roster_window: def on_preferences_menuitem_activate(self, widget): """When preferences is selected : call the preferences_window class""" - print self.plugin.windows['preferences'].window.get_property('visible') if self.plugin.windows['preferences'].window.get_property('visible'): self.plugin.windows['preferences'].window.present() else: