Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts: pyfpdb/Hud.py
This commit is contained in:
parent
5809f28daf
commit
87c82df4b2
|
@ -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:
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user