X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarcircles.cpp;h=aef33214b663c131964ff09595b09de8097d0104;hb=d774c2655ba2c3657a565f325411144452392277;hp=17a3671a132507492a9281d43c398ddaf0ea68d8;hpb=f7188d32d0beaef31fc3475be05daea2f018ebec;p=architektonas diff --git a/src/forms/cadtoolbarcircles.cpp b/src/forms/cadtoolbarcircles.cpp index 17a3671..aef3321 100644 --- a/src/forms/cadtoolbarcircles.cpp +++ b/src/forms/cadtoolbarcircles.cpp @@ -18,41 +18,21 @@ #include "createqtactions.h" CadToolBarCircles::CadToolBarCircles(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/): - QWidget((QWidget *)parent, flags), cadToolBar(parent) + QWidget((QWidget *)parent, flags) { QGridLayout * gridLayout = new QGridLayout(this); gridLayout->setSpacing(0); gridLayout->setContentsMargins(0, 0, 0, 0); - QAction * actionBack = new QAction(QIcon(":/res/qg_back"), tr("Back"), this); - QToolButton * button = new QToolButton(this); - button->setDefaultAction(actionBack); - QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); - button->setSizePolicy(policy); - gridLayout->addWidget(button, 0, 0, 1, 2); - connect(button, SIGNAL(triggered(QAction *)), this, SLOT(back())); + gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2); - gridLayout->addWidget(CreateToolButton(actionDrawCircle), 1, 0, 1, 1); - gridLayout->addWidget(CreateToolButton(actionDrawCircleCR), 1, 1, 1, 1); - gridLayout->addWidget(CreateToolButton(actionDrawCircle2P), 2, 0, 1, 1); - gridLayout->addWidget(CreateToolButton(actionDrawCircle3P), 2, 1, 1, 1); - gridLayout->addWidget(CreateToolButton(actionDrawCircleParallel), 3, 0, 1, 1); + gridLayout->addWidget(parent->CreateToolButton(actionDrawCircle), 1, 0, 1, 1); + gridLayout->addWidget(parent->CreateToolButton(actionDrawCircleCR), 1, 1, 1, 1); + gridLayout->addWidget(parent->CreateToolButton(actionDrawCircle2P), 2, 0, 1, 1); + gridLayout->addWidget(parent->CreateToolButton(actionDrawCircle3P), 2, 1, 1, 1); + gridLayout->addWidget(parent->CreateToolButton(actionDrawCircleParallel), 3, 0, 1, 1); } CadToolBarCircles::~CadToolBarCircles() { } - -void CadToolBarCircles::back() -{ - cadToolBar->back(); -} - -QToolButton * CadToolBarCircles::CreateToolButton(QAction * action) -{ - QToolButton * button = new QToolButton(this); - button->setDefaultAction(action); - button->setIconSize(QSize(18, 18)); - - return button; -}