traipse_dev: orpg/main.py comparison

comparison orpg/main.py @ 133:37d26a98883f alpha

Traipse Alpha 'OpenRPG' {091010-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 (Cleaning up for Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core 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 default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana **Pretty important update that can help remove thousands of dead children from your gametree. **Children, <forms />, <group_atts />, <horizontal />, <cols />, <rows />, <height />, etc... are all tags now. Check your gametree and look for dead children!! **New Gamtree Recusion method, mapping, and context sensitivity. !!Alpha - Watch out for infinite loops!! Dead Node Children, now that's a O O -v-v- Happy Halloween!

author	sirebral
date	Tue, 10 Nov 2009 12:11:13 -0600
parents	e7f990be5075
children	82c47d583493

comparison

equal deleted inserted replaced

-:fe4dc5817d5e
+:37d26a98883f
 from orpg.orpgCore import *
 from orpg_version import *
 from orpg.orpg_windows import *
 import wx.py
-#from orpg import minidom
 import orpg.player_list
 import orpg.tools.pluginui as pluginUI
 import orpg.tools.aliaslib
 import orpg.tools.toolBars
 import orpg.tools.orpg_sound
 import upmana.updatemana
 import upmana.manifest as manifest
 from orpg.dirpath import dir_struct
 from orpg.dieroller.utils import DiceManager
-from orpg.tools.orpg_settings import settings
+from orpg.tools.settings import settings
 from orpg.tools.validate import validate
 from orpg.tools.passtool import PassTool
 from orpg.tools.orpg_log import logger, crash, debug
 from orpg.tools.metamenus import MenuBarEx
 from xml.etree.ElementTree import ElementTree, Element, parse
 from xml.etree.ElementTree import fromstring, tostring
+## Element Tree usage will require users to convert to and from string data quite often until users of older versions update.
+## This is a problem that users of older versions will need to cross as it is both Core and Traipse that will make the change.
+## Older versions have a problem with correct XML.
 from orpg.orpg_xml import xml #to be replaced by etree
 ####################################
 ## Main Frame
 self.mainmenu = MenuBarEx(self, menu)
 if settings.get('Heartbeat') == '1':
 self.mainmenu.SetMenuState("GameServerServerHeartbeat", True)
+self.mainmenu.SetMenuState('ToolsPasswordManager', True if settings.get('PWMannager') == 'On' else False)
 tabtheme = settings.get('TabTheme')  #This change is stable. TaS.
 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedColorful", tabtheme == 'slanted&colorful')
 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedBlackandWhite", tabtheme == 'slanted&bw')
 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedAqua", tabtheme == 'slanted&aqua')
 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatBlackandWhite", tabtheme == 'flat&bw')
 # Traipse Suite of Additions.
 self.traipseSuite = wx.Menu()
 self.mainmenu.Insert(5, self.traipseSuite, "&Traipse Suite")
-	#Update Manager
+#Update Manager
 mana = wx.MenuItem(self.traipseSuite, wx.ID_ANY, "Update Manager", "Update Manager")
 self.Bind(wx.EVT_MENU, self.OnMB_UpdateManagerPanel, mana)
 self.traipseSuite.AppendItem(mana)
 self.debugConsole = wx.MenuItem(self.traipseSuite, -1, "Debug Console", "Debug Console")
 if wx.VERSION_STRING > "2.8": self.Bind(AUI.EVT_AUI_PANE_CLOSE, self.onPaneClose)
 else: self.Bind(AUI.EVT_AUI_PANECLOSE, self.onPaneClose)
 logger.debug("AUI Bindings Done")
 #Load the layout if one exists
-layout = xml_dom.findall("DockLayout")
+layout = xml_dom.find("DockLayout")
 try:
-textnode = xml.safe_get_text_node(layout[0])
+self._mgr.LoadPerspective(layout.text)
-self._mgr.LoadPerspective(textnode.text)
 except: pass
 logger.debug("Perspective Loaded")
 self._mgr.GetPane("Browse Server Window").Hide()
 self._mgr.Update()
 self.Maximize(maximized)
 self._mgr.Update()
 def saveLayout(self):
 filename = dir_struct["user"] + "layout.xml"
-layout = parse(dir_struct["user"] + "layout.xml")
+layout = parse(filename)
 xml_dom = layout.getroot()
 (x_size,y_size) = self.GetClientSize()
 (x_pos,y_pos) = self.GetPositionTuple()
 if self.IsMaximized(): max = 1
 else: max = 0
 xml_dom.set("height", str(y_size))
 xml_dom.set("width", str(x_size))
 xml_dom.set("posx", str(x_pos))
 xml_dom.set("posy", str(y_pos))
 xml_dom.set("maximized", str(max))
-layout = xml_dom.findall("DockLayout")
 try:
-layout[0].text = str(self._mgr.SavePerspective())
+xml_dom.find("DockLayout").text = str(self._mgr.SavePerspective())
 except:
 elem = Element('DockLayout')
 elem.set("DO_NO_EDIT","True")
 elem.text = str(self._mgr.SavePerspective())
 xml_dom.append(elem)
+layout.write(filename)
+"""
 temp_file = open(filename, "w")
 temp_file.write(tostring(xml_dom))
-temp_file.close()
+temp_file.close()"""
 def build_hotkeys(self):
 self.mainmenu.accel.xaccel.extend(self.chat.get_hot_keys())
 self.mainmenu.accel.xaccel.extend(self.map.get_hot_keys())
 for m in ignore_id:
 if m == player[2]: logger.debug("ignoring message from player:" + player[0], True); return
 # ok we are not ignoring this message
 #recvSound = "RecvSound"     #  this will be the default sound.  Whisper will change this below
 ### Alpha  ###
 etreeEl = Element('msg')
 try: etreeEl.append(fromstring(data))
 except: etreeEl.text = data
 ### Remove after Element Tree is integrated further ###
-if player:
+if player: display_name = self.chat.chat_display_name(player)
-display_name = self.chat.chat_display_name(player)
+else: display_name = "Server Administrator"
-else:
-display_name = "Server Administrator"
+if etreeEl.text: self.chat.Post(etreeEl.text)
-if etreeEl.text:
-self.chat.Post(etreeEl.text)
 for child in etreeEl.getchildren():
 if child.tag == 'tree':
 ### Alpha ### Allows users to decide if they want the node or not.
-dlg = wx.MessageDialog(None, display_name + 'is trying to send you a tree node. Accept?', 'Question',
+dlg = wx.MessageDialog(None, display_name + ' is trying to send you a tree node. Accept?', 'Question',
 wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
 if dlg.ShowModal() == wx.ID_YES:
 dlg.Destroy()
-self.tree.on_receive_data(data, player)
+debug(child)
+self.tree.on_receive_data(tostring(child))       #Removed player object because it was unused.
 self.chat.InfoPost(display_name + " has sent you a tree node...")
-### Core ### to be milked in later.
-#TODO: Fix game tree to accepts elements
-#self.tree.on_receive_data(child, player)
-#self.chat.InfoPost(display_name + " has sent you a tree node...")
 elif child.tag == 'map':
-### Core ### Adapted from, remove tostring later
 #TODO: Fix map to accepts elements
 self.map.new_data(tostring(child))
 elif child.tag == 'chat':
-msg = orpg.chat.chat_msg.chat_msg(data)
+msg = orpg.chat.chat_msg.chat_msg(tostring(child))
 self.chat.post_incoming_msg(msg, player)
-### Core ### to be milked in later
-#msg = orpg.chat.chat_msg.chat_msg()
-#msg.takedom(child)
-#self.chat.post_incoming_msg(msg, player)
 def on_mplay_event(self, evt):
 id = evt.get_id()
 if id == orpg.networking.mplay_client.MPLAY_CONNECTED:
 self.chat.InfoPost("Game connected!")

Mercurial > traipse_dev

comparison orpg/main.py @ 133:37d26a98883f alpha