diff orpg/main.py @ 162:e3714f232f2f beta

Traipse Beta 'OpenRPG' {091128-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 (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 Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added 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. *Whiteboard from Core not showing* default_manifest.xml renamed to default_upmana.xml Fix to Update Manager; cleaner clode for saved repositories
author sirebral
date Sat, 28 Nov 2009 01:25:58 -0600
parents 6081bdc2b8d5
children ff48c2741fe7
line wrap: on
line diff
--- a/orpg/main.py	Thu Nov 26 14:25:47 2009 -0600
+++ b/orpg/main.py	Sat Nov 28 01:25:58 2009 -0600
@@ -98,6 +98,7 @@
                 "on_password_signal":self.on_password_signal,
                 "orpgFrame":self}
         self.session = orpg.networking.mplay_client.mplay_client(settings.get("player"), call_backs)
+        component.add("session", self.session)
         self.poll_timer = wx.Timer(self, wx.NewId())
         self.Bind(wx.EVT_TIMER, self.session.poll, self.poll_timer)
         self.poll_timer.Start(100)
@@ -110,19 +111,13 @@
 
         #create password manager --SD 8/03
         self.password_manager = component.get('password_manager')
-        component.add("session", self.session)
-        component.add('frame', self)
 
         # build frame windows
+        component.add('frame', self)
         self.build_menu()
         self.build_gui()
         self.build_hotkeys()
-
         logger.debug("GUI Built")
-        component.add("chat",self.chat)
-        component.add("map",self.map)
-        component.add("alias", self.aliaslib)
-
         logger.debug("openrpg components all added")
         self.tree.load_tree(settings.get("gametree"))
         logger.debug("Tree Loaded")
@@ -138,9 +133,7 @@
         try: tipotday_start = int(tipotday_start)
         except TypeError: tipotday_start = 0
 
-
         self.TipOfTheDay = wx.CreateFileTipProvider(dir_struct['data']+'tips.txt', tipotday_start)
-
         #Load Update Manager
         component.add('updatemana', self.updateMana)
         logger.debug("update manager reloaded")
@@ -164,7 +157,6 @@
             if settings.get('tipotday_enabled').lower() != '0': self.ShowTipOfTheDay()
         except: self.add_setting('Tip of the Day')
 
-
     def add_setting(self, setting):
         if setting == 'Tip of the Day':
             settings.add_tab('General', 'Tip of the Day', 'grid')
@@ -204,7 +196,6 @@
                 else: pass
         except: traceback.print_exc()
 
-    
     def build_menu(self):
         menu = \
                 [[
@@ -583,7 +574,6 @@
             self._mgr.GetPane("Map Tool Bar").Show()
         self._mgr.Update()
 
-    #Help Menu #Needs a custom Dialog because it is ugly on Windows
     def OnMB_HelpAbout(self):
         if self.AboutORPG.IsShown() == True: self.AboutORPG.Hide()
         else: self.AboutORPG.Show()
@@ -732,6 +722,7 @@
 
         #Create the Alias Lib Window
         self.aliaslib = orpg.tools.aliaslib.AliasLib()
+        component.add("alias", self.aliaslib)
         self.aliaslib.Hide()
         logger.debug("Alias Window Created")
         menuid = wx.NewId()
@@ -747,9 +738,11 @@
         logger.debug("AUI Bindings Done")
 
         #Load the layout if one exists
-        layout = xml_dom.find("DockLayout")
-        self._mgr.LoadPerspective(layout.text)
-        logger.debug("Perspective Loaded")
+        try:
+            layout = xml_dom.find("DockLayout")
+            self._mgr.LoadPerspective(layout.text)
+            logger.debug("Perspective Loaded")
+        except: pass
         self._mgr.GetPane("Browse Server Window").Hide()
         self._mgr.Update()
         self.Maximize(maximized)
@@ -785,6 +778,8 @@
         elif name == "map":
             temp_wnd = orpg.mapper.map.map_wnd(parent_wnd, -1)
             self.map = temp_wnd
+            component.add("map",self.map)
+
         elif name == "tree":
             temp_wnd = orpg.gametree.gametree.game_tree(parent_wnd, -1)
             self.tree = temp_wnd
@@ -799,6 +794,7 @@
             temp_wnd = orpg.chat.chatwnd.chat_notebook(parent_wnd, wx.DefaultSize)
             self.chattabs = temp_wnd
             self.chat = temp_wnd.MainChatPanel
+            component.add("chat",self.chat)
 
         elif name == "player":
             temp_wnd = orpg.player_list.player_list(parent_wnd)
@@ -840,7 +836,6 @@
         self._mgr.AddPane(temp_wnd, wndinfo)
         return temp_wnd
 
-    
     def onPaneClose(self, evt):
         pane = evt.GetPane()
         #Arbitrary If ELIF fix. Items had incorrect ID's set. Finding correct ID will fix it for the iteration.
@@ -855,7 +850,6 @@
         evt.Skip()
         self._mgr.Update()
 
-    
     def saveLayout(self):
         filename = dir_struct["user"] + "layout.xml"
         layout = parse(filename)
@@ -869,14 +863,12 @@
         xml_dom.set("posx", str(x_pos))
         xml_dom.set("posy", str(y_pos))
         xml_dom.set("maximized", str(max))
-        try:
-            xml_dom.find("DockLayout").text = str(self._mgr.SavePerspective())
+        try: 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)
 
     def build_hotkeys(self):