Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10121 - trunk/src/common
by js＠gajim.org 03 Aug '08

03 Aug '08

Author: js Date: 2008-08-04 01:01:43 +0200 (Mon, 04 Aug 2008) New Revision: 10121 Modified: trunk/src/common/connection.py trunk/src/common/stanza_session.py Log: Make "This message is encrypted" bodies consistent. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-08-03 22:21:50 UTC (rev 10120) +++ trunk/src/common/connection.py 2008-08-03 23:01:43 UTC (rev 10121) @@ -1080,12 +1080,11 @@ #encrypt msgenc, error = self.gpg.encrypt(msg, [keyID]) if msgenc and not error: - msgtxt = '[This message is encrypted]' + msgtxt = '[This message is *encrypted* (See :XEP:`27`]' lang = os.getenv('LANG') if lang is not None and lang != 'en': # we're not english - # one in locale and one en - msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') +\ - ' ([This message is *encrypted* (See :XEP:`27`])' + # one in locale and one en + msgtxt = _(msgtxt) + ' (' + msgtxt + ')' else: # Encryption failed, do not send message tim = localtime() Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-08-03 22:21:50 UTC (rev 10120) +++ trunk/src/common/stanza_session.py 2008-08-03 23:01:43 UTC (rev 10121) @@ -11,6 +11,7 @@ import xmpp.c14n import base64 +import os XmlDsig = 'http://www.w3.org/2000/09/xmldsig#' @@ -249,8 +250,12 @@ c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ crypto.encode_mpi(old_en_counter))) - stanza.setBody(_('[This message is part of an encrypted session. ' - 'If you see this message, something went wrong.]')) + msgtxt = '[This message is part of an encrypted session. ' \ + 'If you see this message, something went wrong.]' + lang = os.getenv('LANG') + if lang is not None and lang != 'en': # we're not english + msgtxt = _(msgtxt) + ' (' + msgtxt + ')' + stanza.setBody(msgtxt) return stanza

1 0

[commit-gajim] r10120 - trunk/src
by jim++＠gajim.org 03 Aug '08

03 Aug '08

Author: jim++ Date: 2008-08-04 00:21:50 +0200 (Mon, 04 Aug 2008) New Revision: 10120 Modified: trunk/src/gajim.py Log: Update counting of online transports when a transport change status. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-03 22:02:53 UTC (rev 10119) +++ trunk/src/gajim.py 2008-08-03 22:21:50 UTC (rev 10120) @@ -791,8 +791,9 @@ if gajim.jid_is_transport(jid): # It must be an agent if ji in jid_list: - # Update existing iter + # Update existing iter and group counting self.roster.draw_contact(ji, account) + self.roster.draw_group(_('Transports'), account) if new_show > 1 and ji in \ gajim.transport_avatar[account]: # transport just signed in.

1 0

[commit-gajim] r10119 - branches/plugin-system/src/plugins
by vardo＠gajim.org 03 Aug '08

03 Aug '08

Author: vardo Date: 2008-08-04 00:02:53 +0200 (Mon, 04 Aug 2008) New Revision: 10119 Modified: branches/plugin-system/src/plugins/gui.py branches/plugin-system/src/plugins/helpers.py branches/plugin-system/src/plugins/plugin.py branches/plugin-system/src/plugins/pluginmanager.py Log: GUI extension points removal working properly now. Modified: branches/plugin-system/src/plugins/gui.py =================================================================== --- branches/plugin-system/src/plugins/gui.py 2008-08-03 21:48:30 UTC (rev 10118) +++ branches/plugin-system/src/plugins/gui.py 2008-08-03 22:02:53 UTC (rev 10119) @@ -203,11 +203,6 @@ self.child.set_spacing(3) self.init() - - #label = gtk.Label(_('%s Configuration') % (plugin.name)) - #label.set_markup(label.get_label()) - #self.child.pack_start(label, False, False) - @log_calls('GajimPluginConfigDialog') def run(self, parent=None): @@ -222,4 +217,4 @@ pass def on_run(self): - pass \ No newline at end of file + pass Modified: branches/plugin-system/src/plugins/helpers.py =================================================================== --- branches/plugin-system/src/plugins/helpers.py 2008-08-03 21:48:30 UTC (rev 10118) +++ branches/plugin-system/src/plugins/helpers.py 2008-08-03 22:02:53 UTC (rev 10119) @@ -50,7 +50,7 @@ Decorator class for functions to easily log when they are entered and left. ''' - filter_out_classes = ['GajimPlugin', 'GajimPluginConfig', + filter_out_classes = ['GajimPlugin', 'GajimPluginConfig', 'PluginManager', 'GajimPluginConfigDialog', 'PluginsWindow'] ''' List of classes from which no logs should be emited when methods are called, Modified: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py 2008-08-03 21:48:30 UTC (rev 10118) +++ branches/plugin-system/src/plugins/plugin.py 2008-08-03 22:02:53 UTC (rev 10119) @@ -193,7 +193,7 @@ @log_calls('GajimPluginConfig') def save(self): self.data.sync() - log.debug(str(self.data)) + #log.debug(str(self.data)) @log_calls('GajimPluginConfig') def load(self): Modified: branches/plugin-system/src/plugins/pluginmanager.py =================================================================== --- branches/plugin-system/src/plugins/pluginmanager.py 2008-08-03 21:48:30 UTC (rev 10118) +++ branches/plugin-system/src/plugins/pluginmanager.py 2008-08-03 22:02:53 UTC (rev 10119) @@ -200,7 +200,10 @@ extension point name) to identify element to be removed. :type args: tuple ''' - log.debug('name: %s\n args: %s'%(gui_extpoint_name, args)) + + if gui_extpoint_name in self.gui_extension_points: + log.debug('Removing GUI extpoint\n name: %s\n args: %s'%(gui_extpoint_name, args)) + self.gui_extension_points[gui_extpoint_name].remove(args) @log_calls('PluginManager')

