Changeset 8539 for trunk/src/dialogs.py

Timestamp:

08/22/07 13:10:54 (17 months ago)

Author:

asterix

Message:

nicer chat2muc window. see #2095

Files:

• trunk/src/dialogs.py (modified) (3 diffs)

trunk/src/dialogs.py

@@ -3209 +3209 @@
                 self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade')
                 self.window = self.xml.get_widget('chat_to_muc_window')
-                self.window.connect('key_press_event', self._on_keypress_event)
 
                 for widget_to_add in ('invite_button', 'cancel_button',
@@ -3215 +3214 @@
                 'server_and_guests_hseparator', 'server_select_label'):
                         self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
-                self.window.connect('key_press_event', self._on_keypress_event)
 
                 # set comboboxentry
@@ -3270 +3268 @@
                                                 self.store.append([name, jid])
 
-                # show all but...
+                # show all
                 self.window.show_all()
 
-                # ...hide this
-                self.server_selection_visible = True
-                self.toggle_server_selection_visible()
-
                 self.xml.signal_autoconnect(self)
 
-        def toggle_server_selection_visible(self):
-                if self.server_selection_visible:
-                        self.server_selection_visible = False
-                        self.server_and_guests_hseparator.hide()
-                        self.server_list_comboboxentry.hide()
-                        self.server_select_label.hide()
-                else:
-                        self.server_selection_visible = True
-                        self.server_and_guests_hseparator.show()
-                        self.server_list_comboboxentry.show()
-                        self.server_select_label.show()
-
-        def _on_keypress_event(self, widget, event):
-                if (event.state & gtk.gdk.MOD1_MASK) and (event.keyval == gtk.keysyms.c \
-                or event.keyval == gtk.keysyms.C):
-                                self.toggle_server_selection_visible()
-                                return True
+        def on_chat_to_muc_window_key_press_event(self, widget, event):
+                if event.keyval == gtk.keysyms.Escape: # ESCAPE
+                        self.window.destroy()
 
         def on_invite_button_clicked(self, widget):