Author: reinhard
Date: 2009-12-16 13:33:19 -0600 (Wed, 16 Dec 2009)
New Revision: 10132
Modified:
trunk/gnue-forms/src/uidrivers/qt4/widgets/grid.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/gridline.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/hbox.py
Log:
Several fixes to qt4 uidriver.
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/grid.py 2009-12-16 19:07:58 UTC
(rev 10131)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/grid.py 2009-12-16 19:33:19 UTC
(rev 10132)
@@ -68,7 +68,8 @@
self.widget = qt.QFrame(parent)
- hbox = qt.QHBoxLayout(self.widget, 2)
+ hbox = qt.QHBoxLayout(self.widget)
+ hbox.setSpacing(2)
self._container = ResizeContainer(self.widget, self)
self.scroll = qt.QScrollBar(qt.Qt.Vertical, self.widget)
@@ -110,7 +111,7 @@
colnum.sort()
for clx in colnum:
- self.rowsizer.setColStretch(clx, 1)
+ self.rowsizer.setColumnStretch(clx, 1)
pnl = qt.QFrame(self._container)
vbx = qt.QVBoxLayout(pnl)
@@ -119,7 +120,7 @@
stc = qt.QLabel(label, pnl)
vbx.addWidget(stc)
- self.rowsizer.addMultiCellWidget(pnl, 0, 0, clx, clx)
+ self.rowsizer.addWidget(pnl, 0, clx)
# -------------------------------------------------------------------------
@@ -145,7 +146,7 @@
"""
Adjust the thumb-position and the number of rows of the scrollbar
"""
- self.scroll.setMaxValue(count)
+ self.scroll.setMaximum(count)
self.scroll.setPageStep(size)
self.scroll.setValue(position)
@@ -245,7 +246,7 @@
saved = self.ui_grid._uiForm.sizing_enabled
self.ui_grid._uiForm.sizing_enabled = False
try:
- header = self.layout().cellGeometry(0, 0)
+ header = self.layout().cellRect(0, 0)
rech = 0
for item in self.ui_grid._children:
rech += max([panel.layout().minimumSize().height() \
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/gridline.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/gridline.py 2009-12-16
19:07:58 UTC (rev 10131)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/gridline.py 2009-12-16
19:33:19 UTC (rev 10132)
@@ -90,31 +90,17 @@
else:
name = 'grid_color_odd'
- color = self.__load_color_from_string(gConfigForms(name))
- panel.setPaletteBackgroundColor(color)
+ palette = qt.QPalette()
+ palette.setColor(panel.backgroundRole(),
qt.QColor(gConfigForms(name)))
+ panel.setPalette(palette)
self._columns.setdefault(spacer, []).append(panel)
- sizer.addMultiCellWidget(panel, row, row, offset, offset +
- child.span)
+ sizer.addWidget(panel, row, offset, 1, child.span)
offset += child.span
# -------------------------------------------------------------------------
- # Load the given colorname form the database or parse it as hex-rgb-string
- # -------------------------------------------------------------------------
-
- def __load_color_from_string(self, value):
-
- result = qt.QColor(value)
- if not result.isValid():
- (red, green, blue) = value[:2], value[2:4], value[4:6]
- result = qt.QColor(int(red, 16), int(green, 16), int(blue, 16))
-
- return result
-
-
- # -------------------------------------------------------------------------
# Add an UI widget to the Grid container
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/hbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/hbox.py 2009-12-16 19:07:58 UTC
(rev 10131)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/hbox.py 2009-12-16 19:33:19 UTC
(rev 10132)
@@ -67,14 +67,12 @@
span = 1
row = self._entry_pos - 1
- print (row, self.last_item,
- row+span, self.last_item)
-
+
self.sizer.addWidget(ui_widget.widget, row, self.last_item,
1, span)
if add and ui_widget.growable:
- self.sizer.setColStretch(self.last_item, ui_widget.stretch)
+ self.sizer.setColumnStretch(self.last_item, ui_widget.stretch)
self.last_item += int(add)
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
