| ... |
... |
@@ -374,7 +374,9 @@ class MessageWindow(object): |
|
374
|
374
|
if keyval == Gdk.KEY_h: # CTRL + h
|
|
375
|
375
|
if Gtk.Settings.get_default().get_property(
|
|
376
|
376
|
'gtk-key-theme-name') != 'Emacs':
|
|
377
|
|
- control._on_history_menuitem_activate()
|
|
|
377
|
+ arg = GLib.Variant('s', 'none')
|
|
|
378
|
+ self.window.lookup_action(
|
|
|
379
|
+ 'browse-history-%s' % control.control_id).activate(arg)
|
|
378
|
380
|
return True
|
|
379
|
381
|
elif control.type_id == message_control.TYPE_CHAT and \
|
|
380
|
382
|
keyval == Gdk.KEY_f: # CTRL + f
|
| ... |
... |
@@ -386,7 +388,8 @@ class MessageWindow(object): |
|
386
|
388
|
app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
|
|
387
|
389
|
app.interface.roster.tree.grab_focus()
|
|
388
|
390
|
return False
|
|
389
|
|
- control._on_send_file_menuitem_activate(None)
|
|
|
391
|
+ self.window.lookup_action(
|
|
|
392
|
+ 'send-file-%s' % control.control_id).activate()
|
|
390
|
393
|
return True
|
|
391
|
394
|
elif control.type_id == message_control.TYPE_CHAT and \
|
|
392
|
395
|
keyval == Gdk.KEY_g: # CTRL + g
|
| ... |
... |
@@ -394,7 +397,8 @@ class MessageWindow(object): |
|
394
|
397
|
return True
|
|
395
|
398
|
elif control.type_id in (message_control.TYPE_CHAT,
|
|
396
|
399
|
message_control.TYPE_PM) and keyval == Gdk.KEY_i: # CTRL + i
|
|
397
|
|
- control._on_contact_information_menuitem_activate(None)
|
|
|
400
|
+ self.window.lookup_action(
|
|
|
401
|
+ 'information-%s' % control.control_id).activate()
|
|
398
|
402
|
return True
|
|
399
|
403
|
elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L
|
|
400
|
404
|
control.conv_textview.clear()
|
| ... |
... |
@@ -408,7 +412,8 @@ class MessageWindow(object): |
|
408
|
412
|
# theme
|
|
409
|
413
|
if not Gtk.Settings.get_default().get_property(
|
|
410
|
414
|
'gtk-key-theme-name') == 'Emacs':
|
|
411
|
|
- control._on_bookmark_room_menuitem_activate(None)
|
|
|
415
|
+ self.window.lookup_action(
|
|
|
416
|
+ 'bookmark-%s' % control.control_id).activate()
|
|
412
|
417
|
return True
|
|
413
|
418
|
# Tab switch bindings
|
|
414
|
419
|
elif keyval == Gdk.KEY_F4: # CTRL + F4
|
| ... |
... |
@@ -436,7 +441,8 @@ class MessageWindow(object): |
|
436
|
441
|
# CTRL + SHIFT
|
|
437
|
442
|
if control.type_id == message_control.TYPE_GC and \
|
|
438
|
443
|
keyval == Gdk.KEY_n: # CTRL + SHIFT + n
|
|
439
|
|
- control._on_change_nick_menuitem_activate(None)
|
|
|
444
|
+ self.window.lookup_action(
|
|
|
445
|
+ 'change-nick-%s' % control.control_id).activate()
|
|
440
|
446
|
return True
|
|
441
|
447
|
# MOD1 (ALT) mask
|
|
442
|
448
|
elif modifier & Gdk.ModifierType.MOD1_MASK:
|
| ... |
... |
@@ -461,7 +467,8 @@ class MessageWindow(object): |
|
461
|
467
|
return True
|
|
462
|
468
|
elif control.type_id == message_control.TYPE_GC and \
|
|
463
|
469
|
keyval == Gdk.KEY_t: # ALT + t
|
|
464
|
|
- control._on_change_subject_menuitem_activate(None)
|
|
|
470
|
+ self.window.lookup_action(
|
|
|
471
|
+ 'change-subject-%s' % control.control_id).activate()
|
|
465
|
472
|
return True
|
|
466
|
473
|
# Close tab bindings
|
|
467
|
474
|
elif keyval == Gdk.KEY_Escape and \
|