From cf565c08aae0b5f4047cc6fe1c89d573a555c0a5 Mon Sep 17 00:00:00 2001 From: deva Date: Mon, 4 Apr 2011 09:38:52 +0000 Subject: Fix wierd CheckGroupBox layout with type='framed'. --- client/widgets/checkgroupbox.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/client/widgets/checkgroupbox.cc b/client/widgets/checkgroupbox.cc index 2298105..a5692b2 100644 --- a/client/widgets/checkgroupbox.cc +++ b/client/widgets/checkgroupbox.cc @@ -49,17 +49,17 @@ CheckGroupBox::CheckGroupBox(QDomNode &node, MacroWindow *macrowindow) groupbox = new QGroupBox(); groupbox->setCheckable(true); connect(groupbox, SIGNAL(toggled(bool)), this, SLOT(state_change(bool))); - if(elem.hasAttribute("caption")) { - groupbox->setTitle(elem.attribute("caption")); - } widget = groupbox; - setCommonAttributes(widget, node); setCommonLayout(widget, node); addChildren(node, widget->layout()); + if(elem.hasAttribute("caption")) { + groupbox->setTitle(elem.attribute("caption")); + } + } else if(type == "simple") { widget = new QWidget(); widget->setContentsMargins(0,0,0,0); @@ -75,7 +75,6 @@ CheckGroupBox::CheckGroupBox(QDomNode &node, MacroWindow *macrowindow) container = new QWidget(); l->addWidget(container); - setCommonAttributes(widget, node); setCommonLayout(container, node); addChildren(node, container->layout()); @@ -86,6 +85,8 @@ CheckGroupBox::CheckGroupBox(QDomNode &node, MacroWindow *macrowindow) ERROR(checkgroupbox, "Illegal value of attribute 'type'\n"); } + setCommonAttributes(widget, node); + // // From CheckBox // -- cgit v1.2.3