X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarinfo.cpp;h=b65ad7c685df5935a4d2329aeddd6e56d014ce54;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=383e9e6fadd2d138e1af9b0a661684e793fae119;hpb=f7188d32d0beaef31fc3475be05daea2f018ebec;p=architektonas

diff --git a/src/forms/cadtoolbarinfo.cpp b/src/forms/cadtoolbarinfo.cpp
index 383e9e6..b65ad7c 100644
--- a/src/forms/cadtoolbarinfo.cpp
+++ b/src/forms/cadtoolbarinfo.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"
 
 CadToolBarInfo::CadToolBarInfo(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(actionInfoDist), 1, 0, 1, 1);
-	gridLayout->addWidget(CreateToolButton(actionInfoDist2), 1, 1, 1, 1);
-	gridLayout->addWidget(CreateToolButton(actionInfoAngle), 2, 0, 1, 1);
-	gridLayout->addWidget(CreateToolButton(actionInfoTotalLength), 2, 1, 1, 1);
-	gridLayout->addWidget(CreateToolButton(actionInfoArea), 3, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoDist), 1, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoDist2), 1, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoAngle), 2, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoTotalLength), 2, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoArea), 3, 0, 1, 1);
 }
 
 CadToolBarInfo::~CadToolBarInfo()
 {
 }
-
-void CadToolBarInfo::back()
-{
-	cadToolBar->back();
-}
-
-QToolButton * CadToolBarInfo::CreateToolButton(QAction * action)
-{
-	QToolButton * button = new QToolButton(this);
-	button->setDefaultAction(action);
-	button->setIconSize(QSize(18, 18));
-
-	return button;
-}