In the middle of major refactoring...

[architektonas] / src / forms / cadtoolbardim.cpp

diff --git a/src/forms/cadtoolbardim.cpp b/src/forms/cadtoolbardim.cpp
index f7dd4c8700624f5d5d7ee7e3301f5f39c302c7a5..8512b5394dd2501d7d1c18fdf41b566fb694ad8a 100644 (file)
--- a/src/forms/cadtoolbardim.cpp
+++ b/src/forms/cadtoolbardim.cpp
@@ -1,5 +1,6 @@
 // cadtoolbardim.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,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();
 }