X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarcircles.cpp;h=407db6f7e7657f6f791dfe42c8599be71edcfc82;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=17a3671a132507492a9281d43c398ddaf0ea68d8;hpb=f7188d32d0beaef31fc3475be05daea2f018ebec;p=architektonas

diff --git a/src/forms/cadtoolbarcircles.cpp b/src/forms/cadtoolbarcircles.cpp
index 17a3671..407db6f 100644
--- a/src/forms/cadtoolbarcircles.cpp
+++ b/src/forms/cadtoolbarcircles.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -18,41 +20,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;
-}