From 9146758c5ef4680231841c8ce144c132a6d88348 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Mar 2009 15:42:16 -0400 Subject: [PATCH 1/4] Make flop_mucked windows follow the table on Windows. --- pyfpdb/Hud.py | 1 + pyfpdb/Mucked.py | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 3fa677b6..db665d57 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -204,6 +204,7 @@ class Hud: def reposition_windows(self, *args): if self.stat_windows != {} and len(self.stat_windows) > 0: (x.window.move(x.x, x.y) for x in self.stat_windows.itervalues() if type(x) != int) + [aw.relocate(self.hud.x, self.hud.y) for aw in self.aux_windows] return True def debug_stat_windows(self, *args): diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 9f8d6244..7df73e2b 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -39,15 +39,19 @@ import Database class Aux_Window: def __init__(self, hud, params, config): self.hud = hud + self.params = params self.config = config - def update_data(self, *parms): + def update_data(self, *args): pass - def update_gui(self, *parms): + def update_gui(self, *args): pass - def create(self, *parms): + def create(self, *args): + pass + + def relocate(self, *args): pass def save_layout(self, *args): @@ -321,6 +325,7 @@ class Flop_Mucked(Aux_Window): self.config = config # configuration object for this aux window to use self.params = params # dict aux params from config self.positions = {} # dict of window positions + self.rel_positions = {} # dict of window positions, relative to the table origin self.displayed_cards = False self.timer_on = False # bool = Ture if the timeout for removing the cards is on self.card_images = self.get_card_images() @@ -350,6 +355,7 @@ class Flop_Mucked(Aux_Window): self.seen_cards[i] = gtk.image_new_from_pixbuf(self.card_images[('B', 'H')]) self.eb[i].add(self.seen_cards[i]) self.positions[i] = (int(x) + self.hud.table.x, int(y) + self.hud.table.y) + self.rel_positions[i] = (int(x), int(y)) self.m_windows[i].move(self.positions[i][0], self.positions[i][1]) self.m_windows[i].set_opacity(float(self.params['opacity'])) self.m_windows[i].show_all() @@ -434,6 +440,12 @@ class Flop_Mucked(Aux_Window): def configure_event_cb(self, widget, event, i, *args): self.positions[i] = widget.get_position() + self.rel_positions[i] = (self.positions[i][0] - hud.table.x, self.positions[i][1] - hud.table.y) + + def relocate(self, x, y): + for i, w in self.m_windows.iteritems(): + self.positons[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) + self.m_windows.move(self.positions[i]) def expose_all(self): for (i, cards) in self.hud.cards.iteritems(): From 01bc1cebf1be37a3714a757ff96fc6114447e19f Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Mar 2009 16:46:06 -0400 Subject: [PATCH 2/4] Fix numerous typos/bugs in previous commit. --- pyfpdb/Hud.py | 4 ++-- pyfpdb/Mucked.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index db665d57..caf4ebb2 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -178,7 +178,8 @@ class Hud: if not type(w) == int: # how do we get pure ints in this list?? (x, y) = loc[adj[i]] w.relocate(x, y) - + [aw.relocate(self.table.x, self.table.y) for aw in self.aux_windows] + return True def on_button_press(self, widget, event): @@ -204,7 +205,6 @@ class Hud: def reposition_windows(self, *args): if self.stat_windows != {} and len(self.stat_windows) > 0: (x.window.move(x.x, x.y) for x in self.stat_windows.itervalues() if type(x) != int) - [aw.relocate(self.hud.x, self.hud.y) for aw in self.aux_windows] return True def debug_stat_windows(self, *args): diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 7df73e2b..434ef63b 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -440,12 +440,14 @@ class Flop_Mucked(Aux_Window): def configure_event_cb(self, widget, event, i, *args): self.positions[i] = widget.get_position() - self.rel_positions[i] = (self.positions[i][0] - hud.table.x, self.positions[i][1] - hud.table.y) + self.rel_positions[i] = (self.positions[i][0] - self.hud.table.x, self.positions[i][1] - self.hud.table.y) def relocate(self, x, y): for i, w in self.m_windows.iteritems(): - self.positons[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) - self.m_windows.move(self.positions[i]) + self.positions[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) + print "x, y =", x, y + print "rel_pos =", self.rel_positions + w.move(self.positions[i][0], self.positions[i][0]) def expose_all(self): for (i, cards) in self.hud.cards.iteritems(): From 29bd0c2a7ada4fe86d1e05d5e75efa1b01169e1a Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Mar 2009 17:22:28 -0400 Subject: [PATCH 3/4] Back out mucked window dragging changes. --- pyfpdb/Hud.py | 1 - pyfpdb/Mucked.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index caf4ebb2..732832a7 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -178,7 +178,6 @@ class Hud: if not type(w) == int: # how do we get pure ints in this list?? (x, y) = loc[adj[i]] w.relocate(x, y) - [aw.relocate(self.table.x, self.table.y) for aw in self.aux_windows] return True diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 434ef63b..8f7aa29b 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -442,13 +442,6 @@ class Flop_Mucked(Aux_Window): self.positions[i] = widget.get_position() self.rel_positions[i] = (self.positions[i][0] - self.hud.table.x, self.positions[i][1] - self.hud.table.y) - def relocate(self, x, y): - for i, w in self.m_windows.iteritems(): - self.positions[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) - print "x, y =", x, y - print "rel_pos =", self.rel_positions - w.move(self.positions[i][0], self.positions[i][0]) - def expose_all(self): for (i, cards) in self.hud.cards.iteritems(): self.m_windows[i].show() From ceba4be73f27482334ce2be089b704f1e9caba4a Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Mar 2009 17:48:43 -0400 Subject: [PATCH 4/4] More fixing of previous commit. --- pyfpdb/Hud.py | 1 - pyfpdb/Mucked.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 732832a7..53a508df 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -178,7 +178,6 @@ class Hud: if not type(w) == int: # how do we get pure ints in this list?? (x, y) = loc[adj[i]] w.relocate(x, y) - return True def on_button_press(self, widget, event): diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 8f7aa29b..9d70f8e3 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -325,7 +325,7 @@ class Flop_Mucked(Aux_Window): self.config = config # configuration object for this aux window to use self.params = params # dict aux params from config self.positions = {} # dict of window positions - self.rel_positions = {} # dict of window positions, relative to the table origin +# self.rel_positions = {} # dict of window positions, relative to the table origin self.displayed_cards = False self.timer_on = False # bool = Ture if the timeout for removing the cards is on self.card_images = self.get_card_images() @@ -355,7 +355,7 @@ class Flop_Mucked(Aux_Window): self.seen_cards[i] = gtk.image_new_from_pixbuf(self.card_images[('B', 'H')]) self.eb[i].add(self.seen_cards[i]) self.positions[i] = (int(x) + self.hud.table.x, int(y) + self.hud.table.y) - self.rel_positions[i] = (int(x), int(y)) +# self.rel_positions[i] = (int(x), int(y)) self.m_windows[i].move(self.positions[i][0], self.positions[i][1]) self.m_windows[i].set_opacity(float(self.params['opacity'])) self.m_windows[i].show_all() @@ -440,7 +440,7 @@ class Flop_Mucked(Aux_Window): def configure_event_cb(self, widget, event, i, *args): self.positions[i] = widget.get_position() - self.rel_positions[i] = (self.positions[i][0] - self.hud.table.x, self.positions[i][1] - self.hud.table.y) +# self.rel_positions[i] = (self.positions[i][0] - self.hud.table.x, self.positions[i][1] - self.hud.table.y) def expose_all(self): for (i, cards) in self.hud.cards.iteritems():