[Ocemp-CVS] oceanempire/src/gui TransferScreen.py,1.5,1.6

[Marcus v. A. <mar...@us...>]

Update of /cvsroot/ocemp/oceanempire/src/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11949/src/gui

Modified Files:
	TransferScreen.py 
Log Message:
Nicer layout.

Index: TransferScreen.py
===================================================================
RCS file: /cvsroot/ocemp/oceanempire/src/gui/TransferScreen.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TransferScreen.py	29 Jan 2007 10:55:59 -0000	1.5
+++ TransferScreen.py	29 Jan 2007 21:13:38 -0000	1.6
@@ -24,7 +24,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import os
-from ocempgui.widgets import ImageButton, Label, Box, VFrame, HFrame, Table
+from ocempgui.widgets import ImageButton, Label, Box, VFrame, HFrame
+from ocempgui.widgets import Table, ImageLabel
 from ocempgui.widgets.Constants import *
 from ScreenObject import ScreenObject
 from GameEvent import *
@@ -37,6 +38,10 @@
         ScreenObject.__init__ (self, renderer, data, manager)
         self._tbl_goods = [None, None]
         self._lbl_tooltip = None
+        self._lbl_money = None
+        self._lbl_ship_load = None
+        self._lbl_warehouse_load = None
+        self._lbl_oiltank_load = None
         self._curindex = 0
         self._create ()
 
@@ -57,7 +62,8 @@
              _("Warehouse to harbour")),
             (os.path.join (Definitions.IMAGEPATH, "dummy.png"),
              _("Harbour to warehouse")),
-            (os.path.join (Definitions.IMAGEPATH, "dummy.png"), _("Page back")),
+            (os.path.join (Definitions.IMAGEPATH, "dummy.png"),
+             _("Page back")),
             (os.path.join (Definitions.IMAGEPATH, "dummy.png"),
              _("Page forward")),
             ]
@@ -73,12 +79,14 @@
             buttons.append (btn)
         buttons.append (self._lbl_tooltip)
 
+        # The offered goods.
         self._create_goods_tables ()
         frm_goods = HFrame ()
-        frm_goods.border = BORDER_NONE
+        frm_goods.border = BORDER_FLAT
         frm_goods.padding = 0
-        frm_goods.spacing = 120
+        frm_goods.spacing = 150
         frm_goods.children = self._tbl_goods
+
         self._frm_buttons.children = buttons
         self._frm_main.children = self._frm_top, frm_goods, self._frm_buttons
 
@@ -86,10 +94,10 @@
         """
         """
         for i in xrange (2):
-            self._tbl_goods[i] = Table (8, 4)
+            self._tbl_goods[i] = Table (7, 4)
             self._tbl_goods[i].minsize = 300, 470
             self._tbl_goods[i].padding = 0
-            self._tbl_goods[i].spacing = 10
+            self._tbl_goods[i].spacing = 5
             self._tbl_goods[i].set_column_align (1, ALIGN_RIGHT)
             self._tbl_goods[i].set_column_align (2, ALIGN_RIGHT)
             self._tbl_goods[i].set_column_align (3, ALIGN_RIGHT)
@@ -163,7 +171,6 @@
                     table.remove_child (widget)
                     widget.destroy ()
 
-        
         for i in xrange (6):
             if start >= length:
                 break
@@ -210,7 +217,6 @@
         goods.sort (lambda (index, x), (index2, y): cmp (index, index2))
         if self._curindex * 12 >= len (goods):
             return
-
         self._curindex -= 1
         self._update_good_tables (self._curindex * 12, goods, company, ship)
     
@@ -219,11 +225,9 @@
         """
         goods = self.data.goods.values ()
         goods.sort (lambda (index, x), (index2, y): cmp (index, index2))
-        print (self._curindex + 1) * 12, len (goods)
         if (self._curindex + 1)* 12 >= len (goods):
             return
         self._curindex += 1
-
         self._update_good_tables (self._curindex * 12, goods, company, ship)
 
     def show (self, company, event):