Mercurial > traipse_dev
diff orpg/chat/chatwnd.py @ 212:13054be69834 beta
Traipse Beta 'OpenRPG' {100428-00}
Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for
developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to
the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user.
Update Summary (Patch-2)
New Features:
New Namespace method with two new syntaxes
New Namespace Internal is context sensitive, always!
New Namespace External is 'as narrow as you make it'
New Namespace FutureCheck helps ensure you don't receive an incorrect node
New PluginDB access for URL2Link plugin
New to Forms, they now show their content in Design Mode
New to Update Manager, checks Repo for updates on software start
Fixes:
Fix to Server GUI startup errors
Fix to Server GUI Rooms tab updating
Fix to Chat and Settings if non existant die roller is picked
Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated
Fix to Alias Lib's Export to Tree, Open, Save features
Fix to alias node, now works properly
Fix to Splitter node, minor GUI cleanup
Fix to Backgrounds not loading through remote loader
Fix to Node name errors
Fix to rolling dice in chat Whispers
Fix to Splitters Sizing issues
Fix to URL2Link plugin, modified regex compilation should remove memory leak
Fix to mapy.py, a roll back due to zoomed grid issues
Fix to whiteboard_handler, Circles work by you clicking the center of the circle
Fix to Servers parse_incoming_dom which was outdated and did not respect XML
Fix to a broken link in the server welcome message
Fix to InterParse and logger requiring traceback
Fix to Update Manager Status Bar
Fix to failed image and erroneous pop up
| author | sirebral |
|---|---|
| date | Wed, 28 Apr 2010 08:08:09 -0500 |
| parents | fb08f5731b5e |
| children | bb7b9648792c |
line wrap: on
line diff
--- a/orpg/chat/chatwnd.py Mon Feb 01 18:29:16 2010 -0600 +++ b/orpg/chat/chatwnd.py Wed Apr 28 08:08:09 2010 -0500 @@ -45,7 +45,7 @@ ## import os, time, re, sys, traceback, webbrowser, commands, chat_msg, chat_util -from orpg.orpg_version import VERSION +from orpg.orpg_version import VERSION, DISTRO, DIS_VER, BUILD from orpg.orpg_windows import * from orpg.player_list import WG_LIST from orpg.dirpath import dir_struct @@ -763,9 +763,11 @@ self.chatwnd = chat_html_window(self,-1) self.set_colors() wx.CallAfter(self.chatwnd.SetPage, self.chatwnd.Header()) + welcome = "<b>Welcome to <a href='http://www.knowledgearcana.com/traipse-openrpg/'>" + welcome += DISTRO +'</a> '+ DIS_VER +' {'+BUILD+'},' + welcome += ' built on OpenRPG '+ VERSION +'</b>' if (self.sendtarget == "all"): - wx.CallAfter(self.Post, self.colorize(self.syscolor, - "<b>Welcome to <a href='http://www.openrpg.com'>OpenRPG</a> version " + self.version + "... </b>")) + wx.CallAfter(self.Post, self.colorize(self.syscolor, welcome)) self.chattxt = orpg.tools.predTextCtrl.predTextCtrl(self, -1, "", style=wx.TE_PROCESS_ENTER |wx.TE_PROCESS_TAB|wx.TE_LINEWRAP, keyHook = self.myKeyHook, validator=None ) @@ -1030,7 +1032,7 @@ sound_file = self.settings.get_setting("SendSound") if sound_file != '': component.get('sound').play(sound_file) if s[0] != "/": ## it's not a slash command - s = self.ParsePost( s, True, True ) + s = Parse.Post(s, self, True, True) else: self.chat_cmds.docmd(s) # emote is in chatutils.py def on_chat_key_down(self, event): @@ -1169,7 +1171,7 @@ if len(dieMod) and dieMod[0] not in "*/-+": dieMod = "+" + dieMod dieText += dieMod dieText = "[" + dieText + "]" - self.ParsePost(dieText, 1, 1) + Parse.Post(dieText, self, 1, 1) self.chattxt.SetFocus() def on_chat_save(self, evt): @@ -1299,7 +1301,7 @@ return text def emote_message(self, text): - text = Parse.Normalize(text) + text = Parse.Normalize(text, self) text = self.colorize(self.emotecolor, text) if self.type == MAIN_TAB and self.sendtarget == 'all': self.send_chat_message(text,chat_msg.EMOTE_MESSAGE) elif self.type == MAIN_TAB and self.sendtarget == "gm": @@ -1317,7 +1319,7 @@ def whisper_to_players(self, text, player_ids): tabbed_whispers_p = self.settings.get_setting("tabbedwhispers") - text = Parse.Normalize(text) + text = Parse.Normalize(text, self) player_names = "" for m in player_ids: id = m.strip() @@ -1384,6 +1386,7 @@ if (strip_img == "0"): display_name = chat_util.strip_img_tags(display_name) recvSound = "RecvSound" # act on the type of messsage + if (type == chat_msg.CHAT_MESSAGE): text = "<b>" + display_name + "</b>: " + text self.Post(text) @@ -1589,11 +1592,6 @@ logger.general("EXCEPTION: " + str(e)) return "[ERROR]" - def ParsePost(self, s, send=False, myself=False): - s = Parse.Normalize(s) - self.set_colors() - self.Post(s,send,myself) - # This subroutine builds a chat display name. # def chat_display_name(self, player):