1 0

[commit-gajim] r10118 - trunk/src
by asterix＠gajim.org 03 Aug '08

03 Aug '08

Author: asterix Date: 2008-08-03 23:48:30 +0200 (Sun, 03 Aug 2008) New Revision: 10118 Modified: trunk/src/gajim.py Log: save config on quitting Gajim. see #4174 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-03 21:36:26 UTC (rev 10117) +++ trunk/src/gajim.py 2008-08-03 21:48:30 UTC (rev 10118) @@ -384,6 +384,8 @@ # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename) + # Save config + gajim.interface.save_config() if sys.platform == 'darwin': try: import osx

1 0

[commit-gajim] r10117 - trunk/src
by asterix＠gajim.org 03 Aug '08

03 Aug '08

Author: asterix Date: 2008-08-03 23:36:26 +0200 (Sun, 03 Aug 2008) New Revision: 10117 Modified: trunk/src/tooltips.py Log: don't indent status row in systray tooltip. fixes #4171 Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-08-03 21:15:10 UTC (rev 10116) +++ trunk/src/tooltips.py 2008-08-03 21:36:26 UTC (rev 10117) @@ -194,7 +194,8 @@ str_status += ' - ' + status + '' return str_status - def add_status_row(self, file_path, show, str_status, status_time = None, show_lock = False): + def add_status_row(self, file_path, show, str_status, status_time=None, + show_lock=False, indent=True): ''' appends a new row with status icon to the table ''' self.current_row += 1 state_file = show.replace(' ', '_') @@ -209,8 +210,9 @@ break spacer = gtk.Label(self.spacer_label) image.set_alignment(1, 0.5) - self.table.attach(spacer, 1, 2, self.current_row, - self.current_row + 1, 0, 0, 0, 0) + if indent: + self.table.attach(spacer, 1, 2, self.current_row, + self.current_row + 1, 0, 0, 0, 0) self.table.attach(image, 2, 3, self.current_row, self.current_row + 1, gtk.FILL, gtk.FILL, 2, 0) status_label = gtk.Label() @@ -253,13 +255,13 @@ if message: self.add_status_row(file_path, acct['show'], gobject.markup_escape_text(acct['name']) + \ - ' - ' + message, show_lock=show_lock) + ' - ' + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], gobject.markup_escape_text(acct['name']) - , show_lock=show_lock) + , show_lock=show_lock, indent=False) for line in acct['event_lines']: - self.add_text_row(' ' + line, 2) + self.add_text_row(' ' + line, 1) def populate(self, data): self.create_window()

1 0

[commit-gajim] r10116 - trunk/data/glade
by asterix＠gajim.org 03 Aug '08

03 Aug '08

Author: asterix Date: 2008-08-03 23:15:10 +0200 (Sun, 03 Aug 2008) New Revision: 10116 Modified: trunk/data/glade/manage_bookmarks_window.glade Log: [Shutnik] set widgets insensitive in manage bookmark window by default. fixes #4172 Modified: trunk/data/glade/manage_bookmarks_window.glade =================================================================== --- trunk/data/glade/manage_bookmarks_window.glade 2008-08-03 19:11:03 UTC (rev 10115) +++ trunk/data/glade/manage_bookmarks_window.glade 2008-08-03 21:15:10 UTC (rev 10116) @@ -94,6 +94,7 @@ </child> <child> <widget class="GtkEntry" id="pass_entry"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> @@ -108,6 +109,7 @@ </child> <child> <widget class="GtkEntry" id="server_entry"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> </widget> @@ -147,6 +149,7 @@ </child> <child> <widget class="GtkEntry" id="room_entry"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> </widget> @@ -160,6 +163,7 @@ </child> <child> <widget class="GtkEntry" id="nick_entry"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> </widget> @@ -197,6 +201,7 @@ </child> <child> <widget class="GtkEntry" id="title_entry"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> </widget> @@ -221,6 +226,7 @@ </child> <child> <widget class="GtkComboBox" id="print_status_combobox"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="items" translatable="yes"></property> <signal name="changed" handler="on_print_status_combobox_changed"/> @@ -240,6 +246,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <widget class="GtkCheckButton" id="autojoin_checkbutton"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">If checked, Gajim will join this group chat on startup</property> @@ -251,6 +258,7 @@ </child> <child> <widget class="GtkCheckButton" id="minimize_checkbutton"> + <property name="sensitive">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>

1 0

[commit-gajim] r10115 - trunk/src/common
by asterix＠gajim.org 03 Aug '08

03 Aug '08

Author: asterix Date: 2008-08-03 21:11:03 +0200 (Sun, 03 Aug 2008) New Revision: 10115 Modified: trunk/src/common/connection_handlers.py Log: notify GUI about ERROR presences. Fixes #3667 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-08-03 16:46:27 UTC (rev 10114) +++ trunk/src/common/connection_handlers.py 2008-08-03 19:11:03 UTC (rev 10115) @@ -2121,12 +2121,12 @@ elif ptype == 'error': errmsg = prs.getError() errcode = prs.getErrorCode() - if errcode == '502': # Internal Timeout: - self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, - prio, keyID, timestamp, None)) - else: # print in the window the error + if errcode != '502': # Internal Timeout: + # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) + self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, + keyID, timestamp, None)) if ptype == 'unavailable' and jid_stripped in self.sessions: # automatically terminate sessions that they haven't sent a thread ID in

1 0

[commit-gajim] r10114 - trunk/src/common
by bct＠gajim.org 03 Aug '08

03 Aug '08

Author: bct Date: 2008-08-03 18:46:27 +0200 (Sun, 03 Aug 2008) New Revision: 10114 Modified: trunk/src/common/stanza_session.py Log: attach an unencrypted explanatory body to XEP-0200 encrypted messages Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-08-03 13:29:11 UTC (rev 10113) +++ trunk/src/common/stanza_session.py 2008-08-03 16:46:27 UTC (rev 10114) @@ -249,6 +249,9 @@ c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ crypto.encode_mpi(old_en_counter))) + stanza.setBody(_('[This message is part of an encrypted session. ' + 'If you see this message, something went wrong.]')) + return stanza def is_xep_200_encrypted(self, msg): @@ -950,4 +953,4 @@ self.km_o = '' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10113 - in branches/plugin-system: plugins plugins/banner_tweaks plugins/length_notifier plugins/roster_buttons src src/plugins
by vardo＠gajim.org 03 Aug '08

03 Aug '08

Author: vardo Date: 2008-08-03 15:29:11 +0200 (Sun, 03 Aug 2008) New Revision: 10113 Modified: branches/plugin-system/plugins/acronyms_expander.py branches/plugin-system/plugins/banner_tweaks/plugin.py branches/plugin-system/plugins/length_notifier/config_dialog.glade branches/plugin-system/plugins/length_notifier/length_notifier.py branches/plugin-system/plugins/roster_buttons/plugin.py branches/plugin-system/src/chat_control.py branches/plugin-system/src/groupchat_control.py branches/plugin-system/src/message_control.py branches/plugin-system/src/plugins/gui.py branches/plugin-system/src/plugins/helpers.py branches/plugin-system/src/plugins/plugin.py branches/plugin-system/src/plugins/pluginmanager.py Log: Improvements to GUI extension points handling - added method to remove these from PluginManager (memory optimization). Removed logging from most of the code. Modified: branches/plugin-system/plugins/acronyms_expander.py =================================================================== --- branches/plugin-system/plugins/acronyms_expander.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/plugins/acronyms_expander.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -38,11 +38,8 @@ description = u'''Replaces acronyms (or other strings) with given expansions/substitutes.''' authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] homepage = u'http://blog.bilinski.it' - - #@log_calls('AcronymsExpanderPlugin') - #def __init__(self): - #super(AcronymsExpanderPlugin, self).__init__() + @log_calls('AcronymsExpanderPlugin') def init(self): self.config_dialog = None @@ -71,20 +68,20 @@ ACRONYMS = self.config['ACRONYMS'] INVOKER = self.config['INVOKER'] t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) - log.debug('%s %d'%(t, len(t))) + #log.debug('%s %d'%(t, len(t))) if t and t[-1] == INVOKER: - log.debug("changing msg text") + #log.debug("changing msg text") base,sep,head=t[:-1].rpartition(INVOKER) - log.debug('%s | %s | %s'%(base, sep, head)) + #log.debug('%s | %s | %s'%(base, sep, head)) if head in ACRONYMS: head = ACRONYMS[head] log.debug("head: %s"%(head)) t = "".join((base, sep, head, INVOKER)) - log.debug("turning off notify") + #log.debug("turning off notify") tb.freeze_notify() - log.debug("setting text: '%s'"%(t)) + #log.debug("setting text: '%s'"%(t)) tb.set_text(t) - log.debug("turning on notify") + #log.debug("turning on notify") tb.thaw_notify() @log_calls('AcronymsExpanderPlugin') Modified: branches/plugin-system/plugins/banner_tweaks/plugin.py =================================================================== --- branches/plugin-system/plugins/banner_tweaks/plugin.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/plugins/banner_tweaks/plugin.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -94,7 +94,6 @@ if self.config['show_banner_resource'] or self.config['banner_small_fonts']: banner_name_label = chat_control.xml.get_widget('banner_name_label') label_text = banner_name_label.get_label() - log.debug('label_text = "%s"'%(label_text)) contact = chat_control.contact jid = contact.jid Modified: branches/plugin-system/plugins/length_notifier/config_dialog.glade =================================================================== --- branches/plugin-system/plugins/length_notifier/config_dialog.glade 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/plugins/length_notifier/config_dialog.glade 2008-08-03 13:29:11 UTC (rev 10113) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - + <glade-interface> <widget class="GtkWindow" id="window1"> <child> @@ -12,40 +12,58 @@ <property name="column_spacing">7</property> <property name="row_spacing">5</property> <child> - <widget class="GtkHBox" id="hbox2"> + <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <child> - <widget class="GtkSpinButton" id="message_length_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Message length at which notification is invoked.</property> - <property name="width_chars">6</property> - <property name="adjustment">0 0 999999 1 10 10</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="on_message_length_spinbutton_value_changed"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="tooltip" translatable="yes">Message length at which notification is invoked.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Message length:</property> </widget> <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Background color of text entry field in chat window when notification is invoked.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Notification color:</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). Use comma (without space) as separator. If empty plugin is used with every JID. </property> + <property name="xalign">0</property> + <property name="label" translatable="yes">JabberIDs to include:</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="jids_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). Use comma (without space) as separator. If empty plugin is used with every JID. </property> + <signal name="changed" handler="on_jids_entry_changed"/> + <signal name="editing_done" handler="on_jids_entry_editing_done"/> + </widget> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -91,61 +109,43 @@ </packing> </child> <child> - <widget class="GtkEntry" id="jids_entry"> + <widget class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). If empty plugin is used with every JID. [not implemented]</property> - <signal name="changed" handler="on_jids_entry_changed"/> - <signal name="editing_done" handler="on_jids_entry_editing_done"/> + <child> + <widget class="GtkSpinButton" id="message_length_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Message length at which notification is invoked.</property> + <property name="width_chars">6</property> + <property name="adjustment">0 0 999999 1 10 10</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="on_message_length_spinbutton_value_changed"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). If empty plugin is used with every JID. [not implemented]</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">JabberIDs to include:</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Background color of text entry field in chat window when notification is invoked.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Notification color:</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Message length at which notification is invoked.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Message length:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> </widget> </child> </widget> Modified: branches/plugin-system/plugins/length_notifier/length_notifier.py =================================================================== --- branches/plugin-system/plugins/length_notifier/length_notifier.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/plugins/length_notifier/length_notifier.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -40,10 +40,6 @@ description = u'''Highlights message entry field in chat window when given length of message is exceeded.''' authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] homepage = u'http://blog.bilinski.it' - - #@log_calls('LengthNotifierPlugin') - #def __init__(self): - #super(LengthNotifierPlugin, self).__init__() @log_calls('LengthNotifierPlugin') def init(self): @@ -107,7 +103,8 @@ if d['prev_color']: tv.modify_base(gtk.STATE_NORMAL, d['prev_color']) except AttributeError, error: - log.debug('Length Notifier Plugin was (probably) never connected with this chat window.\n Error: %s' % (error)) + pass + #log.debug('Length Notifier Plugin was (probably) never connected with this chat window.\n Error: %s' % (error)) @log_calls('LengthNotifierPlugin') def jid_is_ok(self, jid): Modified: branches/plugin-system/plugins/roster_buttons/plugin.py =================================================================== --- branches/plugin-system/plugins/roster_buttons/plugin.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/plugins/roster_buttons/plugin.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -40,14 +40,9 @@ description = u'''Adds quick action buttons to roster window.''' authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] homepage = u'http://blog.bilinski.it' - - #@log_calls('RosterButtonsPlugin') - #def __init__(self): - #super(RosterButtonsPlugin, self).__init__() @log_calls('RosterButtonsPlugin') def init(self): - #log.debug('self.__path__==%s'%(self.__path__)) self.GLADE_FILE_PATH = self.local_file_path('roster_buttons.glade') self.roster_vbox = gajim.interface.roster.xml.get_widget('roster_vbox2') Modified: branches/plugin-system/src/chat_control.py =================================================================== --- branches/plugin-system/src/chat_control.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/chat_control.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -294,7 +294,15 @@ self.smooth = True + # PluginSystem: adding GUI extension point for ChatControlBase + # instance object (also subclasses, eg. ChatControl or GroupchatControl) gajim.plugin_manager.gui_extension_point('chat_control_base', self) + + def shutdown(self): + # PluginSystem: removing GUI extension points connected with ChatControlBase + # instance object + gajim.plugin_manager.remove_gui_extension_point('chat_control_base', self) + gajim.plugin_manager.remove_gui_extension_point('chat_control_base_draw_banner', self) def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend an option to switch languages''' @@ -1144,6 +1152,8 @@ # restore previous conversation self.restore_conversation() + # PluginSystem: adding GUI extension point for this ChatControl + # instance object gajim.plugin_manager.gui_extension_point('chat_control', self) def on_avatar_eventbox_enter_notify_event(self, widget, event): @@ -2022,6 +2032,13 @@ self.reset_kbd_mouse_timeout_vars() def shutdown(self): + # PluginSystem: calling shutdown of super class (ChatControlBase) to let it remove + # it's GUI extension points + super(ChatControl, self).shutdown() + # PluginSystem: removing GUI extension points connected with ChatControl + # instance object + gajim.plugin_manager.remove_gui_extension_point('chat_control', self) + # destroy banner tooltip - bug #pygtk for that! self.status_tooltip.destroy() Modified: branches/plugin-system/src/groupchat_control.py =================================================================== --- branches/plugin-system/src/groupchat_control.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/groupchat_control.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -1636,6 +1636,11 @@ status = self.subject) def shutdown(self, status='offline'): + # PluginSystem: calling shutdown of super class (ChatControlBase) + # to let it remove it's GUI extension points + super(GroupchatControl, self).shutdown() + + # destroy banner tooltip - bug #pygtk for that! self.subject_tooltip.destroy() gajim.connections[self.account].send_gc_status(self.nick, self.room_jid, Modified: branches/plugin-system/src/message_control.py =================================================================== --- branches/plugin-system/src/message_control.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/message_control.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -28,7 +28,7 @@ #################### -class MessageControl: +class MessageControl(object): '''An abstract base widget that can embed in the gtk.Notebook of a MessageWindow''' def __init__(self, type_id, parent_win, widget_name, contact, account, resource = None): Modified: branches/plugin-system/src/plugins/gui.py =================================================================== --- branches/plugin-system/src/plugins/gui.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/plugins/gui.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -170,7 +170,7 @@ @log_calls('PluginsWindow') def on_configure_plugin_button_clicked(self, widget): - log.debug('widget: %s'%(widget)) + #log.debug('widget: %s'%(widget)) selection = self.installed_plugins_treeview.get_selection() model, iter = selection.get_selected() if iter: Modified: branches/plugin-system/src/plugins/helpers.py =================================================================== --- branches/plugin-system/src/plugins/helpers.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/plugins/helpers.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -50,7 +50,8 @@ Decorator class for functions to easily log when they are entered and left. ''' - filter_out_classes = ['PluginManager'] + filter_out_classes = ['GajimPlugin', 'GajimPluginConfig', + 'GajimPluginConfigDialog', 'PluginsWindow'] ''' List of classes from which no logs should be emited when methods are called, eventhough `log_calls` decorator is used. @@ -129,10 +130,11 @@ def __call__(cls,*args,**kw): if cls.instance is None: cls.instance=super(Singleton,cls).__call__(*args,**kw) - log.debug('%(classname)s - new instance created'%{ - 'classname' : cls.__name__}) + #log.debug('%(classname)s - new instance created'%{ + #'classname' : cls.__name__}) else: - log.debug('%(classname)s - returning already existing instance'%{ - 'classname' : cls.__name__}) + pass + #log.debug('%(classname)s - returning already existing instance'%{ + #'classname' : cls.__name__}) return cls.instance \ No newline at end of file Modified: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/plugins/plugin.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -130,10 +130,22 @@ def save_config(self): self.config.save() - @log_calls('GajimPlugin') + @log_calls('GajimPlugin') def load_config(self): self.config.load() + def __eq__(self, plugin): + if self.short_name == plugin.short_name: + return True + + return False + + def __ne__(self, plugin): + if self.short_name != plugin.short_name: + return True + + return False + @log_calls('GajimPlugin') def local_file_path(self, file_name): return os.path.join(self.__path__, file_name) Modified: branches/plugin-system/src/plugins/pluginmanager.py =================================================================== --- branches/plugin-system/src/plugins/pluginmanager.py 2008-08-02 17:29:32 UTC (rev 10112) +++ branches/plugin-system/src/plugins/pluginmanager.py 2008-08-03 13:29:11 UTC (rev 10113) @@ -96,11 +96,11 @@ for path in gajim.PLUGINS_DIRS: self.add_plugins(PluginManager.scan_dir_for_plugins(path)) - log.debug('plugins: %s'%(self.plugins)) + #log.debug('plugins: %s'%(self.plugins)) self._activate_all_plugins_from_global_config() - log.debug('active: %s'%(self.active_plugins)) + #log.debug('active: %s'%(self.active_plugins)) @log_calls('PluginManager') def _plugin_has_entry_in_global_config(self, plugin): @@ -120,11 +120,16 @@ and adding class from reloaded module or ignoring adding plug-in? ''' plugin = plugin_class() - if not self._plugin_has_entry_in_global_config(plugin): - self._create_plugin_entry_in_global_config(plugin) - - self.plugins.append(plugin) - plugin.active = False + + if plugin not in self.plugins: + if not self._plugin_has_entry_in_global_config(plugin): + self._create_plugin_entry_in_global_config(plugin) + + self.plugins.append(plugin) + plugin.active = False + else: + log.info('Not loading plugin %s v%s from module %s (identified by short name: %s). Plugin already loaded.'%( + plugin.name, plugin.version, plugin.__module__, plugin.short_name)) @log_calls('PluginManager') def add_plugins(self, plugin_classes): @@ -134,7 +139,9 @@ @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' - Invokes all handlers (from plugins) for particular GUI extension point. + Invokes all handlers (from plugins) for particular GUI extension point + and adds it to collection for further processing (eg. by plugins not active + yet). :param gui_extpoint_name: name of GUI extension point. :type gui_extpoint_name: unicode @@ -157,10 +164,69 @@ self._add_gui_extension_point_call_to_list(gui_extpoint_name, *args) self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args) + + @log_calls('PluginManager') + def remove_gui_extension_point(self, gui_extpoint_name, *args): + ''' + Removes GUI extension point from collection held by `PluginManager`. + + From this point this particular extension point won't be visible + to plugins (eg. it won't invoke any handlers when plugin is activated). + + GUI extension point is removed completely (there is no way to recover it + from inside `PluginManager`). + + Removal is needed when instance object that given extension point was + connect with is destroyed (eg. ChatControl is closed or context menu + is hidden). + + Each `PluginManager.gui_extension_point` call should have a call of + `PluginManager.remove_gui_extension_point` related to it. + + :note: in current implementation different arguments mean different + extension points. The same arguments and the same name mean + the same extension point. + :todo: instead of using argument to identify which extpoint should be + removed, maybe add additional 'id' argument - this would work similar + hash in Python objects. 'id' would be calculated based on arguments + passed or on anything else (even could be constant). This would give + core developers (that add new extpoints) more freedom, but is this + necessary? + + :param gui_extpoint_name: name of GUI extension point. + :type gui_extpoint_name: unicode + :param args: arguments that `PluginManager.gui_extension_point` was + called with for this extension point. This is used (along with + extension point name) to identify element to be removed. + :type args: tuple + ''' + log.debug('name: %s\n args: %s'%(gui_extpoint_name, args)) + @log_calls('PluginManager') def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): - self.gui_extension_points.setdefault(gui_extpoint_name, []).append(args) + ''' + Adds GUI extension point call to list of calls. + + This is done only if such call hasn't been added already + (same extension point name and same arguments). + + :note: This is assumption that GUI extension points are different only + if they have different name or different arguments. + + :param gui_extpoint_name: GUI extension point name used to identify it + by plugins. + :type gui_extpoint_name: str + + :param args: parameters to be passed to extension point handlers + (typically and object that invokes `gui_extension_point`; however, + this can be practically anything) + :type args: tuple + + ''' + if ((gui_extpoint_name not in self.gui_extension_points) + or (args not in self.gui_extension_points[gui_extpoint_name])): + self.gui_extension_points.setdefault(gui_extpoint_name, []).append(args) @log_calls('PluginManager') def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, *args): @@ -287,57 +353,62 @@ #log.debug(sys.path) for elem_name in dir_list: - log.debug('- "%s"'%(elem_name)) + #log.debug('- "%s"'%(elem_name)) file_path = os.path.join(path, elem_name) - log.debug(' "%s"'%(file_path)) + #log.debug(' "%s"'%(file_path)) module = None if os.path.isfile(file_path) and fnmatch.fnmatch(file_path,'*.py'): module_name = os.path.splitext(elem_name)[0] - log.debug('Possible module detected.') + #log.debug('Possible module detected.') try: module = __import__(module_name) - log.debug('Module imported.') + #log.debug('Module imported.') except ValueError, value_error: - log.debug('Module not imported successfully. ValueError: %s'%(value_error)) + pass + #log.debug('Module not imported successfully. ValueError: %s'%(value_error)) except ImportError, import_error: - log.debug('Module not imported successfully. ImportError: %s'%(import_error)) + pass + #log.debug('Module not imported successfully. ImportError: %s'%(import_error)) elif os.path.isdir(file_path): module_name = elem_name file_path += os.path.sep - log.debug('Possible package detected.') + #log.debug('Possible package detected.') try: module = __import__(module_name) - log.debug('Package imported.') + #log.debug('Package imported.') except ValueError, value_error: - log.debug('Package not imported successfully. ValueError: %s'%(value_error)) + pass + #log.debug('Package not imported successfully. ValueError: %s'%(value_error)) except ImportError, import_error: - log.debug('Package not imported successfully. ImportError: %s'%(import_error)) + pass + #log.debug('Package not imported successfully. ImportError: %s'%(import_error)) if module: - log.debug('Attributes processing started') + #log.debug('Attributes processing started') for module_attr_name in [attr_name for attr_name in dir(module) if not (attr_name.startswith('__') or attr_name.endswith('__'))]: module_attr = getattr(module, module_attr_name) - log.debug('%s : %s'%(module_attr_name, module_attr)) + #log.debug('%s : %s'%(module_attr_name, module_attr)) try: if issubclass(module_attr, GajimPlugin) and \ not module_attr is GajimPlugin: - log.debug('is subclass of GajimPlugin') + #log.debug('is subclass of GajimPlugin') #log.debug('file_path: %s\nabspath: %s\ndirname: %s'%(file_path, os.path.abspath(file_path), os.path.dirname(os.path.abspath(file_path)))) #log.debug('file_path: %s\ndirname: %s\nabspath: %s'%(file_path, os.path.dirname(file_path), os.path.abspath(os.path.dirname(file_path)))) module_attr.__path__ = os.path.abspath(os.path.dirname(file_path)) plugins_found.append(module_attr) except TypeError, type_error: - log.debug('module_attr: %s, error : %s'%( - module_name+'.'+module_attr_name, - type_error)) + pass + #log.debug('module_attr: %s, error : %s'%( + #module_name+'.'+module_attr_name, + #type_error)) - log.debug(module) + #log.debug(module) return plugins_found \ No newline at end of file

