Merge branch 'master' of git://git.assembla.com/fpdboz.git
This commit is contained in:
		
						commit
						e5b485365f
					
				|  | @ -290,6 +290,7 @@ class Filters(threading.Thread): | ||||||
|         cb = gtk.CheckButton(game) |         cb = gtk.CheckButton(game) | ||||||
|         cb.connect('clicked', self.__set_game_select, game) |         cb.connect('clicked', self.__set_game_select, game) | ||||||
|         hbox.pack_start(cb, False, False, 0) |         hbox.pack_start(cb, False, False, 0) | ||||||
|  |         cb.set_active(True) | ||||||
| 
 | 
 | ||||||
|     def createLimitLine(self, hbox, limit, ltext): |     def createLimitLine(self, hbox, limit, ltext): | ||||||
|         cb = gtk.CheckButton(str(ltext)) |         cb = gtk.CheckButton(str(ltext)) | ||||||
|  |  | ||||||
|  | @ -617,6 +617,8 @@ class HoldemOmahaHand(Hand): | ||||||
|         # which then invokes a 'addXXX' callback |         # which then invokes a 'addXXX' callback | ||||||
|         if builtFrom == "HHC": |         if builtFrom == "HHC": | ||||||
|             hhc.readHandInfo(self) |             hhc.readHandInfo(self) | ||||||
|  |             if self.gametype['type'] == 'tour': | ||||||
|  |                 self.tablename = "%s %s" % (self.tourNo, self.tablename)     | ||||||
|             hhc.readPlayerStacks(self) |             hhc.readPlayerStacks(self) | ||||||
|             hhc.compilePlayerRegexs(self) |             hhc.compilePlayerRegexs(self) | ||||||
|             hhc.markStreets(self) |             hhc.markStreets(self) | ||||||
|  | @ -911,6 +913,8 @@ class DrawHand(Hand): | ||||||
|         # Populate the draw hand. |         # Populate the draw hand. | ||||||
|         if builtFrom == "HHC": |         if builtFrom == "HHC": | ||||||
|             hhc.readHandInfo(self) |             hhc.readHandInfo(self) | ||||||
|  |             if self.gametype['type'] == 'tour': | ||||||
|  |                 self.tablename = "%s %s" % (self.tourNo, self.tablename)     | ||||||
|             hhc.readPlayerStacks(self) |             hhc.readPlayerStacks(self) | ||||||
|             hhc.compilePlayerRegexs(self) |             hhc.compilePlayerRegexs(self) | ||||||
|             hhc.markStreets(self) |             hhc.markStreets(self) | ||||||
|  | @ -1105,6 +1109,8 @@ class StudHand(Hand): | ||||||
|         # which then invokes a 'addXXX' callback |         # which then invokes a 'addXXX' callback | ||||||
|         if builtFrom == "HHC": |         if builtFrom == "HHC": | ||||||
|             hhc.readHandInfo(self) |             hhc.readHandInfo(self) | ||||||
|  |             if self.gametype['type'] == 'tour': | ||||||
|  |                 self.tablename = "%s %s" % (self.tourNo, self.tablename)     | ||||||
|             hhc.readPlayerStacks(self) |             hhc.readPlayerStacks(self) | ||||||
|             hhc.compilePlayerRegexs(self) |             hhc.compilePlayerRegexs(self) | ||||||
|             hhc.markStreets(self) |             hhc.markStreets(self) | ||||||
|  |  | ||||||
|  | @ -449,7 +449,9 @@ class Importer: | ||||||
|                 # Call hudcache update if not in bulk import mode |                 # Call hudcache update if not in bulk import mode | ||||||
|                 # FIXME: Need to test for bulk import that isn't rebuilding the cache |                 # FIXME: Need to test for bulk import that isn't rebuilding the cache | ||||||
|                 if self.callHud: |                 if self.callHud: | ||||||
|                     hand.updateHudCache(self.database) |                     for hand in handlist: | ||||||
|  |                         if hand is not None: | ||||||
|  |                             hand.updateHudCache(self.database) | ||||||
|                     self.database.commit() |                     self.database.commit() | ||||||
| 
 | 
 | ||||||
|                 #pipe the Hands.id out to the HUD |                 #pipe the Hands.id out to the HUD | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user