Mercurial > traipse_dev

diff orpg/main.py @ 115:17b64e9133e9 alpha

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Alpha 'OpenRPG' {091012-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: Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images! Changes made to the map for increased portability. SnowDog has changes planned in Core, though. Added an initial push to the BCG. Not much to see, just shows off how it is re-writing Main code. Fix to remote admin commands Minor fix to texted based server, works in /System/ folder Some Core changes to gametree to correctly disply Pretty Print, thanks David! Fix to Splitter Nodes not being created. Added images to Plugin Control panel for Autostart feature Fix to massive amounts of images loading; from Core {091011} fix to gsclient so with_statement imports Added 'boot' command to remote admin Prep work in Pass tool for remote admin rankings and different passwords, ei, Server, Admin, Moderator, etc. {091012} 00: Remote Admin Commands more organized, more prep work. Added Confirmation window for sent nodes.
author sirebral
date Mon, 12 Oct 2009 01:11:10 -0500
parents 95b5281e8d34
children d078a8cdc1e4
line wrap: on
line diff
--- a/orpg/main.py	Sun Oct 11 16:38:54 2009 -0500
+++ b/orpg/main.py	Mon Oct 12 01:11:10 2009 -0500
@@ -49,8 +49,9 @@
 import orpg.mapper.map
 import orpg.mapper.images
 
-import upmana.updatemana
-import upmana.manifest as manifest
+#Update Manager# Un remark if you have Mercurial installed
+#import upmana.updatemana
+#import upmana.manifest as manifest
 
 from orpg.dirpath import dir_struct
 from orpg.dieroller.utils import DiceManager
@@ -132,12 +133,12 @@
         logger.debug("plugins reloaded and startup plugins launched")
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-        #Load Update Manager
-        component.add('updatemana', self.updateMana)
-        logger.debug("update manager reloaded")
-        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
+        #Load Update Manager# Un remark if you have Mercurial installed
+        #component.add('updatemana', self.updateMana)
+        #logger.debug("update manager reloaded")
+        #self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-        #Load Update Manager
+        #Load Debug Console
         component.add('debugconsole', self.debugger)
         logger.debug("debugger window")
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
@@ -264,9 +265,10 @@
         self.traipseSuite = wx.Menu()
         self.mainmenu.Insert(5, self.traipseSuite, "&Traipse Suite")
 
-        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)
+	#Update Manager# Un remark if you have Mercurial installed
+        #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")
         self.Bind(wx.EVT_MENU, self.OnMB_DebugConsole, self.debugConsole)
@@ -638,18 +640,18 @@
         self.SetDimensions(posx, posy, w, h)
         logger.debug("Dimensions Set")
 
-        # Update Manager
-        self.manifest = manifest.ManifestChanges()
-        self.updateMana = upmana.updatemana.updaterFrame(self, 
-            "OpenRPG Update Manager Beta 0.8", component, self.manifest, True)
-        logger.debug("Menu Created")
-        h = int(xml_dom.getAttribute("height"))
-        w = int(xml_dom.getAttribute("width"))
-        posx = int(xml_dom.getAttribute("posx"))
-        posy = int(xml_dom.getAttribute("posy"))
-        maximized = int(xml_dom.getAttribute("maximized"))
-        self.SetDimensions(posx, posy, w, h)
-        logger.debug("Dimensions Set")
+        # Update Manager # Un remark if you have Mercurial installed
+        #self.manifest = manifest.ManifestChanges()
+        #self.updateMana = upmana.updatemana.updaterFrame(self, 
+        #    "OpenRPG Update Manager Beta 0.8", component, self.manifest, True)
+        #logger.debug("Menu Created")
+        #h = int(xml_dom.getAttribute("height"))
+        #w = int(xml_dom.getAttribute("width"))
+        #posx = int(xml_dom.getAttribute("posx"))
+        #posy = int(xml_dom.getAttribute("posy"))
+        #maximized = int(xml_dom.getAttribute("maximized"))
+        #self.SetDimensions(posx, posy, w, h)
+        #logger.debug("Dimensions Set")
 
         # Debug Console
         self.debugger = orpg.tools.orpg_log.DebugConsole(self)
@@ -974,8 +976,13 @@
         else: display_name = "Server Administrator"
 
         if data[:5] == "<tree":
-            self.tree.on_receive_data(data,player)
-            self.chat.InfoPost(display_name + " has sent you a tree node...")
+            ### 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', 
+                wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
+            if dlg.ShowModal() == wx.ID_YES:
+              dlg.Destroy()
+              self.tree.on_receive_data(data,player)
+              self.chat.InfoPost(display_name + " has sent you a tree node...")
 
         elif data[:4] == "<map": self.map.new_data(data)
 
@@ -1223,7 +1230,8 @@
         logger._set_log_level = int(settings.get_setting('LoggingLevel'))
         logger._set_log_to_console(False)
 
-        self.manifest = manifest.ManifestChanges()
+	#Update Manager# Un remark if you have Mercurial installed
+        #self.manifest = manifest.ManifestChanges()
 
         self.called = False
         wx.InitAllImageHandlers()