1 0

[commit-gajim] r10112 - in branches/plugin-system/plugins: . banner_tweaks
by vardo＠gajim.org 02 Aug '08

02 Aug '08

Author: vardo Date: 2008-08-02 19:29:32 +0200 (Sat, 02 Aug 2008) New Revision: 10112 Removed: branches/plugin-system/plugins/length_notifier.py Modified: branches/plugin-system/plugins/banner_tweaks/plugin.py Log: Banner Tweaks plugin has all (four) options implemented. Modified: branches/plugin-system/plugins/banner_tweaks/plugin.py =================================================================== --- branches/plugin-system/plugins/banner_tweaks/plugin.py 2008-08-02 08:14:30 UTC (rev 10111) +++ branches/plugin-system/plugins/banner_tweaks/plugin.py 2008-08-02 17:29:32 UTC (rev 10112) @@ -32,8 +32,11 @@ import sys import gtk +import gobject +import message_control from common import i18n from common import gajim +from common import helpers from plugins import GajimPlugin from plugins.helpers import log, log_calls @@ -83,24 +86,84 @@ if not self.config['show_banner_image']: banner_status_img = chat_control.xml.get_widget('banner_status_image') banner_status_img.clear() + + # TODO: part below repeats a lot of code from ChatControl.draw_banner_text() + # This could be rewritten using re module: getting markup text from + # banner_name_label and replacing some elements based on plugin config. + # Would it be faster? + if self.config['show_banner_resource'] or self.config['banner_small_fonts']: + banner_name_label = chat_control.xml.get_widget('banner_name_label') + label_text = banner_name_label.get_label() + log.debug('label_text = "%s"'%(label_text)) + + contact = chat_control.contact + jid = contact.jid + name = contact.get_shown_name() + if chat_control.resource: + name += '/' + chat_control.resource + elif contact.resource and self.config['show_banner_resource']: + name += '/' + contact.resource + + if chat_control.TYPE_ID == message_control.TYPE_PM: + name = _('%(nickname)s from group chat %(room_name)s') %\ + {'nickname': name, 'room_name': chat_control.room_name} + name = gobject.markup_escape_text(name) + + # We know our contacts nick, but if another contact has the same nick + # in another account we need to also display the account. + # except if we are talking to two different resources of the same contact + acct_info = '' + for account in gajim.contacts.get_accounts(): + if account == chat_control.account: + continue + if acct_info: # We already found a contact with same nick + break + for jid in gajim.contacts.get_jid_list(account): + other_contact_ = \ + gajim.contacts.get_first_contact_from_jid(account, jid) + if other_contact_.get_shown_name() == chat_control.contact.get_shown_name(): + acct_info = ' (%s)' % \ + gobject.markup_escape_text(chat_control.account) + break + + font_attrs, font_attrs_small = chat_control.get_font_attrs() + if self.config['banner_small_fonts']: + font_attrs = font_attrs_small + + st = gajim.config.get('displayed_chat_state_notifications') + cs = contact.chatstate + if cs and st in ('composing_only', 'all'): + if contact.show == 'offline': + chatstate = '' + elif contact.composing_xep == 'XEP-0085': + if st == 'all' or cs == 'composing': + chatstate = helpers.get_uf_chatstate(cs) + else: + chatstate = '' + elif contact.composing_xep == 'XEP-0022': + if cs in ('composing', 'paused'): + # only print composing, paused + chatstate = helpers.get_uf_chatstate(cs) + else: + chatstate = '' + else: + # When does that happen ? See [7797] and [7804] + chatstate = helpers.get_uf_chatstate(cs) + + label_text = '%s%s %s' % \ + (font_attrs, name, font_attrs_small, acct_info, chatstate) + else: + # weight="heavy" size="x-large" + label_text = '%s%s' % \ + (font_attrs, name, font_attrs_small, acct_info) + + banner_name_label.set_markup(label_text) + def chat_control_base_draw_banner_deactivation(self, chat_control): pass #chat_control.draw_banner() - - #@log_calls('BannerTweaksPlugin') - #def connect_with_chat_control(self, chat_control): - #d = {} - #banner_status_img = chat_control.xml.get_widget('banner_status_image') - #h_id = banner_status_img.connect('state-changed', self.on_banner_status_img_state_changed, chat_control) - #d['banner_img_h_id'] = h_id - - #chat_control.banner_tweaks_plugin_data = d - #@log_calls('BannerTweaksPlugin') - #def disconnect_from_chat_control(self, chat_control): - #pass - class BannerTweaksPluginConfigDialog(GajimPluginConfigDialog): def init(self): self.GLADE_FILE_PATH = self.plugin.local_file_path('config_dialog.glade') Deleted: branches/plugin-system/plugins/length_notifier.py =================================================================== --- branches/plugin-system/plugins/length_notifier.py 2008-08-02 08:14:30 UTC (rev 10111) +++ branches/plugin-system/plugins/length_notifier.py 2008-08-02 17:29:32 UTC (rev 10112) @@ -1,108 +0,0 @@ -# -*- coding: utf-8 -*- - -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -''' -Message length notifier plugin. - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 1st June 2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' - -import sys - -import gtk - -from plugins import GajimPlugin -from plugins.helpers import log, log_calls - -class LengthNotifierPlugin(GajimPlugin): - name = u'Message Length Notifier' - short_name = u'length_notifier' - version = u'0.1' - description = u'''Highlights message entry field in chat window when given length of message is exceeded.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' - - #@log_calls('LengthNotifierPlugin') - #def __init__(self): - #super(LengthNotifierPlugin, self).__init__() - - @log_calls('LengthNotifierPlugin') - def init(self): - #self.config_dialog = None - - self.gui_extension_points = { - 'chat_control' : (self.connect_with_chat_control, - self.disconnect_from_chat_control) - } - - self.MESSAGE_WARNING_LENGTH = 140 - self.WARNING_COLOR = gtk.gdk.color_parse('#F0DB3E') - self.JIDS = [] - - @log_calls('LengthNotifierPlugin') - def textview_length_warning(self, tb, chat_control): - tv = chat_control.msg_textview - d = chat_control.length_notifier_plugin_data - t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) - if t: - len_t = len(t) - #print("len_t: %d"%(len_t)) - if len_t>self.MESSAGE_WARNING_LENGTH: - if not d['prev_color']: - d['prev_color'] = tv.style.copy().base[gtk.STATE_NORMAL] - tv.modify_base(gtk.STATE_NORMAL, self.WARNING_COLOR) - elif d['prev_color']: - tv.modify_base(gtk.STATE_NORMAL, d['prev_color']) - d['prev_color'] = None - - @log_calls('LengthNotifierPlugin') - def connect_with_chat_control(self, chat_control): - jid = chat_control.contact.jid - if self.jid_is_ok(jid): - d = {'prev_color' : None} - tv = chat_control.msg_textview - tb = tv.get_buffer() - h_id = tb.connect('changed', self.textview_length_warning, chat_control) - d['h_id'] = h_id - - t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) - if t: - len_t = len(t) - if len_t>self.MESSAGE_WARNING_LENGTH: - d['prev_color'] = tv.style.copy().base[gtk.STATE_NORMAL] - tv.modify_base(gtk.STATE_NORMAL, self.WARNING_COLOR) - - chat_control.length_notifier_plugin_data = d - - return True - - return False - - @log_calls('LengthNotifierPlugin') - def disconnect_from_chat_control(self, chat_control): - d = chat_control.length_notifier_plugin_data - tv = chat_control.msg_textview - tv.get_buffer().disconnect(d['h_id']) - if d['prev_color']: - tv.modify_base(gtk.STATE_NORMAL, d['prev_color']) - - @log_calls('LengthNotifierPlugin') - def jid_is_ok(self, jid): - return True \ No newline at end of file

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008