mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
+ option statusbar_stuck
* minor fixes git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@251 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
parent
2f22c2f528
commit
c66533b478
3 changed files with 7 additions and 5 deletions
|
@ -482,6 +482,7 @@ class Application:
|
||||||
self.statusbar = PysolStatusbar(self.top)
|
self.statusbar = PysolStatusbar(self.top)
|
||||||
self.statusbar.show(self.opt.statusbar)
|
self.statusbar.show(self.opt.statusbar)
|
||||||
self.statusbar.config('gamenumber', self.opt.statusbar_game_number)
|
self.statusbar.config('gamenumber', self.opt.statusbar_game_number)
|
||||||
|
self.statusbar.config('stuck', self.opt.statusbar_stuck)
|
||||||
self.helpbar = HelpStatusbar(self.top)
|
self.helpbar = HelpStatusbar(self.top)
|
||||||
self.helpbar.show(self.opt.helpbar)
|
self.helpbar.show(self.opt.helpbar)
|
||||||
# create the canvas
|
# create the canvas
|
||||||
|
|
|
@ -53,7 +53,7 @@ class Tournament_Talon(DealRowRedealTalonStack):
|
||||||
for i in range(4):
|
for i in range(4):
|
||||||
if not self.cards:
|
if not self.cards:
|
||||||
break
|
break
|
||||||
num_cards += self.dealRow([r], sound=False)
|
num_cards += self.dealRow([r], sound=False, frames=4)
|
||||||
if sound:
|
if sound:
|
||||||
self.game.stopSamples()
|
self.game.stopSamples()
|
||||||
return num_cards
|
return num_cards
|
||||||
|
@ -125,10 +125,8 @@ class Tournament(Game):
|
||||||
|
|
||||||
def startGame(self):
|
def startGame(self):
|
||||||
self.startDealSample()
|
self.startDealSample()
|
||||||
self.s.talon.dealRow(self.s.reserves)
|
self.s.talon.dealRow(self.s.reserves, frames=4)
|
||||||
for r in self.s.rows:
|
self.s.talon.dealCards()
|
||||||
for i in range(4):
|
|
||||||
self.s.talon.dealRow([r])
|
|
||||||
|
|
||||||
def fillStack(self, stack):
|
def fillStack(self, stack):
|
||||||
if stack in self.s.rows and not stack.cards:
|
if stack in self.s.rows and not stack.cards:
|
||||||
|
|
|
@ -80,6 +80,7 @@ toolbar_compound = string
|
||||||
toolbar_size = integer(0, 1)
|
toolbar_size = integer(0, 1)
|
||||||
statusbar = boolean
|
statusbar = boolean
|
||||||
statusbar_game_number = boolean
|
statusbar_game_number = boolean
|
||||||
|
statusbar_stuck = boolean
|
||||||
num_cards = boolean
|
num_cards = boolean
|
||||||
helpbar = boolean
|
helpbar = boolean
|
||||||
num_recent_games = integer(10, 100)
|
num_recent_games = integer(10, 100)
|
||||||
|
@ -209,6 +210,7 @@ class Options:
|
||||||
('toolbar_size', 'int'),
|
('toolbar_size', 'int'),
|
||||||
('statusbar', 'bool'),
|
('statusbar', 'bool'),
|
||||||
('statusbar_game_number', 'bool'),
|
('statusbar_game_number', 'bool'),
|
||||||
|
('statusbar_stuck', 'bool'),
|
||||||
('num_cards', 'bool'),
|
('num_cards', 'bool'),
|
||||||
('helpbar', 'bool'),
|
('helpbar', 'bool'),
|
||||||
('num_recent_games', 'int'),
|
('num_recent_games', 'int'),
|
||||||
|
@ -285,6 +287,7 @@ class Options:
|
||||||
self.toolbar_vars[w] = True # show all buttons
|
self.toolbar_vars[w] = True # show all buttons
|
||||||
self.statusbar = True
|
self.statusbar = True
|
||||||
self.statusbar_game_number = False # show game number in statusbar
|
self.statusbar_game_number = False # show game number in statusbar
|
||||||
|
self.statusbar_stuck = False # show stuck indicator
|
||||||
self.num_cards = False
|
self.num_cards = False
|
||||||
self.helpbar = False
|
self.helpbar = False
|
||||||
self.splashscreen = True
|
self.splashscreen = True
|
||||||
|
|
Loading…
Add table
Reference in a new issue