parpg-core: src/parpg/gui/hud.py comparison

comparison src/parpg/gui/hud.py @ 12:d60f1dab8469

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	1fd2201f5c36
children	ad75fa042b99

comparison

equal deleted inserted replaced

-:4706e0194af3
+:d60f1dab8469
 import logging
 from fife.extensions import pychan
 from fife.extensions.pychan.tools import callbackWithArguments as cbwa
+from parpg import vfs
 from parpg.gui.filebrowser import FileBrowser
 from parpg.gui.menus import ContextMenu, SettingsMenu
-from parpg.gui import inventorygui
 from parpg.gui.popups import ExaminePopup
 from parpg.gui.containergui import ContainerGUI
 from parpg.gui.dialoguegui import DialogueGUI
 from parpg.gui import drag_drop_data as data_drag
+from parpg.gui.inventorygui import InventoryGUI
 from actionsbox import ActionsBox
 logger = logging.getLogger('hud')
 class Hud(object):
 """Main Hud class"""
 loadGame: called when the user clicks on Load
 quitGame: called when the user clicks on Quit
 @return: None"""
 # TODO: perhaps this should not be hard-coded here
+self.settings = settings
 pychan.registerWidget(ActionsBox)
-self.hud = pychan.loadXML("gui/hud.xml")
+xml_file = vfs.VFS.open('gui/hud.xml')
+self.hud = pychan.loadXML(xml_file)
 self.controller = controller
 self.engine = controller.engine
 self.model = controller.model
-self.settings = settings
 self.inventory = None
 self.character_screen = None
 self.save_game_callback = callbacks['saveGame']
 self.load_game_callback = callbacks['loadGame']
 self.enabled = False
 def initializeInventory(self):
 """Initialize the inventory"""
 if not self.inventory:
-self.inventory = inventorygui.InventoryGUI(self.controller,
+xml_file = vfs.VFS.open('gui/inventory.xml')
-None,
+self.inventory = InventoryGUI(self.controller, xml_file, None)
-None)
 #        inv_callbacks = {
 #            'refreshReadyImages': self.refreshReadyImages,
 #            'toggleInventoryButton': self.toggleInventoryButton,
 #        }
 #        self.inventory_storage = \
 def initializeCharacterScreen(self):
 """Initialize the character screen."""
 # TODO Technomage 2010-12-24:
 if not self.character_screen:
-self.character_screen = pychan.loadXML('gui/character_screen.xml')
+xml_file = vfs.VFS.open('gui/character_screen.xml')
+self.character_screen = pychan.loadXML(xml_file)
 def initializeContextMenu(self):
 """Initialize the Context Menu
 @return: None"""
-self.context_menu = ContextMenu (self.engine, [], (0, 0))
+self.context_menu = ContextMenu(self.engine, [], (0, 0))
 def showContextMenu(self, data, pos):
 """Display the Context Menu with model at pos
 @type model: list
 @param model: model to pass to context menu
 self.context_menu.hide()
 def initializeMainMenu(self):
 """Initalize the main menu.
 @return: None"""
-self.main_menu = pychan.loadXML("gui/hud_pause_menu.xml")
+xml_file = vfs.VFS.open('gui/hud_pause_menu.xml')
+self.main_menu = pychan.loadXML(xml_file)
 #TODO: find more suitalbe place for onOptilonsPress implementation
 self.menu_events = {"resumeButton": self.hideMenu,
 "settingsButton": self.displaySettings,
 "helpButton": self.displayHelp}
 self.main_menu.mapEvents(self.menu_events)
 self.settings_menu.show()
 def initializeHelpMenu(self):
 """Initialize the help menu
 @return: None"""
-self.help_dialog = pychan.loadXML("gui/help.xml")
+xml_file = vfs.VFS.open('gui/help.xml')
+self.help_dialog = pychan.loadXML(xml_file)
 help_events = {"closeButton":self.help_dialog.hide}
 self.help_dialog.mapEvents(help_events)
 main_help_text = u"Welcome to Post-Apocalyptic RPG or PARPG![br][br]"\
 "This game is still in development, so please expect for there to be "\
 "bugs and[br]feel free to tell us about them at "\
 def saveGame(self):
 """ Called when the user wants to save the game.
 @return: None"""
 self.stopActions()
-xml_path = os.path.join(self.settings.system_path,
+xml_path = 'gui/savebrowser.xml'
-self.settings.parpg.GuiPath,
-'savebrowser.xml')
 save_browser = FileBrowser(self.engine,
 self.settings,
 self.save_game_callback,
 xml_path,
 self.loadsave_close,
 def loadGame(self):
 """ Called when the user wants to load a game.
 @return: None"""
 self.stopActions()
-xml_path = os.path.join(self.settings.system_path,
+xml_path = 'gui/loadbrowser.xml'
-self.settings.parpg.GuiPath,
-'loadbrowser.xml')
 load_browser = FileBrowser(self.engine,
 self.settings,
 self.load_game_callback,
 xml_path,
 close_callback = self.loadsave_close,
 button.toggled = 0
 def toggleInventory(self, toggle_image=True):
 """Displays the inventory screen
 @return: None"""
-if self.inventory == None:
+if self.inventory is None:
 self.initializeInventory()
 self.inventory.toggleInventory(toggle_image)
 def toggleCharacterScreen(self):
-if not self.character_screen:
+if self.characcter_screen is None:
 self.initializeCharacterScreen()
 if not self.character_screen.isVisible():
 self.character_screen.show()
 else:
 self.character_screen.hide()

Mercurial > parpg-core

comparison src/parpg/gui/hud.py @ 12:d60f1dab8469