diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index ea73d3c0c..4cb47f797 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -70,7 +70,7 @@
True
- None
+ gtk-missing-image
@@ -156,7 +156,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Show a list of emoticons
+ Show a list of emoticons (Alt-M)
GTK_RELIEF_NONE
False
0
@@ -209,7 +209,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Invite contacts to conversation
+ Invite contacts to the conversation
GTK_RELIEF_NONE
False
0
@@ -231,7 +231,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Show contact information
+ Show contact's profile (Ctrl-I)
GTK_RELIEF_NONE
False
0
@@ -253,7 +253,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Browse history
+ Browse the chat history (Ctrl-H)
GTK_RELIEF_NONE
False
0
@@ -332,7 +332,6 @@
True
gtk-jump-to
- 4
False
@@ -570,171 +569,228 @@
True
- 3
True
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Show a list of emoticons (Alt-M)
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-missing-image
+ 1
+
+
+
+
+ False
+ False
+
+
+
+
+ False
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ False
+ 1
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Change your nickname
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-edit
+ 1
+
+
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Change the room's subject
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-properties
+ 1
+
+
+
+
+ False
+ False
+ 3
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Bookmark this room
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-add
+ 1
+
+
+
+
+ False
+ False
+ 4
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Browse the chat history (Ctrl-H)
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-justify-fill
+ 1
+
+
+
+
+ False
+ False
+ 5
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ False
+ 6
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Show a menu of advanced functions
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ 0
+ 0
+
+
+ True
+ gtk-execute
+ 1
+
+
+
+
+
+
+ False
+ False
+ 7
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+ 8
+
-
+
True
- 6
+ True
+ 0
-
+
True
- True
- Click to insert an emoticon (Alt+M)
- 0
+ 0
+ 0
-
+
True
+ 2
-
+
True
- 2
- gtk-missing-image
-
-
-
-
- True
- GTK_ARROW_DOWN
+ gtk-jump-to
+ 2
+ False
+ False
+
+
+
+
+ True
+ _Send
+ True
+
+
+ False
+ False
1
-
- False
- False
-
-
-
-
- True
- True
- 0
-
-
- True
- 0
- 0
-
-
- True
- 2
-
-
- True
- gtk-execute
-
-
- False
- False
-
-
-
-
- True
- _Actions
- True
-
-
- False
- False
- 1
-
-
-
-
- True
- GTK_ARROW_DOWN
-
-
- False
- False
- 2
-
-
-
-
-
-
-
-
- False
- False
- 1
-
-
-
-
- True
-
-
- False
- 2
- 2
-
-
-
-
- True
- True
- 0
-
-
- True
- 0
- 0
-
-
- True
- 2
-
-
- True
- gtk-jump-to
-
-
- False
- False
-
-
-
-
- True
- _Send
- True
-
-
- False
- False
- 1
-
-
-
-
-
-
-
-
- False
- False
- 3
-
False
- 1
+ False
+ 9
diff --git a/src/chat_control.py b/src/chat_control.py
index 568dad42c..7fe48402b 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -138,29 +138,9 @@ class ChatControlBase(MessageControl):
MessageControl.__init__(self, type_id, parent_win, widget_name,
contact, acct, resource = resource);
- widget = self.xml.get_widget('contact_information_button')
- # FIXME: Required as it's not in GC yet
- if widget != None:
- id = widget.connect('clicked', self._on_contact_information_menuitem_activate)
- self.handlers[id] = widget
-
widget = self.xml.get_widget('history_button')
- # FIXME: Required as it's not in GC yet
- if widget != None:
- id = widget.connect('clicked', self._on_history_menuitem_activate)
- self.handlers[id] = widget
-
- widget = self.xml.get_widget('send_file_button')
- # FIXME: Required as it's not in GC yet
- if widget != None:
- id = widget.connect('clicked', self._on_send_file_menuitem_activate)
- self.handlers[id] = widget
-
- widget = self.xml.get_widget('convert_to_gc_button')
- # FIXME: Required as it's not in GC yet
- if widget != None:
- id = widget.connect('clicked', self._on_convert_to_gc_menuitem_activate)
- self.handlers[id] = widget
+ id = widget.connect('clicked', self._on_history_menuitem_activate)
+ self.handlers[id] = widget
# when/if we do XHTML we will put formatting buttons back
widget = self.xml.get_widget('emoticons_button')
@@ -1049,6 +1029,18 @@ class ChatControl(ChatControlBase):
id = widget.connect('clicked', self.on_actions_button_clicked)
self.handlers[id] = widget
+ widget = self.xml.get_widget('send_file_button')
+ id = widget.connect('clicked', self._on_send_file_menuitem_activate)
+ self.handlers[id] = widget
+
+ widget = self.xml.get_widget('convert_to_gc_button')
+ id = widget.connect('clicked', self._on_convert_to_gc_menuitem_activate)
+ self.handlers[id] = widget
+
+ widget = self.xml.get_widget('contact_information_button')
+ id = widget.connect('clicked', self._on_contact_information_menuitem_activate)
+ self.handlers[id] = widget
+
compact_view = gajim.config.get('compact_view')
self.chat_buttons_set_visible(compact_view)
self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 5dd0e2c9a..863589a9e 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -177,6 +177,18 @@ class GroupchatControl(ChatControlBase):
id = widget.connect('clicked', self.on_actions_button_clicked)
self.handlers[id] = widget
+ widget = self.xml.get_widget('change_nick_button')
+ id = widget.connect('clicked', self._on_change_nick_menuitem_activate)
+ self.handlers[id] = widget
+
+ widget = self.xml.get_widget('change_subject_button')
+ id = widget.connect('clicked', self._on_change_subject_menuitem_activate)
+ self.handlers[id] = widget
+
+ widget = self.xml.get_widget('bookmark_button')
+ id = widget.connect('clicked', self._on_bookmark_room_menuitem_activate)
+ self.handlers[id] = widget
+
widget = self.xml.get_widget('list_treeview')
id = widget.connect('row_expanded', self.on_list_treeview_row_expanded)
self.handlers[id] = widget