Mercurial > parpg-source

diff gui/inventorygui.py @ 2:06145a6ee387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c40d04cf6ed1
line wrap: on
line diff
--- a/gui/inventorygui.py	Tue May 31 02:46:20 2011 -0700
+++ b/gui/inventorygui.py	Mon Jun 06 15:56:14 2011 -1000
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #   This file is part of PARPG.
 
 #   PARPG is free software: you can redistribute it and/or modify
@@ -48,11 +46,10 @@
     
     def __init__(self, label_text=u'equipment', min_size=(50, 50),
                  max_size=(50, 50), margins=None,
-                 background_image="gui/inv_images/inv_background.png",
                  **kwargs):
         pychan.VBox.__init__(self, min_size=min_size, max_size=max_size,
                              **kwargs)
-        self.background_image = background_image
+        self.background_image = 'gui/inv_images/inv_background.png'
         label = pychan.Label(text=unicode(label_text))
         self.addChild(label)
         self.label_text = label_text
@@ -114,7 +111,7 @@
 
 class InventoryGUI(ContainerGUIBase):
     def __init__(self, controller, inventory, callbacks):
-        super(InventoryGUI, self).__init__(controller, "gui/inventory.xml")
+        super(InventoryGUI, self).__init__(controller, inventory)
         self.engine = controller.engine
         self.inventory_shown = False
         render_backend = self.engine.getRenderBackend()