traipse_dev: orpg/main.py annotate

annotate orpg/main.py @ 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	d1aff41c031b
children	65c1604e7949

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 #!/usr/bin/env python
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 # Copyright (C) 2000-2001 The OpenRPG Project
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4 # openrpg-dev@lists.sourceforge.net
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 # This program is free software; you can redistribute it and/or modify
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7 # it under the terms of the GNU General Public License as published by
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 # the Free Software Foundation; either version 2 of the License, or
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 # (at your option) any later version.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 # This program is distributed in the hope that it will be useful,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 # GNU General Public License for more details.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16 # You should have received a copy of the GNU General Public License
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 # along with this program; if not, write to the Free Software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 # --
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # File: main.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 # Author: Chris Davis
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 # Maintainer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 # Version:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 # $Id: main.py,v 1.153 2008/01/24 03:52:03 digitalxero Exp $
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 # Description: This is the main entry point of the oprg application
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	30 __version__ = "$Id: main.py,v 1.154 2009/07/19 03:52:03 madmathlabs Exp $"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 from orpg.orpg_wx import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 from orpg.orpgCore import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 from orpg_version import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 from orpg.orpg_windows import *
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	36
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	37 import wx.py
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	38 from orpg import minidom
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	39 import orpg.player_list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	40 import orpg.tools.pluginui as pluginUI
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	41 import orpg.tools.aliaslib
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42 import orpg.tools.toolBars
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43 import orpg.tools.orpg_sound
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 import orpg.tools.rgbhex
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 import orpg.gametree.gametree
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46 import orpg.chat.chatwnd
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	47 import orpg.networking.gsclient
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48 import orpg.networking.mplay_client
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 import orpg.mapper.map
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50 import orpg.mapper.images
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	51
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	52 import upmana.updatemana
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	53 import upmana.manifest as manifest
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	55 from orpg.dirpath import dir_struct
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	56 from orpg.dieroller.utils import DiceManager
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	57 from orpg.tools.orpg_settings import settings
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	58 from orpg.tools.validate import validate
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	59 from orpg.tools.passtool import PassTool
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	60 from orpg.tools.orpg_log import logger, crash
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	61 from orpg.tools.decorators import debugging
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	62 from orpg.tools.metamenus import MenuBarEx
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	63
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	64 #from xml.etree.ElementTree import ElementTree, Element
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	65 #from xml.etree.ElementTree import fromstring, tostring
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	66 from orpg.orpg_xml import xml #to be replaced by etree
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	67
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	68
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	69 ####################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70 ## Main Frame
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 ####################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 class orpgFrame(wx.Frame):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	75 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76 def __init__(self, parent, id, title):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 wx.Frame.__init__(self, parent, id, title, wx.Point(100, 100), wx.Size(600,420), style=wx.DEFAULT_FRAME_STYLE)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	78 self.validate = component.get("validate")
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	79 logger.debug("Enter orpgFrame")
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	80 self.rgb = orpg.tools.rgbhex.RGBHex()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 self._mgr = AUI.AuiManager(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 # Determine which icon format to use
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 icon = None
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	85 if wx.Platform == '__WXMSW__': icon = wx.Icon(dir_struct["icon"]+'d20.ico', wx.BITMAP_TYPE_ICO)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	86 else: icon = wx.Icon(dir_struct["icon"]+"d20.xpm", wx.BITMAP_TYPE_XPM)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	87 self.SetIcon( icon )
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	89 # create session
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 call_backs = {"on_receive":self.on_receive,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 "on_mplay_event":self.on_mplay_event,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 "on_group_event":self.on_group_event,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	93 "on_player_event":self.on_player_event,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94 "on_status_event":self.on_status_event,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95 "on_password_signal":self.on_password_signal,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	96 "orpgFrame":self}
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	97 self.settings = component.get('settings') #Arbitrary until settings updated with Core.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 self.session = orpg.networking.mplay_client.mplay_client(self.settings.get_setting("player"), call_backs)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	99 self.poll_timer = wx.Timer(self, wx.NewId())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100 self.Bind(wx.EVT_TIMER, self.session.poll, self.poll_timer)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 self.poll_timer.Start(100)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	102 self.ping_timer = wx.Timer(self, wx.NewId())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	103 self.Bind(wx.EVT_TIMER, self.session.update, self.ping_timer)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105 # create roller manager
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	106 self.DiceManager = DiceManager(settings.get_setting("dieroller"))
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	107 component.add('DiceManager', self.DiceManager)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	108
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	109 #create password manager --SD 8/03
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	110 self.password_manager = component.get('password_manager')
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	111 component.add("session", self.session)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	112 component.add('frame', self)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	113
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	114 # build frame windows
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	115 self.build_menu()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	116 self.build_gui()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	117 self.build_hotkeys()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	118
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	119 logger.debug("GUI Built")
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	120 component.add("chat",self.chat)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	121 component.add("map",self.map)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	122 component.add("alias", self.aliaslib)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	123
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	124 logger.debug("openrpg components all added")
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	125 self.tree.load_tree(settings.get_setting("gametree"))
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	126 logger.debug("Tree Loaded")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	127 self.players.size_cols()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 #Load the Plugins This has to be after the chat component has been added
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	130 component.add('pluginmenu', self.pluginMenu)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131 self.pluginsFrame.Start()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	132 logger.debug("plugins reloaded and startup plugins launched")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	133 self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	135 #Load Update Manager
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	136 component.add('updatemana', self.updateMana)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	137 logger.debug("update manager reloaded")
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	138 self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	139
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	140 #Load Update Manager
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	141 component.add('debugconsole', self.debugger)
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	142 logger.debug("debugger window")
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	143 self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	144
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	145 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146 def post_show_init(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 """Some Actions need to be done after the main fram is drawn"""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 self.players.size_cols()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	150 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 def get_activeplugins(self):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	152 try: tmp = self.pluginsFrame.get_activeplugins()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	153 except: tmp = {}
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154 return tmp
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	155
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	156 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	157 def get_startplugins(self):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	158 try: tmp = self.pluginsFrame.get_startplugins()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	159 except: tmp = {}
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	160 return tmp
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	161
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	162 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	163 def on_password_signal(self,signal,type,id,data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	164 try:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	165 msg = ["DEBUG: password response= ",
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	166 str(signal),
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	167 " (T:",
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	168 str(type),
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	169 " #",
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	170 str(id),
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	171 ")"]
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	172 logger.debug("".join(msg))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 id = int(id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 type = str(type)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175 data = str(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	176 signal = str(signal)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	177 if signal == "fail":
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	178 if type == "server": self.password_manager.ClearPassword("server", 0)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	179 elif type == "admin": self.password_manager.ClearPassword("admin", int(id))
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	180 elif type == "room": self.password_manager.ClearPassword("room", int(id))
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	181 else: pass
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	182 except: traceback.print_exc()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	183
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	184 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 def build_menu(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 menu = \
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 [[
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188 ['&OpenRPG'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 [' &Settings\tCtrl-S'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 [' Tab Styles'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 [' Slanted'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 [' Colorful', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194 [' Black and White', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 [' Aqua', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 [' Custom', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 [' Flat'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 [' Black and White', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 [' Aqua', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 [' Custom', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	201 [' NewMap'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 [' &Exit']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 ],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 [
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206 ['&Game Server'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 [' &Browse Servers\tCtrl-B'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	208 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	209 [' Server Heartbeat', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	210 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	211 [' &Start Server']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	212 ],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213 [
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	214 ['&Tools'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 [' Logging Level'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	216 [' Debug', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	217 [' Note', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	218 [' Info', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219 [' General', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	220 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	221 [' Password Manager', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	222 [' -'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	223 [' Sound Toolbar', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	224 [' Dice Bar\tCtrl-D', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	225 [' Map Bar', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	226 [' Status Bar\tCtrl-T', "check"],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	227 ],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	228 [
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	229 ['&Help'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	230 [' &About'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231 [' Online User Guide'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232 [' Change Log'],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 [' Report a Bug']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	234 ]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	235
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	236 self.mainmenu = MenuBarEx(self, menu)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	237 if settings.get_setting('Heartbeat') == '1':
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 self.mainmenu.SetMenuState("GameServerServerHeartbeat", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	240 tabtheme = settings.get_setting('TabTheme') #This change is stable. TaS.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	241 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedColorful", tabtheme == 'slanted&colorful')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	242 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedBlackandWhite", tabtheme == 'slanted&bw')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedAqua", tabtheme == 'slanted&aqua')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatBlackandWhite", tabtheme == 'flat&bw')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	245 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatAqua", tabtheme == 'flat&aqua')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedCustom", tabtheme == 'customslant')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatCustom", tabtheme == 'customflat')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	249 lvl = int(settings.get_setting('LoggingLevel'))
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	250 if lvl & ORPG_DEBUG: self.mainmenu.SetMenuState("ToolsLoggingLevelDebug", True)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	251 if lvl & ORPG_DEBUG: self.mainmenu.SetMenuState("ToolsLoggingLevelNote", True)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	252 if lvl & ORPG_INFO: self.mainmenu.SetMenuState("ToolsLoggingLevelInfo", True)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	253 if lvl & ORPG_GENERAL: self.mainmenu.SetMenuState("ToolsLoggingLevelGeneral", True)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	254
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255 self.pluginMenu = wx.Menu()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	256 item = wx.MenuItem(self.pluginMenu, wx.ID_ANY, "Control Panel", "Control Panel")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	257 self.Bind(wx.EVT_MENU, self.OnMB_PluginControlPanel, item)
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	258
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 self.pluginMenu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	260 self.pluginMenu.AppendSeparator()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261 self.mainmenu.Insert(2, self.pluginMenu, "&Plugins")
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	262
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	263 # Traipse Suite of Additions.
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	264 self.traipseSuite = wx.Menu()
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	265 self.mainmenu.Insert(5, self.traipseSuite, "&Traipse Suite")
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	266
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	267 mana = wx.MenuItem(self.traipseSuite, wx.ID_ANY, "Update Manager", "Update Manager")
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	268 self.Bind(wx.EVT_MENU, self.OnMB_UpdateManagerPanel, mana)
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	269 self.traipseSuite.AppendItem(mana)
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	270
86 bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	271 self.debugConsole = wx.MenuItem(self.traipseSuite, -1, "Debug Console", "Debug Console")
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	272 self.Bind(wx.EVT_MENU, self.OnMB_DebugConsole, self.debugConsole)
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	273 self.traipseSuite.AppendItem(self.debugConsole)
95 af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	274
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	275 def TraipseSuiteWarn(self, menuitem):
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	276 ### Beta ### Allows for the reuse of the 'Attention' menu.
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	277 ### component.get('frame').TraipseSuiteWarn('item') ### Portable
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	278 self.mainmenu.Replace(8, self.traipseSuite, '&Traipse Suite!')
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	279 if menuitem == 'debug':
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	280 self.debugConsole.SetBitmap(wx.Bitmap(dir_struct["icon"] + 'spotlight.png'))
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	281 self.traipseSuite.RemoveItem(self.debugConsole)
af6bf998f425 Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 90 diff changeset	282 self.traipseSuite.AppendItem(self.debugConsole)
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	283
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	284
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 #################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 ## All Menu Events
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	287 #################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 #Tab Styles Menus
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	289 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 def SetTabStyles(self, args, *kwargs):
26 65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	291
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	292 tabtheme = settings.get_setting('TabTheme') #This change is stable. TaS.
26 65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	293 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedColorful", tabtheme == 'slanted&colorful')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	294 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedBlackandWhite", tabtheme == 'slanted&bw')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	295 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedAqua", tabtheme == 'slanted&aqua')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	296 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatBlackandWhite", tabtheme == 'flat&bw')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	297 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatAqua", tabtheme == 'flat&aqua')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	298 self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedCustom", tabtheme == 'customslant')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	299 self.mainmenu.SetMenuState("OpenRPGTabStylesFlatCustom", tabtheme == 'customflat')
65c5cb9be59c This patch fixes the known issue with users not being able to set their name sirebral parents: 19 diff changeset	300
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	301 if kwargs.has_key('style'): newstyle = kwargs['style']
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 else:
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	303 try: newstyle = args[1]
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	304 except: logger.general('Invalid Syntax for orpgFrame->SetTabStyles(self, args, *kwargs)'); return
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	305 if kwargs.has_key('menu'): menu = kwargs['menu']
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 else:
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	307 try: menu = args[0]
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	308 except: logger.general('Invalid Syntax for orpgFrame->SetTabStyles(self, args, *kwargs)'); return
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	309
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	310 if kwargs.has_key('graidentTo'): graidentTo = kwargs['graidentTo']
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	311 else: graidentTo = None
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	312 if kwargs.has_key('graidentFrom'): graidentFrom = kwargs['graidentFrom']
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	313 else: graidentFrom = None
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	314 if kwargs.has_key('textColor'): textColor = kwargs['textColor']
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	315 else: textColor = None
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 #Run though the current tabbed window list and remove those that have been closed
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	318 tabbedwindows = component.get("tabbedWindows")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319 new = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 for wnd in tabbedwindows:
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	321 try: style = wnd.GetWindowStyleFlag(); new.append(wnd)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	322 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	323 tabbedwindows = new
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	324 component.add("tabbedWindows", tabbedwindows)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	325
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	326 #Run though the new list and set the proper styles
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	327 tabbg = settings.get_setting('TabBackgroundGradient')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	328 (red, green, blue) = self.rgb.rgb_tuple(tabbg)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	329
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330 for wnd in tabbedwindows:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 style = wnd.GetWindowStyleFlag()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332 # remove old tabs style
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	333 mirror = ~(FNB.FNB_VC71 \| FNB.FNB_VC8 \| FNB.FNB_FANCY_TABS \| FNB.FNB_COLORFUL_TABS)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	334 style &= mirror
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	335 style \|= newstyle
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	336 wnd.SetWindowStyleFlag(style)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	337 wnd.SetTabAreaColour(wx.Color(red, green, blue))
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	338 if graidentTo != None: wnd.SetGradientColourTo(graidentTo)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	339 if graidentFrom != None: wnd.SetGradientColourFrom(graidentFrom)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	340 if textColor != None: wnd.SetNonActiveTabTextColour(textColor)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	341 wnd.Refresh()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	342
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	343 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	344 def OnMB_OpenRPGNewMap(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	345 pass #Not Implemented yet!
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	346
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	347 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	348 def OnMB_OpenRPGTabStylesSlantedColorful(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349 if self.mainmenu.GetMenuState("OpenRPGTabStylesSlantedColorful"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	350 settings.set_setting('TabTheme', 'slanted&colorful')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351 self.SetTabStyles("OpenRPGTabStylesSlantedColorful", FNB.FNB_VC8\|FNB.FNB_COLORFUL_TABS)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	352 else: self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedColorful", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	354 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	355 def OnMB_OpenRPGTabStylesSlantedBlackandWhite(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	356 if self.mainmenu.GetMenuState("OpenRPGTabStylesSlantedBlackandWhite"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	357 settings.set_setting('TabTheme', 'slanted&bw')
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	358 self.SetTabStyles("OpenRPGTabStylesSlantedBlackandWhite",
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	359 FNB.FNB_VC8, graidentTo=wx.WHITE, graidentFrom=wx.WHITE, textColor=wx.BLACK)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	360 else: self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedBlackandWhite", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	361
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	362 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363 def OnMB_OpenRPGTabStylesSlantedAqua(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 if self.mainmenu.GetMenuState("OpenRPGTabStylesSlantedAqua"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	365 settings.set_setting('TabTheme', 'slanted&aqua')
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	366 self.SetTabStyles("OpenRPGTabStylesSlantedAqua", FNB.FNB_VC8,
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	367 graidentTo=wx.Color(0, 128, 255), graidentFrom=wx.WHITE, textColor=wx.BLACK)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	368 else: self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedAqua", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	370 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	371 def OnMB_OpenRPGTabStylesSlantedCustom(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	372 if self.mainmenu.GetMenuState("OpenRPGTabStylesSlantedCustom"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	373 settings.set_setting('TabTheme', 'customslant')
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	374 gfrom = settings.get_setting('TabGradientFrom')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	375 (fred, fgreen, fblue) = self.rgb.rgb_tuple(gfrom)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	376 gto = settings.get_setting('TabGradientTo')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	377 (tored, togreen, toblue) = self.rgb.rgb_tuple(gto)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	378 tabtext = settings.get_setting('TabTextColor')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	379 (tred, tgreen, tblue) = self.rgb.rgb_tuple(tabtext)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	380 tabbg = settings.get_setting('TabBackgroundGradient')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	381 (red, green, blue) = self.rgb.rgb_tuple(tabbg)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	382 self.SetTabStyles("OpenRPGTabStylesSlantedCustom", FNB.FNB_VC8,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	383 graidentTo=wx.Color(tored, togreen, toblue), graidentFrom=wx.Color(fred, fgreen, fblue),
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	384 textColor=wx.Color(tred, tgreen, tblue))
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	385 else: self.mainmenu.SetMenuState("OpenRPGTabStylesSlantedCustom", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	387 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 def OnMB_OpenRPGTabStylesFlatBlackandWhite(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 if self.mainmenu.GetMenuState("OpenRPGTabStylesFlatBlackandWhite"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	390 settings.set_setting('TabTheme', 'flat&bw')
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	391 self.SetTabStyles("OpenRPGTabStylesFlatBlackandWhite", FNB.FNB_FANCY_TABS,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	392 graidentTo=wx.WHITE, graidentFrom=wx.WHITE, textColor=wx.BLACK)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	393 else: self.mainmenu.SetMenuState("OpenRPGTabStylesFlatBlackandWhite", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	394
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	395 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	396 def OnMB_OpenRPGTabStylesFlatAqua(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 if self.mainmenu.GetMenuState("OpenRPGTabStylesFlatAqua"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	398 settings.set_setting('TabTheme', 'flat&aqua')
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	399 self.SetTabStyles("OpenRPGTabStylesFlatAqua", FNB.FNB_FANCY_TABS,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	400 graidentTo=wx.Color(0, 128, 255), graidentFrom=wx.WHITE, textColor=wx.BLACK)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	401 else: self.mainmenu.SetMenuState("OpenRPGTabStylesFlatAqua", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	403 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404 def OnMB_OpenRPGTabStylesFlatCustom(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405 if self.mainmenu.GetMenuState("OpenRPGTabStylesFlatCustom"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	406 settings.set_setting('TabTheme', 'customflat')
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	407 gfrom = settings.get_setting('TabGradientFrom')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	408 (fred, fgreen, fblue) = self.rgb.rgb_tuple(gfrom)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	409 gto = settings.get_setting('TabGradientTo')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	410 (tored, togreen, toblue) = self.rgb.rgb_tuple(gto)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	411 tabtext = settings.get_setting('TabTextColor')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	412 (tred, tgreen, tblue) = self.rgb.rgb_tuple(tabtext)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	413 tabbg = settings.get_setting('TabBackgroundGradient')
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	414 (red, green, blue) = self.rgb.rgb_tuple(tabbg)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	415 self.SetTabStyles("OpenRPGTabStylesFlatCustom", FNB.FNB_FANCY_TABS,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	416 graidentTo=wx.Color(tored, togreen, toblue), graidentFrom=wx.Color(fred, fgreen, fblue),
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	417 textColor=wx.Color(tred, tgreen, tblue))
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	418 else: self.mainmenu.SetMenuState("OpenRPGTabStylesFlatCustom", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	420 #Window Menu
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	421 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422 def OnMB_WindowsMenu(self, event):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	423 menuid = event.GetId()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	424 name = self.mainwindows[menuid]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	425 if name == 'Alias Lib':
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	426 if self.aliaslib.IsShown(): self.aliaslib.Hide()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	427 else: self.aliaslib.Show()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	428 else:
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	429 if self._mgr.GetPane(name).IsShown(): self._mgr.GetPane(name).Hide()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	430 else: self._mgr.GetPane(name).Show()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	432
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 #OpenRPG Menu
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	434 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	435 def OnMB_OpenRPGSettings(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 dlg = orpg.tools.orpg_settings.orpgSettingsWnd(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 dlg.Centre()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438 dlg.ShowModal()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	439
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440 def OnMB_OpenRPGExit(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	441 self.OnCloseWindow(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	442
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443 #Game Server Menu
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	444 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	445 def OnMB_GameServerBrowseServers(self):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	446 if self._mgr.GetPane("Browse Server Window").IsShown() == True: self._mgr.GetPane("Browse Server Window").Hide()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	447 else: self._mgr.GetPane("Browse Server Window").Show()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	448 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	450 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 def OnMB_GameServerServerHeartbeat(self):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	452 if self.mainmenu.GetMenuState("GameServerServerHeartbeat"): settings.set_setting('Heartbeat', '1')
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	453 else: settings.set_setting('Heartbeat', '0')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	455 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456 def OnMB_GameServerStartServer(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	457 start_dialog = wx.ProgressDialog( "Server Loading", "Server Loading, Please Wait...", 1, self )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	458 # Spawn the new process and close the stdout handle from it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	459 start_dialog.Update( 0 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	460 # Adjusted following code to work with win32, can't test for Unix
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	461 # as per reported bug 586227
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	462 if wx.Platform == "__WXMSW__":
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	463 arg = '\"' + os.path.normpath(dir_struct["home"] + 'start_server_gui.py') + '\"'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	464 args = ( sys.executable, arg )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	465 else:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	466 arg = dir_struct["home"] + 'start_server_gui.py'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 args = (arg,arg)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 os.spawnv( os.P_NOWAIT, sys.executable, args )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	469 start_dialog.Update( 1 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	470 start_dialog.Show(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	471 start_dialog.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	473 # Tools Menu
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	474 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 def OnMB_PluginControlPanel(self, evt):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	476 if self.pluginsFrame.IsShown() == True: self.pluginsFrame.Hide()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	477 else: self.pluginsFrame.Show()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	478
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	479 @debugging
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	480 def OnMB_UpdateManagerPanel(self, evt):
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	481 if self.updateMana.IsShown() == True: self.updateMana.Hide()
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	482 else: self.updateMana.Show()
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	483
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	484 @debugging
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	485 def OnMB_DebugConsole(self, evt):
86 bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	486 ## Alpha ##
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	487 self.traipseSuite.RemoveItem(self.debugConsole)
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	488 self.debugConsole.SetBitmap(wx.Bitmap(dir_struct["icon"] + 'clear.gif'))
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	489 self.traipseSuite.AppendItem(self.debugConsole)
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	490 self.mainmenu.Replace(8, self.traipseSuite, '&Traipse Suite')
bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	491 ###########
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	492 if self.debugger.IsShown() == True: self.debugger.Hide()
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	493 else: self.debugger.Show()
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	494
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	495 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	496 def OnMB_ToolsLoggingLevelDebug(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	497 lvl = logger.log_level
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	498 if self.mainmenu.GetMenuState("ToolsLoggingLevelDebug"): lvl \|= ORPG_DEBUG
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	499 else: lvl &= ~ORPG_DEBUG
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	500 logger.log_level = lvl
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	501 settings.set('LoggingLevel', lvl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	502
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	503 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	504 def OnMB_ToolsLoggingLevelNote(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	505 lvl = logger.log_level
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	506 if self.mainmenu.GetMenuState("ToolsLoggingLevelNote"): lvl \|= ORPG_DEBUG
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	507 else: lvl &= ~ORPG_DEBUG
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	508 logger.log_level = lvl
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	509 settings.set('LoggingLevel', lvl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	510
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	511 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	512 def OnMB_ToolsLoggingLevelInfo(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	513 lvl = logger.log_level
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	514 if self.mainmenu.GetMenuState("ToolsLoggingLevelInfo"): lvl \|= ORPG_INFO
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	515 else: lvl &= ~ORPG_INFO
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	516 logger.log_level = lvl
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	517 settings.set('LoggingLevel', lvl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	518
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	519 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	520 def OnMB_ToolsLoggingLevelGeneral(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	521 lvl = logger.log_level
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	522 if self.mainmenu.GetMenuState("ToolsLoggingLevelGeneral"): lvl \|= ORPG_GENERAL
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	523 else: lvl &= ~ORPG_GENERAL
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	524 logger.log_level = lvl
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	525 settings.set('LoggingLevel', lvl)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	526
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	527 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 def OnMB_ToolsPasswordManager(self):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	529 if self.mainmenu.GetMenuState("ToolsPasswordManager"): self.password_manager.Enable()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	530 else: self.password_manager.Disable()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	532 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	533 def OnMB_ToolsStatusBar(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	534 if self._mgr.GetPane("Status Window").IsShown() == True:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 self.mainmenu.SetMenuState("ToolsStatusBar", False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 self._mgr.GetPane("Status Window").Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	537 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 self.mainmenu.SetMenuState("ToolsStatusBar", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	539 self._mgr.GetPane("Status Window").Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	540 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	541
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	542 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	543 def OnMB_ToolsSoundToolbar(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	544 if self._mgr.GetPane("Sound Control Toolbar").IsShown() == True:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	545 self.mainmenu.SetMenuState("ToolsSoundToolbar", False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	546 self._mgr.GetPane("Sound Control Toolbar").Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	547 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	548 self.mainmenu.SetMenuState("ToolsSoundToolbar", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	549 self._mgr.GetPane("Sound Control Toolbar").Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	550 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	551
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	552 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	553 def OnMB_ToolsDiceBar(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	554 if self._mgr.GetPane("Dice Tool Bar").IsShown() == True:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	555 self.mainmenu.SetMenuState("ToolsDiceBar", False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	556 self._mgr.GetPane("Dice Tool Bar").Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	557 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	558 self.mainmenu.SetMenuState("ToolsDiceBar", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	559 self._mgr.GetPane("Dice Tool Bar").Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	560 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	561
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	562 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	563 def OnMB_ToolsMapBar(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	564 if self._mgr.GetPane("Map Tool Bar").IsShown() == True:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	565 self.mainmenu.SetMenuState("ToolsMapBar", False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	566 self._mgr.GetPane("Map Tool Bar").Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	567 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	568 self.mainmenu.SetMenuState("ToolsMapBar", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	569 self._mgr.GetPane("Map Tool Bar").Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	570 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	571
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	572 #Help Menu #Needs a custom Dialog because it is ugly on Windows
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	573 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	574 def OnMB_HelpAbout(self):
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	575
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	576 description = "OpenRPG is a Virtual Game Table that allows users to connect via a network and play table\n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	577 description += "top games with friends. 'Traipse' is an OpenRPG distro that is easy to setup and provides superb \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	578 description += "functionality. OpenRPG is originally designed by Chris Davis. \n"
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	579
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	580 license = "OpenRPG is free software; you can redistribute it and/or modify it "
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	581 license += "under the terms of the GNU General Public License as published by the Free Software Foundation; \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	582 license += "either version 2 of the License, or (at your option) any later version.\n\n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	583 license += "OpenRPG and Traipse 'OpenRPG' is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	584 license += "without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	585 license += "See the GNU General Public License for more details. You should have received a copy of \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	586 license += "the GNU General Public License along with Traipse 'OpenRPG'; if not, write to \n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	587 license += "the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	588 license += "'Traipse' and the 'Traipse' Logo are trademarks of Mad Mathematics Laboratories."
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	589
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	590 info = wx.AboutDialogInfo()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	591 info.SetIcon(wx.Icon(dir_struct["icon"]+'splash.gif', wx.BITMAP_TYPE_GIF))
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	592 info.SetName('Traipse')
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	593 info.SetVersion('OpenRPG ' + VERSION)
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	594 info.SetDescription(description)
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	595 info.SetCopyright('(C) Copyright 2009 Mad Math Labs')
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	596 info.SetWebSite('http://www.openrpg.com')
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	597 info.SetLicence(license)
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	598 orpg_devs = ['Thomas Baleno', 'Andrew Bennett', 'Lex Berezhny', 'Ted Berg',
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	599 'Bernhard Bergbauer', 'Chris Blocher', 'David Byron', 'Ben Collins-Sussman', 'Robin Cook', 'Greg Copeland',
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	600 'Chris Davis', 'Michael Edwards', 'Andrew Ettinger', 'Todd Faris', 'Dj Gilcrease',
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	601 'Christopher Hickman', 'Paul Hosking', 'Brian Manning', 'Scott Mackay', 'Jesse McConnell',
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	602 'Brian Osman', 'Rome Reginelli', 'Christopher Rouse', 'Dave Sanders', 'Tyler Starke', 'Mark Tarrabain']
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	603 for dev in orpg_devs:
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	604 info.AddDeveloper(dev)
c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	605 wx.AboutBox(info)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	606
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	607 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	608 def OnMB_HelpOnlineUserGuide(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	609 wb = webbrowser.get()
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	610 wb.open("https://www.assembla.com/wiki/show/traipse/User_Manual")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	611
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	612 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	613 def OnMB_HelpChangeLog(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	614 wb = webbrowser.get()
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	615 wb.open("http://www.assembla.com/spaces/milestones/index/traipse_dev?spaces_tool_id=Milestones")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	616
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	617 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	618 def OnMB_HelpReportaBug(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	619 wb = webbrowser.get()
4 c0da99091e1d Check out the new About Dialog. sirebral parents: 0 diff changeset	620 wb.open("http://www.assembla.com/spaces/tickets/index/traipse_dev?spaces_tool_id=Tickets")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	621
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	622
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	623 #################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	624 ## Build the GUI
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	625 #################################
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	626 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	627 def build_gui(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	628 self.Freeze()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	629 self.validate.config_file("layout.xml","default_layout.xml")
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	630
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	631 filename = dir_struct["user"] + "layout.xml"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	632 temp_file = open(filename)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	633 txt = temp_file.read()
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	634 xml_dom = xml.parseXml(txt)._get_documentElement()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	635 temp_file.close()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	636
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	637 """ Would a component work better?
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	638 etree = ElementTree()
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	639 with open(dir_struct['user'] + 'layout.xml') as f:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	640 etree.parse(f)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	641
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	642 base = etree.getroot()
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	643 """
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	644 self.windowsmenu = wx.Menu()
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	645 self.mainwindows = {}
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	646
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	647 #Plugins Window
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	648 self.pluginsFrame = pluginUI.PluginFrame(self)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	649 component.add("plugins", self.get_activeplugins())
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	650 component.add("startplugs", self.get_startplugins())
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	651 logger.debug("Menu Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	652 h = int(xml_dom.getAttribute("height"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	653 w = int(xml_dom.getAttribute("width"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	654 posx = int(xml_dom.getAttribute("posx"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	655 posy = int(xml_dom.getAttribute("posy"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	656 maximized = int(xml_dom.getAttribute("maximized"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	657 self.SetDimensions(posx, posy, w, h)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	658 logger.debug("Dimensions Set")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	659
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	660 #Update Manager
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	661 self.manifest = manifest.ManifestChanges()
59 5aff3ef1ae46 New dev branch for Ornery Orc. Adds CSS styling to chat messages. Updates sirebral parents: 54 diff changeset	662 self.updateMana = upmana.updatemana.updaterFrame(self,
86 bdbeafcb2ef4 Traipse Alpha 'OpenRPG' {090917-00} sirebral parents: 79 diff changeset	663 "OpenRPG Update Manager Beta 0.8", component, self.manifest, True)
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	664 logger.debug("Menu Created")
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	665 h = int(xml_dom.getAttribute("height"))
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	666 w = int(xml_dom.getAttribute("width"))
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	667 posx = int(xml_dom.getAttribute("posx"))
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	668 posy = int(xml_dom.getAttribute("posy"))
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	669 maximized = int(xml_dom.getAttribute("maximized"))
b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	670 self.SetDimensions(posx, posy, w, h)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	671 logger.debug("Dimensions Set")
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	672
79 dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	673 #Update Manager
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	674 self.manifest = manifest.ManifestChanges()
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	675 self.debugger = orpg.tools.orpg_log.DebugConsole(self)
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	676 logger.debug("Menu Created")
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	677 h = int(xml_dom.getAttribute("height"))
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	678 w = int(xml_dom.getAttribute("width"))
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	679 posx = int(xml_dom.getAttribute("posx"))
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	680 posy = int(xml_dom.getAttribute("posy"))
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	681 maximized = int(xml_dom.getAttribute("maximized"))
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	682 self.SetDimensions(posx, posy, w, h)
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	683 logger.debug("Dimensions Set")
dd4be4817377 Chat Window no longer prints excessive debug statements to console. Renamed the Update Manager menu item to Traipse Suite. Added debug console to Traipse Suite. Log now prints an error report and waits for user input so Windows users can see the error being reported. sirebral parents: 74 diff changeset	684
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	685 # Sound Manager
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	686 self.sound_player = orpg.tools.orpg_sound.orpgSound(self)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	687 component.add("sound", self.sound_player)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	688 wndinfo = AUI.AuiPaneInfo()
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	689 menuid = wx.NewId()
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	690 self.mainwindows[menuid] = "Sound Control Toolbar"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	691 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	692 wndinfo.Name("Sound Control Toolbar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	693 wndinfo.Caption("Sound Control Toolbar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	694 wndinfo.Float()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	695 wndinfo.ToolbarPane()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	696 wndinfo.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	697 self._mgr.AddPane(self.sound_player, wndinfo)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	698 children = xml_dom._get_childNodes()
59 5aff3ef1ae46 New dev branch for Ornery Orc. Adds CSS styling to chat messages. Updates sirebral parents: 54 diff changeset	699 for c in children: self.build_window(c, self)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	700
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	701 # status window
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	702 self.status = status_bar(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	703 wndinfo = AUI.AuiPaneInfo()
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	704 menuid = wx.NewId()
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	705 self.mainwindows[menuid] = "Status Window"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	706 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	707 wndinfo.Name("Status Window")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	708 wndinfo.Caption("Status Window")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	709 wndinfo.Float()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	710 wndinfo.ToolbarPane()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	711 wndinfo.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	712 self._mgr.AddPane(self.status, wndinfo)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	713 logger.debug("Status Window Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	714
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	715 # Create and show the floating dice toolbar
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	716 self.dieToolBar = orpg.tools.toolBars.DiceToolBar(self, callBack = self.chat.ParsePost)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	717 wndinfo = AUI.AuiPaneInfo()
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	718 menuid = wx.NewId()
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	719 self.mainwindows[menuid] = "Dice Tool Bar"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	720 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	721 wndinfo.Name("Dice Tool Bar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	722 wndinfo.Caption("Dice Tool Bar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	723 wndinfo.Float()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	724 wndinfo.ToolbarPane()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	725 wndinfo.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	726 self._mgr.AddPane(self.dieToolBar, wndinfo)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	727 logger.debug("Dice Tool Bar Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	728
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	729 #Create the Map tool bar
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	730 self.mapToolBar = orpg.tools.toolBars.MapToolBar(self, callBack = self.map.MapBar)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	731 wndinfo = AUI.AuiPaneInfo()
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	732 menuid = wx.NewId()
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	733 self.mainwindows[menuid] = "Map Tool Bar"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	734 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	735 wndinfo.Name("Map Tool Bar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	736 wndinfo.Caption("Map Tool Bar")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	737 wndinfo.Float()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	738 wndinfo.ToolbarPane()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	739 wndinfo.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	740 self._mgr.AddPane(self.mapToolBar, wndinfo)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	741 logger.debug("Map Tool Bar Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	742
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	743 #Create the Browse Server Window #Turn into frame, as with others.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	744 self.gs = orpg.networking.gsclient.game_server_panel(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	745 wndinfo = AUI.AuiPaneInfo()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	746 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	747 wndinfo.Name("Browse Server Window")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	748 wndinfo.Caption("Game Server")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	749 wndinfo.Float()
90 d1aff41c031b Traipse Alpha 'OpenRPG' {090919-00} sirebral parents: 86 diff changeset	750 wndinfo.FloatingPosition((50,50))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	751 wndinfo.Dockable(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	752 wndinfo.MinSize(wx.Size(640,480))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	753 wndinfo.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	754 self._mgr.AddPane(self.gs, wndinfo)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	755 logger.debug("Game Server Window Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	756
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	757 #Create the Alias Lib Window
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	758 self.aliaslib = orpg.tools.aliaslib.AliasLib()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	759 self.aliaslib.Hide()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	760 logger.debug("Alias Window Created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	761 menuid = wx.NewId()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	762 self.windowsmenu.Append(menuid, "Alias Lib", kind=wx.ITEM_CHECK)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	763 self.windowsmenu.Check(menuid, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	764 self.Bind(wx.EVT_MENU, self.OnMB_WindowsMenu, id=menuid)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	765 self.mainwindows[menuid] = "Alias Lib"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	766 self.mainmenu.Insert(3, self.windowsmenu, 'Windows')
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	767 logger.debug("Windows Menu Done")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	768 self._mgr.Update()
59 5aff3ef1ae46 New dev branch for Ornery Orc. Adds CSS styling to chat messages. Updates sirebral parents: 54 diff changeset	769 if wx.VERSION_STRING > "2.8": self.Bind(AUI.EVT_AUI_PANE_CLOSE, self.onPaneClose)
5aff3ef1ae46 New dev branch for Ornery Orc. Adds CSS styling to chat messages. Updates sirebral parents: 54 diff changeset	770 else: self.Bind(AUI.EVT_AUI_PANECLOSE, self.onPaneClose)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	771 logger.debug("AUI Bindings Done")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	772
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	773 #Load the layout if one exists
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	774 layout = xml_dom.getElementsByTagName("DockLayout")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	775 try:
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	776 textnode = xml.safe_get_text_node(layout[0])
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	777 self._mgr.LoadPerspective(textnode._get_nodeValue())
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	778 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	779 xml_dom.unlink()
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	780 logger.debug("Perspective Loaded")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	781 self._mgr.GetPane("Browse Server Window").Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	782 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	783 self.Maximize(maximized)
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	784 logger.debug("GUI is all created")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	785 self.Thaw()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	786
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	787 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	788 def do_tab_window(self,xml_dom,parent_wnd):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	789 #def do_tab_window(self, etreeEl, parent_wnd):
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	790 # if container window loop through childern and do a recursive call
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	791 temp_wnd = orpgTabberWnd(parent_wnd, style=FNB.FNB_ALLOW_FOREIGN_DND)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	792
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	793 children = xml_dom._get_childNodes()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	794 for c in children:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	795 wnd = self.build_window(c,temp_wnd)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	796 name = c.getAttribute("name")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	797 temp_wnd.AddPage(wnd, name, False)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	798
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	799 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	800 for c in etreeEl.getchildren():
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	801 wnd = self.build_window(c, temp_wnd)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	802 temp_wnd.AddPage(wnd, c.get('name'), False)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	803 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	804 return temp_wnd
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	805
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	806 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	807 def build_window(self, xml_dom, parent_wnd):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	808 name = xml_dom._get_nodeName()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	809 if name == "DockLayout" or name == "dock": return
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	810 dirc = xml_dom.getAttribute("direction") #should NOT use dir, it is a built in function.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	811 pos = xml_dom.getAttribute("pos")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	812 height = xml_dom.getAttribute("height")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	813 width = xml_dom.getAttribute("width")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	814 cap = xml_dom.getAttribute("caption")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	815 dockable = xml_dom.getAttribute("dockable")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	816 layer = xml_dom.getAttribute("layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	817
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	818 try: layer = int(layer); dockable = int(dockable)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	819 except: layer = 0; dockable = 1
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	820
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	821 if name == "tab": temp_wnd = self.do_tab_window(xml_dom, parent_wnd)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	822 elif name == "map":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	823 temp_wnd = orpg.mapper.map.map_wnd(parent_wnd, -1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	824 self.map = temp_wnd
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	825 elif name == "tree":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	826 temp_wnd = orpg.gametree.gametree.game_tree(parent_wnd, -1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	827 self.tree = temp_wnd
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	828 if settings.get_setting('ColorTree') == '1':
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	829 self.tree.SetBackgroundColour(settings.get_setting('bgcolor'))
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	830 self.tree.SetForegroundColour(settings.get_setting('textcolor'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	831 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	832 self.tree.SetBackgroundColour('white')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	833 self.tree.SetForegroundColour('black')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	834
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	835 elif name == "chat":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	836 temp_wnd = orpg.chat.chatwnd.chat_notebook(parent_wnd, wx.DefaultSize)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	837 self.chattabs = temp_wnd
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	838 self.chat = temp_wnd.MainChatPanel
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	839
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	840 elif name == "player":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	841 temp_wnd = orpg.player_list.player_list(parent_wnd)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	842 self.players = temp_wnd
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	843 if settings.get_setting('ColorTree') == '1':
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	844 self.players.SetBackgroundColour(settings.get_setting('bgcolor'))
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	845 self.players.SetForegroundColour(settings.get_setting('textcolor'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	846 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	847 self.players.SetBackgroundColour('white')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	848 self.players.SetForegroundColour('black')
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	849
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	850 if parent_wnd != self: return temp_wnd
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	851 menuid = wx.NewId()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	852 self.windowsmenu.Append(menuid, cap, kind=wx.ITEM_CHECK)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	853 self.windowsmenu.Check(menuid, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	854 self.Bind(wx.EVT_MENU, self.OnMB_WindowsMenu, id=menuid)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	855 self.mainwindows[menuid] = cap
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	856 wndinfo = AUI.AuiPaneInfo()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	857 wndinfo.DestroyOnClose(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	858 wndinfo.Name(cap)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	859 wndinfo.FloatingSize(wx.Size(int(width), int(height)))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	860 wndinfo.BestSize(wx.Size(int(width), int(height)))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	861 wndinfo.Layer(int(layer))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	862 wndinfo.Caption(cap)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	863
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	864 # Lambda here should work! (future dev)
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	865 if dirc.lower() == 'top': wndinfo.Top()
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	866 elif dirc.lower() == 'bottom': wndinfo.Bottom()
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	867 elif dirc.lower() == 'left': wndinfo.Left()
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	868 elif dirc.lower() == 'right': wndinfo.Right()
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	869 elif dirc.lower() == 'center': wndinfo.Center(); wndinfo.CaptionVisible(False)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	870
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	871 if dockable != 1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	872 wndinfo.Dockable(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	873 wndinfo.Floatable(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	874 if pos != '' or pos != '0' or pos != None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	875 wndinfo.Position(int(pos))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	876 wndinfo.Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	877 self._mgr.AddPane(temp_wnd, wndinfo)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	878 return temp_wnd
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	879
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	880 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	881 def onPaneClose(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	882 pane = evt.GetPane()
60 3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	883 #Arbitrary If ELIF fix. Items had incorrect ID's set. Finding correct ID will fix it for the iteration.
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	884 #Adding ID also fixed docking. Go figure.
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	885 if pane.name == 'Sound Control Toolbar': self.mainmenu.SetMenuState('ToolsSoundToolbar', False)
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	886 elif pane.name == 'Status Window': self.mainmenu.SetMenuState('ToolsStatusBar', False)
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	887 elif pane.name == 'Dice Tool Bar': self.mainmenu.SetMenuState('ToolsDiceBar', False)
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	888 elif pane.name == 'Map Tool Bar': self.mainmenu.SetMenuState('ToolsMapBar', False)
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	889 else:
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	890 for wndid, wname in self.mainwindows.iteritems():
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	891 #print pane.name, wname, wndid
3b2cfa13b610 Fix to toolbar menus. More correct fix so docking is working on Ubuntu sirebral parents: 59 diff changeset	892 if pane.name == wname: self.windowsmenu.Check(wndid, False); break
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	893 evt.Skip()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	894 self._mgr.Update()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	895
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	896 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	897 def saveLayout(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	898 filename = dir_struct["user"] + "layout.xml"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	899 temp_file = open(filename)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	900 txt = temp_file.read()
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	901 xml_dom = xml.parseXml(txt)._get_documentElement()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	902 temp_file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	903 (x_size,y_size) = self.GetClientSize()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	904 (x_pos,y_pos) = self.GetPositionTuple()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	905 if self.IsMaximized(): max = 1
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	906 else: max = 0
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	907 xml_dom.setAttribute("height", str(y_size))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	908 xml_dom.setAttribute("width", str(x_size))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	909 xml_dom.setAttribute("posx", str(x_pos))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	910 xml_dom.setAttribute("posy", str(y_pos))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	911 xml_dom.setAttribute("maximized", str(max))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	912 layout = xml_dom.getElementsByTagName("DockLayout")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	913 try:
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	914 textnode = xml.safe_get_text_node(layout[0])
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	915 textnode._set_nodeValue(str(self._mgr.SavePerspective()))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	916 except:
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	917 elem = minidom.Element('DockLayout')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	918 elem.setAttribute("DO_NO_EDIT","True")
72 8bc955faf819 Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates. sirebral parents: 71 diff changeset	919 textnode = xml.safe_get_text_node(elem)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	920 textnode._set_nodeValue(str(self._mgr.SavePerspective()))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	921 xml_dom.appendChild(elem)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	922 temp_file = open(filename, "w")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	923 temp_file.write(xml_dom.toxml(1))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	924 temp_file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	925
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	926 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	927 def build_hotkeys(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	928 self.mainmenu.accel.xaccel.extend(self.chat.get_hot_keys())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	929 self.mainmenu.accel.xaccel.extend(self.map.get_hot_keys())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	930
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	931 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	932 def start_timer(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	933 self.poll_timer.Start(100)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	934 s = component.get('settings')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	935 if s.get_setting("Heartbeat") == "1":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	936 self.ping_timer.Start(1000*60)
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	937 logger.debug("starting heartbeat...", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	938
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	939 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	940 def kill_mplay_session(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	941 self.game_name = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	942 self.session.start_disconnect()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	943
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	944 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	945 def quit_game(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	946 dlg = wx.MessageDialog(self,"Exit gaming session?","Game Session",wx.YES_NO)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	947 if dlg.ShowModal() == wx.ID_YES:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	948 self.session.exitCondition.notifyAll()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	949 dlg.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	950 self.kill_mplay_session()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	951
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	952 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	953 def on_status_event(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	954 id = evt.get_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	955 status = evt.get_data()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	956 if id == orpg.networking.mplay_client.STATUS_SET_URL: self.status.set_url(status)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	957
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	958 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	959 def on_player_event(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	960 id = evt.get_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	961 player = evt.get_data()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	962 display_name = self.chat.chat_display_name(player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	963 time_str = time.strftime("%H:%M", time.localtime())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	964 if id == orpg.networking.mplay_client.PLAYER_NEW:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	965 self.players.add_player(player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	966 self.chat.InfoPost(display_name + " (enter): " + time_str)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	967 elif id == orpg.networking.mplay_client.PLAYER_DEL:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	968 self.players.del_player(player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	969 self.chat.InfoPost(display_name + " (exit): " + time_str)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	970 elif id == orpg.networking.mplay_client.PLAYER_UPDATE:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	971 self.players.update_player(player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	972 self.players.Refresh()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	973
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	974 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	975 def on_group_event(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	976 id = evt.get_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	977 data = evt.get_data()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	978 if id == orpg.networking.mplay_client.GROUP_NEW: self.gs.add_room(data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	979 elif id == orpg.networking.mplay_client.GROUP_DEL:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	980 self.password_manager.RemoveGroupData(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	981 self.gs.del_room(data)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	982 elif id == orpg.networking.mplay_client.GROUP_UPDATE: self.gs.update_room(data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	983
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	984 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	985 def on_receive(self, data, player):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	986 # see if we are ignoring this user
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	987 (ignore_id,ignore_name) = self.session.get_ignore_list()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	988 for m in ignore_id:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	989 if m == player[2]: logger.debug("ignoring message from player:" + player[0], True); return
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	990
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	991 # ok we are not ignoring this message
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	992 #recvSound = "RecvSound" # this will be the default sound. Whisper will change this below
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	993 if player: display_name = self.chat.chat_display_name(player)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	994 else: display_name = "Server Administrator"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	995
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	996 if data[:5] == "<tree":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	997 self.tree.on_receive_data(data,player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	998 self.chat.InfoPost(display_name + " has sent you a tree node...")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	999
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1000 elif data[:4] == "<map": self.map.new_data(data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1001
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1002 elif data[:5] == "<chat":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1003 msg = orpg.chat.chat_msg.chat_msg(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1004 self.chat.post_incoming_msg(msg,player)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1005 else:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1006 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1007 all this below code is for comptiablity with older clients and can
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1008 be removed after a bit
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1009 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1010 import warnings
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1011 warnings.warn("Getting here is bad, find out how and fix it",
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1012 DeprecationWarning, 2)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1013 if data[:3] == "/me":
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1014 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1015 This fixes the emote coloring to comply with what has been
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1016 asked for by the user population, not to mention, what I
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1017 committed to many moons ago. In doing so, Woody's scheme has
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1018 been tossed out. I'm sure Woody won't be happy but I'm
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1019 invoking developer priveledge to satisfy user request, not to
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1020 mention, this scheme actually makes more sense. In Woody's
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1021 scheme, a user could over-ride another users emote color. This
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1022 doesn't make sense, rather, people dictate their OWN colors...
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1023 which is as it should be in the first place and is as it has
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1024 been with normal text. In short, this makes sense and is
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1025 consistent.
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1026 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1027 data = data.replace( "/me", "" )
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1028 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1029 Check to see if we find the closing '>' for the font within the
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1030 first 22 values
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1031 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1032 index = data[:22].find( ">" )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1033 if index == -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1034 data = " " + self.chat.colorize( self.chat.infocolor, display_name + data ) + " "
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1035
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1036 else:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1037 """
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1038 This means that we found a valid font string, so we can
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1039 simply plug the name into the string between the start and
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1040 stop font delimiter
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1041 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1042 print "pre data = " + data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1043 data = data[:22] + " " + display_name + " " + data[22:] + " "
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1044 print "post data = " + data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1045
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1046 elif data[:2] == "/w":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1047 data = data.replace("/w","")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1048 data = "<b>" + display_name + "</b> (whispering): " + data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1049
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1050 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1051 # Normal text
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1052 if player: data = "<b>" + display_name + "</b>: " + data
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1053 else: data = "<b><i><u>" + display_name + "</u>-></i></b> " + data
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1054 self.chat.Post(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1055
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1056 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1057 def on_mplay_event(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1058 id = evt.get_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1059 if id == orpg.networking.mplay_client.MPLAY_CONNECTED:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1060 self.chat.InfoPost("Game connected!")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1061 self.gs.set_connected(1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1062 self.password_manager.ClearPassword("ALL")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1063
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1064 elif id == orpg.networking.mplay_client.MPLAY_DISCONNECTED:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1065 self.poll_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1066 self.ping_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1067 self.chat.SystemPost("Game disconnected!")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1068 self.players.reset()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1069 self.gs.set_connected(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1070 self.status.set_connect_status("Not Connected")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1071
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1072 ####Begin changes for Custom Exit Message by mDuo13######
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1073 elif id == orpg.networking.mplay_client.MPLAY_DISCONNECTING:
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1074 settings = component.get('settings')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1075 custom_msg = settings.get_setting("dcmsg")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1076 custom_msg=custom_msg[:80]
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1077 if custom_msg[:3]=="/me": self.chat.send_chat_message(custom_msg[3:], 3)
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1078 else: self.chat.system_message(custom_msg)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1079 #####End Changes for Custom Exit Message by mDuo13
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1080
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1081 elif id== orpg.networking.mplay_client.MPLAY_GROUP_CHANGE:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1082 group = evt.get_data()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1083 self.chat.InfoPost("Moving to room '"+group[1]+"'..")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1084 if self.gs : self.gs.set_cur_room_text(group[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1085 self.players.reset()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1086 elif id== orpg.networking.mplay_client.MPLAY_GROUP_CHANGE_F:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1087 self.chat.SystemPost("Room access denied!")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1088
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1089 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1090 def OnCloseWindow(self, event):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1091 dlg = wx.MessageDialog(self, "Quit OpenRPG?", "OpenRPG", wx.YES_NO)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1092 if dlg.ShowModal() == wx.ID_YES:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1093 dlg.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1094 self.closed_confirmed()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1095
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1096 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1097 def closed_confirmed(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1098 self.activeplugins = component.get('plugins')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1099 self.aliaslib.OnMB_FileSave(None)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1100
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1101 #following lines added by mDuo13
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1102 #########plugin_disabled()#########
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1103 for plugin_fname in self.activeplugins.keys():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1104 plugin = self.activeplugins[plugin_fname]
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1105 try: plugin.plugin_disabled()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1106 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1107 traceback.print_exc()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1108 #end mDuo13 added code
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1109 self.saveLayout()
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	1110 try: settings.save()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1111 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1112 logger.general("[WARNING] Error saving 'settings' component", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1113
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1114 try: self.map.pre_exit_cleanup()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1115 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1116 logger.general("[WARNING] Map error pre_exit_cleanup()", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1117
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1118 try:
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	1119 save_tree = string.upper(settings.get_setting("SaveGameTreeOnExit"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1120 if (save_tree != "0") and (save_tree != "False") and (save_tree != "NO"):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	1121 self.tree.save_tree(settings.get_setting("gametree"))
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1122 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1123 logger.general("[WARNING] Error saving gametree", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1124
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1125 if self.session.get_status() == orpg.networking.mplay_client.MPLAY_CONNECTED: self.kill_mplay_session()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1126
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1127 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1128 #Kill all the damn timers
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1129 self.sound_player.timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1130 del self.sound_player.timer
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1131 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1132 logger.general("sound didn't die properly.", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1133
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1134 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1135 self.poll_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1136 self.ping_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1137 self.chat.parent.chat_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1138 self.map.canvas.zoom_display_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1139 self.map.canvas.image_timer.Stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1140 self.status.timer.Stop()
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1141 del self.ping_timer; del self.poll_timer; del self.chat.parent.chat_timer
0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1142 del self.map.canvas.zoom_display_timer; del self.map.canvas.image_timer; del self.status.timer
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1143 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1144 logger.general("some timer didn't die properly.", True)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1145
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1146 self._mgr.UnInit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1147 mainapp = wx.GetApp()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1148 mainapp.ExitMainLoop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1149 self.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1150
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1151 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1152 if self.server_pipe != None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1153 dlg = wx.ProgressDialog("Exit","Stoping server",2,self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1154 dlg.Update(2)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1155 dlg.Show(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1156 self.server_pipe.write("\nkill\n")
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1157 logger.general("Killing Server process:", True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1158 time.sleep(5)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1159 self.server_stop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1160 self.server_pipe.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1161 self.std_out.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1162 self.server_thread.exit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1163 dlg.Destroy()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1164 logger.general("Server killed:", True)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1165 except Exception:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1166 pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1167
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1168
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1169 ########################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1170 ## Application class
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1171 ########################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1172 class orpgSplashScreen(wx.SplashScreen):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1173 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1174 def __init__(self, parent, bitmapfile, duration, callback):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1175 wx.SplashScreen.__init__(self, wx.Bitmap(bitmapfile),
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1176 wx.SPLASH_CENTRE_ON_SCREEN \| wx.SPLASH_TIMEOUT, duration, None, -1)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1177 self.callback = callback
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1178 self.closing = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1179 self.Bind(wx.EVT_CLOSE, self.callback)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1180
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1181 class orpgApp(wx.App):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1182 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1183 def OnInit(self):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1184
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1185 component.add('log', logger)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1186 component.add('xml', xml)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 68 diff changeset	1187 component.add('settings', settings)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1188 component.add('validate', validate)
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1189 component.add("tabbedWindows", [])
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1190
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	1191 logger._set_log_level = int(settings.get_setting('LoggingLevel'))
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	1192 logger._set_log_to_console(False)
fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	1193
49 b41ea7d28a9e Final testing! Moving to a WinXP platform for final testing before stable. sirebral parents: 26 diff changeset	1194 self.manifest = manifest.ManifestChanges()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1195
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1196 self.called = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1197 wx.InitAllImageHandlers()
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1198 self.splash = orpgSplashScreen(None, dir_struct["icon"] + 'splash13.jpg', 3000, self.AfterSplash)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1199 self.Bind(wx.EVT_KEY_DOWN, self.OnKeyPress)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1200 self._crust = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1201 wx.Yield()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1202 return True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1203
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1204 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1205 def OnKeyPress(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1206 #Event handler
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1207 if evt.AltDown() and evt.CmdDown() and evt.KeyCode == ord('I'): self.ShowShell()
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1208 else: evt.Skip()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1209
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1210 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1211 def ShowShell(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1212 #Show the PyCrust window.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1213 if not self._crust:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1214 self._crust = wx.py.crust.CrustFrame(self.GetTopWindow())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1215 self._crust.shell.interp.locals['app'] = self
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1216 win = wx.FindWindowAtPointer()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1217 self._crust.shell.interp.locals['win'] = win
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1218 self._crust.Show()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1219
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1220 @debugging
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1221 def AfterSplash(self,evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1222 if not self.called:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1223 self.splash.Hide()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1224 self.called = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1225 self.frame = orpgFrame(None, wx.ID_ANY, MENU_TITLE)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1226 self.frame.Raise()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1227 self.frame.Refresh()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1228 self.frame.Show(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1229 self.SetTopWindow(self.frame)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1230 #self.frame.show_dlgs()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1231 self.frame.post_show_init()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1232 wx.CallAfter(self.splash.Close)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1233 return True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1234
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1235 @debugging
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1236 def OnExit_CleanUp(self):
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	1237 logger.debug("Preforming cleanup\n")
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1238 try: del os.environ["OPENRPG_BASE"]
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1239 except: pass
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1240 try: os.remove(os.environ["OPENRPG_BASE"] + os.sep + 'orpg' + os.sep + 'dirpath' + os.sep + 'approot.py')
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1241 except: pass
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1242 try: os.remove(os.environ["OPENRPG_BASE"] + os.sep + 'orpg' + os.sep + 'dirpath' + os.sep + 'approot.pyc')
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	1243 except: pass
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1244
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 61 diff changeset	1245 @debugging
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1246 def OnExit(self):
0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 7 diff changeset	1247 self.OnExit_CleanUp()
5 5a2c95067daf This update causes the software to remove approot.py and approot.pyc sirebral parents: 4 diff changeset	1248 #Exit
74 fdcca00696ea Continuing the code refinement. sirebral parents: 72 diff changeset	1249 logger.debug("Main Application Exit\n\n")

Mercurial > traipse_dev

annotate orpg/main.py @ 95:af6bf998f425 alpha