copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correctly set transient window for muc error dialogs. Fixes #6943

This commit is contained in:
Yann Leboulanger 2011-08-14 12:19:43 +02:00
parent b668569caa
commit 8a82e9021f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui_interface.py
View File

@ -244,8 +244,15 @@ class Interface:
gc_control.error_dialog = None gc_control.error_dialog = None
gc_control.error_dialog = dialogs.ErrorDialog(pritext, sectext, gc_control.error_dialog = dialogs.ErrorDialog(pritext, sectext,
on_response_ok=on_close, on_response_cancel=on_close) on_response_ok=on_close, on_response_cancel=on_close)
gc_control.error_dialog.set_modal(False)
if gc_control.parent_win:
gc_control.error_dialog.set_transient_for(
gc_control.parent_win.window)
else: else:
dialogs.ErrorDialog(pritext, sectext) d = dialogs.ErrorDialog(pritext, sectext)
if gc_control and gc_control.parent_win:
d.set_transient_for(gc_control.parent_win.window)
d.set_modal(False)
def handle_gc_password_required(self, account, room_jid, nick): def handle_gc_password_required(self, account, room_jid, nick):
def on_ok(text): def on_ok(text):
@ -281,8 +288,8 @@ class Interface:
# maximum user number reached # maximum user number reached
self.handle_gc_error(gc_control, self.handle_gc_error(gc_control,
_('Unable to join group chat'), _('Unable to join group chat'),
_('Maximum number of users for %s has been reached') % \ _('Maximum number of users for <b>%s</b> has been reached')\
obj.room_jid) % obj.room_jid)
elif (obj.errcode == '401') or (obj.errcon == 'not-authorized'): elif (obj.errcode == '401') or (obj.errcon == 'not-authorized'):
# password required to join # password required to join
self.handle_gc_password_required(obj.conn.name, obj.room_jid, self.handle_gc_password_required(obj.conn.name, obj.room_jid,
@ -290,19 +297,20 @@ class Interface:
elif (obj.errcode == '403') or (obj.errcon == 'forbidden'): elif (obj.errcode == '403') or (obj.errcon == 'forbidden'):
# we are banned # we are banned
self.handle_gc_error(gc_control, _('Unable to join group chat'), self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('You are banned from group chat %s.') % obj.room_jid) _('You are banned from group chat <b>%s</b>.') % \
obj.room_jid)
elif (obj.errcode == '404') or (obj.errcon in ('item-not-found', elif (obj.errcode == '404') or (obj.errcon in ('item-not-found',
'remote-server-not-found')): 'remote-server-not-found')):
# group chat does not exist # group chat does not exist
self.handle_gc_error(gc_control, _('Unable to join group chat'), self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('Group chat %s does not exist.') % obj.room_jid) _('Group chat <b>%s</b> does not exist.') % obj.room_jid)
elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'): elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'):
self.handle_gc_error(gc_control, _('Unable to join group chat'), self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('Group chat creation is restricted.')) _('Group chat creation is restricted.'))
elif (obj.errcode == '406') or (obj.errcon == 'not-acceptable'): elif (obj.errcode == '406') or (obj.errcon == 'not-acceptable'):
self.handle_gc_error(gc_control, _('Unable to join group chat'), self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('Your registered nickname must be used in group chat ' _('Your registered nickname must be used in group chat '
'%s.') % obj.room_jid) '<b>%s</b>.') % obj.room_jid)
elif (obj.errcode == '407') or (obj.errcon == \ elif (obj.errcode == '407') or (obj.errcon == \
'registration-required'): 'registration-required'):
self.handle_gc_error(gc_control, _('Unable to join group chat'), self.handle_gc_error(gc_control, _('Unable to join group chat'),