[gnue] r10104 - in trunk/gnue-forms/src: . uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2009-12-08 06:47:53 -0600 (Tue, 08 Dec 2009)
New Revision: 10104

Modified:
   trunk/gnue-forms/src/GFConfig.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/grid.py
Log:
Changed grid colors to a somewhat more discreet choice, added lines between
grid lines/columns.


Modified: trunk/gnue-forms/src/GFConfig.py
===================================================================
--- trunk/gnue-forms/src/GFConfig.py    2009-12-08 10:58:51 UTC (rev 10103)
+++ trunk/gnue-forms/src/GFConfig.py    2009-12-08 12:47:53 UTC (rev 10104)
@@ -232,7 +232,7 @@
                  + 'Format is either "RRGGBB", each digit being hexadecimal '
                  + 'or a color name as specified in wx.lib.colourdb.',
     'Typecast'   : GTypecast.text,
-    'Default'    : 'PALE TURQUOISE' },
+    'Default'    : 'F0F8F4' },
 
   { 'Name'       : 'grid_color_odd',
     'Type'       : 'Setting',
@@ -241,7 +241,7 @@
                  + 'Format is either "RRGGBB", each digit being hexadecimal '
                  + 'or a color name as specified in wx.lib.colourdb.',
     'Typecast'   : GTypecast.text,
-    'Default'    : 'LIGHT STEEL BLUE' },
+    'Default'    : 'E0E8E4' },
 
   { 'Name'       : 'DropdownSeparator',
     'Type'       : 'Setting',

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/grid.py   2009-12-08 10:58:51 UTC 
(rev 10103)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/grid.py   2009-12-08 12:47:53 UTC 
(rev 10104)
@@ -100,8 +100,10 @@
         outer.Add(inner, 0, wx.EXPAND)
 
         # The actual grid.
-        self._container = wx.Panel(self.widget, -1)
-        self._container.SetSizer(wx.GridBagSizer())
+        self._container = wx.Panel(self.widget, style=wx.SUNKEN_BORDER)
+        self._container.SetBackgroundColour(
+                wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DSHADOW))
+        self._container.SetSizer(wx.GridBagSizer(vgap=1, hgap=1))
         inner.Add(self._container, 1, wx.EXPAND | wx.LEFT | wx.TOP, 3)
 
         # The scroll bar.
@@ -113,7 +115,7 @@
         # reset the min size to 0 later (in update_size_hints) *after* the form
         # has been initially layouted, so the panel starts with 3 pixel height
         # in the initial layout.
-        self.__spacer = wx.Panel(self.widget, -1, size=(0, 3))
+        self.__spacer = wx.Panel(self.widget, size=(0, 3))
         outer.Add(self.__spacer, 1, wx.EXPAND)
 
         self.__max = self._gfObject.rows
@@ -141,11 +143,12 @@
                 if isinstance(item, GComment):
                     continue
                 span = int(getattr(item, 'Sizer__span', 1))
-                panel = wx.Panel(self._container, -1, style=wx.RAISED_BORDER)
+                panel = wx.Panel(self._container)
                 box = wx.BoxSizer(wx.HORIZONTAL)
                 panel.SetSizer(box)
                 static = wx.StaticText(panel, -1, getattr(item, 'label') or 
u"")
-                box.Add(static, 1, wx.EXPAND | wx.LEFT | wx.RIGHT, border=3)
+                box.Add(static, 1,
+                        wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 
border=5)
                 sizer.Add(panel, (linenum, index), (1, span), wx.EXPAND)
                 index += span
             num_cols = max(num_cols, index)