sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change chat's send_message() -> send_text_message() to prepare for sketch-in-chat

Browse Source
This commit is contained in:
Dan Williams 2006-05-19 16:27:29 -04:00
parent 2b8d593f4a
commit 2a2903d1fb
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sugar/browser/browser.py
View File

@ -251,7 +251,7 @@ class BrowserActivity(activity.Activity):
escaped_title = saxutils.escape(self.embed.get_title()) escaped_title = saxutils.escape(self.embed.get_title())
escaped_address = saxutils.escape(address) escaped_address = saxutils.escape(address)
chat_shell.send_message('<richtext><link href="' + escaped_address + chat_shell.send_text_message('<richtext><link href="' + escaped_address +
'">' + escaped_title + '</link></richtext>') '">' + escaped_title + '</link></richtext>')
def __title_cb(self, embed): def __title_cb(self, embed):

22
sugar/chat/chat.py
View File

@ -99,7 +99,7 @@ class Chat(activity.Activity):
serializer = richtext.RichTextSerializer() serializer = richtext.RichTextSerializer()
text = serializer.serialize(buf) text = serializer.serialize(buf)
self.send_message(text) self.send_text_message(text)
buf.set_text("") buf.set_text("")
buf.place_cursor(buf.get_start_iter()) buf.place_cursor(buf.get_start_iter())
@ -145,9 +145,6 @@ class Chat(activity.Activity):
print "act %d: in activity_on_got_focus" % self.activity_get_id() print "act %d: in activity_on_got_focus" % self.activity_get_id()
# FIXME self._controller.notify_activate(self) # FIXME self._controller.notify_activate(self)
def recv_message(self, buddy, msg):
self._insert_rich_message(buddy.get_nick_name(), msg)
def _insert_rich_message(self, nick, msg): def _insert_rich_message(self, nick, msg):
buf = self._chat_view.get_buffer() buf = self._chat_view.get_buffer()
aniter = buf.get_end_iter() aniter = buf.get_end_iter()
@ -159,7 +156,16 @@ class Chat(activity.Activity):
aniter = buf.get_end_iter() aniter = buf.get_end_iter()
buf.insert(aniter, "\n") buf.insert(aniter, "\n")
def send_message(self, text): def _insert_sketch(self, sketch):
"""Insert a sketch object into the chat buffer."""
pass
def recv_message(self, buddy, msg):
"""Insert a remote chat message into the chat buffer."""
self._insert_rich_message(buddy.get_nick_name(), msg)
def send_text_message(self, text):
"""Send a chat message and insert it into the local buffer."""
if len(text) <= 0: if len(text) <= 0:
return return
self._stream_writer.write(text) self._stream_writer.write(text)
@ -351,7 +357,7 @@ class GroupChat(Chat):
self._buddy_list_model.set(aniter, self._MODEL_COL_ICON, self._pixbuf_active_chat) self._buddy_list_model.set(aniter, self._MODEL_COL_ICON, self._pixbuf_active_chat)
def _group_recv_message(self, buddy, msg): def _group_recv_message(self, buddy, msg):
Chat.recv_message(self, buddy, msg) self.recv_message(buddy, msg)
self._controller.notify_new_message(self, None) self._controller.notify_new_message(self, None)
def _buddy_recv_message(self, buddy, msg): def _buddy_recv_message(self, buddy, msg):
@ -385,8 +391,8 @@ class ChatShell(dbus.service.Object):
self._group_chat.activity_connect_to_shell() self._group_chat.activity_connect_to_shell()
@dbus.service.method('com.redhat.Sugar.ChatShell') @dbus.service.method('com.redhat.Sugar.ChatShell')
def send_message(self, message): def send_text_message(self, message):
self._group_chat.send_message(message) self._group_chat.send_text_message(message)
if len(sys.argv) > 1 and sys.argv[1] == "--console": if len(sys.argv) > 1 and sys.argv[1] == "--console":
sys.stdout = LogWriter("Chat") sys.stdout = LogWriter("Chat")