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

Merge branch 'master' of git://git.assembla.com/free_poker_tools

Browse Source 
Conflicts:

	pyfpdb/Hud.py
This commit is contained in:
Worros 2008-10-29 23:35:47 +09:00
parent 5809f28daf
commit 87c82df4b2
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyfpdb/Hud.py
View File

@ -60,11 +60,11 @@ class Hud:
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)
self.main_window.set_title(table.name + " FPDBHUD") self.main_window.set_title(table.name + " FPDBHUD")
self.main_window.connect("destroy", self.kill_hud) self.main_window.connect("destroy", self.kill_hud)
self.main_window.set_decorated(False) self.main_window.set_decorated(False)
@ -100,12 +100,9 @@ class Hud:
if os.name == 'nt': if os.name == 'nt':
self.topify_window(self.main_window) self.topify_window(self.main_window)
else: else:
self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(self.table.number) 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) 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.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)
def on_button_press(self, widget, event): def on_button_press(self, widget, event):
if event.button == 3: if event.button == 3:
@ -343,7 +340,7 @@ class Stat_Window:
self.window.set_decorated(0) self.window.set_decorated(0)
self.window.set_opacity(parent.config.supported_sites[self.table.site].hudopacity) self.window.set_opacity(parent.config.supported_sites[self.table.site].hudopacity)
self.window.set_gravity(gtk.gdk.GRAVITY_STATIC) 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_title("%s" % seat)
self.window.set_property("skip-taskbar-hint", True) self.window.set_property("skip-taskbar-hint", True)
self.window.set_transient_for(parent.main_window) self.window.set_transient_for(parent.main_window)

2
pyfpdb/fpdb_import.py
View File

@ -138,7 +138,7 @@ class Importer:
# ^^ May not work on windows # ^^ May not work on windows
for dir in self.dirlist: for dir in self.dirlist:
for file in os.listdir(dir): 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)) self.filelist = list(set(self.filelist))