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

diff --git a/src/forms/cadtoolbardim.cpp b/src/forms/cadtoolbardim.cpp
index b6eb567..8512b53 100644
--- a/src/forms/cadtoolbardim.cpp
+++ b/src/forms/cadtoolbardim.cpp
@@ -15,93 +15,27 @@
 #include "cadtoolbardim.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
+#include "createqtactions.h"
 
-CadToolBarDim::CadToolBarDim(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarDim::CadToolBarDim(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+	QWidget((QWidget *)parent, flags)
 {
-	ui.setupUi(this);
-}
-
-CadToolBarDim::~CadToolBarDim()
-{
-}
+	QGridLayout * gridLayout = new QGridLayout(this);
+	gridLayout->setSpacing(0);
+	gridLayout->setContentsMargins(0, 0, 0, 0);
 
-void CadToolBarDim::mousePressEvent(QMouseEvent * e)
-{
-	if (e->button() == Qt::RightButton && cadToolBar != NULL)
-	{
-		cadToolBar->back();
-		e->accept();
-	}
-}
+	gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
 
-void CadToolBarDim::contextMenuEvent(QContextMenuEvent * e)
-{
-	e->accept();
+	gridLayout->addWidget(parent->CreateToolButton(actionDimAligned), 1, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimLinear), 1, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimLinearHor), 2, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimLinearVer), 2, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimRadial), 3, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimDiametric), 3, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimAngular), 4, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionDimLeader), 4, 1, 1, 1);
 }
 
-void CadToolBarDim::setCadToolBar(CadToolBar * tb)
-{
-	cadToolBar = tb;
-
-	if (tb != NULL)
-		actionHandler = tb->getActionHandler();
-	else
-		RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarDim::setCadToolBar(): No valid toolbar set.");
-}
-
-void CadToolBarDim::drawDimAligned()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimAligned();
-}
-
-void CadToolBarDim::drawDimLinear()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimLinear();
-}
-
-void CadToolBarDim::drawDimLinearHor()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimLinearHor();
-}
-
-void CadToolBarDim::drawDimLinearVer()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimLinearVer();
-}
-
-void CadToolBarDim::drawDimRadial()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimRadial();
-}
-
-void CadToolBarDim::drawDimDiametric()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimDiametric();
-}
-
-void CadToolBarDim::drawDimAngular()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimAngular();
-}
-
-void CadToolBarDim::drawDimLeader()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotDimLeader();
-}
-
-void CadToolBarDim::back()
+CadToolBarDim::~CadToolBarDim()
 {
-	if (cadToolBar != NULL)
-		cadToolBar->back();
 }