changeset 2b03ab714d38 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=2b03ab714d38
description: merge presence handling modifications changes
diffstat:
data/gui/chat_control.ui | 18 +
data/gui/groupchat_control.ui | 14 +
plugins/Makefile.am | 2 +-
plugins/acronyms_expander.py | 102 ----------
plugins/acronyms_expander/__init__.py | 1 +
plugins/acronyms_expander/acronyms_expander.py | 96 +++++++++
plugins/acronyms_expander/manifest.ini | 9 +
plugins/banner_tweaks/manifest.ini | 10 +
plugins/banner_tweaks/plugin.py | 9 -
plugins/dbus_plugin/manifest.ini | 10 +
plugins/dbus_plugin/plugin.py | 7 -
plugins/events_dump/manifest.ini | 8 +
plugins/events_dump/plugin.py | 6 -
plugins/google_translation/manifest.ini | 8 +
plugins/google_translation/plugin.py | 6 -
plugins/length_notifier/length_notifier.py | 6 -
plugins/length_notifier/manifest.ini | 9 +
plugins/new_events_example/manifest.ini | 11 +
plugins/new_events_example/plugin.py | 6 -
plugins/roster_buttons/manifest.ini | 10 +
plugins/roster_buttons/plugin.py | 6 -
plugins/snarl_notifications/manifest.ini | 11 +
plugins/snarl_notifications/plugin.py | 7 -
src/common/connection_handlers.py | 3 -
src/common/connection_handlers_events.py | 3 -
src/common/jingle_rtp.py | 3 +
src/config.py | 2 -
src/dialogs.py | 9 +-
src/groupchat_control.py | 2 -
src/plugins/gui.py | 29 +-
src/plugins/pluginmanager.py | 252 +++++++++++++-----------
src/statusicon.py | 6 +-
32 files changed, 386 insertions(+), 295 deletions(-)
diffs (truncated from 1286 to 300 lines):
diff -r ce68139c3179 -r 2b03ab714d38 data/gui/chat_control.ui
--- a/data/gui/chat_control.ui Thu Sep 23 20:46:47 2010 +0200
+++ b/data/gui/chat_control.ui Thu Sep 23 21:43:07 2010 +0200
@@ -270,6 +270,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a list
of emoticons (Alt+M)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -292,6 +294,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a list
of formattings</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -324,6 +328,8 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Add this
contact to roster (Ctrl+D)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image9">
@@ -365,6 +371,8 @@
<object class="GtkToggleButton" id="audio_togglebutton">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle audio
session</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="audio_image">
@@ -383,6 +391,8 @@
<object class="GtkToggleButton" id="video_togglebutton">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle video
session</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="video_image">
@@ -403,6 +413,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Invite
contacts to the conversation (Ctrl+G)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -425,6 +437,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show the
contact's profile (Ctrl+I)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -447,6 +461,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Browse the
chat history (Ctrl+H)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -480,6 +496,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a menu
of advanced functions (Alt+D)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
diff -r ce68139c3179 -r 2b03ab714d38 data/gui/groupchat_control.ui
--- a/data/gui/groupchat_control.ui Thu Sep 23 20:46:47 2010 +0200
+++ b/data/gui/groupchat_control.ui Thu Sep 23 21:43:07 2010 +0200
@@ -166,6 +166,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a list
of emoticons (Alt+M)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="emoticons_button_image">
@@ -193,6 +195,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a list of
formattings</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
@@ -224,6 +228,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Change your
nickname (Ctrl+N)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image4">
@@ -246,6 +252,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Change the room's
subject (Alt+T)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image6">
@@ -269,6 +277,8 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Bookmark this
room (Ctrl+B)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image7">
@@ -291,6 +301,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Browse the chat
history (Ctrl+H)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image8">
@@ -323,6 +335,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Show a menu of
advanced functions (Alt+D)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
diff -r ce68139c3179 -r 2b03ab714d38 plugins/Makefile.am
--- a/plugins/Makefile.am Thu Sep 23 20:46:47 2010 +0200
+++ b/plugins/Makefile.am Thu Sep 23 21:43:07 2010 +0200
@@ -3,8 +3,8 @@
gajimpluginsdir = $(gajim_pluginsdir)
nobase_dist_gajimplugins_PYTHON = \
- $(srcdir)/*.py \
$(srcdir)/*/*.py \
+ $(srcdir)/*/manifest.ini \
$(srcdir)/*/*.ui
MAINTAINERCLEANFILES = Makefile.in
diff -r ce68139c3179 -r 2b03ab714d38 plugins/acronyms_expander.py
--- a/plugins/acronyms_expander.py Thu Sep 23 20:46:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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/>.
-##
-
-'''
-Acronyms expander plugin.
-
-:author: Mateusz Biliński <[email protected]>
-:since: 9th June 2008
-:copyright: Copyright (2008) Mateusz Biliński <[email protected]>
-:license: GPL
-'''
-
-import sys
-
-import gtk
-import gobject
-
-from plugins import GajimPlugin
-from plugins.helpers import log, log_calls
-
-class AcronymsExpanderPlugin(GajimPlugin):
- name = u'Acronyms Expander'
- short_name = u'acronyms_expander'
- version = u'0.1'
- description = u'''Replaces acronyms (or other strings) with given
expansions/substitutes.'''
- authors = [u'Mateusz Biliński <[email protected]>']
- homepage = u'http://blog.bilinski.it'
-
- @log_calls('AcronymsExpanderPlugin')
- def init(self):
- self.config_dialog = None
-
- self.gui_extension_points = {
- 'chat_control_base': (self.connect_with_chat_control_base,
- self.disconnect_from_chat_control_base)
- }
-
- self.config_default_values = {
- 'INVOKER': (' ', _('')),
- 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual',
- '/slap': '/me slaps',
- 'PS-': 'plug-in system',
- 'G-': 'Gajim',
- 'GNT-': 'http://trac.gajim.org/newticket',
- 'GW-': 'http://trac.gajim.org/',
- 'GTS-': 'http://trac.gajim.org/report',
- },
- _('')),
- }
-
- @log_calls('AcronymsExpanderPlugin')
- def textbuffer_live_acronym_expander(self, tb):
- """
- @param tb gtk.TextBuffer
- """
- #assert isinstance(tb,gtk.TextBuffer)
- 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)))
- if t and t[-1] == INVOKER:
- #log.debug('changing msg text')
- base, sep, head=t[:-1].rpartition(INVOKER)
- 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("setting text: '%s'"%(t))
- gobject.idle_add(tb.set_text, t)
-
- @log_calls('AcronymsExpanderPlugin')
- def connect_with_chat_control_base(self, chat_control):
- d = {}
- tv = chat_control.msg_textview
- tb = tv.get_buffer()
- h_id = tb.connect('changed', self.textbuffer_live_acronym_expander)
- d['h_id'] = h_id
-
- chat_control.acronyms_expander_plugin_data = d
-
- return True
-
- @log_calls('AcronymsExpanderPlugin')
- def disconnect_from_chat_control_base(self, chat_control):
- d = chat_control.acronyms_expander_plugin_data
- tv = chat_control.msg_textview
- tv.get_buffer().disconnect(d['h_id'])
diff -r ce68139c3179 -r 2b03ab714d38 plugins/acronyms_expander/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/acronyms_expander/__init__.py Thu Sep 23 21:43:07 2010 +0200
@@ -0,0 +1,1 @@
+from acronyms_expander import AcronymsExpanderPlugin
diff -r ce68139c3179 -r 2b03ab714d38
plugins/acronyms_expander/acronyms_expander.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/acronyms_expander/acronyms_expander.py Thu Sep 23 21:43:07
2010 +0200
@@ -0,0 +1,96 @@
+# -*- 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/>.
+##
+
+'''
+Acronyms expander plugin.
+
+:author: Mateusz Biliński <[email protected]>
+:since: 9th June 2008
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
