From 0efc590a6cf609befc017ffad297379c2a53e88f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 14 Jun 2010 05:55:56 +0000 Subject: [PATCH] * bugfixes git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@259 efabe8c0-fbe8-4139-b769-b5e6d273206e --- pysollib/games/pyramid.py | 6 ++++++ pysollib/settings.py | 4 ++-- pysollib/stack.py | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 5292468f..963af822 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -109,6 +109,12 @@ class Pyramid_Talon(Pyramid_StackMethods, FaceUpWasteTalonStack): return 1 return FaceUpWasteTalonStack.clickHandler(self, event) + def releaseHandler(self, event, drag, sound=True): + if self.game.app.opt.mouse_type == 'point-n-click': + drag.stack.dragMove(drag, self, sound=sound) + return + FaceUpWasteTalonStack.releaseHandler(self, event, drag, sound) + def canDealCards(self): if not FaceUpWasteTalonStack.canDealCards(self): return False diff --git a/pysollib/settings.py b/pysollib/settings.py index 9f5bd7b4..6f06c1a0 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -30,8 +30,8 @@ PACKAGE = 'PySolFC' TITLE = 'PySol' PACKAGE_URL = 'http://pysolfc.sourceforge.net/' -VERSION = '2.0' -VERSION_TUPLE = (2, 0) +VERSION = '2.0.1' +VERSION_TUPLE = (2,0,1) # Tk windowing system (auto set up in init.py) WIN_SYSTEM = 'x11' # win32, x11, aqua, classic diff --git a/pysollib/stack.py b/pysollib/stack.py index 604e0475..73a18b64 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -902,6 +902,9 @@ class Stack: return True return False + def resize(self, xf, yf): + print 'resize', self + def basicShallHighlightSameRank(self, card): # by default all open stacks are available for highlighting assert card in self.cards @@ -1313,7 +1316,7 @@ class Stack: images = self.game.app.images cx, cy = cards[0].x, cards[0].y ddx, ddy = cx-cards[-1].x, cy-cards[-1].y - if TOOLKIT == 'tk' and Image and Image.VERSION > '1.1.7': # use PIL + if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7': # use PIL c0 = cards[-1] if self.CARD_XOFFSET[0] < 0: c0 = cards[0] if self.CARD_YOFFSET[0] < 0: c0 = cards[0]