[gnue] r8883 - trunk/gnue-forms/src/uidrivers/qt3/widgets

[johannes]

Author: johannes
Date: 2006-10-20 03:20:46 -0500 (Fri, 20 Oct 2006)
New Revision: 8883

Modified:
   trunk/gnue-forms/src/uidrivers/qt3/widgets/hbox.py
   trunk/gnue-forms/src/uidrivers/qt3/widgets/vbox.py
Log:
Fixed spanning of child widgets


Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/hbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/hbox.py  2006-10-20 07:59:18 UTC 
(rev 8882)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/hbox.py  2006-10-20 08:20:46 UTC 
(rev 8883)
@@ -25,11 +25,16 @@
 
 from gnue.forms.uidrivers.qt3.widgets._base import ManagedBox
 
+__all__ = ['UIHBox']
+
 # =============================================================================
 # Interface implementation for a box widget
 # =============================================================================
 
 class UIHBox(ManagedBox):
+    """
+    Implementation of the <hbox> tag
+    """
 
     _vertical_ = False
 
@@ -39,9 +44,13 @@
 
     def add_widgets(self, ui_widget, spacer):
         """
+        Add a given UI widget to the horizontal box
+
+        @param ui_widget: the widget to be added
+        @param spacer: not used for boxes
         """
 
-        both = isinstance(ui_widget, (ManagedBox, qt.QCheckBox))
+        both = isinstance(ui_widget, ManagedBox)
         add = False
 
         if ui_widget.label:

Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/vbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/vbox.py  2006-10-20 07:59:18 UTC 
(rev 8882)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/vbox.py  2006-10-20 08:20:46 UTC 
(rev 8883)
@@ -25,11 +25,16 @@
 
 from gnue.forms.uidrivers.qt3.widgets._base import ManagedBox
 
+__all__ = ['UIVBox']
+
 # =============================================================================
 # Interface implementation for a box widget
 # =============================================================================
 
 class UIVBox(ManagedBox):
+    """
+    Implementation of the <vbox> tag
+    """
 
     # -------------------------------------------------------------------------
     # Add an item to the box
@@ -37,26 +42,36 @@
 
     def add_widgets(self, ui_widget, spacer):
         """
+        Add a given UI widget to the vertical box.  The following widgets span
+        both columns: vbox, hbox, grid and checkboxes
+
+        @param ui_widget: widget to add
+        @param spacer: not used for boxes
         """
 
-        both = isinstance(ui_widget, (ManagedBox, qt.QCheckBox))
+        both = isinstance(ui_widget, ManagedBox) or \
+                isinstance(ui_widget.widget, qt.QCheckBox)
         add = False
 
         if ui_widget.label:
             add = True
             self.sizer.addMultiCellWidget(ui_widget.label, self.last_item,
-                    self.last_item, 0, 0)
+                    self.last_item, 0, 0, qt.Qt.AlignLeft | qt.Qt.AlignTop)
 
         if ui_widget.widget:
             add = True
 
             span = 0
+            row = self.last_item
+            left = self._entry_pos - 1
+            right = left + span
+
             if both and not ui_widget.label:
+                left = 0
                 span = 1
 
-            self.sizer.addMultiCellWidget(ui_widget.widget, self.last_item,
-                    self.last_item, self._entry_pos - 1, self._entry_pos - 1 +
-                    span)
+            self.sizer.addMultiCellWidget(ui_widget.widget, row, row, left,
+                    right)
 
         if add and ui_widget.growable:
             self.sizer.setRowStretch(self.last_item, ui_widget.stretch)