Phase two of adding polyline functionality...

[architektonas] / src / forms / cadtoolbarlines.cpp

diff --git a/src/forms/cadtoolbarlines.cpp b/src/forms/cadtoolbarlines.cpp
index a02ad624fe17b66e46a52bdcc87c64e4847cd4a3..dd5adfa7fbfd15d766d56a9c5555b40a719cf4ad 100644 (file)
--- a/src/forms/cadtoolbarlines.cpp
+++ b/src/forms/cadtoolbarlines.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>
 //
@@ -21,51 +23,31 @@
 #include "createqtactions.h"
 
 CadToolBarLines::CadToolBarLines(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(CreateToolButton(actionDrawLine), 1, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineAngle), 1, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineHorizontal), 2, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineVertical), 2, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineRectangle), 3, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineBisector), 3, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineParallel), 4, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineParallelThrough), 4, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineTangent1), 5, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineTangent2), 5, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineOrthogonal), 6, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineRelAngle), 6, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLinePolygon), 7, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLinePolygon2), 7, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawLineFree), 8, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
+
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLine), 1, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineAngle), 1, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineHorizontal), 2, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineVertical), 2, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineRectangle), 3, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineBisector), 3, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineParallel), 4, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineParallelThrough), 4, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineTangent1), 5, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineTangent2), 5, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineOrthogonal), 6, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineRelAngle), 6, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLinePolygon), 7, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLinePolygon2), 7, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawLineFree), 8, 0, 1, 1);
 }
 
 CadToolBarLines::~CadToolBarLines()
 {
 }
-
-void CadToolBarLines::back()
-{
-       cadToolBar->back();
-}
-
-QToolButton * CadToolBarLines::CreateToolButton(QAction * action)
-{
-       QToolButton * button = new QToolButton(this);
-       button->setDefaultAction(action);
-       button->setIconSize(QSize(18, 18));
-
-       return button;
-}