+ option statusbar_stuck

* minor fixes


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@251 39dd0a4e-7c14-0410-91b3-c4f2d318f732

pysollib/app.py

@@ -482,6 +482,7 @@ class Application:
         self.statusbar = PysolStatusbar(self.top)
         self.statusbar.show(self.opt.statusbar)
         self.statusbar.config('gamenumber', self.opt.statusbar_game_number)
+        self.statusbar.config('stuck', self.opt.statusbar_stuck)
         self.helpbar = HelpStatusbar(self.top)
         self.helpbar.show(self.opt.helpbar)
         # create the canvas

pysollib/games/tournament.py

@@ -53,7 +53,7 @@ class Tournament_Talon(DealRowRedealTalonStack):
             for i in range(4):
                 if not self.cards:
                     break
-                num_cards += self.dealRow([r], sound=False)
+                num_cards += self.dealRow([r], sound=False, frames=4)
         if sound:
             self.game.stopSamples()
         return num_cards
@@ -125,10 +125,8 @@ class Tournament(Game):
 
     def startGame(self):
         self.startDealSample()
-        self.s.talon.dealRow(self.s.reserves)
-        for r in self.s.rows:
-            for i in range(4):
-                self.s.talon.dealRow([r])
+        self.s.talon.dealRow(self.s.reserves, frames=4)
+        self.s.talon.dealCards()
 
     def fillStack(self, stack):
         if stack in self.s.rows and not stack.cards:

pysollib/options.py

@@ -80,6 +80,7 @@ toolbar_compound = string
 toolbar_size = integer(0, 1)
 statusbar = boolean
 statusbar_game_number = boolean
+statusbar_stuck = boolean
 num_cards = boolean
 helpbar = boolean
 num_recent_games = integer(10, 100)
@@ -209,6 +210,7 @@ class Options:
         ('toolbar_size', 'int'),
         ('statusbar', 'bool'),
         ('statusbar_game_number', 'bool'),
+        ('statusbar_stuck', 'bool'),
         ('num_cards', 'bool'),
         ('helpbar', 'bool'),
         ('num_recent_games', 'int'),
@@ -285,6 +287,7 @@ class Options:
             self.toolbar_vars[w] = True # show all buttons
         self.statusbar = True
         self.statusbar_game_number = False # show game number in statusbar
+        self.statusbar_stuck = False       # show stuck indicator
         self.num_cards = False
         self.helpbar = False
         self.splashscreen = True