Mercurial > fife-parpg

diff tools/editor/scripts/gui/filemanager.py @ 680:60621d858548

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fixed the image/animation functions in GenericRenderer and LightRenderer. The functions now consider the camera zoom level. * Added the forgotten LightEdit plugin for the editor.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Sun, 21 Nov 2010 15:58:14 +0000
parents 64738befdf3b
children
line wrap: on
line diff
--- a/tools/editor/scripts/gui/filemanager.py	Thu Nov 18 17:28:15 2010 +0000
+++ b/tools/editor/scripts/gui/filemanager.py	Sun Nov 21 15:58:14 2010 +0000
@@ -26,6 +26,8 @@
 from fife.extensions import pychan
 from fife.extensions import filebrowser
 from fife.extensions import loaders, savers
+from fife.extensions.serializers.xmlobject import XMLObjectLoader
+from fife.extensions.serializers.xml_loader_tools import loadImportFile, loadImportDir, loadImportDirRec
 import action
 import scripts.editor
 import fife.extensions.pychan.widgets as widgets
@@ -53,6 +55,13 @@
 		self._importbrowser = None
 		self._savebrowser = None
 
+		self.obj_loader = XMLObjectLoader(
+			self.engine.getImagePool(),
+			self.engine.getAnimationPool(),
+			self.engine.getModel(),
+			self.engine.getVFS()
+		)		
+
 		newAction = Action(u"New map", "gui/icons/new_map.png")
 		loadAction = Action(u"Open", "gui/icons/load_map.png")
 		closeAction = Action(u"Close", "gui/icons/close_map.png")
@@ -214,7 +223,7 @@
 		
 		try:
 			if os.path.isfile(file):
-				loaders.loadImportFile(file, self.engine)
+				loadImportFile(self.obj_loader, file, self.engine)
 			else:
 				raise file+ " is not a file!"
 		except:
@@ -239,7 +248,7 @@
 		
 		try:
 			if os.path.isdir(path):
-				loaders.loadImportDirRec(path, self.engine)
+				loadImportDirRec(self.obj_loader, path, self.engine)
 			else:
 				raise file+ " is not a directory!"
 		except: