In the middle of major refactoring...

[architektonas] / src / forms / cadtoolbarpoints.cpp

diff --git a/src/forms/cadtoolbarpoints.cpp b/src/forms/cadtoolbarpoints.cpp
index 5f1245eb344d9dd394f709c71f464ddf50a0f81f..2342922be0d02c9864323bdd246c0f208d394af1 100644 (file)
--- a/src/forms/cadtoolbarpoints.cpp
+++ b/src/forms/cadtoolbarpoints.cpp
@@ -1,5 +1,6 @@
 // cadtoolbarpoints.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,51 +15,20 @@
 #include "cadtoolbarpoints.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
+#include "createqtactions.h"
 
-CadToolBarPoints::CadToolBarPoints(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-       QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarPoints::CadToolBarPoints(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+       QWidget((QWidget *)parent, flags)
 {
-       ui.setupUi(this);
-}
-
-CadToolBarPoints::~CadToolBarPoints()
-{
-}
-
-void CadToolBarPoints::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 CadToolBarPoints::contextMenuEvent(QContextMenuEvent * e)
-{
-       e->accept();
-}
-
-void CadToolBarPoints::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, "QG_CadToolBarPoints::setCadToolBar(): No valid toolbar set.");
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawPoint), 1, 0, 1, 1);
 }
 
-void CadToolBarPoints::drawPoint()
-{
-       if (cadToolBar != NULL && actionHandler != NULL)
-               actionHandler->slotDrawPoint();
-}
-
-void CadToolBarPoints::back()
+CadToolBarPoints::~CadToolBarPoints()
 {
-       if (cadToolBar != NULL)
-               cadToolBar->back();
 }