Mercurial > parpg-source

diff gui/filebrowser.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 0296f5f74a0f
line wrap: on
line diff
--- a/gui/filebrowser.py	Tue May 31 02:46:20 2011 -0700
+++ b/gui/filebrowser.py	Mon Jun 06 15:56:14 2011 -1000
@@ -10,13 +10,14 @@
 
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import sys
+import os
+import logging
 
 from fife.extensions import pychan
 from fife.extensions.pychan import widgets
 
-import sys
-import os
-import logging
+from parpg import vfs
 
 logger = logging.getLogger('filebrowser')
 
@@ -37,7 +38,6 @@
                  extensions=('.dat',)):
         self.engine = engine
         self.settings = settings
-        print self.settings.parpg.SavesPath
         self.file_selected = file_selected
 
         self._widget = None
@@ -47,8 +47,10 @@
         self.gui_xml_path = gui_xml_path 
         
         self.extensions = extensions
-        self.path = os.path.join(self.settings.user_path,
-                                 self.settings.parpg.SavesPath)
+        # FIXME M. George Hansen 2011-06-06: Not sure that user_path is set
+        #     correctly atm. Plus, I don't think that this should be
+        #     hard-coded.
+        self.path = os.path.join(self.settings.user_path, 'saves')
         self.dir_list = []
         self.file_list = []
         
@@ -63,7 +65,8 @@
         if self._widget:
             self._widget.show()
             return
-        self._widget = pychan.loadXML(self.gui_xml_path)
+        xml_file = vfs.VFS.open(self.gui_xml_path)
+        self._widget = pychan.loadXML(xml_file)
         self._widget.mapEvents({
             'dirList'       : self._setPath,
             'selectButton'  : self._selectFile,