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

9
pyfpdb/Hud.py
View File

@ -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:

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))