Changeset 8888

Timestamp:

10/07/07 19:22:47 (14 months ago)

Author:

asterix

Message:

NonModalConfirmationDialog? and ConfirmationDialognow? automaticaly close window on ok or cancel. fixes #3486

Location:

trunk/src

Files:

• config.py (modified) (5 diffs)
• dialogs.py (modified) (2 diffs)
• filetransfers_window.py (modified) (2 diffs)
• groupchat_control.py (modified) (2 diffs)
• gtkgui_helpers.py (modified) (2 diffs)
• history_manager.py (modified) (4 diffs)
• roster_window.py (modified) (10 diffs)

trunk/src/config.py

@@ -1646 +1646 @@
                                         break
                 # Detect if we have opened windows for this account
-                self.dialog = None
-                def remove(widget, account):
-                        if self.dialog:
-                                self.dialog.destroy()
+                def remove(account):
                         if gajim.interface.instances[account].has_key('remove_account'):
                                 gajim.interface.instances[account]['remove_account'].window.\
@@ -1657 +1654 @@
                                         RemoveAccountWindow(account)
                 if win_opened:
-                        self.dialog = dialogs.ConfirmationDialog(
+                        dialog = dialogs.ConfirmationDialog(
                                 _('You have opened chat in account %s') % account,
                                 _('All chat and groupchat windows will be closed. Do you want to '
@@ -1663 +1660 @@
                                 on_response_ok = (remove, account))
                 else:
-                        remove(widget, account)
+                        remove(account)
 
         def on_rename_button_clicked(self, widget):
@@ -2525 +2522 @@
 
         def on_remove_button_clicked(self, widget):
-                def remove(widget):
-                        if self.dialog:
-                                self.dialog.destroy()
+                def remove():
                         if gajim.connections[self.account].connected and \
                         not self.remove_and_unregister_radiobutton.get_active():
@@ -2550 +2545 @@
                                 self._on_remove_success(True)
 
-                self.dialog = None
                 if gajim.connections[self.account].connected:
-                        self.dialog = dialogs.ConfirmationDialog(
+                        dialog = dialogs.ConfirmationDialog(
                                 _('Account "%s" is connected to the server') % self.account,
                                 _('If you remove it, the connection will be lost.'),
                                 on_response_ok = remove)
                 else:
-                        remove(None)
+                        remove()
         
         def _on_remove_success(self, res):

trunk/src/dialogs.py

@@ -1017 +1017 @@
         def __init__(self, pritext, sectext='', on_response_ok = None,
         on_response_cancel = None):
+                self.user_response_ok = on_response_ok
+                self.user_response_cancel = on_response_cancel
                 HigDialog.__init__(self, None, 
                         gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext,
-                        on_response_ok, on_response_cancel)
+                        self.on_response_ok, self.on_response_cancel)
                 self.popup()
+
+        def on_response_ok(self, widget):
+                if self.user_response_ok:
+                        if isinstance(self.user_response_ok, tuple):
+                                self.user_response_ok[0](*self.user_response_ok[1:])
+                        else:
+                                self.user_response_ok()
+                self.destroy()
+
+        def on_response_cancel(self, widget):
+                if self.user_response_cancel:
+                        if isinstance(self.user_response_cancel, tuple):
+                                self.user_response_cancel[0](*self.user_response_ok[1:])
+                        else:
+                                self.user_response_cancel()
+                self.destroy()
 
 class NonModalConfirmationDialog(HigDialog):
@@ -1026 +1044 @@
         def __init__(self, pritext, sectext='', on_response_ok = None,
         on_response_cancel = None):
+                self.user_response_ok = on_response_ok
+                self.user_response_cancel = on_response_cancel
                 HigDialog.__init__(self, None, 
                         gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext,
-                        on_response_ok, on_response_cancel)
+                        self.on_response_ok, self.on_response_cancel)
                 self.set_modal(False)
+
+        def on_response_ok(self, widget):
+                if self.user_response_ok:
+                        if isinstance(self.user_response_ok, tuple):
+                                self.user_response_ok[0](*self.user_response_ok[1:])
+                        else:
+                                self.user_response_ok()
+                self.destroy()
+
+        def on_response_cancel(self, widget):
+                if self.user_response_cancel:
+                        if isinstance(self.user_response_cancel, tuple):
+                                self.user_response_cancel[0](*self.user_response_ok[1:])
+                        else:
+                                self.user_response_cancel()
+                self.destroy()
 
 class WarningDialog(HigDialog):

trunk/src/filetransfers_window.py

@@ -295 +295 @@
                 dialog, dialog2 = None, None
 
-                def on_response_ok(widget, account, contact, file_props):
-                        dialog.destroy()
+                def on_response_ok(account, contact, file_props):
 
                         def on_ok(widget, account, contact, file_props):
@@ -349 +348 @@
                                 on_cancel(widget, account, contact, file_props))
 
-                def on_response_cancel(widget, account, file_props):
-                        dialog.destroy()
+                def on_response_cancel(account, file_props):
                         gajim.connections[account].send_file_rejection(file_props)
 

trunk/src/groupchat_control.py

@@ -851 +851 @@
         def on_send_file(self, widget, gc_contact):
                 '''sends a file to a contact in the room'''
-                def _on_send_files(widget, gc_c):
-                        if widget:
-                                widget.destroy()
+                def _on_send_files(gc_c):
                         gajim.interface.instances['file_transfers'].show_file_send_request(
                                 self.account, gc_c)
@@ -866 +864 @@
                         dialog.popup()
                 else:
-                        _on_send_files(None, gc_contact)
+                        _on_send_files(gc_contact)
 
         def draw_contact(self, nick, selected=False, focus=False):

