diff options
| author | Treeki <treeki@gmail.com> | 2011-11-10 02:09:06 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2011-11-10 02:09:06 +0100 |
| commit | 51f915a11c4d84a68d94a2d20adce7c4ead5de9f (patch) | |
| tree | 31d0383379a8f9096de3e92b22609f0750efca21 /src | |
| parent | 58397adbf19eb20d1359fa591a147ec7117821e6 (diff) | |
| download | koopatlas-51f915a11c4d84a68d94a2d20adce7c4ead5de9f.tar.gz koopatlas-51f915a11c4d84a68d94a2d20adce7c4ead5de9f.zip | |
fixes to make tilesets work for both me and Tempus
Diffstat (limited to '')
| -rw-r--r-- | src/mapdata.py | 6 | ||||
| -rw-r--r-- | 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') @@ -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 |