From 24069d607be8f416413f18dd7ae9b9e69940956a Mon Sep 17 00:00:00 2001 From: eblade Date: Sun, 21 Dec 2008 06:49:34 -0500 Subject: [PATCH] code/comment cleanup in Hud --- pyfpdb/Hud.py | 83 +++++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 59 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 1e29c017..e49e8f23 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -68,28 +68,31 @@ class Hud: else: print "Setting font to ", font + " " + font_size self.font = pango.FontDescription(font + " " + font_size) + + # do we need to add some sort of condition here for dealing with a request for a font that doesn't exist? # Set up a main window for this this instance of the HUD self.main_window = gtk.Window() -# self.window.set_decorated(0) self.main_window.set_gravity(gtk.gdk.GRAVITY_STATIC) self.main_window.set_title(table.name + " FPDBHUD") self.main_window.connect("destroy", self.kill_hud) self.main_window.set_decorated(False) self.main_window.set_opacity(self.colors["hudopacity"]) - #self.main_window.set_transient_for(parent.get_toplevel()) 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("FPDB Menu (Right Click)\nLeft-drag to move") - self.label.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudbgcolor'])) - self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor'])) + self.backgroundcolor = gtk.gdk.color_parse(self.colors['hudbgcolor']) + self.foregroundcolor = gtk.gdk.color_parse(self.colors['hudfgcolor']) + + self.label.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor) + self.label.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor) self.main_window.add(self.ebox) self.ebox.add(self.label) - self.ebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudbgcolor'])) - self.ebox.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor'])) + + self.ebox.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor) + self.ebox.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor) self.main_window.move(self.table.x, self.table.y) @@ -118,24 +121,21 @@ class Hud: self.ebox.connect_object("button-press-event", self.on_button_press, self.menu) self.main_window.show_all() -# set_keep_above(1) for windows + if os.name == 'nt': self.topify_window(self.main_window) else: self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(self.table.number) # gets a gdk handle for poker client self.main_window.gdkhandle = gtk.gdk.window_foreign_new(self.main_window.window.xid) # gets a gdk handle for the hud table window self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) # - - self.main_window.set_destroy_with_parent(True) - + def update_table_position(self): -# self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(self.table.number) -# if self.main_window.parentgdkhandle == None: if os.name == 'nt': if not win32gui.IsWindow(self.table.number): self.kill_hud() return False - + # anyone know how to do this in unix, or better yet, trap the X11 error that is triggered when executing the get_origin() for a closed window? + (x, y) = self.main_window.parentgdkhandle.get_origin() if self.table.x != x or self.table.y != y: self.table.x = x @@ -175,7 +175,6 @@ class Hud: def save_layout(self, *args): new_layout = [(0, 0)] * self.max -# todo: have the hud track the poker table's window position regularly, don't forget to update table.x and table.y. for sw in self.stat_windows: loc = self.stat_windows[sw].window.get_position() new_loc = (loc[0] - self.table.x, loc[1] - self.table.y) @@ -291,29 +290,13 @@ class Hud: for w in tl_windows: if w[1] == unique_name: - #win32gui.ShowWindow(w[0], win32con.SW_HIDE) self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(long(self.table.number)) self.main_window.gdkhandle = gtk.gdk.window_foreign_new(w[0]) self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) - #win32gui.ShowWindow(w[0], win32con.SW_SHOW) style = win32gui.GetWindowLong(self.table.number, win32con.GWL_EXSTYLE) - #style |= win32con.WS_EX_TOOLWINDOW - #style &= ~win32con.WS_EX_APPWINDOW style |= win32con.WS_CLIPCHILDREN win32gui.SetWindowLong(self.table.number, win32con.GWL_EXSTYLE, style) - - - #win32gui.SetWindowPos(w[0], win32con.HWND_TOPMOST, 0, 0, 0, 0, win32con.SWP_NOMOVE|win32con.SWP_NOSIZE) - -# notify_id = (w[0], -# 0, -# win32gui.NIF_ICON | win32gui.NIF_MESSAGE | win32gui.NIF_TIP, -# win32con.WM_USER+20, -# 0, -# '') -# win32gui.Shell_NotifyIcon(win32gui.NIM_DELETE, notify_id) -# window.set_title(real_name) class Stat_Window: @@ -335,7 +318,6 @@ class Stat_Window: if event.button == 2: # middle button event self.window.hide() -# print "middle button clicked" pass if event.button == 1: # left button event @@ -404,15 +386,15 @@ class Stat_Window: for c in range(self.game.cols): self.e_box[r].append( gtk.EventBox() ) - self.e_box[r][c].modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.colors['hudbgcolor'])) - self.e_box[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.colors['hudfgcolor'])) + self.e_box[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor) + self.e_box[r][c].modify_fg(gtk.STATE_NORMAL, parent.foregroundcolor) 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.label[r].append( gtk.Label('xxx') ) - self.label[r][c].modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.colors['hudbgcolor'])) - self.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(parent.colors['hudfgcolor'])) + self.label[r][c].modify_bg(gtk.STATE_NORMAL, parent.backgroundcolor) + self.label[r][c].modify_fg(gtk.STATE_NORMAL, parent.foregroundcolor) self.e_box[r][c].add(self.label[r][c]) self.e_box[r][c].connect("button_press_event", self.button_press_cb) @@ -436,7 +418,6 @@ class Popup_window: self.window = gtk.Window() self.window.set_decorated(0) self.window.set_gravity(gtk.gdk.GRAVITY_STATIC) -# self.window.set_keep_above(1) self.window.set_title("popup") self.window.set_property("skip-taskbar-hint", True) self.window.set_transient_for(parent.get_toplevel()) @@ -451,15 +432,13 @@ class Popup_window: self.window.add(self.ebox) self.ebox.add(self.lab) - self.ebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudbgcolor'])) - self.ebox.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudfgcolor'])) - self.window.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudbgcolor'])) - self.window.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudfgcolor'])) - self.lab.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudbgcolor'])) - self.lab.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(stat_window.parent.colors['hudfgcolor'])) + self.ebox.modify_bg(gtk.STATE_NORMAL, stat_window.parent.backgroundcolor) + self.ebox.modify_fg(gtk.STATE_NORMAL, stat_window.parent.foregroundcolor) + self.window.modify_bg(gtk.STATE_NORMAL, stat_window.parent.backgroundcolor) + self.window.modify_fg(gtk.STATE_NORMAL, stat_window.parent.foregroundcolor) + self.lab.modify_bg(gtk.STATE_NORMAL, stat_window.parent.backgroundcolor) + self.lab.modify_fg(gtk.STATE_NORMAL, stat_window.parent.foregroundcolor) -# self.window.realize() - # figure out the row, col address of the click that activated the popup row = 0 col = 0 @@ -564,22 +543,8 @@ class Popup_window: for w in tl_windows: if w[1] == unique_name: -# win32gui.ShowWindow(w[0], win32con.SW_HIDE) -# style = win32gui.GetWindowLong(w[0], win32con.GWL_EXSTYLE) -# style |= win32con.WS_EX_TOOLWINDOW -# style &= ~win32con.WS_EX_APPWINDOW -# win32gui.SetWindowLong(w[0], win32con.GWL_EXSTYLE, style) -# win32gui.ShowWindow(w[0], win32con.SW_SHOW) win32gui.SetWindowPos(w[0], win32con.HWND_TOPMOST, 0, 0, 0, 0, win32con.SWP_NOMOVE|win32con.SWP_NOSIZE) -# notify_id = (w[0], -# 0, -# win32gui.NIF_ICON | win32gui.NIF_MESSAGE | win32gui.NIF_TIP, -# win32con.WM_USER+20, -# 0, -# '') -# win32gui.Shell_NotifyIcon(win32gui.NIM_DELETE, notify_id) -# window.set_title(real_name) if __name__== "__main__":