From 51f915a11c4d84a68d94a2d20adce7c4ead5de9f Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 10 Nov 2011 02:09:06 +0100 Subject: fixes to make tilesets work for both me and Tempus --- src/mapdata.py | 6 +++++- src/ui.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mapdata.py b/src/mapdata.py index 4bde9a6..2b7a403 100644 --- a/src/mapdata.py +++ b/src/mapdata.py @@ -126,7 +126,11 @@ class KPMap(object): self.loadedTilesets = {} # TESTING CRAP - self.tilesets['Test'] = {'path': '/Users/Tempus/Dropbox/NEWERsmbw/Test2.arc'} + import os.path + if os.path.exists('/Users/Tempus'): + self.tilesets['Test'] = {'path': '/Users/Tempus/Dropbox/NEWERsmbw/Test2.arc'} + else: + self.tilesets['Test'] = {'path': '/home/me/Dropbox/NEWERsmbw/Test2.arc'} self.reloadTileset('Test') diff --git a/src/ui.py b/src/ui.py index 0ea63b3..f933457 100644 --- a/src/ui.py +++ b/src/ui.py @@ -246,7 +246,10 @@ class KPMainWindow(QtGui.QMainWindow): @QtCore.pyqtSlot() def updateObjectSelector(self): - tileset = KPTileset.loadFromArc('/Users/Tempus/Dropbox/NEWERsmbw/Test3.arc') + try: + tileset = KPTileset.loadFromArc('/Users/Tempus/Dropbox/NEWERsmbw/Test3.arc') + except IOError: + tileset = KPTileset.loadFromArc('/home/me/Dropbox/NEWERsmbw/Test3.arc') self.objectSelector.setModel(tileset.getModel()) tileset.getModel().view = self.objectSelector -- cgit v1.2.3