X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbararcs.cpp;h=b4956d027f3fa4289d4664104b39bff9786c78c6;hb=d774c2655ba2c3657a565f325411144452392277;hp=6ea2bd0689ff4d56505c626ca9fc5b2803c4fb2e;hpb=658ad9ec22e868cc5f575e6c4f3d38c153f6af51;p=architektonas

diff --git a/src/forms/cadtoolbararcs.cpp b/src/forms/cadtoolbararcs.cpp
index 6ea2bd0..b4956d0 100644
--- a/src/forms/cadtoolbararcs.cpp
+++ b/src/forms/cadtoolbararcs.cpp
@@ -15,67 +15,23 @@
 #include "cadtoolbararcs.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
+#include "createqtactions.h"
 
-CadToolBarArcs::CadToolBarArcs(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarArcs::CadToolBarArcs(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+	QWidget((QWidget *)parent, flags)
 {
-	ui.setupUi(this);
-}
-
-CadToolBarArcs::~CadToolBarArcs()
-{
-}
-
-/*void QG_CadToolBarArcs::mousePressEvent(QMouseEvent* e) {
-	if (e->button()==RightButton && cadToolBar!=NULL) {
-		cadToolBar->back();
-		e->accept();
-	}
-}*/
+	QGridLayout * gridLayout = new QGridLayout(this);
+	gridLayout->setSpacing(0);
+	gridLayout->setContentsMargins(0, 0, 0, 0);
 
-void CadToolBarArcs::contextMenuEvent(QContextMenuEvent * e)
-{
-	e->accept();
-}
-
-void CadToolBarArcs::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, "CadToolBarArcs::setCadToolBar(): No valid toolbar set.");
+	gridLayout->addWidget(parent->CreateToolButton(actionDrawArc), 1, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDrawArc3P), 1, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDrawArcParallel), 2, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDrawArcTangential), 2, 1, 1, 1);
 }
 
-void CadToolBarArcs::drawArc()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDrawArc();
-}
-
-void CadToolBarArcs::drawArc3P()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDrawArc3P();
-}
-
-void CadToolBarArcs::drawArcParallel()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDrawArcParallel();
-}
-
-void CadToolBarArcs::drawArcTangential()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDrawArcTangential();
-}
-
-void CadToolBarArcs::back()
+CadToolBarArcs::~CadToolBarArcs()
 {
-	if (cadToolBar != NULL)
-		cadToolBar->back();
 }