# HG changeset patch # User sirebral # Date 1253175783 18000 # Node ID eb1b275699c4e04af93fab88562f171f95f49de8 # Parent bdbeafcb2ef4b7f83e9c19d2198635fe086a4148 Traipse Alpha 'OpenRPG' {090917-01} 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: 00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. 01: Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands. diff -r bdbeafcb2ef4 -r eb1b275699c4 orpg/chat/chatwnd.py --- a/orpg/chat/chatwnd.py Thu Sep 17 01:14:48 2009 -0500 +++ b/orpg/chat/chatwnd.py Thu Sep 17 03:23:03 2009 -0500 @@ -72,7 +72,8 @@ from orpg.tools.orpg_settings import settings from orpg.orpgCore import component from orpg.tools.orpg_log import logger -from orpg.tools.decorators import debugging +from orpg.tools.decorators import debugging + NEWCHAT = False try: import wx.webview @@ -175,11 +176,11 @@ self.menu.AppendItem(item) @debugging - def OnM_EditCopy(self, evt): - wx.TheClipboard.Open() - wx.TheClipboard.Clear() - wx.TheClipboard.SetData(wx.TextDataObject(self.SelectionToText())) - wx.TheClipboard.Close() + def OnM_EditCopy(self, evt): + wx.TheClipboard.UsePrimarySelection(False) + wx.TheClipboard.Open() + wx.TheClipboard.SetData(wx.TextDataObject(self.SelectionToText())) + wx.TheClipboard.Close() @debugging def scroll_down(self): @@ -289,8 +290,11 @@ wx.CallAfter(self.parent.set_chat_text_focus, None) @debugging - def OnM_EditCopy(self, evt): - self.Copy() + def OnM_EditCopy(self, evt): + wx.TheClipboard.UsePrimarySelection(False) + wx.TheClipboard.Open() + wx.TheClipboard.SetData(wx.TextDataObject(self.SelectionToText())) + wx.TheClipboard.Close() #Cutom Methods @debugging @@ -874,15 +878,10 @@ self.Bind(wx.EVT_BUTTON, self.lock_scroll, self.scroll_lock) self.chattxt.Bind(wx.EVT_MOUSEWHEEL, self.chatwnd.mouse_wheel) self.chattxt.Bind(wx.EVT_CHAR, self.chattxt.OnChar) - self.chattxt.Bind(wx.EVT_TEXT_COPY, self.textCopy) + self.chattxt.Bind(wx.EVT_TEXT_COPY, self.chatwnd.OnM_EditCopy) # def build_ctrls - end @debugging - def textCopy(self, event): - if self.chattxt.GetStringSelection() == '': self.chatwnd.OnM_EditCopy(None) - else: self.chatwnd.Copy() - - @debugging def build_bar(self): self.toolbar_sizer = wx.BoxSizer(wx.HORIZONTAL) self.scroll_lock = None diff -r bdbeafcb2ef4 -r eb1b275699c4 orpg/chat/commands.py --- a/orpg/chat/commands.py Thu Sep 17 01:14:48 2009 -0500 +++ b/orpg/chat/commands.py Thu Sep 17 03:23:03 2009 -0500 @@ -14,6 +14,7 @@ import orpg.orpg_windows import traceback +from orpg.orpgCore import component from orpg.tools.orpg_log import logger from orpg.tools.decorators import debugging @@ -262,7 +263,7 @@ @debugging def on_dieroller(self, cmdargs): args = string.split(cmdargs,None,-1) - rm = self.chat.DiceManager + rm = component.get('DiceManager') try: rm.setRoller(args[0]) self.chat.SystemPost("You have changed your die roller to the \"" + args[0] + "\" roller.") diff -r bdbeafcb2ef4 -r eb1b275699c4 orpg/gametree/nodehandlers/forms.py --- a/orpg/gametree/nodehandlers/forms.py Thu Sep 17 01:14:48 2009 -0500 +++ b/orpg/gametree/nodehandlers/forms.py Thu Sep 17 03:23:03 2009 -0500 @@ -29,6 +29,7 @@ __version__ = "$Id: forms.py,v 1.53 2007/04/21 23:00:51 digitalxero Exp $" from containers import * +import orpg.minidom as minidom from orpg.orpg_xml import xml from wx.lib.scrolledpanel import ScrolledPanel @@ -66,7 +67,7 @@ else: self.tree.load_xml(c,self.mytree_node) if not self.atts: - elem = self.xml.minidom.Element('form') + elem = minidom.Element('form') elem.setAttribute("width","400") elem.setAttribute("height","600") self.atts = self.master_dom.appendChild(elem) diff -r bdbeafcb2ef4 -r eb1b275699c4 orpg/gametree/nodehandlers/rpg_grid.py --- a/orpg/gametree/nodehandlers/rpg_grid.py Thu Sep 17 01:14:48 2009 -0500 +++ b/orpg/gametree/nodehandlers/rpg_grid.py Thu Sep 17 03:23:03 2009 -0500 @@ -392,8 +392,7 @@ t_node = cell.appendChild(t_node) r.appendChild(cell) self.AppendCols(1) - self.fit_cols() - + #self.fit_cols()::Where did this go? TaS. def del_row(self,evt=None): num = self.GetNumberRows() @@ -409,7 +408,7 @@ cells = r.getElementsByTagName('cell') r.removeChild(cells[num-1]) self.DeleteCols(num-1,1) - self.fit_cols() + #self.fit_cols()::Where did this go? TaS. G_TITLE = wx.NewId() diff -r bdbeafcb2ef4 -r eb1b275699c4 orpg/orpg_version.py --- a/orpg/orpg_version.py Thu Sep 17 01:14:48 2009 -0500 +++ b/orpg/orpg_version.py Thu Sep 17 03:23:03 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Alpha" DIS_VER = "Ornery Orc" -BUILD = "090917-00" +BUILD = "090917-01" # This version is for network capability. PROTOCOL_VERSION = "1.2"