Refactored CAD tool bars once more...

[architektonas] / src / forms / cadtoolbararcs.cpp

diff --git a/src/forms/cadtoolbararcs.cpp b/src/forms/cadtoolbararcs.cpp
index 98469c14bc02bdf648c528a7458b83afc76cee62..b4956d027f3fa4289d4664104b39bff9786c78c6 100644 (file)
--- a/src/forms/cadtoolbararcs.cpp
+++ b/src/forms/cadtoolbararcs.cpp
@@ -14,112 +14,24 @@
 
 #include "cadtoolbararcs.h"
 
-#if 0
-#include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
-
-CadToolBarArcs::CadToolBarArcs(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-       QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
-{
-       ui.setupUi(this);
-}
-
-CadToolBarArcs::~CadToolBarArcs()
-{
-}
-
-/*void QG_CadToolBarArcs::mousePressEvent(QMouseEvent* e) {
-       if (e->button()==RightButton && cadToolBar!=NULL) {
-               cadToolBar->back();
-               e->accept();
-       }
-}*/
-
-void CadToolBarArcs::contextMenuEvent(QContextMenuEvent * e)
-{
-       e->accept();
-}
-
-void CadToolBarArcs::setCadToolBar(CadToolBar * tb)
-{
-       cadToolBar = tb;
-
-       if (tb != NULL)
-               actionHandler = tb->getActionHandler();
-       else
-               RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarArcs::setCadToolBar(): No valid toolbar set.");
-}
-
-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()
-{
-       if (cadToolBar != NULL)
-               cadToolBar->back();
-}
-#else
 #include "cadtoolbar.h"
 #include "createqtactions.h"
 
 CadToolBarArcs::CadToolBarArcs(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
-       QWidget((QWidget *)parent, flags), cadToolBar(parent)
+       QWidget((QWidget *)parent, flags)
 {
        QGridLayout * gridLayout = new QGridLayout(this);
        gridLayout->setSpacing(0);
        gridLayout->setContentsMargins(0, 0, 0, 0);
 
-       QAction * actionBack = new QAction(QIcon(":/res/qg_back"), tr("Back"), this);
-       QToolButton * button = new QToolButton(this);
-       button->setDefaultAction(actionBack);
-       QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-       button->setSizePolicy(policy);
-       gridLayout->addWidget(button, 0, 0, 1, 2);
-       connect(button, SIGNAL(triggered(QAction *)), this, SLOT(back()));
+       gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
 
-       gridLayout->addWidget(CreateToolButton(actionDrawArc), 1, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawArc3P), 1, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawArcParallel), 2, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionDrawArcTangential), 2, 1, 1, 1);
+       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);
 }
 
 CadToolBarArcs::~CadToolBarArcs()
 {
 }
-
-void CadToolBarArcs::back()
-{
-       cadToolBar->back();
-}
-
-QToolButton * CadToolBarArcs::CreateToolButton(QAction * action)
-{
-       QToolButton * button = new QToolButton(this);
-       button->setDefaultAction(action);
-       button->setIconSize(QSize(18, 18));
-
-       return button;
-}
-#endif