Refactored CAD tool bars once more...

[architektonas] / src / forms / cadtoolbarellipses.cpp

diff --git a/src/forms/cadtoolbarellipses.cpp b/src/forms/cadtoolbarellipses.cpp
index 6e385327fbe3d1fe09b2416d1a55788e40cefcf4..72f0f7de6be8b37ab3d959ab1a47f2d20ede12b8 100644 (file)
--- a/src/forms/cadtoolbarellipses.cpp
+++ b/src/forms/cadtoolbarellipses.cpp
@@ -15,57 +15,21 @@
 #include "cadtoolbarellipses.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
+#include "createqtactions.h"
 
-CadToolBarEllipses::CadToolBarEllipses(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-       QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarEllipses::CadToolBarEllipses(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+       QWidget((QWidget *)parent, flags)
 {
-       ui.setupUi(this);
-}
-
-CadToolBarEllipses::~CadToolBarEllipses()
-{
-}
+       QGridLayout * gridLayout = new QGridLayout(this);
+       gridLayout->setSpacing(0);
+       gridLayout->setContentsMargins(0, 0, 0, 0);
 
-void CadToolBarEllipses::mousePressEvent(QMouseEvent * e)
-{
-       if (e->button() == Qt::RightButton && cadToolBar != NULL)
-       {
-               cadToolBar->back();
-               e->accept();
-       }
-}
+       gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
 
-void CadToolBarEllipses::contextMenuEvent(QContextMenuEvent * e)
-{
-       e->accept();
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawEllipseAxis), 1, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawEllipseArcAxis), 1, 1, 1, 1);
 }
 
-void CadToolBarEllipses::setCadToolBar(CadToolBar * tb)
-{
-       cadToolBar = tb;
-
-       if (tb != NULL)
-               actionHandler = tb->getActionHandler();
-       else
-               RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarEllipses::setCadToolBar(): No valid toolbar set.");
-}
-
-void CadToolBarEllipses::drawEllipseAxis()
-{
-       if (cadToolBar != NULL && actionHandler != NULL)
-               actionHandler->slotDrawEllipseAxis();
-}
-
-void CadToolBarEllipses::drawEllipseArcAxis()
-{
-       if (cadToolBar != NULL && actionHandler != NULL)
-               actionHandler->slotDrawEllipseArcAxis();
-}
-
-void CadToolBarEllipses::back()
+CadToolBarEllipses::~CadToolBarEllipses()
 {
-       if (cadToolBar != NULL)
-               cadToolBar->back();
 }