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