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

Configuration.py: add "bgcolor" and "fgcolor" to <site> node

Browse Source 
HUD: table hud and stat windows respect "bgcolor" and "fgcolor" on a per site basis
Tables: force tw.number to be an int in Unix
This commit is contained in:
eblade 2008-10-27 06:29:39 -04:00
parent 2bde12a6cf
commit 5f15a4f928
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyfpdb/Configuration.py
View File

@ -53,6 +53,14 @@ class Site:
self.site_path = node.getAttribute("site_path") self.site_path = node.getAttribute("site_path")
self.HH_path = node.getAttribute("HH_path") self.HH_path = node.getAttribute("HH_path")
self.decoder = node.getAttribute("decoder") self.decoder = node.getAttribute("decoder")
self.hudbgcolor = node.getAttribute("bgcolor")
if self.hudbgcolor == "":
self.hudbgcolor = "#FFFFFF"
self.hudfgcolor = node.getAttribute("fgcolor")
if self.hudfgcolor == "":
self.hudfgcolor = "#000000"
self.layout = {} self.layout = {}
for layout_node in node.getElementsByTagName('layout'): for layout_node in node.getElementsByTagName('layout'):

1
pyfpdb/HUD_main.py
View File

@ -29,7 +29,6 @@ Main for FreePokerTools HUD.
# to do no hud window for hero # to do no hud window for hero
# to do things to add to config.xml # to do things to add to config.xml
# to do font and size # to do font and size
# to do bg and fg color
# to do opacity # to do opacity
# Standard Library modules # Standard Library modules

21
pyfpdb/Hud.py
View File

@ -59,9 +59,9 @@ class Hud:
self.stat_windows = {} self.stat_windows = {}
self.popup_windows = {} self.popup_windows = {}
self.font = pango.FontDescription("Sans 8") self.font = pango.FontDescription("Sans 8")
# Set up a main window for this this instance of the HUD # Set up a main window for this this instance of the HUD
self.main_window = gtk.Window() self.main_window = gtk.Window()
# self.window.set_decorated(0) # self.window.set_decorated(0)
self.main_window.set_gravity(gtk.gdk.GRAVITY_STATIC) self.main_window.set_gravity(gtk.gdk.GRAVITY_STATIC)
#self.main_window.set_keep_above(True) #self.main_window.set_keep_above(True)
@ -72,8 +72,15 @@ class Hud:
self.ebox = gtk.EventBox() self.ebox = gtk.EventBox()
self.label = gtk.Label("Right click to close HUD for %s\nor Save Stat Positions." % (table.name)) self.label = gtk.Label("Right click to close HUD for %s\nor Save Stat Positions." % (table.name))
self.label.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(config.supported_sites[self.table.site].hudbgcolor))
self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(config.supported_sites[self.table.site].hudfgcolor))
self.main_window.add(self.ebox) self.main_window.add(self.ebox)
self.ebox.add(self.label) self.ebox.add(self.label)
self.ebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(config.supported_sites[self.table.site].hudbgcolor))
self.ebox.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(config.supported_sites[self.table.site].hudfgcolor))
self.main_window.move(self.table.x, self.table.y) self.main_window.move(self.table.x, self.table.y)
# A popup window for the main window # A popup window for the main window
@ -351,9 +358,17 @@ class Stat_Window:
self.label.append([]) self.label.append([])
for c in range(self.game.cols): for c in range(self.game.cols):
self.e_box[r].append( gtk.EventBox() ) self.e_box[r].append( gtk.EventBox() )
self.e_box[r][c].modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.config.supported_sites[self.table.site].hudbgcolor))
self.e_box[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.config.supported_sites[self.table.site].hudfgcolor))
Stats.do_tip(self.e_box[r][c], 'farts') Stats.do_tip(self.e_box[r][c], 'farts')
self.grid.attach(self.e_box[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0) self.grid.attach(self.e_box[r][c], c, c+1, r, r+1, xpadding = 0, ypadding = 0)
self.label[r].append( gtk.Label('xxx') ) self.label[r].append( gtk.Label('xxx') )
self.label[r][c].modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.config.supported_sites[self.table.site].hudbgcolor))
self.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.config.supported_sites[self.table.site].hudfgcolor))
self.e_box[r][c].add(self.label[r][c]) self.e_box[r][c].add(self.label[r][c])
self.e_box[r][c].connect("button_press_event", self.button_press_cb) self.e_box[r][c].connect("button_press_event", self.button_press_cb)
# font = pango.FontDescription("Sans 8") # font = pango.FontDescription("Sans 8")
@ -544,7 +559,7 @@ if __name__== "__main__":
c = Configuration.Config() c = Configuration.Config()
#tables = Tables.discover(c) #tables = Tables.discover(c)
t = Tables.discover_table_by_name(c, "Corona") t = Tables.discover_table_by_name(c, "Chelsea")
if t is None: if t is None:
print "Table not found." print "Table not found."
db = Database.Database(c, 'fpdb', 'holdem') db = Database.Database(c, 'fpdb', 'holdem')

2
pyfpdb/Tables.py
View File

@ -96,7 +96,7 @@ def discover_posix(c):
if re.match('[\(\)\d\s]+', mo.group(2)): continue # this is a popup if re.match('[\(\)\d\s]+', mo.group(2)): continue # this is a popup
tw = Table_Window() tw = Table_Window()
tw.site = c.supported_sites[s].site_name tw.site = c.supported_sites[s].site_name
tw.number = mo.group(1) tw.number = int(mo.group(1), 0)
tw.title = mo.group(2) tw.title = mo.group(2)
tw.width = int( mo.group(3) ) tw.width = int( mo.group(3) )
tw.height = int( mo.group(4) ) tw.height = int( mo.group(4) )