# HG changeset patch
# User sirebral
# Date 1263494714 21600
# Node ID ff19dd30064b2aa38eefb87b4cc81a38b3397d3d
# Parent 60dde67c4ed61a43a647f2244d8f85011c0a2429
Traipse Alpha 'OpenRPG' {100114-02}
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 (Keeping up with Beta)
New Features:
Added Bookmarks
Added 'boot' command to remote admin
Added confirmation window for sent nodes
Minor changes to allow for portability to an OpenSUSE linux OS
Miniatures Layer pop up box allows users to turn off Mini labels, from
FlexiRPG
Zoom Mouse plugin added
Images added to Plugin UI
Switching to Element Tree
Map efficiency, from FlexiRPG
Added Status Bar to Update Manager
New TrueDebug Class in orpg_log (See documentation for usage)
Portable Mercurial
Tip of the Day added, from Core and community
New Reference Syntax added for custom PC sheets
New Child Reference for gametree
New Parent Reference for gametree
New Gametree Recursion method, mapping, context sensitivity, and
effeciency..
New Features node with bonus nodes and Node Referencing help added
Dieroller structure from Core
New DieRoller portability for odd Dice
Added 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)]
New 'Mythos' System die roller added
Added new vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)].
Included for Mythos roller also
New Warhammer FRPG Die Roller (Special thanks to Puu-san for the
support)
New EZ_Tree Reference system. Push a button, Traipse the tree, get a
reference (Beta!)
Fixes:
Fix to Text based Server
Fix to Remote Admin Commands
Fix to Pretty Print, from Core
Fix to Splitter Nodes not being created
Fix to massive amounts of images loading, from Core
Fix to Map from gametree not showing to all clients
Fix to gametree about menus
Fix to Password Manager check on startup
Fix to PC Sheets from tool nodes. They now use the tabber_panel
Fixed Whiteboard ID to prevent random line or text deleting.
Modified ID's to prevent non updated clients from ruining the fix.
default_manifest.xml renamed to default_upmana.xml
Fix to Update Manager; cleaner clode for saved repositories
Fixes made to Settings Panel and now reactive settings when Ok is
pressed
Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of
a Splice
Fix to Use panel of Forms and Tabbers. Now longer enters design mode
Fix made Image Fetching. New fetching image and new failed image
diff -r 60dde67c4ed6 -r ff19dd30064b images/Copyright Notice.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/images/Copyright Notice.txt Thu Jan 14 12:45:14 2010 -0600
@@ -0,0 +1,8 @@
+The following images are Copyright Sekkyumu and released to the Public Domain
+add.png
+add_button.png
+check_button.png
+(from) failed.png
+(from) fetching.png
+spotlight.png
+star.png
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/chat/chatwnd.py
--- a/orpg/chat/chatwnd.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/chat/chatwnd.py Thu Jan 14 12:45:14 2010 -0600
@@ -168,7 +168,6 @@
self.Bind(wx.EVT_MENU, self.OnM_EditCopy, item)
self.menu.AppendItem(item)
-
def OnM_EditCopy(self, evt):
wx.TheClipboard.UsePrimarySelection(False)
wx.TheClipboard.Open()
@@ -524,6 +523,12 @@
self.lockscroll = False # set the default to scrolling on.
self.chat_cmds = commands.chat_commands(self)
self.html_strip = strip_html
+ self.f_keys = {wx.WXK_F1: 'event.GetKeyCode() == wx.WXK_F1', wx.WXK_F2: 'event.GetKeyCode() == wx.WXK_F2',
+ wx.WXK_F3: 'event.GetKeyCode() == wx.WXK_F3', wx.WXK_F4: 'event.GetKeyCode() == wx.WXK_F4',
+ wx.WXK_F5: 'event.GetKeyCode() == wx.WXK_F5', wx.WXK_F6: 'event.GetKeyCode() == wx.WXK_F6',
+ wx.WXK_F7: 'event.GetKeyCode() == wx.WXK_F7', wx.WXK_F8: 'event.GetKeyCode() == wx.WXK_F8',
+ wx.WXK_F9: 'event.GetKeyCode() == wx.WXK_F9', wx.WXK_F10: 'event.GetKeyCode() == wx.WXK_F10',
+ wx.WXK_F11: 'event.GetKeyCode() == wx.WXK_F11', wx.WXK_F12: 'event.GetKeyCode() == wx.WXK_F12'}
#Alias Lib stuff
self.defaultAliasName = 'Use Real Name'
self.defaultFilterName = 'No Filter'
@@ -831,6 +836,7 @@
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_KEY_DOWN, self.on_chat_key_down)
self.chattxt.Bind(wx.EVT_TEXT_COPY, self.chatwnd.OnM_EditCopy)
# def build_ctrls - end
@@ -1092,50 +1098,47 @@
#
# Note: self.chattxt now handles it's own Key events. It does, however still
# call it's parent's (self) OnChar to handle "default" behavior.
+
+ def submit_chat_text(self, s):
+ self.histidx = -1
+ self.temptext = ""
+ self.history = [s] + self.history
+ #if not len(macroText): self.chattxt.SetValue("")
+
+ # play sound
+ 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 )
+ else: self.chat_cmds.docmd(s) # emote is in chatutils.py
+
+ def on_chat_key_down(self, event):
+ s = self.chattxt.GetValue()
+ if event.GetKeyCode() == wx.WXK_RETURN and not event.ShiftDown():
+ logger.debug("event.GetKeyCode() == wx.WXK_RETURN")
+ self.set_colors()
+ if self.session.get_status() == MPLAY_CONNECTED:
+ self.sendTyping(0)
+ if len(s):
+ self.chattxt.SetValue('')
+ s = s.replace('\n', '
')
+ self.submit_chat_text(s)
+ return
+ event.Skip()
def OnChar(self, event):
s = self.chattxt.GetValue()
- #self.histlen = len(self.history) - 1
- ## RETURN KEY (no matter if there is text in chattxt)
- # This section is run even if there is nothing in the chattxt (as opposed to the next wx.WXK_RETURN handler
- if event.GetKeyCode() == wx.WXK_RETURN:
- logger.debug("event.GetKeyCode() == wx.WXK_RETURN")
- self.set_colors()
- if self.session.get_status() == MPLAY_CONNECTED: # only do if we're connected
- self.sendTyping(0) # Send a "not_typing" event on enter key press
- macroText=""
- recycle_bin = {wx.WXK_F1: 'event.GetKeyCode() == wx.WXK_F1', wx.WXK_F2: 'event.GetKeyCode() == wx.WXK_F2',
- wx.WXK_F3: 'event.GetKeyCode() == wx.WXK_F3', wx.WXK_F4: 'event.GetKeyCode() == wx.WXK_F4',
- wx.WXK_F5: 'event.GetKeyCode() == wx.WXK_F5', wx.WXK_F6: 'event.GetKeyCode() == wx.WXK_F6',
- wx.WXK_F7: 'event.GetKeyCode() == wx.WXK_F7', wx.WXK_F8: 'event.GetKeyCode() == wx.WXK_F8',
- wx.WXK_F9: 'event.GetKeyCode() == wx.WXK_F9', wx.WXK_F10: 'event.GetKeyCode() == wx.WXK_F10',
- wx.WXK_F11: 'event.GetKeyCode() == wx.WXK_F11', wx.WXK_F12: 'event.GetKeyCode() == wx.WXK_F12'}
+ macroText = ""
+ s_key = False
+ if self.f_keys.has_key(event.GetKeyCode()): s_key = self.f_keys[event.GetKeyCode()]
- bin_event = event.GetKeyCode()
- if recycle_bin.has_key(bin_event):
- logger.debug(lambda bin_event: recycle_bin[bin_event])
- macroText = self.settings.get_setting(recycle_bin[bin_event][29:])
- recycle_bin = {}; del bin_event
+ if s_key: macroText = settings.get(s_key[29:])
# Append to the existing typed text as needed and make sure the status doesn't change back.
if len(macroText):
self.sendTyping(0)
- s = macroText
-
- ## RETURN KEY (and not text in control)
- if (event.GetKeyCode() == wx.WXK_RETURN and len(s)) or len(macroText):
- logger.debug("(event.GetKeyCode() == wx.WXK_RETURN and len(s)) or len(macroText)")
- self.histidx = -1
- self.temptext = ""
- self.history = [s] + self.history#prepended instead of appended now, so higher index = greater age
- if not len(macroText): self.chattxt.SetValue("")
- # play sound
- 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 )
- else: self.chat_cmds.docmd(s) # emote is in chatutils.py
+ self.submit_chat_text(macroText)
## UP KEY
elif event.GetKeyCode() == wx.WXK_UP:
@@ -1228,6 +1231,14 @@
self.Post()
event.Skip()
+ elif event.GetKeyCode() == wx.WXK_RETURN and event.ShiftDown():
+ st = self.chattxt.GetValue().split('\x0b')
+ st += '\n'
+ i = self.chattxt.GetInsertionPoint()
+ self.chattxt.SetValue(''.join(st))
+ self.chattxt.SetInsertionPoint(i+1)
+ return
+
## NOTHING
else: event.Skip()
logger.debug("Exit chat_panel->OnChar(self, event)")
@@ -1939,7 +1950,7 @@
value = ""
path = s.split('::')
depth = len(path)
- self.gametree = component.get('tree_back')
+ self.gametree = component.get('tree_fs')
try: node = self.gametree.tree_map[path[0]]['node']
except Exception, e: return self.data
if node.get('class') in ('dnd35char_handler',
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/gametree/gametree.py
--- a/orpg/gametree/gametree.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/gametree/gametree.py Thu Jan 14 12:45:14 2010 -0600
@@ -125,7 +125,7 @@
## tree wont parse fully without adding the component, and when a dupplicate component is created
## the older one is deleted. If there are an C++ errors the tree_back can be used as a failsafe
- if not self.ez_ref: component.add("tree", self); component.add('tree_back', self) ## Fail Safe
+ if not self.ez_ref: component.add("tree", self); component.add('tree_fs', self) ## Fail Safe
component.add('tree', self)
#build tree
@@ -337,8 +337,8 @@
self.Bind(wx.EVT_MENU, self.on_export_html, id=STD_MENU_HTML)
self.top_menu = wx.Menu()
self.top_menu.SetTitle("game tree")
- self.top_menu.Append(TOP_IFILE,"&Insert File")
- self.top_menu.Append(TOP_INSERT_URL,"Insert &URL")
+ self.top_menu.Append(TOP_IFILE,"&Insert Node File")
+ self.top_menu.Append(TOP_INSERT_URL,"Insert Node &URL")
self.top_menu.Append(TOP_FEATURES, "Insert &Features Node")
self.top_menu.Append(TOP_NEW_TREE, "&Load New Tree")
self.top_menu.Append(TOP_SAVE_TREE,"&Save Tree")
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/gametree/nodehandlers/core.py
--- a/orpg/gametree/nodehandlers/core.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/gametree/nodehandlers/core.py Thu Jan 14 12:45:14 2010 -0600
@@ -54,6 +54,7 @@
self.xml = xml
self.mytree_node = tree_node
self.tree = component.get('tree')
+ self.core_tree = component.get('tree_fs')
self.frame = component.get('frame')
self.chat = component.get('chat')
self.drag = True
@@ -82,7 +83,7 @@
pass
def on_rclick(self,evt):
- self.tree.do_std_menu(evt,self)
+ self.core_tree.do_std_menu(evt,self)
def on_ldclick(self,evt):
return 0
@@ -216,28 +217,28 @@
self.chat.ParsePost(self.tohtml(),True,True)
def on_drop(self, evt):
- drag_obj = self.tree.drag_obj
- if drag_obj == self or self.tree.is_parent_node(self.mytree_node, drag_obj.mytree_node):
+ drag_obj = self.core_tree.drag_obj
+ if drag_obj == self or self.core_tree.is_parent_node(self.mytree_node, drag_obj.mytree_node):
return
- drop_xml = self.tree.drag_obj.delete()
- parent_node = self.tree.GetItemParent(self.mytree_node)
- prev_sib = self.tree.GetPrevSibling(self.mytree_node)
- if parent_node == self.tree.root: parent_xml = self.tree.GetPyData(parent_node)
- else: parent_xml = self.tree.GetPyData(parent_node).xml
+ drop_xml = self.core_tree.drag_obj.delete()
+ parent_node = self.core_tree.GetItemParent(self.mytree_node)
+ prev_sib = self.core_tree.GetPrevSibling(self.mytree_node)
+ if parent_node == self.core_tree.root: parent_xml = self.core_tree.GetPyData(parent_node)
+ else: parent_xml = self.core_tree.GetPyData(parent_node).xml
for i in range(len(parent_xml)):
if parent_xml[i] is self.xml:
parent_xml.insert(i, drop_xml)
break
if not prev_sib.IsOk():
prev_sib = parent_node
- self.tree.load_xml(drop_xml, parent_node, prev_sib)
+ self.core_tree.load_xml(drop_xml, parent_node, prev_sib)
def get_tree(self):
family = []
test = treenode
- while test != self.tree.root:
- test = self.tree.GetItemParent(test)
- parent = self.tree.GetItemText(test)
+ while test != self.core_tree.root:
+ test = self.core_tree.GetItemParent(test)
+ parent = self.core_tree.GetItemText(test)
family.append(parent)
return family
@@ -249,26 +250,26 @@
def delete(self):
""" removes the tree_node and xml_node, and returns the removed xml_node """
- parent_node = self.tree.GetItemParent(self.mytree_node)
- if parent_node == self.tree.root: parent_xml = self.tree.GetPyData(parent_node)
- else: parent_xml = self.tree.GetPyData(parent_node).xml
+ parent_node = self.core_tree.GetItemParent(self.mytree_node)
+ if parent_node == self.core_tree.root: parent_xml = self.core_tree.GetPyData(parent_node)
+ else: parent_xml = self.core_tree.GetPyData(parent_node).xml
parent_xml.remove(self.xml)
- self.tree.Delete(self.mytree_node)
+ self.core_tree.Delete(self.mytree_node)
return self.xml
def rename(self,name):
if len(name):
- self.tree.SetItemText(self.mytree_node,name)
+ self.core_tree.SetItemText(self.mytree_node,name)
self.xml.set('name', name)
def change_icon(self,icon):
self.xml.set("icon",icon)
- self.tree.SetItemImage(self.mytree_node, self.tree.icons[icon])
- self.tree.SetItemImage(self.mytree_node, self.tree.icons[icon], wx.TreeItemIcon_Selected)
- self.tree.Refresh()
+ self.core_tree.SetItemImage(self.mytree_node, self.core_tree.icons[icon])
+ self.core_tree.SetItemImage(self.mytree_node, self.core_tree.icons[icon], wx.TreeItemIcon_Selected)
+ self.core_tree.Refresh()
def on_save(self,evt):
- f = wx.FileDialog(self.tree,"Select a file", orpg.dirpath.dir_struct["user"],"","XML files (*.xml)|*.xml",wx.SAVE)
+ f = wx.FileDialog(self.core_tree,"Select a file", orpg.dirpath.dir_struct["user"],"","XML files (*.xml)|*.xml",wx.SAVE)
if f.ShowModal() == wx.ID_OK: ElementTree(self.xml).write(f.GetPath())
f.Destroy()
@@ -364,8 +365,8 @@
def on_ldclick(self,evt):
title = self.xml.get('name')
new_xml = XML(tostring(self.xml[0]))
- self.tree.root_xml.insert(0, new_xml)
- tree_node = self.tree.load_xml(new_xml,self.tree.root,self.tree.root)
+ self.core_tree.root_xml.insert(0, new_xml)
+ tree_node = self.core_tree.load_xml(new_xml,self.core_tree.root,self.core_tree.root)
return 1
##########################
@@ -385,19 +386,19 @@
def on_ldclick(self,evt):
file_name = self.file_node.get("name")
- self.tree.insert_xml(open(orpg.dirpath.dir_struct["nodes"] + file_name,"r").read())
+ self.core_tree.insert_xml(open(orpg.dirpath.dir_struct["nodes"] + file_name,"r").read())
return 1
def on_design(self,evt):
tlist = ['Title','File Name']
vlist = [self.xml.get("name"),
self.file_node.get("name")]
- dlg = orpgMultiTextEntry(self.tree.GetParent(),tlist,vlist,"File Loader Edit")
+ dlg = orpgMultiTextEntry(self.core_tree.GetParent(),tlist,vlist,"File Loader Edit")
if dlg.ShowModal() == wx.ID_OK:
vlist = dlg.get_values()
self.file_node.set('name', vlist[1])
self.xml.set('name', vlist[0])
- self.tree.SetItemText(self.mytree_node,vlist[0])
+ self.core_tree.SetItemText(self.mytree_node,vlist[0])
dlg.Destroy()
##########################
@@ -418,19 +419,19 @@
def on_ldclick(self,evt):
file_name = self.file_node.get("url")
file = urllib.urlopen(file_name)
- self.tree.insert_xml(file.read())
+ self.core_tree.insert_xml(file.read())
return 1
def on_design(self,evt):
tlist = ['Title','URL']
vlist = [self.xml.get("name"),
self.file_node.get("url")]
- dlg = orpgMultiTextEntry(self.tree.GetParent(),tlist,vlist,"File Loader Edit")
+ dlg = orpgMultiTextEntry(self.core_tree.GetParent(),tlist,vlist,"File Loader Edit")
if dlg.ShowModal() == wx.ID_OK:
vlist = dlg.get_values()
self.file_node.set('url', vlist[1])
self.xml.set('name', vlist[0])
- self.tree.SetItemText(self.mytree_node,vlist[0])
+ self.core_tree.SetItemText(self.mytree_node,vlist[0])
dlg.Destroy()
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/gametree/nodehandlers/forms.py
--- a/orpg/gametree/nodehandlers/forms.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/gametree/nodehandlers/forms.py Thu Jan 14 12:45:14 2010 -0600
@@ -335,17 +335,18 @@
## EZ_Tree Core TaS - Prof.Ebral ##
def on_reference(self, evt, car=None):
- self.do_tree = wx.Frame(self, -1, 'Tree')
+ self.do_tree = wx.Frame(self, -1, 'EZ Tree')
self.ez_tree = orpg.gametree.gametree
self.temp_wnd = self.ez_tree.game_tree(self.do_tree, self.ez_tree.EZ_REF)
self.temp_wnd.Bind(wx.EVT_LEFT_DCLICK, self.on_ldclick)
+ component.get('tree_fs').save_tree(settings.get("gametree"))
self.temp_wnd.load_tree(settings.get("gametree"))
self.do_tree.Show()
def get_grid_ref(self, obj, complete):
self.temp_wnd.Freeze()
self.grid_ref = complete
- self.mini_grid = wx.Frame(self, -1, 'Mini Grid')
+ self.mini_grid = wx.Frame(self, -1, 'EZ Tree Mini Grid')
self.temp_grid = obj.get_use_panel(self.mini_grid)
self.temp_grid.grid.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.on_grid_ldclick)
self.mini_grid.Show()
@@ -356,6 +357,7 @@
col = str(evt.GetCol()+1)
complete = complete[:len(complete)-2] + '::'+'('+row+','+col+')'+complete[len(complete)-2:]
self.text.AppendText(complete); self.on_text(evt)
+ self.mini_grid.Destroy()
def on_ldclick(self, evt):
self.rename_flag = 0
@@ -410,7 +412,6 @@
txt = self.text.GetValue()
#txt = strip_text(txt) ##Does not seem to exist.
self.handler.text_elem.text = txt
- #component.add('tree', component.get('tree_back')) ## Backup
def on_button(self,evt):
self.handler.text_elem.set("multiline",str(bool2int(evt.Checked())))
@@ -779,17 +780,18 @@
## EZ_Tree Core TaS - Prof.Ebral ##
def on_reference(self, evt, car=None):
- self.do_tree = wx.Frame(self, -1, 'Tree')
+ self.do_tree = wx.Frame(self, -1, 'EZ Tree')
self.ez_tree = orpg.gametree.gametree
self.temp_wnd = self.ez_tree.game_tree(self.do_tree, self.ez_tree.EZ_REF)
self.temp_wnd.Bind(wx.EVT_LEFT_DCLICK, self.on_ldclick)
+ component.get('tree_fs').save_tree(settings.get("gametree"))
self.temp_wnd.load_tree(settings.get("gametree"))
self.do_tree.Show()
def get_grid_ref(self, obj, complete):
self.temp_wnd.Freeze()
self.grid_ref = complete
- self.mini_grid = wx.Frame(self, -1, 'Mini Grid')
+ self.mini_grid = wx.Frame(self, -1, 'EZ Tree Grid')
self.temp_grid = obj.get_use_panel(self.mini_grid)
self.temp_grid.grid.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.on_grid_ldclick)
self.mini_grid.Show()
@@ -800,6 +802,7 @@
col = str(evt.GetCol()+1)
complete = complete[:len(complete)-2] + '::'+'('+row+','+col+')'+complete[len(complete)-2:]
self.value_entry.AppendText(complete)
+ self.mini_grid.Destroy()
def on_ldclick(self, evt):
self.rename_flag = 0
@@ -848,12 +851,12 @@
self.handler.edit_option(self.index, self.value_entry.GetValue())
self.reload_options()
self.dlg.Destroy()
- component.add('tree', component.get('tree_back')) ## Backup
+ #component.add('tree', component.get('tree_fs')) ## Backup
return
def on_edit_cancel(self, evt):
self.dlg.Destroy()
- component.add('tree', component.get('tree_back')) ## Backup
+ #component.add('tree', component.get('tree_fs')) ## Backup
return
def on_remove(self,evt):
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/gametree/nodehandlers/rpg_grid.py
--- a/orpg/gametree/nodehandlers/rpg_grid.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/gametree/nodehandlers/rpg_grid.py Thu Jan 14 12:45:14 2010 -0600
@@ -433,17 +433,18 @@
## EZ_Tree Core TaS - Prof.Ebral ##
def on_reference(self, evt, car=None):
- self.do_tree = wx.Frame(self, -1, 'Tree')
+ self.do_tree = wx.Frame(self, -1, 'EZ Tree')
self.ez_tree = orpg.gametree.gametree
self.temp_wnd = self.ez_tree.game_tree(self.do_tree, self.ez_tree.EZ_REF)
- #self.temp_wnd.Bind(wx.EVT_LEFT_DCLICK, self.on_ldclick) ## Remove for Alpha ##
+ self.temp_wnd.Bind(wx.EVT_LEFT_DCLICK, self.on_ldclick) ## Remove for Alpha ##
+ component.get('tree_fs').save_tree(settings.get("gametree"))
self.temp_wnd.load_tree(settings.get("gametree"))
self.do_tree.Show()
def get_grid_ref(self, obj, complete):
self.temp_wnd.Freeze()
self.grid_ref = complete
- self.mini_grid = wx.Frame(self, -1, 'Mini Grid')
+ self.mini_grid = wx.Frame(self, -1, 'EZ Tree Mini Grid')
self.temp_grid = obj.get_use_panel(self.mini_grid)
self.temp_grid.grid.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.on_grid_ldclick)
self.mini_grid.Show()
@@ -453,7 +454,12 @@
row = str(evt.GetRow()+1)
col = str(evt.GetCol()+1)
complete = complete[:len(complete)-2] + '::'+'('+row+','+col+')'+complete[len(complete)-2:]
- self.value_entry.AppendText(complete); self.reload_options()
+ col = self.grid.GetGridCursorCol()
+ row = self.grid.GetGridCursorRow()
+ self.grid.SetCellValue(row, col, complete)
+ cells = self.grid.rows[row].findall('cell')
+ cells[col].text = complete
+ self.mini_grid.Destroy()
def on_ldclick(self, evt):
self.rename_flag = 0
@@ -488,10 +494,15 @@
complete = "!!"
for e in end: complete += e +'::'
complete = complete + obj.xml.get('name') + '!!'
- if do != 'None':
+ if do != 'None':
if obj.xml.get('class') == 'rpg_grid_handler':
self.get_grid_ref(obj, complete)
- else: self.value_entry.AppendText(complete); self.reload_options()
+ else:
+ col = self.grid.GetGridCursorCol()
+ row = self.grid.GetGridCursorRow()
+ self.grid.SetCellValue(row, col, complete)
+ cells = self.grid.rows[row].findall('cell')
+ cells[col].text = complete
self.do_tree.Destroy()
if do == 'None':
wx.MessageBox('Invalid Reference', 'Error')
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/mapper/map.py
--- a/orpg/mapper/map.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/mapper/map.py Thu Jan 14 12:45:14 2010 -0600
@@ -473,8 +473,8 @@
def on_left_up(self, evt):
if evt.ShiftDown(): self.on_tape_up(evt)
- elif component.get("tree").dragging:
- tree = component.get("tree")
+ elif component.get('tree_fs').dragging:
+ tree = component.get('tree_fs')
if tree.drag_obj.map_aware():
tree.drag_obj.on_send_to_map(evt)
tree.dragging = False
@@ -483,7 +483,7 @@
def on_motion(self, evt):
if evt.ShiftDown(): self.on_tape_motion(evt)
- elif evt.LeftIsDown() and component.get("tree").dragging: pass
+ elif evt.LeftIsDown() and component.get('tree_fs').dragging: pass
else: self.frame.on_motion(evt)
def on_zoom_out(self, evt):
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/mapper/miniatures_handler.py
--- a/orpg/mapper/miniatures_handler.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/mapper/miniatures_handler.py Thu Jan 14 12:45:14 2010 -0600
@@ -358,7 +358,7 @@
name = self.sel_rmin.label if self.sel_rmin.label else 'Unnamed Miniature'
node.set('name', name)
node.append(fromstring(mini))
- gametree = component.get('tree')
+ gametree = component.get('tree_fs')
gametree.insert_xml(tostring(node))
### ElementTree is a nice decision from Core, kudos!! ###
elif id == MIN_SHOW_HIDE:
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/orpg_version.py
--- a/orpg/orpg_version.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/orpg_version.py Thu Jan 14 12:45:14 2010 -0600
@@ -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 = "100114-00"
+BUILD = "100114-02"
# This version is for network capability.
PROTOCOL_VERSION = "1.2"
diff -r 60dde67c4ed6 -r ff19dd30064b orpg/tools/predTextCtrl.py
--- a/orpg/tools/predTextCtrl.py Thu Jan 14 03:32:20 2010 -0600
+++ b/orpg/tools/predTextCtrl.py Thu Jan 14 12:45:14 2010 -0600
@@ -311,7 +311,7 @@
# Purpose: Constructor for predTextCtrl. Calls wx.TextCtrl.__init__ to get default init
# behavior and then inits a LetterTree and captures the parent for later use in
# passing events up the chain.
- def __init__(self, parent, id = -1, value = "" , size = wx.DefaultSize, style = 0, name = "text",keyHook = None, validator=None):
+ def __init__(self, parent, id = -1, value = "", size = (30,30), style = 0, name = "text", keyHook = None, validator=None):
# Call super() for default behavior
if validator:
@@ -319,6 +319,7 @@
else:
ExpandoTextCtrl.__init__(self, parent, id=id, value=value, size=size, style=style, name=name)
+
self.tree = LetterTree # Instantiate a new LetterTree.
# TODO: make name of word file an argument.
self.parent = parent # Save parent for later use in passing KeyEvents
@@ -427,27 +428,23 @@
# clobber the prediction.
return # Don't pass tab on in this case
- elif event.GetKeyCode() == wx.WXK_RETURN and event.ShiftDown():
- logger.exception('Shift + Enter Not completed, 439, predtextCtrl', True)
- st = self.GetValue()
- st += '
'
- return
- elif event.GetKeyCode() == wx.WXK_RETURN: # We want to hook returns, so that we can update the word list
+ elif event.GetKeyCode() == wx.WXK_RETURN: # We want to hook returns, so that we can update the word list
st = self.GetValue() # Grab the text from the control
newSt = "" # Init a buffer
# This block of code, by popular demand, changes the behavior of the control to ignore any prediction that
- # hasn't been "accepted" when the enter key is struck.
- (startSel,endSel) = self.GetSelection() # get the curren selection
+ # hasn't been "accepted" when the enter key is struck.
+ (startSel,endSel) = self.GetSelection() # get the curren selection
#
# Start update
# Changed the following to allow for more friendly behavior in
# a multilined predTextCtrl.
#
- # front = st[:startSel] # Slice off the text to the front of where we are
- # back = st[endSel:] # Slice off the text to the end from where we are
- # st = front + back # This expression creates a string that get rid of any selected text.
+ # front = st[:startSel] # Slice off the text to the front of where we are
+ # back = st[endSel:] # Slice off the text to the end from where we are
+ # st = front + back # This expression creates a string that get rid
+ # of any selected text.
# self.SetValue(st)
self.Remove( startSel, endSel )
@@ -470,8 +467,7 @@
# new ones
for aWord in string.split(newSt):
self.tree.incWord(string.lower(aWord))
-
- self.parent.OnChar(event) # Now that all of the words are added, pass the event and return
+ self.parent.OnChar(event) # Now that all of the words are added, pass the event and return
return
# We want to capture the right arrow key to fix a slight UI bug that occurs when one right arrows