From acc78e6d48f7812633c013a601894b39f7ff36e1 Mon Sep 17 00:00:00 2001 From: js Date: Mon, 19 May 2008 18:48:53 +0000 Subject: [PATCH] Coding style & make translatable. --- src/message_control.py | 19 ++- src/otr_windows.py | 306 ++++++++++++++++++++++++----------------- 2 files changed, 191 insertions(+), 134 deletions(-) diff --git a/src/message_control.py b/src/message_control.py index 9b63aa60c..8419e3f5e 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -96,7 +96,8 @@ class MessageControl: pass def get_tab_image(self): - '''Return a suitable tab image for display. None clears any current label.''' + # Return a suitable tab image for display. + # None clears any current label. return None def prepare_context_menu(self): @@ -114,7 +115,8 @@ class MessageControl: pass def get_specific_unread(self): - return len(gajim.events.get_events(self.account, self.contact.jid)) + return len(gajim.events.get_events(self.account, + self.contact.jid)) def set_session(self, session): oldsession = None @@ -130,7 +132,8 @@ class MessageControl: session.control = self if oldsession: - self.parent_win.change_thread_key(self.contact.jid, self.account, + self.parent_win.change_thread_key( + self.contact.jid, self.account, oldsession.thread_id, session.thread_id) if oldsession.enable_encryption: @@ -183,7 +186,9 @@ class MessageControl: return # Send and update history - return gajim.connections[self.account].send_message(jid, message, keyID, - type = type, chatstate = chatstate, msg_id = msg_id, - composing_xep = composing_xep, resource = self.resource, - user_nick = user_nick, session = self.session, original_message = original_message) + return gajim.connections[self.account].send_message(jid, + message, keyID, type = type, chatstate = chatstate, + msg_id = msg_id, composing_xep = composing_xep, + resource = self.resource, user_nick = user_nick, + session = self.session, + original_message = original_message) diff --git a/src/otr_windows.py b/src/otr_windows.py index 61aad50af..405754e16 100644 --- a/src/otr_windows.py +++ b/src/otr_windows.py @@ -22,79 +22,90 @@ import gtkgui_helpers from common import gajim -our_fp_text = """Your fingerprint: -%s""" - -their_fp_text = """Purported fingerprint for %s: -%s""" +our_fp_text = _('Your fingerprint:\n' \ + '%s') +their_fp_text = _('Purported fingerprint for %s:\n' \ + '%s') class ContactOtrSMPWindow: - def gw(self, n): - """ shorthand for self.xml.get_widget(n)""" + # shorthand for self.xml.get_widget(n) return self.xml.get_widget(n) def __init__(self, fjid, account): self.fjid = fjid self.account = account - self.xml = gtkgui_helpers.get_glade("contact_otr_window.glade") - self.window = self.xml.get_widget("otr_smp_window") + self.xml = gtkgui_helpers.get_glade('contact_otr_window.glade') + self.window = self.xml.get_widget('otr_smp_window') - - # the contact may be unknown to gajim if ContactOtrSMPWindow is created very early - self.contact = gajim.contacts.get_contact_from_full_jid(account, fjid) + # the contact may be unknown to gajim if ContactOtrSMPWindow + # is created very early + self.contact = gajim.contacts.get_contact_from_full_jid( + account, fjid) if self.contact: - self.window.set_title("OTR settings for %s"% + self.window.set_title(_('OTR settings for %s') % \ self.contact.get_full_jid()) self.ctx = gajim.otr_module.otrl_context_find( gajim.connections[self.account].otr_userstates, - self.fjid.encode(), gajim.get_jid_from_account(self.account).encode(), - gajim.OTR_PROTO, 1, (gajim.otr_add_appdata, self.account))[0] + self.fjid.encode(), gajim.get_jid_from_account( + self.account).encode(), gajim.OTR_PROTO, 1, + (gajim.otr_add_appdata, self.account))[0] - self.gw("smp_cancel_button").connect("clicked", self._on_destroy) - self.gw("smp_ok_button").connect("clicked", self._apply) + self.gw('smp_cancel_button').connect('clicked', + self._on_destroy) + self.gw('smp_ok_button').connect('clicked', self._apply) def show(self, response): - # re-initialize if contact was unknown when we initially initialized + # re-initialize if contact was unknown when we + # initially initialized if not self.contact: self.__init__(self.fjid, self.account) - assert(self.contact) # the contact MUST be known when showing the dialog + # the contact MUST be known when showing the dialog + assert(self.contact) self.smp_running = False self.finished = False self.response = response if response: - self.gw("desc_label").set_markup("%s is trying to authenticate you " - "using a secret only known to him/her and you. Please enter your secret " - "below."% self.contact.get_full_jid()) + self.gw('desc_label').set_markup(_('%s is trying ' \ + 'to authenticate you using a secret only ' \ + 'known to him/her and you. Please enter ' \ + 'your secret below.') % \ + self.contact.get_full_jid()) else: - self.gw("desc_label").set_markup("You are trying to authenticate %s " - "using a secret only known to him/her and yourself. Please enter your " - "secret below."% self.contact.get_full_jid()) + self.gw('desc_label').set_markup(_('You are ' \ + 'trying to authenticate %s using a secret' \ + 'only known to him/her and yourself.' \ + 'Please enter your secret below.') % \ + self.contact.get_full_jid()) self.window.show_all() def _abort(self, text=None): self.smp_running = False - gajim.otr_module.otrl_message_abort_smp(gajim.connections[self.account].otr_userstates, - (gajim.otr_ui_ops, {'account':self.account}), self.ctx) + gajim.otr_module.otrl_message_abort_smp( + gajim.connections[self.account].otr_userstates, + (gajim.otr_ui_ops, {'account': self.account}), self.ctx) if text: - gajim.otr_ui_ops.gajim_log(text, self.account, self.contact.get_full_jid()) + gajim.otr_ui_ops.gajim_log(text, self.account, + self.contact.get_full_jid()) def _finish(self, text): self.smp_running = False self.finished = True - self.gw("smp_cancel_button").set_sensitive(False) - self.gw("smp_ok_button").set_sensitive(True) - self.gw("progressbar").set_fraction(1) - gajim.otr_ui_ops.gajim_log(text, self.account, self.contact.get_full_jid()) - self.gw("desc_label").set_markup(text) - for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(self.contact.jid, self.account): + self.gw('smp_cancel_button').set_sensitive(False) + self.gw('smp_ok_button').set_sensitive(True) + self.gw('progressbar').set_fraction(1) + gajim.otr_ui_ops.gajim_log(text, self.account, + self.contact.get_full_jid()) + self.gw('desc_label').set_markup(text) + for ctrl in gajim.interface.msg_win_mgr.get_chat_controls( + self.contact.jid, self.account): ctrl.update_ui() - gajim.otr_ui_ops.write_fingerprints({'account':self.account}) + gajim.otr_ui_ops.write_fingerprints({'account': self.account}) def handle_tlv(self, tlvs): if not self.contact: @@ -102,69 +113,88 @@ class ContactOtrSMPWindow: if tlvs: nextTLV = self.ctx.smstate.nextExpected; - tlv = gajim.otr_module.otrl_tlv_find(tlvs, gajim.otr_module.OTRL_TLV_SMP1) + tlv = gajim.otr_module.otrl_tlv_find(tlvs, + gajim.otr_module.OTRL_TLV_SMP1) if tlv: - if nextTLV != gajim.otr_module.OTRL_SMP_EXPECT1: + if nextTLV != \ + gajim.otr_module.OTRL_SMP_EXPECT1: self._abort() else: self.show(True) - self.gw("progressbar").set_fraction(0.3) - tlv = gajim.otr_module.otrl_tlv_find(tlvs, gajim.otr_module.OTRL_TLV_SMP2) + self.gw('progressbar'). \ + set_fraction(0.3) + tlv = gajim.otr_module.otrl_tlv_find(tlvs, + gajim.otr_module.OTRL_TLV_SMP2) if tlv: if nextTLV != gajim.otr_module.OTRL_SMP_EXPECT2: self._abort() else: - self.ctx.smstate.nextExpected = gajim.otr_module.OTRL_SMP_EXPECT4; - self.gw("progressbar").set_fraction(0.6) - tlv = gajim.otr_module.otrl_tlv_find(tlvs, gajim.otr_module.OTRL_TLV_SMP3) + self.ctx.smstate.nextExpected = \ + gajim.otr_module. \ + OTRL_SMP_EXPECT4 + self.gw('progressbar').set_fraction(0.6) + tlv = gajim.otr_module.otrl_tlv_find(tlvs, + gajim.otr_module.OTRL_TLV_SMP3) if tlv: if nextTLV != gajim.otr_module.OTRL_SMP_EXPECT3: self._abort() else: - self.ctx.smstate.nextExpected = gajim.otr_module.OTRL_SMP_EXPECT1; + self.ctx.smstate.nextExpected = \ + gajim.otr_module. \ + OTRL_SMP_EXPECT1; if self.ctx.active_fingerprint.trust: - self._finish("SMP verifying succeeded") + self._finish(_('SMP ' \ + 'verifying succeeded')) else: - self._finish("SMP verifying failed") - tlv = gajim.otr_module.otrl_tlv_find(tlvs, gajim.otr_module.OTRL_TLV_SMP4) + self._finish(_('SMP ' \ + 'verifying failed')) + tlv = gajim.otr_module.otrl_tlv_find(tlvs, + gajim.otr_module.OTRL_TLV_SMP4) if tlv: if nextTLV != gajim.otr_module.OTRL_SMP_EXPECT4: self._abort() else: - self.ctx.smstate.nextExpected = gajim.otr_module.OTRL_SMP_EXPECT1; + self.ctx.smstate.nextExpected = \ + gajim.otr_module. \ + OTRL_SMP_EXPECT1; if self.ctx.active_fingerprint.trust: - self._finish("SMP verifying succeeded") + self._finish(_('SMP ' \ + 'verifying succeeded')) else: - self._finish("SMP verifying failed") - tlv = gajim.otr_module.otrl_tlv_find(tlvs, gajim.otr_module.OTRL_TLV_SMP_ABORT) + self._finish(_('SMP ' \ + 'verifying failed')) + tlv = gajim.otr_module.otrl_tlv_find(tlvs, + gajim.otr_module.OTRL_TLV_SMP_ABORT) if tlv: - self._finish("SMP verifying aborted") + self._finish(_('SMP verifying aborted')) def _on_destroy(self, widget): if self.smp_running: - self._abort("user aborted SMP authentication") + self._abort(_('user aborted SMP authentication')) self.window.hide_all() def _apply(self, widget): if self.finished: self.window.hide_all() return - secret = self.gw("secret_entry").get_text() + secret = self.gw('secret_entry').get_text() if self.response: - gajim.otr_module.otrl_message_respond_smp(gajim.connections[self.account].otr_userstates, - (gajim.otr_ui_ops, {'account':self.account}), self.ctx, secret) + gajim.otr_module.otrl_message_respond_smp( + gajim.connections[self.account].otr_userstates, + (gajim.otr_ui_ops, {'account': self.account}), + self.ctx, secret) else: - gajim.otr_module.otrl_message_initiate_smp(gajim.connections[self.account].otr_userstates, - (gajim.otr_ui_ops, {'account':self.account}), self.ctx, secret) - self.gw("progressbar").set_fraction(0.3) + gajim.otr_module.otrl_message_initiate_smp( + gajim.connections[self.account].otr_userstates, + (gajim.otr_ui_ops, {'account': self.account}), + self.ctx, secret) + self.gw('progressbar').set_fraction(0.3) self.smp_running = True widget.set_sensitive(False) - class ContactOtrWindow: - def gw(self, n): - """ shorthand for self.xml.get_widget(n)""" + # shorthand for self.xml.get_widget(n) return self.xml.get_widget(n) def __init__(self, contact, account, ctrl=None): @@ -176,77 +206,85 @@ class ContactOtrWindow: gajim.connections[self.account].otr_userstates, self.contact.get_full_jid().encode(), gajim.get_jid_from_account(self.account).encode(), - gajim.OTR_PROTO, 1, (gajim.otr_add_appdata, self.account))[0] + gajim.OTR_PROTO, 1, (gajim.otr_add_appdata, + self.account))[0] - self.xml = gtkgui_helpers.get_glade("contact_otr_window.glade") - self.window = self.xml.get_widget("otr_settings_window") + self.xml = gtkgui_helpers.get_glade('contact_otr_window.glade') + self.window = self.xml.get_widget('otr_settings_window') - self.gw("settings_cancel_button").connect("clicked", self._on_destroy) - self.gw("settings_ok_button").connect("clicked", self._apply) - self.gw("otr_default_checkbutton").connect("toggled", - self._otr_default_checkbutton_toggled) + self.gw('settings_cancel_button').connect('clicked', + self._on_destroy) + self.gw('settings_ok_button').connect('clicked', self._apply) + self.gw('otr_default_checkbutton').connect('toggled', + self._otr_default_checkbutton_toggled) - self.window.set_title("OTR settings for %s"% + self.window.set_title(_('OTR settings for %s') % \ self.contact.get_full_jid()) # always set the label containing our fingerprint - self.gw("our_fp_label").set_markup(our_fp_text% + self.gw('our_fp_label').set_markup(our_fp_text % \ gajim.otr_module.otrl_privkey_fingerprint( - gajim.connections[self.account].otr_userstates, - gajim.get_jid_from_account(self.account).encode(), - gajim.OTR_PROTO)) + gajim.connections[self.account].otr_userstates, + gajim.get_jid_from_account(self.account).encode(), + gajim.OTR_PROTO)) - if self.ctx.msgstate != gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED: - # make the fingerprint widgets insensitive when not encrypted - for widget in self.gw("otr_fp_vbox").get_children(): + if self.ctx.msgstate != \ + gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED: + # make the fingerprint widgets insensitive + # when not encrypted + for widget in self.gw('otr_fp_vbox').get_children(): widget.set_sensitive(False) # show that the fingerprint is unknown - self.gw("their_fp_label").set_markup( - their_fp_text%(self.contact.get_full_jid(), - "unknown")) - self.gw("verified_combobox").set_active(-1) + self.gw('their_fp_label').set_markup( + their_fp_text % (self.contact.get_full_jid(), + _('unknown'))) + self.gw('verified_combobox').set_active(-1) else: # make the fingerprint widgets sensitive when encrypted - for widget in self.gw("otr_fp_vbox").get_children(): + for widget in self.gw('otr_fp_vbox').get_children(): widget.set_sensitive(True) # show their fingerprint - self.gw("their_fp_label").set_markup( + self.gw('their_fp_label').set_markup( their_fp_text%(self.contact.get_full_jid(), gajim.otr_module.otrl_privkey_hash_to_human( - self.ctx.active_fingerprint.fingerprint))) + self.ctx.active_fingerprint.fingerprint))) # set the trust combobox if self.ctx.active_fingerprint.trust: - self.gw("verified_combobox").set_active(1) + self.gw('verified_combobox').set_active(1) else: - self.gw("verified_combobox").set_active(0) + self.gw('verified_combobox').set_active(0) - otr_flags = gajim.config.get_per("contacts", self.contact.jid, - "otr_flags") + otr_flags = gajim.config.get_per('contacts', self.contact.jid, + 'otr_flags') if otr_flags >= 0: - self.gw("otr_default_checkbutton").set_active(0) - for w in self.gw("otr_settings_vbox").get_children(): + self.gw('otr_default_checkbutton').set_active(0) + for w in self.gw('otr_settings_vbox').get_children(): w.set_sensitive(True) else: - # per-user settings not available, using default settings - otr_flags = gajim.config.get_per("accounts", self.account, - "otr_flags") - self.gw("otr_default_checkbutton").set_active(1) - for w in self.gw("otr_settings_vbox").get_children(): + # per-user settings not available, + # using default settings + otr_flags = gajim.config.get_per('accounts', + self.account, 'otr_flags') + self.gw('otr_default_checkbutton').set_active(1) + for w in self.gw('otr_settings_vbox').get_children(): w.set_sensitive(False) - self.gw("otr_policy_allow_v1_checkbutton").set_active( + self.gw('otr_policy_allow_v1_checkbutton').set_active( otr_flags & gajim.otr_module.OTRL_POLICY_ALLOW_V1) - self.gw("otr_policy_allow_v2_checkbutton").set_active( + self.gw('otr_policy_allow_v2_checkbutton').set_active( otr_flags & gajim.otr_module.OTRL_POLICY_ALLOW_V2) - self.gw("otr_policy_require_checkbutton").set_active( + self.gw('otr_policy_require_checkbutton').set_active( otr_flags & gajim.otr_module.OTRL_POLICY_REQUIRE_ENCRYPTION) - self.gw("otr_policy_send_tag_checkbutton").set_active( - otr_flags & gajim.otr_module.OTRL_POLICY_SEND_WHITESPACE_TAG) - self.gw("otr_policy_start_on_tag_checkbutton").set_active( - otr_flags & gajim.otr_module.OTRL_POLICY_WHITESPACE_START_AKE) - self.gw("otr_policy_start_on_error_checkbutton").set_active( - otr_flags & gajim.otr_module.OTRL_POLICY_ERROR_START_AKE) + self.gw('otr_policy_send_tag_checkbutton').set_active( + otr_flags & \ + gajim.otr_module.OTRL_POLICY_SEND_WHITESPACE_TAG) + self.gw('otr_policy_start_on_tag_checkbutton').set_active( + otr_flags & \ + gajim.otr_module.OTRL_POLICY_WHITESPACE_START_AKE) + self.gw('otr_policy_start_on_error_checkbutton').set_active( + otr_flags & \ + gajim.otr_module.OTRL_POLICY_ERROR_START_AKE) self.window.show_all() @@ -254,16 +292,19 @@ class ContactOtrWindow: self.window.destroy() def _apply(self, widget): - # -1 when nothing is selected (ie. the connection is not encrypted) - trust_state = self.gw("verified_combobox").get_active() + # -1 when nothing is selected + # (ie. the connection is not encrypted) + trust_state = self.gw('verified_combobox').get_active() if trust_state == 1 and not self.ctx.active_fingerprint.trust: gajim.otr_module.otrl_context_set_trust( - self.ctx.active_fingerprint, "verified") - gajim.otr_ui_ops.write_fingerprints({'account':self.account}) + self.ctx.active_fingerprint, 'verified') + gajim.otr_ui_ops.write_fingerprints( + {'account': self.account}) elif trust_state == 0: gajim.otr_module.otrl_context_set_trust( - self.ctx.active_fingerprint, "") - gajim.otr_ui_ops.write_fingerprints({'account':self.account}) + self.ctx.active_fingerprint, '') + gajim.otr_ui_ops.write_fingerprints( + {'account': self.account}) if not self.ctrl: self.ctrl = gajim.interface.msg_win_mgr.get_control( @@ -271,30 +312,41 @@ class ContactOtrWindow: if self.ctrl: self.ctrl.update_ui() - if self.gw("otr_default_checkbutton").get_active(): - # default is enabled, so remove any user-specific settings if available - gajim.config.set_per("contacts", self.contact.jid, "otr_flags", -1) + if self.gw('otr_default_checkbutton').get_active(): + # default is enabled, so remove any user-specific + # settings if available + gajim.config.set_per('contacts', + self.contact.jid, 'otr_flags', -1) else: # build the flags using the checkboxes flags = 0 - flags += self.gw("otr_policy_allow_v1_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_ALLOW_V1 - flags += self.gw("otr_policy_allow_v2_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_ALLOW_V2 - flags += self.gw("otr_policy_require_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_REQUIRE_ENCRYPTION - flags += self.gw("otr_policy_send_tag_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_SEND_WHITESPACE_TAG - flags += self.gw("otr_policy_start_on_tag_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_WHITESPACE_START_AKE - flags += self.gw("otr_policy_start_on_error_checkbutton").get_active() \ - and gajim.otr_module.OTRL_POLICY_ERROR_START_AKE + flags += self.gw('otr_policy_allow_v1_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_ALLOW_V1 + flags += self.gw('otr_policy_allow_v2_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_ALLOW_V2 + flags += self.gw('otr_policy_require_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_REQUIRE_ENCRYPTION + flags += self.gw('otr_policy_send_tag_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_SEND_WHITESPACE_TAG + flags += self.gw( + 'otr_policy_start_on_tag_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_WHITESPACE_START_AKE + flags += self.gw( + 'otr_policy_start_on_error_checkbutton'). \ + get_active() and gajim.otr_module. \ + OTRL_POLICY_ERROR_START_AKE - gajim.config.add_per("contacts", self.contact.jid) - gajim.config.set_per("contacts", self.contact.jid, "otr_flags", flags) + gajim.config.add_per('contacts', self.contact.jid) + gajim.config.set_per('contacts', self.contact.jid, + 'otr_flags', flags) self._on_destroy(widget) def _otr_default_checkbutton_toggled(self, widget): - for w in self.gw("otr_settings_vbox").get_children(): + for w in self.gw('otr_settings_vbox').get_children(): w.set_sensitive(not widget.get_active())