From a1499db849de4a084bd00c69fb7d6d88b742dc58 Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 26 Oct 2008 20:13:30 +0900 Subject: [PATCH 1/3] Fix return type of tables_by_name discovery for posix --- pyfpdb/Tables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py index 6afbddea..a5090fd7 100644 --- a/pyfpdb/Tables.py +++ b/pyfpdb/Tables.py @@ -114,7 +114,7 @@ def discover_posix_by_name(c, tablename): tables = discover_posix(c) for t in tables: if tables[t].name.find(tablename) > -1: - return t + return tables[t] return None # From 56d80d785c0fbddbbfe2e420d7446590fab32524 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 27 Oct 2008 20:14:08 +0900 Subject: [PATCH 2/3] HUD chmod --- pyfpdb/HUD_main.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pyfpdb/HUD_main.py diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py old mode 100644 new mode 100755 From 87c82df4b2b81a18889159740b6beb615e61c2b8 Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 29 Oct 2008 23:35:47 +0900 Subject: [PATCH 3/3] Merge branch 'master' of git://git.assembla.com/free_poker_tools Conflicts: pyfpdb/Hud.py --- pyfpdb/Hud.py | 19 ++++++++----------- pyfpdb/fpdb_import.py | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index e9ac814c..2d67c7ca 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -59,12 +59,12 @@ class Hud: self.stat_windows = {} self.popup_windows = {} self.font = pango.FontDescription("Sans 8") - -# Set up a main window for this this instance of the HUD - self.main_window = gtk.Window() + +# 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_keep_above(True) +# self.main_window.set_keep_above(True) self.main_window.set_title(table.name + " FPDBHUD") self.main_window.connect("destroy", self.kill_hud) self.main_window.set_decorated(False) @@ -100,12 +100,9 @@ class Hud: if os.name == 'nt': self.topify_window(self.main_window) else: - self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(self.table.number) - self.main_window.gdkhandle = gtk.gdk.window_foreign_new(self.main_window.window.xid) - self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) - #window.parentgdkhandle = gtk.gdk.window_foreign_new(self.table.number) - #self.main_window.gdkhandle = gtk.gdk.window_foreign_new(window.window.xid) - #self.main_window.gdkhandle.set_transient_for(window.parentgdkhandle) + 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) # def on_button_press(self, widget, event): if event.button == 3: @@ -343,7 +340,7 @@ class Stat_Window: self.window.set_decorated(0) self.window.set_opacity(parent.config.supported_sites[self.table.site].hudopacity) self.window.set_gravity(gtk.gdk.GRAVITY_STATIC) - #self.window.set_keep_above(1) +# self.window.set_keep_above(1) self.window.set_title("%s" % seat) self.window.set_property("skip-taskbar-hint", True) self.window.set_transient_for(parent.main_window) diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index fb170240..4a855d1d 100755 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -138,7 +138,7 @@ class Importer: # ^^ May not work on windows for dir in self.dirlist: for file in os.listdir(dir): - self.filelist = self.filelist + [dir+os.sep+file] + self.filelist = self.filelist + [os.path.join(dir, file)] self.filelist = list(set(self.filelist))