changeset 639dad01a62b in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=639dad01a62b description: [OlegOAndreev] add Ctrl+K support to enable roster filter. Fixes #7302

diffstat:

src/roster_window.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (53 lines):

diff -r eab7311f57a2 -r 639dad01a62b src/roster_window.py --- a/src/roster_window.py Tue Feb 12 19:31:35 2013 +0100 +++ b/src/roster_window.py Sat Feb 16 12:27:28 2013 +0100 @@ -3567,6 +3567,8 @@ self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) return True + elif keyval == gtk.keysyms.k: # CTRL + k + self.enable_rfilter('')

def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed @@ -4435,7 +4437,6 @@ self.disable_rfilter()

def on_rfilter_entry_key_press_event(self, widget, event): - print 'rfilter', event.keyval if event.keyval == gtk.keysyms.Escape: self.disable_rfilter() elif event.keyval == gtk.keysyms.Return: @@ -4462,6 +4463,10 @@ self.tree.expand_all() self.rfilter_entry.set_position(-1)

+ # If roster is hidden, let's temporarily show it. This can happen if user + # enables rfilter via keyboard shortcut. + self.show_roster_vbox(True) + def disable_rfilter(self): self.rfilter_enabled = False self.rfilter_entry.set_text('') @@ -4471,6 +4476,9 @@ self.tree.grab_focus() self._readjust_expand_collapse_state()

+ # If roster was hidden before enable_rfilter was called, hide it back. + self.on_show_roster_menuitem_toggled(self.xml.get_object('show_roster_menuitem')) + def on_roster_hpaned_notify(self, pane, gparamspec): """ Keep changing the width of the roster @@ -6690,6 +6698,11 @@ keyval, mod = gtk.accelerator_parse('<Control>s') accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, self.accel_group_func) + + # Setting CTRL+k to focus rfilter_entry + keyval, mod = gtk.accelerator_parse('<Control>k') + accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) self.window.add_accel_group(accel_group)

# Setting the search stuff