changeset 95:af6bf998f425 alpha

Traipse Alpha 'OpenRPG' {090919-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: 00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. 01: Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands. 02: Fixes problems with Remote Image Upload. Fixes Drop and Drag of Minis to Map. CherryPy can now use any image in the webfiles/ folder and sub-folders. CherryPy can now Drop and Drag Minis to the Map. 03: Minor changes to Update Manager's GUI. Expert recommendation warning added to Revision Update. Step down compatibility with open_rpg & component added to orpgCore. 19-00: Better backwards compatibility in orpgCore. Using majority of 'Grumpy' network folder to correct server lag. 01: Build Number updated. 02: Fixes CherryPit misspelling. Makes Traipse Suite 'Attention' item portable, and executes it on 'Critical' debug notices. Adds incomplete Shift + Enter to Text Entry, currently creates a 'Critical' warning.
author sirebral
date Sat, 19 Sep 2009 12:19:17 -0500
parents ce5c76d49df0
children 65c1604e7949
files orpg/main.py orpg/mapper/miniatures_handler.py orpg/orpg_version.py orpg/tools/orpg_log.py orpg/tools/predTextCtrl.py
diffstat 5 files changed, 21 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/main.py	Sat Sep 19 06:46:50 2009 -0500
+++ b/orpg/main.py	Sat Sep 19 12:19:17 2009 -0500
@@ -271,6 +271,15 @@
         self.debugConsole = wx.MenuItem(self.traipseSuite, -1, "Debug Console", "Debug Console")
         self.Bind(wx.EVT_MENU, self.OnMB_DebugConsole, self.debugConsole)
         self.traipseSuite.AppendItem(self.debugConsole)
+
+    def TraipseSuiteWarn(self, menuitem):
+        ### Beta ### Allows for the reuse of the 'Attention' menu.
+        ### component.get('frame').TraipseSuiteWarn('item') ### Portable
+        self.mainmenu.Replace(8, self.traipseSuite, '&Traipse Suite!')
+        if menuitem == 'debug':
+            self.debugConsole.SetBitmap(wx.Bitmap(dir_struct["icon"] + 'spotlight.png'))
+            self.traipseSuite.RemoveItem(self.debugConsole)
+            self.traipseSuite.AppendItem(self.debugConsole)
        
 
     #################################
--- a/orpg/mapper/miniatures_handler.py	Sat Sep 19 06:46:50 2009 -0500
+++ b/orpg/mapper/miniatures_handler.py	Sat Sep 19 12:19:17 2009 -0500
@@ -167,7 +167,7 @@
             thread.start_new_thread(self.canvas.layers['miniatures'].upload, 
                                     (postdata, dlg.GetPath()), {'pos':cmpPoint(x,y)})
         else:
-            self.CherryPy(dlg.GetDirectory(), filename)
+            self.CherryPit(dlg.GetDirectory(), filename)
 
     def CherryPit(self, path, filename):
         try: min_url = component.get("cherrypy") + filename
--- a/orpg/orpg_version.py	Sat Sep 19 06:46:50 2009 -0500
+++ b/orpg/orpg_version.py	Sat Sep 19 12:19:17 2009 -0500
@@ -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 = "090919-01"
+BUILD = "090919-02"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/orpg/tools/orpg_log.py	Sat Sep 19 06:46:50 2009 -0500
+++ b/orpg/tools/orpg_log.py	Sat Sep 19 12:19:17 2009 -0500
@@ -54,16 +54,10 @@
     crash_report.close()
     logger.exception("Crash Report Created!!")
     logger.info("Printed out crash-report.txt in your System folder", True)
-    #component.get('frame').traipseSuite.SetTitle('&Traipse!!')
-    component.get('frame').mainmenu.Replace(8, component.get('frame').traipseSuite, '&Traipse Suite!')
-    component.get('frame').debugConsole.SetBitmap(wx.Bitmap(dir_struct["icon"] + 'spotlight.png'))
-    component.get('frame').traipseSuite.RemoveItem(component.get('frame').debugConsole)
-    component.get('frame').traipseSuite.AppendItem(component.get('frame').debugConsole)
-    #wx.MessageBox('Crash Report Created!', 'System Failure')
 
 class DebugConsole(wx.Frame):
     def __init__(self, parent):
-        super(DebugConsole, self).__init__(parent, -1, "Debug Window")
+        super(DebugConsole, self).__init__(parent, -1, "Debug Console")
         icon = None
         icon = wx.Icon(dir_struct["icon"]+'note.ico', wx.BITMAP_TYPE_ICO)
         self.SetIcon( icon )
@@ -122,6 +116,8 @@
         self.log(msg, ORPG_GENERAL, to_console)
 
     def exception(self, msg, to_console=True):
+        ### Beta ### Every 'Critical' exception will draw attention to the Debug Console
+        component.get('frame').TraipseSuiteWarn('debug')
         self.log(msg, ORPG_CRITICAL, to_console)
 
     def log(self, msg, log_type, to_console=False):
--- a/orpg/tools/predTextCtrl.py	Sat Sep 19 06:46:50 2009 -0500
+++ b/orpg/tools/predTextCtrl.py	Sat Sep 19 12:19:17 2009 -0500
@@ -34,6 +34,7 @@
 import string
 from orpg.orpg_windows import *
 from wx.lib.expando import ExpandoTextCtrl
+from orpg.tools.orpg_log import logger
 
 #  This line added to test CVS commit
 
@@ -434,6 +435,12 @@
                                                            #  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 += '<br />'
+                return
+
 
             elif event.GetKeyCode() == wx.WXK_RETURN:            #  We want to hook returns, so that we can update the word list