# HG changeset patch # User unc0rr # Date 1218533204 0 # Node ID 2911384169b4b853e90c21249733dc571c9ba10e # Parent 63b7961f68de2be3a7aa752c453454fe62797cd8 Finish iconed groupbox implementation diff -r 63b7961f68de -r 2911384169b4 QTfrontend/igbox.cpp --- a/QTfrontend/igbox.cpp Tue Aug 12 08:48:44 2008 +0000 +++ b/QTfrontend/igbox.cpp Tue Aug 12 09:26:44 2008 +0000 @@ -18,6 +18,9 @@ #include #include +#include +#include + #include "igbox.h" IconedGroupBox::IconedGroupBox(QWidget * parent) @@ -32,7 +35,11 @@ void IconedGroupBox::paintEvent(QPaintEvent * event) { - QPainter painter(this); + QStylePainter painter(this); - icon.paint(&painter, QRect(QPoint(0, 0), size())); + QStyleOptionGroupBox option; + initStyleOption(&option); + painter.drawComplexControl(QStyle::CC_GroupBox, option); + + icon.paint(&painter, QRect(QPoint(0, 0), icon.actualSize(size()))); } diff -r 63b7961f68de -r 2911384169b4 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Tue Aug 12 08:48:44 2008 +0000 +++ b/QTfrontend/main.cpp Tue Aug 12 09:26:44 2008 +0000 @@ -183,15 +183,14 @@ "padding: 3px;" "margin-top: 60px;" "margin-left: 16px;" -// "padding-top: 6px;" - "}" - "QGroupBox::indicator{" - "image: url(\":/res/graphicsicon.png\");" + "padding-top: 6px;" "}" "QGroupBox::title{" "subcontrol-origin: margin;" "subcontrol-position: top left;" - "text-align: center;" + "padding-left: 82px;" + "padding-top: 26px;" + "text-align: left;" "}" "QCheckBox{" diff -r 63b7961f68de -r 2911384169b4 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Tue Aug 12 08:48:44 2008 +0000 +++ b/QTfrontend/pages.cpp Tue Aug 12 09:26:44 2008 +0000 @@ -284,8 +284,8 @@ BtnEditTeam = addButton(tr("Edit team"), GBTlayout, 0, 2); - AGGroupBox = new QGroupBox(this); - //AGGroupBox->setIcon(QIcon(":/res/graphicsicon.png")); + AGGroupBox = new IconedGroupBox(this); + AGGroupBox->setIcon(QIcon(":/res/graphicsicon.png")); AGGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); AGGroupBox->setTitle(QGroupBox::tr("Audio/Graphic options")); pageLayout->addWidget(AGGroupBox, 2, 1); diff -r 63b7961f68de -r 2911384169b4 QTfrontend/pages.h --- a/QTfrontend/pages.h Tue Aug 12 08:48:44 2008 +0000 +++ b/QTfrontend/pages.h Tue Aug 12 09:26:44 2008 +0000 @@ -192,7 +192,7 @@ QPushButton *BtnNewTeam; QPushButton *BtnEditTeam; QComboBox *CBTeamName; - QGroupBox *AGGroupBox; + IconedGroupBox *AGGroupBox; QComboBox *CBResolution; QCheckBox *CBEnableSound; QCheckBox *CBEnableMusic;