beginning of the group chat support
do not create a new connexion in the core if it already exists
This commit is contained in:
Yann Leboulanger
parent
22192e503d
commit
4658ab8927
|
|
@ -31,6 +31,7 @@ class GajimPlugin:
|
|||
|
||||
def load(self):
|
||||
thr = common.thread.GajimThread(self.name, self.queueIn, self.queueOut)
|
||||
thr.setDaemon(1)
|
||||
thr.start()
|
||||
# END load
|
||||
# END GajimPlugin
|
||||
|
|
|
|||
57
core/core.py
57
core/core.py
|
|
@ -176,10 +176,14 @@ class GajimCore:
|
|||
|
||||
def messageCB(self, con, msg):
|
||||
"""Called when we recieve a message"""
|
||||
if msg.getType() == 'error':
|
||||
typ = msg.getType()
|
||||
if typ == 'error':
|
||||
self.hub.sendPlugin('MSGERROR', self.connexions[con], \
|
||||
(str(msg.getFrom()), msg.getErrorCode(), msg.getError(), \
|
||||
msg.getBody()))
|
||||
elif typ == 'groupchat':
|
||||
self.hub.sendPlugin('GC_MSG', self.connexions[con], \
|
||||
(str(msg.getFrom()), msg.getBody()))
|
||||
else:
|
||||
self.hub.sendPlugin('MSG', self.connexions[con], \
|
||||
(str(msg.getFrom()), msg.getBody()))
|
||||
|
|
@ -258,20 +262,31 @@ class GajimCore:
|
|||
name = self.cfgParser.tab[account]["name"]
|
||||
password = self.cfgParser.tab[account]["password"]
|
||||
ressource = self.cfgParser.tab[account]["ressource"]
|
||||
if self.cfgParser.tab[account]["use_proxy"]:
|
||||
proxy = {"host":self.cfgParser.tab[account]["proxyhost"]}
|
||||
proxy["port"] = self.cfgParser.tab[account]["proxyport"]
|
||||
else:
|
||||
proxy = None
|
||||
if self.log:
|
||||
con = common.jabber.Client(host = hostname, debug = [], \
|
||||
log = sys.stderr, connection=common.xmlstream.TCP, port=5222, \
|
||||
proxy = proxy)
|
||||
else:
|
||||
con = common.jabber.Client(host = hostname, debug = [], log = None, \
|
||||
connection=common.xmlstream.TCP, port=5222, proxy = proxy)
|
||||
#debug = [common.jabber.DBG_ALWAYS], log = sys.stderr, \
|
||||
#connection=common.xmlstream.TCP_SSL, port=5223, proxy = proxy)
|
||||
|
||||
#create connexion if it doesn't already existe
|
||||
con = None
|
||||
for conn in self.connexions:
|
||||
if self.connexions[conn] == account:
|
||||
con = conn
|
||||
if not con:
|
||||
if self.cfgParser.tab[account]["use_proxy"]:
|
||||
proxy = {"host":self.cfgParser.tab[account]["proxyhost"]}
|
||||
proxy["port"] = self.cfgParser.tab[account]["proxyport"]
|
||||
else:
|
||||
proxy = None
|
||||
if self.log:
|
||||
con = common.jabber.Client(host = hostname, debug = [], \
|
||||
log = sys.stderr, connection=common.xmlstream.TCP, port=5222, \
|
||||
proxy = proxy)
|
||||
else:
|
||||
con = common.jabber.Client(host = hostname, debug = [], log = None,\
|
||||
connection=common.xmlstream.TCP, port=5222, proxy = proxy)
|
||||
#debug = [common.jabber.DBG_ALWAYS], log = sys.stderr, \
|
||||
#connection=common.xmlstream.TCP_SSL, port=5223, proxy = proxy)
|
||||
con.setDisconnectHandler(self.disconnectedCB)
|
||||
con.registerHandler('message', self.messageCB)
|
||||
con.registerHandler('presence', self.presenceCB)
|
||||
con.registerHandler('iq',self.vCardCB,'result')#common.jabber.NS_VCARD)
|
||||
try:
|
||||
con.connect()
|
||||
except IOError, e:
|
||||
|
|
@ -292,13 +307,12 @@ class GajimCore:
|
|||
self.hub.sendPlugin('WARNING', None, _("Couldn't connect to %s : %s") \
|
||||
% (hostname, e))
|
||||
return 0
|
||||
except:
|
||||
sys.exc_info()[1][0]
|
||||
sys.exc_info()[1][1]
|
||||
else:
|
||||
log.debug("Connected to server")
|
||||
|
||||
con.registerHandler('message', self.messageCB)
|
||||
con.registerHandler('presence', self.presenceCB)
|
||||
con.registerHandler('iq',self.vCardCB,'result')#common.jabber.NS_VCARD)
|
||||
con.setDisconnectHandler(self.disconnectedCB)
|
||||
#BUG in jabberpy library : if hostname is wrong : "boucle"
|
||||
if con.auth(name, password, ressource):
|
||||
self.connexions[con] = account
|
||||
|
|
@ -596,6 +610,11 @@ class GajimCore:
|
|||
self.hub.register(ev[1], msg)
|
||||
elif ev[0] == 'EXEC_PLUGIN':
|
||||
self.loadPlugins(ev[2])
|
||||
#('GC_JOIN', account, (nick, room, server, passwd))
|
||||
elif ev[0] == 'GC_JOIN':
|
||||
p = common.jabber.Presence(to='%s@%s/%s' % (ev[2][1], ev[2][2], \
|
||||
ev[2][0]))
|
||||
con.send(p)
|
||||
else:
|
||||
log.debug(_("Unknown Command %s") % ev[0])
|
||||
if self.mode == 'server':
|
||||
|
|
|
|||
|
|
@ -125,7 +125,6 @@ class vCard_Window:
|
|||
self.xml.signal_connect('on_retrieve_clicked', self.on_retrieve)
|
||||
self.xml.signal_connect('on_publish_clicked', self.on_publish)
|
||||
|
||||
|
||||
class preference_Window:
|
||||
"""Class for Preferences window"""
|
||||
def delete_event(self, widget):
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image138">
|
||||
<widget class="GtkImage" id="image161">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-convert</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
<signal name="activate" handler="on_preferences_activate" last_modification_time="Wed, 22 Oct 2003 21:18:29 GMT"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image139">
|
||||
<widget class="GtkImage" id="image162">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-preferences</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<signal name="activate" handler="on_accounts_activate" last_modification_time="Wed, 22 Oct 2003 21:18:21 GMT"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image140">
|
||||
<widget class="GtkImage" id="image163">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-select-color</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
<signal name="activate" handler="on_browse_agents_activate" last_modification_time="Wed, 12 Nov 2003 10:50:33 GMT"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image141">
|
||||
<widget class="GtkImage" id="image164">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-find</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkMenuItem" id="separatormenuitem1">
|
||||
<widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image142">
|
||||
<widget class="GtkImage" id="image165">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-add</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -158,7 +158,16 @@
|
|||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkMenuItem" id="separator1">
|
||||
<widget class="GtkMenuItem" id="join_gc">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Join Groupchat</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_join_gc_activate" last_modification_time="Tue, 03 Aug 2004 22:15:03 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSeparatorMenuItem" id="separator1">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
|
@ -171,7 +180,7 @@
|
|||
<signal name="activate" handler="on_about_activate" last_modification_time="Fri, 03 Oct 2003 12:49:50 GMT"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image143">
|
||||
<widget class="GtkImage" id="image166">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-help</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -193,7 +202,7 @@
|
|||
<accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="image144">
|
||||
<widget class="GtkImage" id="image167">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-quit</property>
|
||||
<property name="icon_size">1</property>
|
||||
|
|
@ -7127,7 +7136,7 @@ when NOT online</property>
|
|||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkWindow" id="Group_chat">
|
||||
<widget class="GtkWindow" id="Gc">
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Group chat</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
|
|
@ -7140,6 +7149,7 @@ when NOT online</property>
|
|||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<signal name="destroy" handler="gtk_widget_destroy" last_modification_time="Tue, 03 Aug 2004 22:05:41 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox27">
|
||||
|
|
@ -7208,7 +7218,6 @@ when NOT online</property>
|
|||
<widget class="GtkVPaned" id="vpaned2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="position">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkNotebook" id="notebook">
|
||||
|
|
@ -7236,7 +7245,7 @@ when NOT online</property>
|
|||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTreeView" id="treeview">
|
||||
<widget class="GtkTreeView" id="list">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="headers_visible">False</property>
|
||||
|
|
@ -7262,7 +7271,7 @@ when NOT online</property>
|
|||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTextView" id="textview1">
|
||||
<widget class="GtkTextView" id="conversation">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
|
|
@ -7328,7 +7337,7 @@ when NOT online</property>
|
|||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTextView" id="textview2">
|
||||
<widget class="GtkTextView" id="message">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
|
|
@ -7363,4 +7372,333 @@ when NOT online</property>
|
|||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkWindow" id="Join_gc">
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Join Groupchat</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<signal name="destroy" handler="gtk_widget_destroy" last_modification_time="Tue, 03 Aug 2004 22:05:29 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox28">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTable" id="table15">
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">4</property>
|
||||
<property name="n_columns">2</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">5</property>
|
||||
<property name="column_spacing">10</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label142">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Nickname</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label143">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Room</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label144">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Server</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label145">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Password</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="bottom_attach">4</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="entry_nick">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char" translatable="yes">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="entry_room">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char" translatable="yes">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="entry_server">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char" translatable="yes">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
</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"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="entry_pass">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">3</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char" translatable="yes">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="bottom_attach">4</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHSeparator" id="hseparator9">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHButtonBox" id="hbuttonbox12">
|
||||
<property name="border_width">10</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
<property name="spacing">20</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="button23">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-cancel</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_cancel_clicked" last_modification_time="Tue, 03 Aug 2004 22:06:07 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="button24">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_join_clicked" last_modification_time="Tue, 03 Aug 2004 22:06:23 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment25">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox37">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image148">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-apply</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label146">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Join</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
</glade-interface>
|
||||
|
|
|
|||
|
|
@ -298,6 +298,92 @@ class message_Window:
|
|||
if plugin.queues[account].has_key(user.jid):
|
||||
self.read_queue(plugin.queues[account][user.jid])
|
||||
|
||||
class gc:
|
||||
def delete_event(self, widget):
|
||||
"""close window"""
|
||||
del self.plugin.windows[self.account]['chats'][self.jid]
|
||||
|
||||
def on_close(self, widget):
|
||||
"""When Cancel button is clicked"""
|
||||
widget.get_toplevel().destroy()
|
||||
|
||||
def print_conversation(self, txt, contact = None, tim = None):
|
||||
"""Print a line in the conversation :
|
||||
if contact is set : it's a message from someone
|
||||
if contact is not set : it's a message from the server"""
|
||||
conversation = self.xml.get_widget('conversation')
|
||||
buffer = conversation.get_buffer()
|
||||
if not txt:
|
||||
txt = ""
|
||||
end_iter = buffer.get_end_iter()
|
||||
if not tim:
|
||||
tim = time.strftime("[%H:%M:%S]")
|
||||
buffer.insert(end_iter, tim)
|
||||
if contact:
|
||||
#TODO it a message from me
|
||||
if contact == '':
|
||||
buffer.insert_with_tags_by_name(end_iter, '<'+contact+'> ', 'outgoing')
|
||||
else:
|
||||
buffer.insert_with_tags_by_name(end_iter, '<' + \
|
||||
contact + '> ', 'incoming')
|
||||
buffer.insert(end_iter, txt+'\n')
|
||||
else:
|
||||
buffer.insert_with_tags_by_name(end_iter, txt+'\n', \
|
||||
'status')
|
||||
#scroll to the end of the textview
|
||||
conversation.scroll_to_mark(buffer.get_mark('end'), 0.1, 0, 0, 0)
|
||||
|
||||
def __init__(self, jid, plugin, account):
|
||||
self.jid = jid
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Gc', APP)
|
||||
self.window = self.xml.get_widget('Gc')
|
||||
conversation = self.xml.get_widget('conversation')
|
||||
buffer = conversation.get_buffer()
|
||||
end_iter = buffer.get_end_iter()
|
||||
buffer.create_mark('end', end_iter, 0)
|
||||
self.tagIn = buffer.create_tag("incoming")
|
||||
color = self.plugin.config['inmsgcolor']
|
||||
self.tagIn.set_property("foreground", color)
|
||||
self.tagOut = buffer.create_tag("outgoing")
|
||||
color = self.plugin.config['outmsgcolor']
|
||||
self.tagOut.set_property("foreground", color)
|
||||
self.tagStatus = buffer.create_tag("status")
|
||||
color = self.plugin.config['statusmsgcolor']
|
||||
self.tagStatus.set_property("foreground", color)
|
||||
self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
|
||||
|
||||
class join_gc:
|
||||
def delete_event(self, widget):
|
||||
"""close window"""
|
||||
del self.plugin.windows['join_gc']
|
||||
|
||||
def on_close(self, widget):
|
||||
"""When Cancel button is clicked"""
|
||||
widget.get_toplevel().destroy()
|
||||
|
||||
def on_join(self, widget):
|
||||
"""When Join button is clicked"""
|
||||
nick = self.xml.get_widget('entry_nick').get_text()
|
||||
room = self.xml.get_widget('entry_room').get_text()
|
||||
server = self.xml.get_widget('entry_server').get_text()
|
||||
passw = self.xml.get_widget('entry_pass').get_text()
|
||||
jid = '%s@%s' % (room, server)
|
||||
self.plugin.windows[self.account]['chats'][jid] = gc(jid, self.plugin,\
|
||||
self.account)
|
||||
#TODO: verify entries
|
||||
self.plugin.send('GC_JOIN', self.account, (nick, room, server, passw))
|
||||
widget.get_toplevel().destroy()
|
||||
|
||||
def __init__(self, plugin, account):
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Join_gc', APP)
|
||||
self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
|
||||
self.xml.signal_connect('on_cancel_clicked', self.on_close)
|
||||
self.xml.signal_connect('on_join_clicked', self.on_join)
|
||||
|
||||
class log_Window:
|
||||
"""Class for bowser agent window :
|
||||
to know the agents on the selected server"""
|
||||
|
|
@ -581,13 +667,15 @@ class roster_Window:
|
|||
model.set_value(iter, 1, name)
|
||||
|
||||
def mkmenu(self):
|
||||
"""create the browse agents and add sub menus"""
|
||||
"""create the browse agents, add and join groupchat sub menus"""
|
||||
if len(self.plugin.accounts.keys()) > 0:
|
||||
self.xml.get_widget('add').set_sensitive(True)
|
||||
self.xml.get_widget('browse_agents').set_sensitive(True)
|
||||
self.xml.get_widget('join_gc').set_sensitive(True)
|
||||
else:
|
||||
self.xml.get_widget('add').set_sensitive(False)
|
||||
self.xml.get_widget('browse_agents').set_sensitive(False)
|
||||
self.xml.get_widget('join_gc').set_sensitive(False)
|
||||
if len(self.plugin.accounts.keys()) > 1:
|
||||
#add
|
||||
menu_sub = gtk.Menu()
|
||||
|
|
@ -605,6 +693,14 @@ class roster_Window:
|
|||
menu_sub.append(item)
|
||||
item.connect("activate", self.on_browse, a)
|
||||
menu_sub.show_all()
|
||||
#join gc
|
||||
menu_sub = gtk.Menu()
|
||||
self.xml.get_widget('join_gc').set_submenu(menu_sub)
|
||||
for a in self.plugin.accounts.keys():
|
||||
item = gtk.MenuItem(a)
|
||||
menu_sub.append(item)
|
||||
item.connect("activate", self.on_join_gc, a)
|
||||
menu_sub.show_all()
|
||||
elif len(self.plugin.accounts.keys()) == 1:
|
||||
#add
|
||||
self.xml.get_widget('add').connect("activate", self.on_add, \
|
||||
|
|
@ -612,6 +708,9 @@ class roster_Window:
|
|||
#agents
|
||||
self.xml.get_widget('browse_agents').connect("activate", \
|
||||
self.on_browse, self.plugin.accounts.keys()[0])
|
||||
#join_gc
|
||||
self.xml.get_widget('join_gc').connect("activate", \
|
||||
self.on_join_gc, self.plugin.accounts.keys()[0])
|
||||
|
||||
def draw_roster(self):
|
||||
"""Clear and draw roster"""
|
||||
|
|
@ -1086,6 +1185,12 @@ class roster_Window:
|
|||
call the add class"""
|
||||
addContact_Window(self.plugin, account)
|
||||
|
||||
def on_join_gc(self, widget, account):
|
||||
"""When Join Groupchat is selected :
|
||||
call the join_gc class"""
|
||||
if not self.plugin.windows.has_key('join_gc'):
|
||||
self.plugin.windows['join_gc'] = join_gc(self.plugin, account)
|
||||
|
||||
def on_about(self, widget):
|
||||
"""When about is selected :
|
||||
call the about class"""
|
||||
|
|
@ -1097,6 +1202,14 @@ class roster_Window:
|
|||
call the accounts class to modify accounts"""
|
||||
if not self.plugin.windows.has_key('accounts'):
|
||||
self.plugin.windows['accounts'] = accounts_Window(self.plugin)
|
||||
|
||||
def close_all(self, dic):
|
||||
"""close all the windows in the given dictionary"""
|
||||
for w in dic.values():
|
||||
if type(w) == type({}):
|
||||
self.close_all(w)
|
||||
else:
|
||||
w.event(gtk.gdk.Event(gtk.gdk.DESTROY))
|
||||
|
||||
def on_quit(self, widget):
|
||||
"""When we quit the gtk plugin :
|
||||
|
|
@ -1105,8 +1218,10 @@ class roster_Window:
|
|||
self.plugin.send('CONFIG', None, ('GtkGui', self.plugin.config))
|
||||
self.plugin.send('QUIT', None, ('gtkgui', 0))
|
||||
print _("plugin gtkgui stopped")
|
||||
# self.close_all(self.plugin.windows)
|
||||
self.plugin.systray.t.destroy()
|
||||
gtk.mainquit()
|
||||
gtk.main_quit()
|
||||
# gtk.gdk.threads_leave()
|
||||
|
||||
def on_row_activated(self, widget, path, col=0):
|
||||
"""When an iter is dubble clicked :
|
||||
|
|
@ -1798,6 +1913,23 @@ class plugin:
|
|||
if self.windows['logs'].has_key(array[0]):
|
||||
self.windows['logs'][array[0]].new_line(array[1:])
|
||||
|
||||
def handle_event_gc_msg(self, account, array):
|
||||
#('GC_MSG', account, (jid, msg))
|
||||
jids = string.split(array[0], '/')
|
||||
jid = jids[0]
|
||||
if not self.windows[account]['chats'].has_key(jid):
|
||||
return
|
||||
if len(jids) == 1:
|
||||
#message from server
|
||||
self.windows[account]['chats'][jid].print_conversation(array[1])
|
||||
else:
|
||||
#message from someone
|
||||
self.windows[account]['chats'][jid].print_conversation(array[1], \
|
||||
jids[1])
|
||||
if not self.windows[account]['chats'][jid].window.\
|
||||
get_property('is-active'):
|
||||
self.systray.add_jid(jid, account)
|
||||
|
||||
def read_queue(self):
|
||||
"""Read queue from the core and execute commands from it"""
|
||||
while self.queueIN.empty() == 0:
|
||||
|
|
@ -1836,6 +1968,8 @@ class plugin:
|
|||
self.handle_event_log_nb_line(ev[1], ev[2])
|
||||
elif ev[0] == 'LOG_LINE':
|
||||
self.handle_event_log_line(ev[1], ev[2])
|
||||
elif ev[0] == 'GC_MSG':
|
||||
self.handle_event_gc_msg(ev[1], ev[2])
|
||||
return 1
|
||||
|
||||
def read_sleepy(self):
|
||||
|
|
@ -1868,14 +2002,14 @@ class plugin:
|
|||
return 1
|
||||
|
||||
def __init__(self, quIN, quOUT):
|
||||
gtk.threads_init()
|
||||
gtk.threads_enter()
|
||||
gtk.gdk.threads_init()
|
||||
# gtk.gdk.threads_enter()
|
||||
self.queueIN = quIN
|
||||
self.queueOUT = quOUT
|
||||
self.send('REG_MESSAGE', 'gtkgui', ['ROSTER', 'WARNING', 'STATUS', \
|
||||
'NOTIFY', 'MSG', 'MSGERROR', 'SUBSCRIBED', 'UNSUBSCRIBED', \
|
||||
'SUBSCRIBE', 'AGENTS', 'AGENT_INFO', 'QUIT', 'ACC_OK', 'CONFIG', \
|
||||
'MYVCARD', 'VCARD', 'LOG_NB_LINE', 'LOG_LINE', 'VISUAL'])
|
||||
'MYVCARD', 'VCARD', 'LOG_NB_LINE', 'LOG_LINE', 'VISUAL', 'GC_MSG'])
|
||||
self.send('ASK_CONFIG', None, ('GtkGui', 'GtkGui', {'autopopup':1,\
|
||||
'autopopupaway':1,\
|
||||
'showoffline':0,\
|
||||
|
|
@ -1926,6 +2060,5 @@ class plugin:
|
|||
else:
|
||||
self.systray = systrayDummy()
|
||||
gtk.main()
|
||||
gtk.threads_leave()
|
||||
|
||||
print _("plugin gtkgui loaded")
|
||||
|
|
|
|||
Loading…
Reference in New Issue