X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbararcs.cpp;h=9fc3cd46c8076967de190457aed4ec3d39f9baa2;hb=48105dec9198cf5a81dd9286010d0d45e28f70c3;hp=5ee2eb86091db0a3b29aa7f38212cc0044a0b6b2;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/cadtoolbararcs.cpp b/src/forms/cadtoolbararcs.cpp
index 5ee2eb8..9fc3cd4 100644
--- a/src/forms/cadtoolbararcs.cpp
+++ b/src/forms/cadtoolbararcs.cpp
@@ -1,8 +1,11 @@
 // cadtoolbararcs.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
+// 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>
 //
@@ -14,66 +17,23 @@
 #include "cadtoolbararcs.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.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();
 }