From bd8ae59a76d24f30be8d45f63c7b85ba53d0bcfe Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 2 Nov 2008 14:04:46 +0000
Subject: [PATCH] Use Alt+T to change subject in a room instead of Ctrl+T
---
src/groupchat_control.py | 4 ++--
src/message_window.py | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index fc97e27db2..c1a648035e 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -633,8 +633,8 @@ class GroupchatControl(ChatControlBase):
ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
- self.change_subject_menuitem.add_accelerator('activate', ag, gtk.keysyms.t,
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+ self.change_subject_menuitem.add_accelerator('activate', ag,
+ gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE)
self.bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b,
gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
diff --git a/src/message_window.py b/src/message_window.py
index 6039bd6950..3a81efdb27 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -99,10 +99,10 @@ class MessageWindow(object):
self.handlers[id] = self.window
keys=['<Control>f', '<Control>g', '<Control>h', '<Control>i',
- '<Control>l', '<Control>L', '<Control>n', '<Control>t', '<Control>u',
- '<Control>v', '<Control>b', '<Control><Shift>Tab', '<Control>Tab',
- '<Control>F4', '<Control>w', '<Control>Page_Up', '<Control>Page_Down',
- '<Alt>Right', '<Alt>Left', '<Alt>a', '<Alt>c', '<Alt>m', 'Escape'] + \
+ '<Control>l', '<Control>L', '<Control>n', '<Control>u', '<Control>v',
+ '<Control>b', '<Control><Shift>Tab', '<Control>Tab', '<Control>F4',
+ '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right',
+ '<Alt>Left', '<Alt>a', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \
['<Alt>'+str(i) for i in xrange(10)]
accel_group = gtk.AccelGroup()
for key in keys:
@@ -335,9 +335,6 @@ class MessageWindow(object):
elif control.type_id == message_control.TYPE_GC and \
keyval == gtk.keysyms.n: # CTRL + n
control._on_change_nick_menuitem_activate(None)
- elif control.type_id == message_control.TYPE_GC and \
- keyval == gtk.keysyms.t: # CTRL + t
- control._on_change_subject_menuitem_activate(None)
elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line
control.clear(control.msg_textview)
elif keyval == gtk.keysyms.v: # CTRL + v: Paste into msg_textview
@@ -397,6 +394,9 @@ class MessageWindow(object):
control.show_emoticons_menu()
elif keyval == gtk.keysyms.a: # ALT + A show actions menu
control.on_actions_button_clicked(control.actions_button)
+ elif control.type_id == message_control.TYPE_GC and \
+ keyval == gtk.keysyms.t: # ALT + t
+ control._on_change_subject_menuitem_activate(None)
# Close tab bindings
elif keyval == gtk.keysyms.Escape and \
gajim.config.get('escape_key_closes'): # Escape
--
GitLab