evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with eric's drag changes

Browse Source
This commit is contained in:
Ray 2008-12-10 13:45:56 -05:00
parent fff1e53eb9
commit 95f5eab448
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyfpdb/Hud.py
View File

@ -224,13 +224,9 @@ class Hud:
game_params = config.get_game_parameters(self.poker_game) game_params = config.get_game_parameters(self.poker_game)
if not game_params['aux'] == "": if not game_params['aux'] == "":
aux_params = config.get_aux_parameters(game_params['aux']) aux_params = config.get_aux_parameters(game_params['aux'])
<<<<<<< HEAD:pyfpdb/Hud.py
self.aux_windows.append(eval("%s.%s(gtk.Window(), self, config, 'fpdb')" % (aux_params['module'], aux_params['class']))) self.aux_windows.append(eval("%s.%s(gtk.Window(), self, config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
=======
self.aux_windows.append(eval("%s.%s(gtk.Window(), config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
gobject.timeout_add(0.5, self.update_table_position) gobject.timeout_add(0.5, self.update_table_position)
>>>>>>> f607b3ff632a015de2cdbe2a92f706d90b116458:pyfpdb/Hud.py
def update(self, hand, config, stat_dict): def update(self, hand, config, stat_dict):
self.hand = hand # this is the last hand, so it is available later self.hand = hand # this is the last hand, so it is available later