Mercurial > parpg-source
diff gui/containergui_base.py @ 2:06145a6ee387
Fixed resource path dependencies issue that caused PARPG to crash on start.
* PARPG should now run without issue (system installation not tested).
* Utilized FIFE's VFS module to remove path dependencies from most PARPG modules.
* The new parpg.vfs module is a singleton with a single global variable, VFS, which is a reference to the global VFS instance. Although a singleton is not ideal it should be replaced once PARPG's core code is refactored.
* The parpg.vfs singleton is initialized in the parpg.applicaiton.PARPGApplication class with the absolute path to the data directory via the parpg.settings module and corresponding configuration file.
* A new DataPath entry was added to the default system configuration file template under the [parpg] section to support the new parpg.vfs module.
* Updated the parpg-assets subrepo to revision 3 to fix some dialog file format issues (for details see commit message for parpg-assets).
* Fixed a few bugs in the parpg.dialogueparsers.YAMLDialogueParser class related to exception handling.
author | M. George Hansen <technopolitica@gmail.com> |
---|---|
date | Mon, 06 Jun 2011 15:56:14 -1000 |
parents | 7a89ea5404b1 |
children | 30dbbae653ad |
line wrap: on
line diff
--- a/gui/containergui_base.py Tue May 31 02:46:20 2011 -0700 +++ b/gui/containergui_base.py Mon Jun 06 15:56:14 2011 -1000 @@ -10,13 +10,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from copy import deepcopy +from types import StringTypes from fife import fife from fife.extensions import pychan +from parpg import vfs from parpg.gui import drag_drop_data as data_drag from parpg.objects.action import ACTIONS -from copy import deepcopy class ContainerGUIBase(object): """ @@ -26,7 +28,11 @@ def __init__(self, controller, gui_file): self.controller = controller - self.gui = pychan.loadXML(gui_file) + if isinstance(gui_file, StringTypes): + xml_file = vfs.VFS.open(gui_file) + self.gui = pychan.loadXML(xml_file) + else: + self.gui = pychan.loadXML(gui_file) def dragDrop(self, obj): """Decide whether to drag or drop the image.