X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarsplines.cpp;h=e54966106d5b66fff213788962582a9163c04450;hb=d774c2655ba2c3657a565f325411144452392277;hp=755f3e34c2d35a7fac9a8c8fff71b162cd9c07c0;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/cadtoolbarsplines.cpp b/src/forms/cadtoolbarsplines.cpp
index 755f3e3..e549661 100644
--- a/src/forms/cadtoolbarsplines.cpp
+++ b/src/forms/cadtoolbarsplines.cpp
@@ -1,5 +1,6 @@
 // cadtoolbarsplines.cpp
 //
+// 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
@@ -14,50 +15,20 @@
 #include "cadtoolbarsplines.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
+#include "createqtactions.h"
 
-CadToolBarSplines::CadToolBarSplines(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarSplines::CadToolBarSplines(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+	QWidget((QWidget *)parent, flags)
 {
-	ui.setupUi(this);
-}
-
-CadToolBarSplines::~CadToolBarSplines()
-{
-}
-
-void CadToolBarSplines::mousePressEvent(QMouseEvent * e)
-{
-	if (e->button() == Qt::RightButton && cadToolBar != NULL)
-	{
-		cadToolBar->back();
-		e->accept();
-	}
-}
+	QGridLayout * gridLayout = new QGridLayout(this);
+	gridLayout->setSpacing(0);
+	gridLayout->setContentsMargins(0, 0, 0, 0);
 
-void CadToolBarSplines::contextMenuEvent(QContextMenuEvent * e)
-{
-	e->accept();
-}
-
-void CadToolBarSplines::setCadToolBar(CadToolBar * tb)
-{
-	cadToolBar = tb;
+	gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
 
-	if (tb != NULL)
-		actionHandler = tb->getActionHandler();
-	else
-		RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarSplines::setCadToolBar(): No valid toolbar set.");
+	gridLayout->addWidget(parent->CreateToolButton(actionDrawSpline), 1, 0, 1, 1);
 }
 
-void CadToolBarSplines::drawSpline()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDrawSpline();
-}
-
-void CadToolBarSplines::back()
+CadToolBarSplines::~CadToolBarSplines()
 {
-	if (cadToolBar != NULL)
-		cadToolBar->back();
 }