Changeset 9601
- Timestamp:
- 05/09/08 11:34:38 (2 months ago)
- Files:
-
- trunk/data/glade/message_window.glade (modified) (5 diffs)
- trunk/src/chat_control.py (modified) (1 diff)
- trunk/src/groupchat_control.py (modified) (1 diff)
- trunk/src/message_window.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/data/glade/message_window.glade
r9596 r9601 188 188 <property name="visible">True</property> 189 189 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 190 <property name="tooltip" translatable="yes">Send a file </property>190 <property name="tooltip" translatable="yes">Send a file (Ctrl-F)</property> 191 191 <property name="relief">GTK_RELIEF_NONE</property> 192 192 <property name="focus_on_click">False</property> … … 210 210 <property name="visible">True</property> 211 211 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 212 <property name="tooltip" translatable="yes">Invite contacts to the conversation </property>212 <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl-G)</property> 213 213 <property name="relief">GTK_RELIEF_NONE</property> 214 214 <property name="focus_on_click">False</property> … … 612 612 <property name="visible">True</property> 613 613 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 614 <property name="tooltip" translatable="yes">Change your nickname </property>614 <property name="tooltip" translatable="yes">Change your nickname (Ctrl-N)</property> 615 615 <property name="relief">GTK_RELIEF_NONE</property> 616 616 <property name="response_id">0</property> … … 634 634 <property name="visible">True</property> 635 635 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 636 <property name="tooltip" translatable="yes">Change the room's subject </property>636 <property name="tooltip" translatable="yes">Change the room's subject (Ctrl-T)</property> 637 637 <property name="relief">GTK_RELIEF_NONE</property> 638 638 <property name="response_id">0</property> … … 656 656 <property name="visible">True</property> 657 657 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 658 <property name="tooltip" translatable="yes">Bookmark this room </property>658 <property name="tooltip" translatable="yes">Bookmark this room (Ctrl-B)</property> 659 659 <property name="relief">GTK_RELIEF_NONE</property> 660 660 <property name="response_id">0</property> trunk/src/chat_control.py
r9592 r9601 1706 1706 1707 1707 ag = gtk.accel_groups_from_object(self.parent_win.window)[0] 1708 send_file_menuitem.add_accelerator('activate', ag, gtk.keysyms.f, gtk.gdk.CONTROL_MASK, 1709 gtk.ACCEL_VISIBLE) 1710 convert_to_gc_menuitem.add_accelerator('activate', ag, gtk.keysyms.g, gtk.gdk.CONTROL_MASK, 1711 gtk.ACCEL_VISIBLE) 1708 1712 history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h, gtk.gdk.CONTROL_MASK, 1709 1713 gtk.ACCEL_VISIBLE) trunk/src/groupchat_control.py
r9592 r9601 562 562 '''sets sensitivity state for configure_room''' 563 563 ag = gtk.accel_groups_from_object(self.parent_win.window)[0] 564 self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n, 565 gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) 566 self.change_subject_menuitem.add_accelerator('activate', ag, gtk.keysyms.t, 567 gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) 568 self.bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b, 569 gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) 564 570 self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h, 565 571 gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) trunk/src/message_window.py
r9488 r9601 87 87 self.handlers[id] = self.window 88 88 89 keys=['<Control>h', '<Control>i', '<Control><Shift>Tab', 90 '<Control>Tab', '<Control>F4', '<Control>w', 91 '<Alt>Right', '<Alt>Left', '<Alt>c', 'Escape'] +\ 89 keys=['<Control>f', '<Control>g', '<Control>h', '<Control>i', 90 '<Control>n', '<Control>t', '<Control>b', 91 '<Control><Shift>Tab', '<Control>Tab', 92 '<Control>F4', '<Control>w', '<Alt>Right', 93 '<Alt>Left', '<Alt>c', 'Escape'] +\ 92 94 ['<Alt>'+str(i) for i in xrange(10)] 93 95 accel_group = gtk.AccelGroup() … … 291 293 control._on_history_menuitem_activate() 292 294 elif control.type_id == message_control.TYPE_CHAT and \ 295 keyval == gtk.keysyms.f: 296 control._on_send_file_menuitem_activate(None) 297 elif control.type_id == message_control.TYPE_CHAT and \ 298 keyval == gtk.keysyms.g: 299 control._on_convert_to_gc_menuitem_activate(None) 300 elif control.type_id == message_control.TYPE_CHAT and \ 293 301 keyval == gtk.keysyms.i: 294 302 control._on_contact_information_menuitem_activate(None) 303 elif control.type_id == message_control.TYPE_GC and \ 304 keyval == gtk.keysyms.n: 305 control._on_change_nick_menuitem_activate(None) 306 elif control.type_id == message_control.TYPE_GC and \ 307 keyval == gtk.keysyms.t: 308 control._on_change_subject_menuitem_activate(None) 309 elif control.type_id == message_control.TYPE_GC and \ 310 keyval == gtk.keysyms.b: 311 control._on_bookmark_room_menuitem_activate(None) 295 312 # Tab switch bindings 296 313 elif keyval == gtk.keysyms.ISO_Left_Tab: # CTRL + SHIFT + TAB
