Changeset 10138

Timestamp:

08/06/08 22:34:36 (4 months ago)

Author:

asterix

Message:

make EditGroups? and ChangePassword? dialogs asynchronous. see #4147

Location:

trunk/src

Files:

• config.py (modified) (1 diff)
• dialogs.py (modified) (3 diffs)
• roster_window.py (modified) (2 diffs)

trunk/src/config.py

@@ -1881 +1881 @@
 
         def on_change_password_button1_clicked(self, widget):
+                def on_changed(new_password):
+                        if new_password is not None:
+                                gajim.connections[self.current_account].change_password(
+                                        new_password)
+                                if self.xml.get_widget('save_password_checkbutton1').get_active():
+                                        self.xml.get_widget('password_entry1').set_text(new_password)
+
                 try:
-                        dialog = dialogs.ChangePasswordDialog(self.current_account)
+                        dialog = dialogs.ChangePasswordDialog(self.current_account, on_changed)
                 except GajimGeneralException:
                         # if we showed ErrorDialog, there will not be dialog instance
                         return
-
-                new_password = dialog.run()
-                if new_password != -1:
-                        gajim.connections[self.current_account].change_password(new_password)
-                        if self.xml.get_widget('save_password_checkbutton1').get_active():
-                                self.xml.get_widget('password_entry1').set_text(new_password)
 
         def on_autoconnect_checkbutton_toggled(self, widget):

trunk/src/dialogs.py

@@ -82 +82 @@
                 self.init_list()
 
-        def run(self):
                 self.dialog.show_all()
                 if self.changes_made:
@@ -1980 +1979 @@
 
 class ChangePasswordDialog:
-        def __init__(self, account):
+        def __init__(self, account, on_response):
                 # 'account' can be None if we are about to create our first one
                 if not account or gajim.connections[account].connected < 2:
@@ -1987 +1986 @@
                         raise GajimGeneralException, 'You are not connected to the server'
                 self.account = account
+                self.on_response = on_response
                 self.xml = gtkgui_helpers.get_glade('change_password_dialog.glade')
                 self.dialog = self.xml.get_widget('change_password_dialog')
                 self.password1_entry = self.xml.get_widget('password1_entry')
                 self.password2_entry = self.xml.get_widget('password2_entry')
+                self.dialog.connect('response', self.on_dialog_response)
 
                 self.dialog.show_all()
 
-        def run(self):
-                '''Wait for OK button to be pressed and return new password'''
-                end = False
-                while not end:
-                        rep = self.dialog.run()
-                        if rep == gtk.RESPONSE_OK:
-                                password1 = self.password1_entry.get_text().decode('utf-8')
-                                if not password1:
-                                        ErrorDialog(_('Invalid password'),
-                                                        _('You must enter a password.'))
-                                        continue
-                                password2 = self.password2_entry.get_text().decode('utf-8')
-                                if password1 != password2:
-                                        ErrorDialog(_('Passwords do not match'),
-                                                        _('The passwords typed in both fields must be identical.'))
-                                        continue
-                                message = password1
-                        else:
-                                message = -1
-                        end = True
-                self.dialog.destroy()
-                return message
-
+        def on_dialog_response(self, dialog, response):
+                if response != gtk.RESPONSE_OK:
+                        dialog.destroy()
+                        self.on_response(None)
+                        return
+                password1 = self.password1_entry.get_text().decode('utf-8')
+                if not password1:
+                        ErrorDialog(_('Invalid password'), _('You must enter a password.'))
+                        return
+                password2 = self.password2_entry.get_text().decode('utf-8')
+                if password1 != password2:
+                        ErrorDialog(_('Passwords do not match'),
+                                _('The passwords typed in both fields must be identical.'))
+                        return
+                dialog.destroy()
+                self.on_response(password1)
 
 class PopupNotificationWindow:

trunk/src/roster_window.py

@@ -2728 +2728 @@
 
         def on_remove_group_item_activated(self, widget, group, account):
-                dlg = dialogs.ConfirmationDialogCheck(_('Remove Group'),
+                dialogs.ConfirmationDialogCheck(_('Remove Group'),
                         _('Do you want to remove group %s from the roster?' % group),
-                        _('Remove also all contacts in this group from your roster'))
-                dlg.set_default_response(gtk.BUTTONS_OK_CANCEL)
-                response = dlg.run()
-                if response == gtk.RESPONSE_OK:
+                        _('Remove also all contacts in this group from your roster'),
+                        on_response_ok=on_ok)
+                def on_ok(checked):
                         for contact in gajim.contacts.get_contacts_from_group(account, group):
-                                if not dlg.is_checked():
+                                if not checked:
                                         self.remove_contact_from_groups(contact.jid,account, [group])
                                 else:
@@ -2821 +2820 @@
 
         def on_edit_groups(self, widget, list_):
-                dlg = dialogs.EditGroupsDialog(list_)
-                dlg.run()
+                dialogs.EditGroupsDialog(list_)
 
         def on_history(self, widget, contact, account):