trunk/src/gtkgui_helpers.py

@@ -751 +751 @@
 default_name = ''):
         def on_ok(widget):
-                def on_ok2(widget, file_path, pixbuf):
+                def on_ok2(file_path, pixbuf):
                         pixbuf.save(file_path, 'jpeg')
-                        dialog2.destroy()
                         dialog.destroy()
 
@@ -807 +806 @@
                                 os.remove(file_path)
                         new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg'
-                        dialog2 = dialogs.ConfirmationDialog(_('Extension not supported'),
+                        dialogs.ConfirmationDialog(_('Extension not supported'),
                                 _('Image cannot be saved in %(type)s format. Save as %(new_filename)s?') % {'type': type_, 'new_filename': new_file_path},
                                 on_response_ok = (on_ok2, new_file_path, pixbuf))

trunk/src/history_manager.py

@@ -482 +482 @@
                         return
 
-                def on_ok(widget, liststore, list_of_paths):
+                def on_ok(liststore, list_of_paths):
                         # delete all rows from db that match jid_id
-                        self.dialog.destroy()
                         list_of_rowrefs = []
                         for path in list_of_paths: # make them treerowrefs (it's needed)
@@ -515 +514 @@
                         'Do you really want to delete logs of the selected contacts?',
                         paths_len)
-                self.dialog = dialogs.ConfirmationDialog(pri_text,
+                dialogs.ConfirmationDialog(pri_text,
                         _('This is an irreversible operation.'), on_response_ok = (on_ok,
                         liststore, list_of_paths))
@@ -524 +523 @@
                         return
 
-                def on_ok(widget, liststore, list_of_paths):
-                        self.dialog.destroy()
+                def on_ok(liststore, list_of_paths):
                         # delete rows from db that match log_line_id
                         list_of_rowrefs = []
@@ -551 +549 @@
                         'Do you really want to delete the selected message?',
                         'Do you really want to delete the selected messages?', paths_len)
-                self.dialog = dialogs.ConfirmationDialog(pri_text,
+                dialogs.ConfirmationDialog(pri_text,
                         _('This is an irreversible operation.'), on_response_ok = (on_ok,
                         liststore, list_of_paths))

trunk/src/roster_window.py

@@ -1525 +1525 @@
                                 return
 
-                def remove(widget, list_):
-                        self.dialog.destroy()
+                def remove(list_):
                         for (contact, account) in list_:
                                 full_jid = contact.get_full_jid()
@@ -1558 +1557 @@
                         sectext = _('You will no longer be able to send and receive messages '
                                 'to contacts from these transports:%s') % jids
-                self.dialog = dialogs.ConfirmationDialog(pritext, sectext,
+                dialogs.ConfirmationDialog(pritext, sectext,
                         on_response_ok = (remove, list_))
 
@@ -3346 +3345 @@
                                                 gajim.events.remove_events(account, contact.jid)
                                         self.readd_if_needed(contact, account)
+
+                def on_ok2(list_):
+                        on_ok(False, list_)
+
                 if len(list_) == 1:
                         contact = list_[0][0]
@@ -3352 +3355 @@
                                 contact.get_shown_name()
                         if contact.sub == 'to':
-                                self.dialog = dialogs.ConfirmationDialog(pritext,
+                                dialogs.ConfirmationDialog(pritext,
                                         _('By removing this contact you also remove authorization '
                                         'resulting in him or her always seeing you as offline.'),
-                                        on_response_ok = (on_ok, list_))
+                                        on_response_ok = (on_ok2, list_))
                         else:
-                                self.dialog = dialogs.ConfirmationDialogCheck(pritext,
+                                dialogs.ConfirmationDialogCheck(pritext,
                                         _('By removing this contact you also by default remove '
                                         'authorization resulting in him or her always seeing you as '
@@ -3372 +3375 @@
                                 'authorization resulting in them always seeing you as offline.') % \
                                 jids
-                        self.dialog = dialogs.ConfirmationDialog(pritext, sectext,
+                        dialogs.ConfirmationDialog(pritext, sectext,
                                 on_response_ok = (on_ok, list_))
 
@@ -3531 +3534 @@
 
         def change_status(self, widget, account, status):
-                def change(widget, account, status):
-                        if self.dialog:
-                                self.dialog.destroy()
+                def change(account, status):
                         message = self.get_status_message(status)
                         if message is None:
@@ -3540 +3541 @@
                         self.send_status(account, status, message)
 
-                self.dialog = None
                 if status == 'invisible' and self.connected_rooms(account):
-                        self.dialog = dialogs.ConfirmationDialog(
+                        dialogs.ConfirmationDialog(
                                 _('You are participating in one or more group chats'),
                                 _('Changing your status to invisible will result in disconnection '
@@ -3548 +3548 @@
                                 on_response_ok = (change, account, status))
                 else:
-                        change(None, account, status)
+                        change(account, status)
 
         def on_send_custom_status(self, widget, contact_list, show, group=None):
@@ -4937 +4937 @@
                         uri_splitted = uri.split() # we may have more than one file dropped
                         nb_uri = len(uri_splitted)
-                        def _on_send_files(widget, account, jid, uris):
-                                dialog.destroy()
+                        def _on_send_files(account, jid, uris):
                                 c = gajim.contacts.get_contact_with_highest_priority(account, jid)
                                 for uri in uris:
@@ -4953 +4952 @@
                                 path = helpers.get_file_path_from_dnd_dropped_uri(uri)
                                 sec_text += '\n' + os.path.basename(path)
-                        dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text,
+                        dialogs.NonModalConfirmationDialog(prim_text, sec_text,
                                 on_response_ok = (_on_send_files, account_dest, jid_dest,
                                 uri_splitted))