Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: ability to open rename dialog twice when we cancel first ...
by Yann Leboulanger 03 Feb '10

03 Feb '10

changeset 744b23bdb439 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=744b23bdb439 description: ability to open rename dialog twice when we cancel first instance. Fixes #5587 diffstat: data/gui/input_dialog.ui | 2 +- src/dialogs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 428adcf83dc7 -r 744b23bdb439 data/gui/input_dialog.ui --- a/data/gui/input_dialog.ui Wed Feb 03 19:59:41 2010 +0100 +++ b/data/gui/input_dialog.ui Wed Feb 03 21:16:38 2010 +0100 @@ -6,7 +6,7 @@ <property name="border_width">6</property> <property name="type_hint">dialog</property> <property name="has_separator">False</property> - <signal name="delete_event" handler="on_input_dialog_delete_event"/> + <signal name="destroy" handler="on_input_dialog_destroy"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property> diff -r 428adcf83dc7 -r 744b23bdb439 src/dialogs.py --- a/src/dialogs.py Wed Feb 03 19:59:41 2010 +0100 +++ b/src/dialogs.py Wed Feb 03 21:16:38 2010 +0100 @@ -1764,7 +1764,7 @@ self.xml.connect_signals(self) self.dialog.show_all() - def on_input_dialog_delete_event(self, widget, event): + def on_input_dialog_destroy(self, widget): if self.cancel_handler: self.cancel_handler() @@ -1788,7 +1788,7 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, cancel_handler)

1 0

gajim: [zimio and me] Ask what to do when we want to unregister ...
by Yann Leboulanger 03 Feb '10

03 Feb '10

