changeset 7f7118c375a1 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=7f7118c375a1 description: fix using change nick button in groupchats

diffstat:

src/dialogs.py | 32 ++++++++++++++++---------------- src/gajim.py | 10 ++++++++-- src/groupchat_control.py | 11 ++++++++--- 3 files changed, 32 insertions(+), 21 deletions(-)

diffs (119 lines):

diff -r 44fb9b10259e -r 7f7118c375a1 src/dialogs.py --- a/src/dialogs.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/dialogs.py Tue Jul 21 00:30:43 2009 +0200 @@ -1639,9 +1639,10 @@ self.input_entry.set_text(input_str) self.input_entry.select_region(0, -1) # select all

- self.checkbutton = gtk.CheckButton(checktext) - self.vbox.pack_start(self.checkbutton, expand=False, fill=True) - self.checkbutton.show() + if checktext: + self.checkbutton = gtk.CheckButton(checktext) + self.vbox.pack_start(self.checkbutton, expand=False, fill=True) + self.checkbutton.show()

def on_okbutton_clicked(self, widget): user_input = self.get_text() @@ -1659,16 +1660,18 @@

def is_checked(self): ''' Get active state of the checkbutton ''' - return self.checkbutton.get_active() + try: + return self.checkbutton.get_active() + except Exception: + # There is no checkbutton + return False

class ChangeNickDialog(InputDialogCheck): '''Class for changing room nickname in case of conflict''' - def __init__(self, account, room_jid): - title = _('Unable to join group chat') - check_text = _('Always use this nickname when there is a conflict') + def __init__(self, account, room_jid, title, prompt, check_text=None): InputDialogCheck.__init__(self, title, '', checktext=check_text, input_str='', is_modal=True, ok_handler=None, cancel_handler=None) - self.room_queue = [(account, room_jid)] + self.room_queue = [(account, room_jid, prompt)] self.check_next()

def on_input_dialog_delete_event(self, widget, event): @@ -1686,10 +1689,7 @@ self.check_next() return label = self.xml.get_widget('label') - prompt = _('Your desired nickname in group chat %s is in use or ' - 'registered by another occupant.\nPlease specify another nickname ' - 'below:') % self.room_jid - label.set_markup(prompt) + label.set_markup(self.prompt) self.set_entry(self.gc_control.nick + \ gajim.config.get('gc_proposed_nick_char'))

@@ -1699,7 +1699,7 @@ self.dialog.destroy() del gajim.interface.instances['change_nick_dialog'] return - self.account, self.room_jid = self.room_queue.pop(0) + self.account, self.room_jid, self.prompt = self.room_queue.pop(0) self.setup_dialog()

if gajim.new_room_nick is not None and not gajim.gc_connected[ @@ -1743,9 +1743,9 @@ self.gc_control.new_nick = '' self.check_next()

- def add_room(self, account, room_jid): - if (account, room_jid) not in self.room_queue: - self.room_queue.append((account, room_jid)) + def add_room(self, account, room_jid, pompt): + if (account, room_jid, prompt) not in self.room_queue: + self.room_queue.append((account, room_jid, prompt))

class InputTextDialog(CommonInputDialog): '''Class for multilines Input dialog (more place than InputDialog)''' diff -r 44fb9b10259e -r 7f7118c375a1 src/gajim.py --- a/src/gajim.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/gajim.py Tue Jul 21 00:30:43 2009 +0200 @@ -506,11 +506,17 @@ def handle_event_ask_new_nick(self, account, data): #('ASK_NEW_NICK', account, (room_jid,)) room_jid = data[0] + title = _('Unable to join group chat') + prompt = _('Your desired nickname in group chat %s is in use or ' + 'registered by another occupant.\nPlease specify another nickname ' + 'below:') % room_jid + check_text = _('Always use this nickname when there is a conflict') if 'change_nick_dialog' in self.instances: - self.instances['change_nick_dialog'].add_room(account, room_jid) + self.instances['change_nick_dialog'].add_room(account, room_jid, + prompt) else: self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( - account, room_jid) + account, room_jid, title, prompt)

def handle_event_http_auth(self, account, data): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) diff -r 44fb9b10259e -r 7f7118c375a1 src/groupchat_control.py --- a/src/groupchat_control.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/groupchat_control.py Tue Jul 21 00:30:43 2009 +0200 @@ -1939,9 +1939,14 @@ ok_handler=on_ok)

def _on_change_nick_menuitem_activate(self, widget): - title = _('Changing Nickname') - prompt = _('Please specify the new nickname you want to use:') - self.show_change_nick_input_dialog(title, prompt) + if 'change_nick_dialog' in gajim.interface.instances: + gajim.interface.instances['change_nick_dialog'].present() + else: + title = _('Changing Nickname') + prompt = _('Please specify the new nickname you want to use:') + gajim.interface.instances['change_nick_dialog'] = \ + dialogs.ChangeNickDialog(self.account, self.room_jid, title, + prompt)

def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick)