Mercurial > traipse_dev

changeset 180:12ba14d30baa alpha

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Alpha 'OpenRPG' {100115-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 (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 Fix to Whiteboard ID to prevent random line or text deleting. Fixes to Server, Remote Server, and Server GUI 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 Modified ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml
author sirebral
date Fri, 15 Jan 2010 00:09:39 -0600
parents 5609ac142298
children fa18af3e04b9
files orpg/dieroller/base.py orpg/gametree/nodehandlers/core.py orpg/gametree/nodehandlers/forms.py orpg/gametree/nodehandlers/rpg_grid.py orpg/orpg_version.py
diffstat 5 files changed, 48 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/dieroller/base.py	Thu Jan 14 21:22:21 2010 -0600
+++ b/orpg/dieroller/base.py	Fri Jan 15 00:09:39 2010 -0600
@@ -392,8 +392,8 @@
 
     def __cmp__(self,other):
         #  this function included for backwards compatibility
-#  As of 2.1, lists implement the "rich comparison"
-#  methods overloaded above.
+        #  As of 2.1, lists implement the "rich comparison"
+        #  methods overloaded above.
         if type(other) == type(3) or type(other) == type(3.0):
             return cmp(self.value, other)
         elif hasattr(other,"value"):
--- a/orpg/gametree/nodehandlers/core.py	Thu Jan 14 21:22:21 2010 -0600
+++ b/orpg/gametree/nodehandlers/core.py	Fri Jan 15 00:09:39 2010 -0600
@@ -54,7 +54,7 @@
         self.xml = xml
         self.mytree_node = tree_node
         self.tree = component.get('tree')
-        self.core_tree = component.get('tree_fs')
+        #self.tree = component.get('tree_fs')
         self.frame = component.get('frame')
         self.chat = component.get('chat')
         self.drag = True
@@ -83,7 +83,7 @@
         pass
 
     def on_rclick(self,evt):
-        self.core_tree.do_std_menu(evt,self)
+        self.tree.do_std_menu(evt,self)
 
     def on_ldclick(self,evt):
         return 0
@@ -217,28 +217,28 @@
         self.chat.ParsePost(self.tohtml(),True,True)
 
     def on_drop(self, evt):
-        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):
+        drag_obj = self.tree.drag_obj
+        if drag_obj == self or self.tree.is_parent_node(self.mytree_node, drag_obj.mytree_node):
             return
-        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
+        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
         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.core_tree.load_xml(drop_xml, parent_node, prev_sib)
+        self.tree.load_xml(drop_xml, parent_node, prev_sib)
 
     def get_tree(self):
         family = []
         test = treenode
-        while test != self.core_tree.root:
-            test = self.core_tree.GetItemParent(test)
-            parent = self.core_tree.GetItemText(test)
+        while test != self.tree.root:
+            test = self.tree.GetItemParent(test)
+            parent = self.tree.GetItemText(test)
             family.append(parent)
         return family
 
@@ -250,26 +250,26 @@
 
     def delete(self):
         """ removes the tree_node and xml_node, and returns the removed xml_node """
-        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_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_xml.remove(self.xml)
-        self.core_tree.Delete(self.mytree_node)
+        self.tree.Delete(self.mytree_node)
         return self.xml
 
     def rename(self,name):
         if len(name):
-            self.core_tree.SetItemText(self.mytree_node,name)
+            self.tree.SetItemText(self.mytree_node,name)
             self.xml.set('name', name)
 
     def change_icon(self,icon):
         self.xml.set("icon",icon)
-        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()
+        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()
 
     def on_save(self,evt):
-        f = wx.FileDialog(self.core_tree,"Select a file", orpg.dirpath.dir_struct["user"],"","XML files (*.xml)|*.xml",wx.SAVE)
+        f = wx.FileDialog(self.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()
 
@@ -365,8 +365,8 @@
     def on_ldclick(self,evt):
         title = self.xml.get('name')
         new_xml = XML(tostring(self.xml[0]))
-        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)
+        self.tree.root_xml.insert(0, new_xml)
+        tree_node = self.tree.load_xml(new_xml,self.tree.root,self.tree.root)
         return 1
 
 ##########################
@@ -386,19 +386,19 @@
 
     def on_ldclick(self,evt):
         file_name = self.file_node.get("name")
-        self.core_tree.insert_xml(open(orpg.dirpath.dir_struct["nodes"] + file_name,"r").read())
+        self.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.core_tree.GetParent(),tlist,vlist,"File Loader Edit")
+        dlg = orpgMultiTextEntry(self.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.core_tree.SetItemText(self.mytree_node,vlist[0])
+            self.tree.SetItemText(self.mytree_node,vlist[0])
         dlg.Destroy()
 
 ##########################
@@ -419,19 +419,19 @@
     def on_ldclick(self,evt):
         file_name = self.file_node.get("url")
         file = urllib.urlopen(file_name)
-        self.core_tree.insert_xml(file.read())
+        self.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.core_tree.GetParent(),tlist,vlist,"File Loader Edit")
+        dlg = orpgMultiTextEntry(self.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.core_tree.SetItemText(self.mytree_node,vlist[0])
+            self.tree.SetItemText(self.mytree_node,vlist[0])
         dlg.Destroy()
 
 
--- a/orpg/gametree/nodehandlers/forms.py	Thu Jan 14 21:22:21 2010 -0600
+++ b/orpg/gametree/nodehandlers/forms.py	Fri Jan 15 00:09:39 2010 -0600
@@ -256,7 +256,6 @@
         self.Bind(wx.EVT_BUTTON, self.on_send, id=FORM_SEND_BUTTON)
 
     def on_text(self, evt):
-        debug()
         txt = self.text.GetValue()
         #txt = strip_text(txt) ##Does not seem to exist.
         self.handler.text_elem.text = txt
@@ -289,6 +288,7 @@
     def __init__(self, parent, handler):
         wx.Panel.__init__(self, parent, -1)
         self.handler = handler
+        self.parent = parent
         sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, "Text Properties"), wx.VERTICAL)
 
         self.title = wx.TextCtrl(self, P_TITLE, handler.xml.get('name'))