changeset 428adcf83dc7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=428adcf83dc7 description: [zimio and me] Ask what to do when we want to unregister from a server but connection fails. Fixes #324 diffstat: src/chat_control.py | 9 +++- src/config.py | 10 +++++ src/dialogs.py | 93 +++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 96 insertions(+), 16 deletions(-) diffs (176 lines): diff -r b61ec03994e9 -r 428adcf83dc7 src/chat_control.py --- a/src/chat_control.py Tue Feb 02 20:02:47 2010 +0100 +++ b/src/chat_control.py Wed Feb 03 19:59:41 2010 +0100 @@ -553,10 +553,15 @@ widget.modify_fg(gtk.STATE_NORMAL, fg_color) self.connect_style_event(widget, opts[0], opts[1]) + def _conv_textview_key_press_event(self, widget, event): - if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c, + # translate any layout to latin_layout + keymap = gtk.gdk.keymap_get_default() + keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] + keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] + if (event.state & gtk.gdk.CONTROL_MASK and keyval in (keycodec, gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ - event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): + keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event) return True diff -r b61ec03994e9 -r 428adcf83dc7 src/config.py --- a/src/config.py Tue Feb 02 20:02:47 2010 +0100 +++ b/src/config.py Wed Feb 03 19:59:41 2010 +0100 @@ -2904,10 +2904,20 @@ else: remove() + def on_remove_responce_ok(self, is_checked): + if is_checked[0]: + self._on_remove_success(True) + def _on_remove_success(self, res): # action of unregistration has failed, we don't remove the account # Error message is send by connect_and_auth() if not res: + confirmation_check = dialogs.ConfirmationDialogDoubleRadio( + _('Connection to server %s failed') % self.account, + _('What would you like to do?'), + _('Remove only from Gajim'), + _('Don\'t remove anything. I\'ll try again later'), + on_response_ok=self.on_remove_responce_ok, is_modal=False) return # Close all opened windows gajim.interface.roster.close_all(self.account, force = True) diff -r b61ec03994e9 -r 428adcf83dc7 src/dialogs.py --- a/src/dialogs.py Tue Feb 02 20:02:47 2010 +0100 +++ b/src/dialogs.py Wed Feb 03 19:59:41 2010 +0100 @@ -1299,23 +1299,34 @@ self.format_secondary_markup(sectext) buttons = self.action_area.get_children() - possible_responses = {gtk.STOCK_OK: on_response_ok, - gtk.STOCK_CANCEL: on_response_cancel, gtk.STOCK_YES: on_response_yes, - gtk.STOCK_NO: on_response_no} + self.possible_responses = {gtk.STOCK_OK: on_response_ok, + gtk.STOCK_CANCEL: on_response_cancel, gtk.STOCK_YES: on_response_yes, + gtk.STOCK_NO: on_response_no} for b in buttons: - for response in possible_responses: + for response in self.possible_responses: if b.get_label() == response: - if not possible_responses[response]: + if not self.possible_responses[response]: b.connect('clicked', self.just_destroy) - elif isinstance(possible_responses[response], tuple): - if len(possible_responses[response]) == 1: - b.connect('clicked', possible_responses[response][0]) + elif isinstance(self.possible_responses[response], tuple): + if len(self.possible_responses[response]) == 1: + b.connect('clicked', self.possible_responses[response][0]) else: - b.connect('clicked', *possible_responses[response]) + b.connect('clicked', *self.possible_responses[response]) else: - b.connect('clicked', possible_responses[response]) + b.connect('clicked', self.possible_responses[response]) break + self.connect('destroy', self.on_dialog_destroy) + + def on_dialog_destroy(self, widget): + cancel_handler = self.possible_responses[gtk.STOCK_CANCEL] + if not cancel_handler: + return False + if isinstance(cancel_handler, tuple): + cancel_handler[0](None, *cancel_handler[1:]) + else: + cancel_handler(None) + def just_destroy(self, widget): self.destroy() @@ -1548,8 +1559,6 @@ self.set_modal(is_modal) self.popup() - # XXX should cancel if somebody closes the dialog - def on_response_ok(self, widget): if self.user_response_ok: if isinstance(self.user_response_ok, tuple): @@ -1607,8 +1616,6 @@ self.set_modal(is_modal) self.popup() - # XXX should cancel if somebody closes the dialog - def on_response_ok(self, widget): if self.user_response_ok: if isinstance(self.user_response_ok, tuple): @@ -1638,6 +1645,64 @@ is_checked_2 = False return [is_checked_1, is_checked_2] +class ConfirmationDialogDoubleRadio(ConfirmationDialog): + """ + HIG compliant confirmation dialog with 2 radios + """ + + def __init__(self, pritext, sectext='', radiotext1='', radiotext2='', + on_response_ok=None, on_response_cancel=None, is_modal=True): + 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, self.on_response_ok, + self.on_response_cancel) + + self.set_default_response(gtk.RESPONSE_OK) + + ok_button = self.action_area.get_children()[0] # right to left + ok_button.grab_focus() + + self.radiobutton1 = gtk.RadioButton(label=radiotext1) + self.vbox.pack_start(self.radiobutton1, expand=False, fill=True) + + self.radiobutton2 = gtk.RadioButton(group=self.radiobutton1, + label=radiotext2) + self.vbox.pack_start(self.radiobutton2, expand=False, fill=True) + + self.set_modal(is_modal) + 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.is_checked(), + *self.user_response_ok[1:]) + else: + self.user_response_ok(self.is_checked()) + 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_cancel[1:]) + else: + self.user_response_cancel() + self.destroy() + + def is_checked(self): + ''' Get active state of the checkbutton ''' + if self.radiobutton1: + is_checked_1 = self.radiobutton1.get_active() + else: + is_checked_1 = False + if self.radiobutton2: + is_checked_2 = self.radiobutton2.get_active() + else: + is_checked_2 = False + return [is_checked_1, is_checked_2] + class FTOverwriteConfirmationDialog(ConfirmationDialog): """ HIG compliant confirmation dialog to overwrite or resume a file transfert

1 0

gajim: correctly get error numbre from error object.
by Yann Leboulanger 02 Feb '10

02 Feb '10

changeset b61ec03994e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b61ec03994e9 description: correctly get error numbre from error object. diffstat: src/common/socks5.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b3fda919309b -r b61ec03994e9 src/common/socks5.py --- a/src/common/socks5.py Fri Jan 29 21:59:13 2010 +0100 +++ b/src/common/socks5.py Tue Feb 02 20:02:47 2010 +0100 @@ -865,7 +865,7 @@ try: self._serv = socket.socket(*ai[:3]) except socket.error, e: - if e.errno == EAFNOSUPPORT: + if e.args[0] == EAFNOSUPPORT: self.ai = None continue raise

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010