copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shortcuts in chat window 

Fixes #8873
This commit is contained in:
Philipp Hörist 2018-01-27 08:44:11 +01:00
parent 32e23ff58b
commit b8a62a8bb2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gajim/groupchat_control.py
View File

@ -681,6 +681,7 @@ class GroupchatControl(ChatControlBase):
app.interface.add_gc_bookmark( app.interface.add_gc_bookmark(
self.account, self.name, self.room_jid, self.account, self.name, self.room_jid,
'0', '0', password, self.nick) '0', '0', password, self.nick)
self.update_actions()
def _on_request_voice(self, action, param): def _on_request_voice(self, action, param):
""" """

19
gajim/message_window.py
View File

@ -374,7 +374,9 @@ class MessageWindow(object):
if keyval == Gdk.KEY_h: # CTRL + h if keyval == Gdk.KEY_h: # CTRL + h
if Gtk.Settings.get_default().get_property( if Gtk.Settings.get_default().get_property(
'gtk-key-theme-name') != 'Emacs': 'gtk-key-theme-name') != 'Emacs':
control._on_history_menuitem_activate() arg = GLib.Variant('s', 'none')
self.window.lookup_action(
'browse-history-%s' % control.control_id).activate(arg)
return True return True
elif control.type_id == message_control.TYPE_CHAT and \ elif control.type_id == message_control.TYPE_CHAT and \
keyval == Gdk.KEY_f: # CTRL + f keyval == Gdk.KEY_f: # CTRL + f
@ -386,7 +388,8 @@ class MessageWindow(object):
app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
app.interface.roster.tree.grab_focus() app.interface.roster.tree.grab_focus()
return False return False
control._on_send_file_menuitem_activate(None) self.window.lookup_action(
'send-file-%s' % control.control_id).activate()
return True return True
elif control.type_id == message_control.TYPE_CHAT and \ elif control.type_id == message_control.TYPE_CHAT and \
keyval == Gdk.KEY_g: # CTRL + g keyval == Gdk.KEY_g: # CTRL + g
@ -394,7 +397,8 @@ class MessageWindow(object):
return True return True
elif control.type_id in (message_control.TYPE_CHAT, elif control.type_id in (message_control.TYPE_CHAT,
message_control.TYPE_PM) and keyval == Gdk.KEY_i: # CTRL + i message_control.TYPE_PM) and keyval == Gdk.KEY_i: # CTRL + i
control._on_contact_information_menuitem_activate(None) self.window.lookup_action(
'information-%s' % control.control_id).activate()
return True return True
elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L
control.conv_textview.clear() control.conv_textview.clear()
@ -408,7 +412,8 @@ class MessageWindow(object):
# theme # theme
if not Gtk.Settings.get_default().get_property( if not Gtk.Settings.get_default().get_property(
'gtk-key-theme-name') == 'Emacs': 'gtk-key-theme-name') == 'Emacs':
control._on_bookmark_room_menuitem_activate(None) self.window.lookup_action(
'bookmark-%s' % control.control_id).activate()
return True return True
# Tab switch bindings # Tab switch bindings
elif keyval == Gdk.KEY_F4: # CTRL + F4 elif keyval == Gdk.KEY_F4: # CTRL + F4
@ -436,7 +441,8 @@ class MessageWindow(object):
# CTRL + SHIFT # CTRL + SHIFT
if control.type_id == message_control.TYPE_GC and \ if control.type_id == message_control.TYPE_GC and \
keyval == Gdk.KEY_n: # CTRL + SHIFT + n keyval == Gdk.KEY_n: # CTRL + SHIFT + n
control._on_change_nick_menuitem_activate(None) self.window.lookup_action(
'change-nick-%s' % control.control_id).activate()
return True return True
# MOD1 (ALT) mask # MOD1 (ALT) mask
elif modifier & Gdk.ModifierType.MOD1_MASK: elif modifier & Gdk.ModifierType.MOD1_MASK:
@ -461,7 +467,8 @@ class MessageWindow(object):
return True return True
elif control.type_id == message_control.TYPE_GC and \ elif control.type_id == message_control.TYPE_GC and \
keyval == Gdk.KEY_t: # ALT + t keyval == Gdk.KEY_t: # ALT + t
control._on_change_subject_menuitem_activate(None) self.window.lookup_action(
'change-subject-%s' % control.control_id).activate()
return True return True
# Close tab bindings # Close tab bindings
elif keyval == Gdk.KEY_Escape and \ elif keyval == Gdk.KEY_Escape and \