Mercurial > traipse

diff orpg/mapper/background_handler.py @ 18:97265586402b ornery-orc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse 'OpenRPG' {090827-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: Update Manager is now in version 0.8. While not every button works, users can now browse the different revisions and their different changesets. The code has been refined some with feature from Core added to it. A Crash report is now created if the users software crashes. Update Manager has been moved to the Traipse Suite menu item, and a Debug Console as been added as well.
author sirebral
date Thu, 27 Aug 2009 01:04:43 -0500
parents 211ac836b6a0
children 51428d30c59e
line wrap: on
line diff
--- a/orpg/mapper/background_handler.py	Thu Aug 13 13:14:10 2009 -0500
+++ b/orpg/mapper/background_handler.py	Thu Aug 27 01:04:43 2009 -0500
@@ -35,10 +35,12 @@
 import os
 from base import *
 
+from orpg.tools.orpg_settings import settings
+
 class background_handler(base_layer_handler):
     def __init__(self, parent, id, canvas):
         base_layer_handler.__init__(self, parent, id, canvas)
-        self.settings = self.canvas.settings
+        self.settings = settings
 
     def build_ctrls(self):
         base_layer_handler.build_ctrls(self)
@@ -86,10 +88,10 @@
                 thread.start_new_thread(self.canvas.layers['bg'].upload, 
                     (postdata, dlg.GetPath(), self.bg_type.GetStringSelection()))
             else:
-                try: min_url = open_rpg.get_component("cherrypy") + filename
+                try: min_url = component.get("cherrypy") + filename
                 except: return
                 min_url = dlg.GetDirectory().replace(orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep, 
-                    open_rpg.get_component("cherrypy")) + '/' + filename
+                    component.get("cherrypy")) + '/' + filename
 
                 if self.bg_type.GetStringSelection() == 'Texture': self.canvas.layers['bg'].set_texture(min_url)
                 elif self.bg_type.GetStringSelection() == 'Image': self.size = self.canvas.layers['bg'].set_image(min_url,1)
@@ -138,7 +140,7 @@
     def on_apply(self, evt):
         session=self.canvas.frame.session
         if (session.my_role() != session.ROLE_GM) and (session.use_roles()):
-            open_rpg.get_component("chat").InfoPost("You must be a GM to use this feature")
+            component.get("chat").InfoPost("You must be a GM to use this feature")
             return
         self.canvas.layers['bg'].set_color(self.color_button.GetBackgroundColour())