[Pybridge-commits] SF.net SVN: pybridge: [506] trunk/pybridge/pybridge/games/bridge/ui/ window_bridgetable.py

[<umg...@us...>]

Revision: 506
          http://pybridge.svn.sourceforge.net/pybridge/?rev=506&view=rev
Author:   umgangee
Date:     2007-10-04 09:40:59 -0700 (Thu, 04 Oct 2007)

Log Message:
-----------
Pop-up score sheet in own window, remove expanding frame for bidding view.

Modified Paths:
--------------
    trunk/pybridge/pybridge/games/bridge/ui/window_bridgetable.py

Modified: trunk/pybridge/pybridge/games/bridge/ui/window_bridgetable.py
===================================================================
--- trunk/pybridge/pybridge/games/bridge/ui/window_bridgetable.py	2007-10-04 16:37:16 UTC (rev 505)
+++ trunk/pybridge/pybridge/games/bridge/ui/window_bridgetable.py	2007-10-04 16:40:59 UTC (rev 506)
@@ -29,7 +29,7 @@
 
 from pybridge.ui.window_gametable import WindowGameTable
 from window_bidbox import WindowBidbox
-from window_scoresheet import ScoreSheet
+from window_scoresheet import WindowScoreSheet
 
 
 class BiddingView(gtk.TreeView):
@@ -187,6 +187,12 @@
             self.takeseat_menuitems[position] = item
         self.takeseat.set_menu(menu)
 
+        # Set up bridge-specific toolbar buttons.
+        self.showscores = gtk.ToggleToolButton(gtk.STOCK_EDIT)
+        self.showscores.set_label(_('Show Scoresheet'))
+        self.showscores.connect('clicked', self.on_showscores_clicked)
+        self.toolbar.insert(self.showscores, -1)
+
         # Set up CardArea widget.
         self.cardarea = CardArea(positions=Direction)
 
@@ -205,10 +211,7 @@
         sw.add(self.biddingview)
         frame = gtk.Frame()
         frame.add(sw)
-        exp = gtk.Expander(_('Bidding'))
-        exp.set_expanded(True)
-        exp.add(frame)
-        self.sidebar.pack_start(exp, expand=True)
+        self.sidebar.pack_start(frame, expand=True)
 
         self.trickarea = TrickArea(positions=Direction)
         self.trickarea.set_size_request(-1, 180)
@@ -219,16 +222,16 @@
         exp.add(frame)
         self.sidebar.pack_start(exp, expand=False)
 
-        self.scoresheet = ScoreSheet()
-        sw = gtk.ScrolledWindow()
-        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        sw.add(self.scoresheet)
-        frame = gtk.Frame()
-        frame.add(sw)
-        exp = gtk.Expander(_('Score Sheet'))
-        exp.set_expanded(False)
-        exp.add(frame)
-        self.sidebar.pack_start(exp, expand=False)
+#        self.scoresheet = ScoreSheet()
+#        sw = gtk.ScrolledWindow()
+#        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+#        sw.add(self.scoresheet)
+#        frame = gtk.Frame()
+#        frame.add(sw)
+#        exp = gtk.Expander(_('Score Sheet'))
+#        exp.set_expanded(False)
+#        exp.add(frame)
+#        self.sidebar.pack_start(exp, expand=False)
 
 
     def setTable(self, table):
@@ -263,7 +266,6 @@
                 bidbox.setCallSelectHandler(self.on_call_selected)
                 bidbox.setTable(self.table, self.position)
 
-
         # Initialise seat menu and player labels.
         for position in Direction:
             player = self.table.players.get(position)  # Player name or None.
@@ -298,7 +300,7 @@
 
         # Determine and display score in dialog box and score sheet.
         if self.table.game.contract:
-            self.scoresheet.add_result(self.table.game.result)
+            #self.scoresheet.add_result(self.table.game.result)
 
             tricksMade = self.table.game.result.tricksMade
             tricksRequired = self.table.game.contract.bid.level.index + 7
@@ -565,3 +567,15 @@
         d = super(WindowBridgeTable, self).on_leaveseat_clicked(widget, *args)
         d.addCallback(success)
 
+
+    def on_showscores_clicked(self, widget, *args):
+        if self.showscores.get_active():
+            w = self.children.open(WindowScoreSheet)
+            # This re-invokes on_showscores_clicked if user closes w.
+            delete_event = lambda w, e: self.showscores.set_active(False)
+            w.window.connect('delete_event', delete_event)
+            w.setTable(self.table)
+
+        else:
+            self.children.close(self.children[WindowScoreSheet])
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.