Mercurial > openrpg
changeset 538:4652c82bf351
bug #63 is ready for testing
| author | Digitalxero |
|---|---|
| date | Mon, 22 Mar 2010 23:56:51 -0600 |
| parents | 63b7f7839475 |
| children | 939a744054f0 69f2abad0d92 |
| files | orpg/map/__init__.py orpg/pluginhandler.py orpg/tools/passtool.py orpg/tools/scriptkit.py plugins/xxgsc.py plugins/xxgvm.py plugins/xxsimpleinit.py plugins/xxstatus.py |
| diffstat | 8 files changed, 19 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/map/__init__.py Mon Mar 22 23:41:45 2010 -0600 +++ b/orpg/map/__init__.py Mon Mar 22 23:56:51 2010 -0600 @@ -9,6 +9,8 @@ from orpg.tools.rgbhex import RGBHex import orpg.tools.ButtonPanel as BP +from orpg.tools.settings import settings + from _canvas import MapCanvas class MapWnd(wx.Panel): @@ -19,7 +21,6 @@ self.xml = self.openrpg.get_component("xml") self.dir_struct = self.openrpg.get_component("dir_struct") self.validate = self.openrpg.get_component("validate") - self.settings = self.openrpg.get_component("settings") self.Freeze() sizer = wx.GridBagSizer(hgap=1, vgap=1)
--- a/orpg/pluginhandler.py Mon Mar 22 23:41:45 2010 -0600 +++ b/orpg/pluginhandler.py Mon Mar 22 23:56:51 2010 -0600 @@ -45,7 +45,7 @@ @debugging def menu_cleanup(self): - self.settings.save() + settings.save() rootMenu = open_rpg.get_component("pluginmenu") menus = rootMenu.MenuItems rootMenu.RemoveItem(self._basemenu)
--- a/orpg/tools/passtool.py Mon Mar 22 23:41:45 2010 -0600 +++ b/orpg/tools/passtool.py Mon Mar 22 23:56:51 2010 -0600 @@ -165,12 +165,12 @@ @debugging def Enable(self): self.enabled = 1 - self.settings.set_setting('PWMannager', 'On') + settings.set('PWMannager', 'On') @debugging def Disable(self): self.enabled = 0 - self.settings.set_setting('PWMannager', 'Off') + settings.set('PWMannager', 'Off') @debugging def AdminPass(self, groupid):
--- a/orpg/tools/scriptkit.py Mon Mar 22 23:41:45 2010 -0600 +++ b/orpg/tools/scriptkit.py Mon Mar 22 23:56:51 2010 -0600 @@ -33,6 +33,7 @@ from orpg.orpg_wx import * import orpg.chat.chat_msg from orpg.tools.orpg_log import logger +from orpg.tools.settings import settings class scriptkit: def __init__(self): @@ -41,9 +42,8 @@ <li>openrpg - a reference to the application openrpg object. </ul> """ - self.chat = open_rpg.get_component( 'chat' ) - self.map = open_rpg.get_component( 'map' ) - self.settings = open_rpg.get_component( 'settings' ) + self.chat = open_rpg.get_component('chat') + self.map = open_rpg.get_component('map') self.session = open_rpg.get_component('session') def addMiniatureToMap( self, min_label, min_url, unique=0 ):
--- a/plugins/xxgsc.py Mon Mar 22 23:41:45 2010 -0600 +++ b/plugins/xxgsc.py Mon Mar 22 23:56:51 2010 -0600 @@ -3,6 +3,8 @@ import random import orpg.pluginhandler +from orpg.tools.settings import settings + ID_ROLL = wx.NewId() @@ -63,7 +65,6 @@ wx.Frame.__init__(self, parent, ID, title, wx.DefaultPosition, wx.Size(200, 70)) - self.settings = plugin.settings self.session = plugin.session self.plugin = plugin @@ -75,7 +76,7 @@ menuBar.Append(menu, "&File"); self.SetMenuBar(menuBar) - self.old_idle = self.settings.get_setting('IdleStatusAlias') + self.old_idle = settings.get('IdleStatusAlias') wx.StaticText(self.panel, -1, "AC:", wx.Point(0, 5)) self.ac = wx.SpinCtrl(self.panel, ID_ROLL, "", wx.Point(18, 0), wx.Size(45, -1), min = -100, max = 100, initial = 10) @@ -97,11 +98,11 @@ def SetStatus(self, evt): new_status = "AC: " + str(self.ac.GetValue()) + " HP: " + str(self.hp.GetValue()) + "/" + str(self.max_hp.GetValue()) - self.settings.set_setting('IdleStatusAlias',new_status) + settings.set('IdleStatusAlias',new_status) self.session.set_text_status(new_status) def TimeToQuit(self, event): - self.settings.set_setting('IdleStatusAlias',self.old_idle) + settings.set('IdleStatusAlias',self.old_idle) self.session.set_text_status(self.old_idle) self.frame = None self.Destroy()
--- a/plugins/xxgvm.py Mon Mar 22 23:41:45 2010 -0600 +++ b/plugins/xxgvm.py Mon Mar 22 23:56:51 2010 -0600 @@ -2,6 +2,8 @@ import orpg.pluginhandler import string +from orpg.tools.settings import settings + class Plugin(orpg.pluginhandler.PluginHandler): # Initialization subroutine. # @@ -181,7 +183,7 @@ newchain = [key] + newchain for key in keychain: cmd = cmd.replace("$" + key, self.vars[key]) - self.settings.set_setting("IdleStatusAlias", cmd) + settings.set("IdleStatusAlias", cmd) self.session.set_text_status(cmd) def make_list(self):
--- a/plugins/xxsimpleinit.py Mon Mar 22 23:41:45 2010 -0600 +++ b/plugins/xxsimpleinit.py Mon Mar 22 23:56:51 2010 -0600 @@ -287,7 +287,6 @@ self.SetOwnBackgroundColour('#EFEFEF') self.dir_struct = open_rpg.get_component('dir_struct') - self.settings = open_rpg.get_component('settings') self.xml = open_rpg.get_component('xml') self.validate = open_rpg.get_component('validate')
--- a/plugins/xxstatus.py Mon Mar 22 23:41:45 2010 -0600 +++ b/plugins/xxstatus.py Mon Mar 22 23:56:51 2010 -0600 @@ -3,6 +3,8 @@ from random import randint from time import time +from orpg.tools.settings import settings + class Plugin(orpg.pluginhandler.PluginHandler): # Initialization subroutine. # @@ -54,7 +56,7 @@ def refresh_counter(self): if self.idle_timer_status == '': - self.idle_timer_status = self.settings.get_setting("IdleStatusAlias") + self.idle_timer_status = settings.get("IdleStatusAlias") current_time = time() self.minutes = round((current_time - self.start_time)/60,1)