Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts: pyfpdb/Hud.py Carl was right, the differences were trivial (comment markers mostly)
This commit is contained in:
commit
6f65f3eadb
|
@ -64,7 +64,7 @@ class 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,8 @@ 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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user