@@ -332,6 +332,7 @@
         self.Bind(wx.EVT_CHECKBOX, self.on_hide_button, id=F_HIDE_TITLE)
         self.Bind(wx.EVT_CHECKBOX, self.on_send_button, id=F_SEND_BUTTON)
         self.Bind(wx.EVT_BUTTON, self.on_reference, id=T_BUT_REF)
+        self.parent.Bind(wx.EVT_CLOSE, self.tree_failsafe)
 
     ## EZ_Tree Core TaS - Prof.Ebral ##
     def on_reference(self, evt, car=None):
@@ -343,6 +344,10 @@
         self.temp_wnd.load_tree(settings.get("gametree"))
         self.do_tree.Show()
 
+    def tree_failsafe(self, evt):
+        self.parent.Destroy()
+        component.add('tree', component.get('tree_fs')) ## Backup
+
     def get_grid_ref(self, obj, complete):
         self.temp_wnd.Freeze()
         self.grid_ref = complete
@@ -776,6 +781,7 @@
         self.handler.add_option(self.caption_entry.GetValue(), self.value_entry.GetValue())
         self.reload_options()
         self.dlg.Destroy()
+        component.add('tree', component.get('tree_fs')) ## Backup
         return
 
     ## EZ_Tree Core TaS - Prof.Ebral ##
@@ -851,12 +857,12 @@
         self.handler.edit_option(self.index, self.value_entry.GetValue())
         self.reload_options()
         self.dlg.Destroy()
-        #component.add('tree', component.get('tree_fs')) ## 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_fs')) ## Backup
+        component.add('tree', component.get('tree_fs')) ## Backup
         return
 
     def on_remove(self,evt):
--- a/orpg/gametree/nodehandlers/rpg_grid.py	Thu Jan 14 21:22:21 2010 -0600
+++ b/orpg/gametree/nodehandlers/rpg_grid.py	Fri Jan 15 00:09:39 2010 -0600
@@ -387,6 +387,7 @@
     def __init__(self, parent, handler):
         wx.Panel.__init__(self, parent, -1)
         self.handler = handler
+        self.parent = parent
         self.grid = rpg_grid(self,handler)
         self.main_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, "Grid"), wx.VERTICAL)
 
@@ -430,6 +431,7 @@
         self.Bind(wx.EVT_RADIOBOX, self.on_radio_box, id=GRID_BOR)
         self.Bind(wx.EVT_CHECKBOX, self.on_auto_size, id=G_AUTO_SIZE)
         self.Bind(wx.EVT_BUTTON, self.on_reference, id=G_BUT_REF)
+        self.parent.Bind(wx.EVT_CLOSE, self.tree_failsafe)
 
     ## EZ_Tree Core TaS - Prof.Ebral ##
     def on_reference(self, evt, car=None):
@@ -441,6 +443,10 @@
         self.temp_wnd.load_tree(settings.get("gametree"))
         self.do_tree.Show()
 
+    def tree_failsafe(self, evt):
+        self.parent.Destroy()
+        component.add('tree', component.get('tree_fs')) ## Backup
+
     def get_grid_ref(self, obj, complete):
         self.temp_wnd.Freeze()
         self.grid_ref = complete
--- a/orpg/orpg_version.py	Thu Jan 14 21:22:21 2010 -0600
+++ b/orpg/orpg_version.py	Fri Jan 15 00:09:39 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-03"
+BUILD = "100115-00"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"