papyon @@ -1,3 +1,3 @@ -[submodule "pymsn"] - path = pymsn - url = git://github.com/Kjir/pymsn.git +[submodule "papyon"] + path = papyon + url = git://github.com/Kjir/papyon.git .gitmodules @@ -5,7 +5,7 @@ python-pyopenssl python-crypto maybe some other stuff... -Before launching amsn2 you have to fetch the submodules (pymsn). Instructions can be found on the aMSN forum: +Before launching amsn2 you have to fetch the submodules (papyon). Instructions can be found on the aMSN forum: http://www.amsn-project.net/forums/viewtopic.php?t=5994 If you launch ./amsn2.py and it gives an error, that error probably tells you which dependency you need... README @@ -2,7 +2,7 @@ import sys import os import optparse -sys.path.insert(0, "./pymsn") +sys.path.insert(0, "./papyon") import locale locale.setlocale(locale.LC_ALL, '') amsn2.py @@ -21,7 +21,7 @@ import profile from amsn2 import gui from amsn2 import protocol -import pymsn +import papyon from views import * from contactlist_manager import * from conversation_manager import * @@ -53,15 +53,15 @@ class aMSNCore(object): self._oim_manager = aMSNOIMManager(self) self._conversation_manager = aMSNConversationManager(self) - self.p2s = {pymsn.Presence.ONLINE:"online", - pymsn.Presence.BUSY:"busy", - pymsn.Presence.IDLE:"idle", - pymsn.Presence.AWAY:"away", - pymsn.Presence.BE_RIGHT_BACK:"brb", - pymsn.Presence.ON_THE_PHONE:"phone", - pymsn.Presence.OUT_TO_LUNCH:"lunch", - pymsn.Presence.INVISIBLE:"hidden", - pymsn.Presence.OFFLINE:"offline"} + self.p2s = {papyon.Presence.ONLINE:"online", + papyon.Presence.BUSY:"busy", + papyon.Presence.IDLE:"idle", + papyon.Presence.AWAY:"away", + papyon.Presence.BE_RIGHT_BACK:"brb", + papyon.Presence.ON_THE_PHONE:"phone", + papyon.Presence.OUT_TO_LUNCH:"lunch", + papyon.Presence.INVISIBLE:"hidden", + papyon.Presence.OFFLINE:"offline"} if self._options.debug: import logging @@ -135,17 +135,17 @@ class aMSNCore(object): status_str = \ { - pymsn.event.ClientState.CONNECTING : 'Connecting to server...', - pymsn.event.ClientState.CONNECTED : 'Connected', - pymsn.event.ClientState.AUTHENTICATING : 'Authenticating...', - pymsn.event.ClientState.AUTHENTICATED : 'Password accepted', - pymsn.event.ClientState.SYNCHRONIZING : 'Please wait while your contact list\nis being downloaded...', - pymsn.event.ClientState.SYNCHRONIZED : 'Contact list downloaded successfully.\nHappy Chatting' + papyon.event.ClientState.CONNECTING : 'Connecting to server...', + papyon.event.ClientState.CONNECTED : 'Connected', + papyon.event.ClientState.AUTHENTICATING : 'Authenticating...', + papyon.event.ClientState.AUTHENTICATED : 'Password accepted', + papyon.event.ClientState.SYNCHRONIZING : 'Please wait while your contact list\nis being downloaded...', + papyon.event.ClientState.SYNCHRONIZED : 'Contact list downloaded successfully.\nHappy Chatting' } if state in status_str: profile.login.onConnecting((state + 1)/ 7., status_str[state]) - elif state == pymsn.event.ClientState.OPEN: + elif state == papyon.event.ClientState.OPEN: clwin = self._gui.gui.aMSNContactListWindow(self, self._main) clwin.profile = profile profile.clwin = clwin amsn2/core/amsn.py @@ -1,7 +1,7 @@ from views import * import os import tempfile -import pymsn +import papyon class aMSNContactListManager: @@ -18,7 +18,7 @@ class aMSNContactListManager: self._contacts = {} self._groups = {} - self._pymsn_addressbook = None + self._papyon_addressbook = None #TODO: sorting contacts & groups @@ -44,10 +44,10 @@ class aMSNContactListManager: - def onContactPresenceChanged(self, pymsn_contact): + def onContactPresenceChanged(self, papyon_contact): #1st/ update the aMSNContact object - c = self.getContact(pymsn_contact.id, pymsn_contact) - c.fill(self._core, pymsn_contact) + c = self.getContact(papyon_contact.id, papyon_contact) + c.fill(self._core, papyon_contact) #2nd/ update the ContactView cv = ContactView(self._core, c) self.emit(self.CONTACTVIEW_UPDATED, cv) @@ -55,14 +55,14 @@ class aMSNContactListManager: #TODO: update the group view #Request the DP... - if (pymsn_contact.presence is not pymsn.Presence.OFFLINE and - pymsn_contact.msn_object): - self._core._profile.client._msn_object_store.request(pymsn_contact.msn_object, + if (papyon_contact.presence is not papyon.Presence.OFFLINE and + papyon_contact.msn_object): + self._core._profile.client._msn_object_store.request(papyon_contact.msn_object, (self.onDPdownloaded, - pymsn_contact.id)) + papyon_contact.id)) def onCLDownloaded(self, address_book): - self._pymsn_addressbook = address_book + self._papyon_addressbook = address_book grpviews = [] cviews = [] clv = ContactListView() @@ -80,7 +80,7 @@ class aMSNContactListManager: grpviews.append(gv) clv.group_ids.append(group.id) - contacts = address_book.contacts.search_by_memberships(pymsn.Membership.FORWARD) + contacts = address_book.contacts.search_by_memberships(papyon.Membership.FORWARD) no_group_ids= [] for contact in contacts: if len(contact.groups) == 0: @@ -116,13 +116,13 @@ class aMSNContactListManager: self.emit(self.CONTACTVIEW_UPDATED, cv) - def getContact(self, cid, pymsn_contact=None): + def getContact(self, cid, papyon_contact=None): #TODO: should raise UnknownContact or sthg like that try: return self._contacts[cid] except KeyError: - if pymsn_contact is not None: - c = aMSNContact(self._core, pymsn_contact) + if papyon_contact is not None: + c = aMSNContact(self._core, papyon_contact) self._contacts[cid] = c self.emit(self.AMSNCONTACT_UPDATED, c) return c @@ -135,29 +135,29 @@ class aMSNContactListManager: everytime """ class aMSNContact(): - def __init__(self, core, pymsn_contact): - self.uid = pymsn_contact.id - self.fill(core, pymsn_contact) + def __init__(self, core, papyon_contact): + self.uid = papyon_contact.id + self.fill(core, papyon_contact) - def fill(self, core, pymsn_contact): + def fill(self, core, papyon_contact): self.icon = ImageView() - self.icon.load("Theme","buddy_" + core.p2s[pymsn_contact.presence]) + self.icon.load("Theme","buddy_" + core.p2s[papyon_contact.presence]) self.dp = ImageView() #TODO: for the moment, use default dp self.dp.load("Theme", "dp_nopic") self.emblem = ImageView() - self.emblem.load("Theme", "emblem_" + core.p2s[pymsn_contact.presence]) + self.emblem.load("Theme", "emblem_" + core.p2s[papyon_contact.presence]) #TODO: PARSE ONLY ONCE self.nickname = StringView() - self.nickname.appendText(pymsn_contact.display_name) + self.nickname.appendText(papyon_contact.display_name) self.personal_message = StringView() - self.personal_message.appendText(pymsn_contact.personal_message) + self.personal_message.appendText(papyon_contact.personal_message) self.current_media = StringView() - self.current_media.appendText(pymsn_contact.current_media) + self.current_media.appendText(papyon_contact.current_media) self.status = StringView() - self.status.appendText(core.p2s[pymsn_contact.presence]) - #for the moment, we store the pymsn_contact object, but we shouldn't have to - #TODO: getPymsnContact(self, core...) or _pymsn_contact? - self._pymsn_contact = pymsn_contact + self.status.appendText(core.p2s[papyon_contact.presence]) + #for the moment, we store the papyon_contact object, but we shouldn't have to + #TODO: getPymsnContact(self, core...) or _papyon_contact? + self._papyon_contact = papyon_contact amsn2/core/contactlist_manager.py @@ -21,7 +21,7 @@ from amsn2.protocol import conversation from amsn2.core.contactlist_manager import * from amsn2.core.views import * -import pymsn +import papyon class aMSNConversation: def __init__(self, core, conv_manager, conv = None, contacts_uid = None): @@ -33,10 +33,10 @@ class aMSNConversation: self._contacts_uid = contacts_uid if conv is None: #New conversation - pymsn_contacts = [core._contactlist_manager.getContact(uid) for uid in contacts_uid] - pymsn_contacts = [c._pymsn_contact for c in pymsn_contacts if c is not None] + papyon_contacts = [core._contactlist_manager.getContact(uid) for uid in contacts_uid] + papyon_contacts = [c._papyon_contact for c in papyon_contacts if c is not None] #if c was None.... wtf? - self._conv = pymsn.Conversation(self._core._profile.client, pymsn_contacts) + self._conv = papyon.Conversation(self._core._profile.client, papyon_contacts) else: #From an existing conversation self._conv = conv @@ -90,7 +90,7 @@ class aMSNConversation: # for the moment, no formatting, no smiley substitution... (TODO) # peacey: Added formatting of styles self.onMessageReceived(msg, formatting=formatting) - message = pymsn.ConversationMessage(msg.toString(), formatting) + message = papyon.ConversationMessage(msg.toString(), formatting) self._conv.send_text_message(message) def sendNudge(self): @@ -105,6 +105,6 @@ class aMSNConversation: def inviteContact(self, contact_uid): """ contact_uid is the Id of the contact to invite """ c = self._core._contactlist_manager.getContact(contact_uid) - self._conv.invite_user(contact.pymsn_contact) + self._conv.invite_user(contact.papyon_contact) #TODO: ... amsn2/core/conversation.py @@ -1,23 +1,23 @@ from amsn2.gui import base -import pymsn +import papyon class Contact(object): def __init__(self, name, presence): self.name = name self.presence = presence - self.p2s = {pymsn.Presence.ONLINE:"online", - pymsn.Presence.BUSY:"busy", - pymsn.Presence.IDLE:"idle", - pymsn.Presence.AWAY:"away", - pymsn.Presence.BE_RIGHT_BACK:"brb", - pymsn.Presence.ON_THE_PHONE:"phone", - pymsn.Presence.OUT_TO_LUNCH:"lunch", - pymsn.Presence.INVISIBLE:"hidden", - pymsn.Presence.OFFLINE:"offline"} + self.p2s = {papyon.Presence.ONLINE:"online", + papyon.Presence.BUSY:"busy", + papyon.Presence.IDLE:"idle", + papyon.Presence.AWAY:"away", + papyon.Presence.BE_RIGHT_BACK:"brb", + papyon.Presence.ON_THE_PHONE:"phone", + papyon.Presence.OUT_TO_LUNCH:"lunch", + papyon.Presence.INVISIBLE:"hidden", + papyon.Presence.OFFLINE:"offline"} def is_online(self): - return self.presence != pymsn.Presence.OFFLINE + return self.presence != papyon.Presence.OFFLINE def status(self): return self.p2s[self.presence] amsn2/gui/front_ends/console/contact_list.py @@ -10,7 +10,7 @@ from image import * from amsn2.core.views import StringView from amsn2.gui import base -import pymsn +import papyon class aMSNContactListWindow(base.aMSNContactListWindow): def __init__(self, amsn_core, parent): amsn2/gui/front_ends/efl/contact_list.py @@ -30,7 +30,7 @@ from htmltextview import * from amsn2.gui import base from amsn2.core.views import StringView import gtk_extras -import pymsn +import papyon class aMSNChatWindow(base.aMSNChatWindow, gtk.Window): def __init__(self, amsn_core): @@ -247,14 +247,14 @@ class aMSNChatWidget(base.aMSNChatWidget, gtk.VBox): color = self.button_color.get_color() hex8 = "%.2x%.2x%.2x" % ((color.red/0x101), (color.green/0x101), (color.blue/0x101)) - style = pymsn.TextFormat.NO_EFFECT - if self.button_bold.get_active(): style |= pymsn.TextFormat.BOLD - if self.button_italic.get_active(): style |= pymsn.TextFormat.ITALIC - if self.button_underline.get_active(): style |= pymsn.TextFormat.UNDERLINE - if self.button_strikethrough.get_active(): style |= pymsn.TextFormat.STRIKETHROUGH + style = papyon.TextFormat.NO_EFFECT + if self.button_bold.get_active(): style |= papyon.TextFormat.BOLD + if self.button_italic.get_active(): style |= papyon.TextFormat.ITALIC + if self.button_underline.get_active(): style |= papyon.TextFormat.UNDERLINE + if self.button_strikethrough.get_active(): style |= papyon.TextFormat.STRIKETHROUGH font_name = self.button_font.get_font_name() font_family = pango.FontDescription(font_name).get_family() - format = pymsn.TextFormat(font=font_family, color=hex8, style=style) + format = papyon.TextFormat(font=font_family, color=hex8, style=style) strv = StringView() strv.appendText(msg) self._amsn_conversation.sendMessage(strv, format) @@ -308,13 +308,13 @@ class aMSNChatWidget(base.aMSNChatWidget, gtk.VBox): fmsg += "font-family: %s;" % formatting.font if formatting.color: fmsg += "color: %s;" % ("#"+formatting.color) - if formatting.style & pymsn.TextFormat.BOLD == pymsn.TextFormat.BOLD: + if formatting.style & papyon.TextFormat.BOLD == papyon.TextFormat.BOLD: fmsg += "font-weight: bold;" - if formatting.style & pymsn.TextFormat.ITALIC == pymsn.TextFormat.ITALIC: + if formatting.style & papyon.TextFormat.ITALIC == papyon.TextFormat.ITALIC: fmsg += "font-style: italic;" - if formatting.style & pymsn.TextFormat.UNDERLINE == pymsn.TextFormat.UNDERLINE: + if formatting.style & papyon.TextFormat.UNDERLINE == papyon.TextFormat.UNDERLINE: fmsg += "text-decoration: underline;" - if formatting.style & pymsn.TextFormat.STRIKETHROUGH == pymsn.TextFormat.STRIKETHROUGH: + if formatting.style & papyon.TextFormat.STRIKETHROUGH == papyon.TextFormat.STRIKETHROUGH: fmsg += "text-decoration: line-through;" if formatting.right_alignment: fmsg += "text-align: right;" amsn2/gui/front_ends/gtk/chat_window.py @@ -27,7 +27,7 @@ import gtk import pango import gobject -#import pymsn +#import papyon from image import * from amsn2.core.views import StringView from amsn2.core.views import GroupView amsn2/gui/front_ends/gtk/contact_list.py @@ -18,13 +18,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import pymsn -import pymsn.event +import papyon +import papyon.event -class AddressBookEvents(pymsn.event.AddressBookEventInterface): +class AddressBookEvents(papyon.event.AddressBookEventInterface): def __init__(self, client, amsn_core): self._amsn_core = amsn_core - pymsn.event.AddressBookEventInterface.__init__(self, client) + papyon.event.AddressBookEventInterface.__init__(self, client) def on_addressbook_messenger_contact_added(self, contact): pass @@ -52,4 +52,4 @@ class AddressBookEvents(pymsn.event.AddressBookEventInterface): def on_addressbook_group_contact_deleted(self, group, contact): pass - \ No newline at end of file + amsn2/protocol/addressbook.py @@ -1,19 +1,19 @@ -import pymsn -import pymsn.event +import papyon +import papyon.event -class ClientEvents(pymsn.event.ClientEventInterface): +class ClientEvents(papyon.event.ClientEventInterface): def __init__(self, client, amsn_core): self._amsn_core = amsn_core - pymsn.event.ClientEventInterface.__init__(self, client) + papyon.event.ClientEventInterface.__init__(self, client) def on_client_state_changed(self, state): self._amsn_core.connectionStateChanged(self._client._amsn_profile, state) - if state == pymsn.event.ClientState.OPEN: + if state == papyon.event.ClientState.OPEN: self._client.profile.display_name = "aMSN2" - self._client.profile.presence = pymsn.Presence.ONLINE + self._client.profile.presence = papyon.Presence.ONLINE self._client.profile.current_media = ("I listen to", "Nothing") self._client.profile.personal_message = "Testing aMSN2!" amsn2/protocol/client.py @@ -1,12 +1,12 @@ -import pymsn -import pymsn.event +import papyon +import papyon.event -class ContactEvents(pymsn.event.ContactEventInterface): +class ContactEvents(papyon.event.ContactEventInterface): def __init__(self, client, contact_manager): self._contact_manager = contact_manager - pymsn.event.ContactEventInterface.__init__(self, client) + papyon.event.ContactEventInterface.__init__(self, client) def on_contact_presence_changed(self, contact): self._contact_manager.onContactPresenceChanged(contact) amsn2/protocol/contact.py @@ -19,15 +19,15 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from amsn2.core.views import * -import pymsn -import pymsn.event +import papyon +import papyon.event -class ConversationEvents(pymsn.event.ConversationEventInterface): +class ConversationEvents(papyon.event.ConversationEventInterface): def __init__(self, amsn_conversation): self._amsn_conversation = amsn_conversation self._conversation = amsn_conversation._conv - pymsn.event.ConversationEventInterface.__init__(self, self._conversation) + papyon.event.ConversationEventInterface.__init__(self, self._conversation) def on_conversation_state_changed(self, state): self._amsn_conversation.onStateChanged(state) amsn2/protocol/conversation.py @@ -1,13 +1,13 @@ -import pymsn -import pymsn.event +import papyon +import papyon.event -class InviteEvents(pymsn.event.InviteEventInterface): +class InviteEvents(papyon.event.InviteEventInterface): def __init__(self, client, amsn_core): self._amsn_core = amsn_core - pymsn.event.InviteEventInterface.__init__(self, client) + papyon.event.InviteEventInterface.__init__(self, client) def on_invite_conversation(self, conversation): self._amsn_core._conversation_manager.onInviteConversation(conversation) amsn2/protocol/invite.py @@ -18,13 +18,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import pymsn -import pymsn.event +import papyon +import papyon.event -class OIMEvents(pymsn.event.OfflineMessagesEventInterface): +class OIMEvents(papyon.event.OfflineMessagesEventInterface): def __init__(self, client, oim_manager): self._oim_manager = oim_manager - pymsn.event.OfflineMessagesEventInterface.__init__(self, client) + papyon.event.OfflineMessagesEventInterface.__init__(self, client) def on_oim_state_changed(self, state): pass @@ -39,4 +39,4 @@ class OIMEvents(pymsn.event.OfflineMessagesEventInterface): pass def on_oim_message_sent(self, recipient, message): - pass \ No newline at end of file + pass amsn2/protocol/oim.py @@ -18,21 +18,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import pymsn -import pymsn.event +import papyon +import papyon.event from client import * from contact import * from invite import * from oim import * from addressbook import * -class Client(pymsn.Client): +class Client(papyon.Client): def __init__(self, amsn_core, profile): self._amsn_profile = profile self._amsn_core = amsn_core server = (self._amsn_profile.getConfigKey("ns_server", "messenger.hotmail.com"), self._amsn_profile.getConfigKey("ns_port", 1863)) - pymsn.Client.__init__(self, server) + papyon.Client.__init__(self, server) self._client_events_handler = ClientEvents(self, self._amsn_core) self._contact_events_handler = ContactEvents(self, self._amsn_core._contactlist_manager) amsn2/protocol/protocol.py @@ -5,7 +5,7 @@ import py2app from dircache import listdir # A list of files to include in the bundle. -files = ['amsn2', 'pymsn'] +files = ['amsn2', 'papyon'] # Nibs need to be appened individually because they they need to be in the root of the bundle. for f in listdir('amsn2/gui/front_ends/cocoa/nibs/files/'): setupCocoa.py pymsn 4982775801ff39aa7263379f47ca76f1d80e4c6b Stéphane Bisinger stephane.bisinger@gmail.com http://github.com/drf/amsn2/commit/e276b04a738cf36ef04974dca16bebab95b82c82 e276b04a738cf36ef04974dca16bebab95b82c82 2009-05-05T14:48:07-07:00 2009-05-05T14:48:07-07:00 Renamed pymsn to papyon 9d1d84dd1d6dfc16ffde0e4b23f877ef01688a86 Stéphane Bisinger stephane.bisinger@gmail.com