Merge branch 'nuto'

This commit is contained in:
Steffen Schaumburg 2010-12-18 21:28:38 +01:00
commit b1d0943c91
6 changed files with 18 additions and 28 deletions

View File

@ -1694,11 +1694,11 @@ class Database:
def storeHand(self, p, printdata = False): def storeHand(self, p, printdata = False):
if printdata: if printdata:
print "######## Hands ##########" print _("######## Hands ##########")
import pprint import pprint
pp = pprint.PrettyPrinter(indent=4) pp = pprint.PrettyPrinter(indent=4)
pp.pprint(p) pp.pprint(p)
print "###### End Hands ########" print _("###### End Hands ########")
#stores into table hands: #stores into table hands:
q = self.sql.query['store_hand'] q = self.sql.query['store_hand']

View File

@ -118,7 +118,7 @@ class GuiReplayer:
self.table[i]={"name":self.MyHand.players[i][1],"stack":Decimal(self.MyHand.players[i][2]),"x":x,"y":y,"chips":0,"status":"live"} #save coordinates of each player self.table[i]={"name":self.MyHand.players[i][1],"stack":Decimal(self.MyHand.players[i][2]),"x":x,"y":y,"chips":0,"status":"live"} #save coordinates of each player
try: try:
self.table[i]['holecards']=self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][1]+' '+self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][2] self.table[i]['holecards']=self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][1]+' '+self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][2]
print "holecards",self.table[i]['holecards'] print "holecards: ",self.table[i]['holecards']
except: except:
self.table[i]['holecards']='' self.table[i]['holecards']=''
except IndexError: #if seat is empty except IndexError: #if seat is empty
@ -236,7 +236,7 @@ class GuiReplayer:
rect = gtk.gdk.Rectangle(270,270,100,50) rect = gtk.gdk.Rectangle(270,270,100,50)
self.area.window.invalidate_rect(rect, True) #refresh pot area self.area.window.invalidate_rect(rect, True) #refresh pot area
self.area.window.process_updates(True) self.area.window.process_updates(True)
print "draw action",self.action_number,self.actions[self.action_number][1],self.actions[self.action_number][2],self.actions[self.action_number][3] print "draw action: ",self.action_number,self.actions[self.action_number][1],self.actions[self.action_number][2],self.actions[self.action_number][3]
return True return True

View File

@ -155,15 +155,10 @@ class GuiSessionViewer (threading.Thread):
# make sure Hand column is not displayed # make sure Hand column is not displayed
#[x for x in self.columns if x[0] == 'hand'][0][1] = False #[x for x in self.columns if x[0] == 'hand'][0][1] = False
if DEBUG == False: if DEBUG == False:
warning_string = """ warning_string = _("Session Viewer is proof of concept code only, and contains many bugs.\n")
Session Viewer is proof of concept code only, and contains many bugs. warning_string += _("Feel free to use the viewer, but there is no guarantee that the data is accurate.\n")
warning_string += _("If you are interested in developing the code further please contact us via the usual channels.\n")
Feel free to use the viewer, but there is no guarantee that the data is accurate. warning_string += _("Thankyou")
If you are interested in developing the code further please contact us via the usual channels.
Thankyou
"""
self.warning_box(warning_string) self.warning_box(warning_string)
def warning_box(self, str, diatitle=_("FPDB WARNING")): def warning_box(self, str, diatitle=_("FPDB WARNING")):

View File

@ -54,15 +54,10 @@ class GuiStove():
self.mainHBox.show_all() self.mainHBox.show_all()
if DEBUG == False: if DEBUG == False:
warning_string = _(""" warning_string = _("Stove is a GUI mockup of a EV calculation page, and completely non functional.\n")
Stove is a GUI mockup of a EV calculation page, and completely non functional. warning_string = _("Unless you are interested in developing this feature, please ignore this page.\n")
warning_string = _("If you are interested in developing the code further see GuiStove.py and Stove.py\n")
Unless you are interested in developing this feature, please ignore this page. warning_string = _("Thank you\n")
If you are interested in developing the code further see GuiStove.py and Stove.py
Thankyou
""")
self.warning_box(warning_string) self.warning_box(warning_string)

View File

@ -321,7 +321,7 @@ def idle_resize(hud):
[aw.update_card_positions() for aw in hud.aux_windows] [aw.update_card_positions() for aw in hud.aux_windows]
hud.resize_windows() hud.resize_windows()
except: except:
log.exception("Error resizing HUD for table: %s." % hud.table.title) log.exception(_("Error resizing HUD for table: %s.") % hud.table.title)
finally: finally:
gtk.gdk.threads_leave() gtk.gdk.threads_leave()
@ -335,7 +335,7 @@ def idle_kill(hud_main, table):
del(hud_main.hud_dict[table]) del(hud_main.hud_dict[table])
hud_main.main_window.resize(1, 1) hud_main.main_window.resize(1, 1)
except: except:
log.exception("Error killing HUD for table: %s." % table.title) log.exception(_("Error killing HUD for table: %s.") % table.title)
finally: finally:
gtk.gdk.threads_leave() gtk.gdk.threads_leave()
@ -358,7 +358,7 @@ def idle_create(hud_main, new_hand_id, table, temp_key, max, poker_game, type, s
hud_main.hud_dict[temp_key].update(new_hand_id, hud_main.config) hud_main.hud_dict[temp_key].update(new_hand_id, hud_main.config)
hud_main.hud_dict[temp_key].reposition_windows() hud_main.hud_dict[temp_key].reposition_windows()
except: except:
log.exception("Error creating HUD for hand %s." % new_hand_id) log.exception(_("Error creating HUD for hand %s.") % new_hand_id)
finally: finally:
gtk.gdk.threads_leave() gtk.gdk.threads_leave()
return False return False
@ -369,7 +369,7 @@ def idle_update(hud_main, new_hand_id, table_name, config):
hud_main.hud_dict[table_name].update(new_hand_id, config) hud_main.hud_dict[table_name].update(new_hand_id, config)
[aw.update_gui(new_hand_id) for aw in hud_main.hud_dict[table_name].aux_windows] [aw.update_gui(new_hand_id) for aw in hud_main.hud_dict[table_name].aux_windows]
except: except:
log.exception("Error updating HUD for hand %s." % new_hand_id) log.exception(_("Error updating HUD for hand %s.") % new_hand_id)
finally: finally:
gtk.gdk.threads_leave() gtk.gdk.threads_leave()
return False return False

View File

@ -1094,7 +1094,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
self.add_and_display_tab(gv_tab, _("Tourney Graphs")) self.add_and_display_tab(gv_tab, _("Tourney Graphs"))
def tabStove(self, widget, data=None): def tabStove(self, widget, data=None):
"""opens a tab for bulk importing tournament summaries""" """opens a tab for poker stove"""
thread = GuiStove.GuiStove(self.config, self.window) thread = GuiStove.GuiStove(self.config, self.window)
self.threads.append(thread) self.threads.append(thread)
tab = thread.get_vbox() tab = thread.get_vbox()