dabodemo Commit
Revision 417
Date: 2006-10-15 11:59:14 -0700 (Sun, 15 Oct 2006)
Author: ed
Changed:
U trunk/games/minesweeper.py
Log:
Fixed problem with restoring presets. It was expecting 'int', but the pref
dialog was returning 'long'.
Diff:
Modified: trunk/games/minesweeper.py
===================================================================
--- trunk/games/minesweeper.py 2006-10-15 14:42:36 UTC (rev 416)
+++ trunk/games/minesweeper.py 2006-10-15 18:59:14 UTC (rev 417)
@@ -501,7 +501,10 @@
bs = self._boardSize
except AttributeError:
pfm = self.Form.PreferenceManager
- bs = (pfm.boardwidth, pfm.boardheight)
+ if pfm.preset.id:
+ bs = (int(pfm.preset.width),
int(pfm.preset.height))
+ else:
+ bs = (int(pfm.boardwidth), int(pfm.boardheight))
if bs[0] is None or bs[1] is None:
bs = _defaultBoardSize
self.BoardSize = tuple(bs)
@@ -606,8 +609,6 @@
def afterInit(self):
- self.addObject(Board, Name="board")
- self.Sizer.append(self.board, "expand", 1)
self.fillMenu()
self.preset = {}
self._initPrefs()
@@ -619,7 +620,7 @@
their default value.
"""
pfm = self.PreferenceManager
- if not isinstance(pfm.preset.mines, int):
+ if not isinstance(pfm.preset.mines, (int, long)):
# First time through; initialize the default values.
pfm.deleteAllPrefs()
pfm.preset.mines = 0
@@ -631,7 +632,6 @@
pfm.boardheight = _defaultBoardSize[1]
pfm.minecount = _defaultMineCount
pfm.playername = None
-
self.preset["Id"] = pfm.preset.id
self.preset["Name"] = pfm.preset.name
self.preset["Width"] = pfm.preset.width
@@ -762,13 +762,13 @@
def newGame(self):
- bs = self.board.BoardSize
- mc = self.board.MineCount
try:
self.board
except AttributeError:
self.addObject(Board, "board")
self.Sizer.append(self.board, "expand", 1)
+ bs = self.board.BoardSize
+ mc = self.board.MineCount
self.board.BoardSize = bs
self.board.MineCount = mc
self.board.newGame()
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
