Merge branch 'master' of git://git.assembla.com/fpdboz.git

Fix accessing the decoder from the wrong object, causing the hud to not work, it should work again. yay.
This commit is contained in:
eblade
2008-10-25 05:36:18 -04:00
28 changed files with 277 additions and 231 deletions
+4 -3
View File
@@ -53,6 +53,7 @@ class Hud:
self.max = max
self.db_name = db_name
self.deleted = False
self.stacked = True
self.stat_windows = {}
self.popup_windows = {}
@@ -68,7 +69,8 @@ class Hud:
#self.main_window.set_transient_for(parent.get_toplevel())
self.ebox = gtk.EventBox()
self.label = gtk.Label("Close this window to\nkill the HUD for\n %s" % (table.name))
self.label = gtk.Label("Close this window to\nkill the HUD for\n %s\nMinimizing it hides stats." %
(table.name))
self.main_window.add(self.ebox)
self.ebox.add(self.label)
self.main_window.move(self.table.x, self.table.y)
@@ -211,9 +213,8 @@ class Hud:
# self.m = Mucked.Mucked(self.mucked_window, self.db_connection)
# self.mucked_window.show_all()
def update(self, hand, db, config):
def update(self, hand, config, stat_dict):
self.hand = hand # this is the last hand, so it is available later
stat_dict = db.get_stats_from_hand(hand)
for s in stat_dict.keys():
self.stat_windows[stat_dict[s]['seat']].player_id = stat_dict[s]['player_id']
for r in range(0, config.supported_games[self.poker_game].rows):