Refactored CAD tool bars to use predefined actions.

[architektonas] / src / forms / cadtoolbarpoints.cpp

diff --git a/src/forms/cadtoolbarpoints.cpp b/src/forms/cadtoolbarpoints.cpp
index 89758ab9c576dcf8b6e04666f56ef4f939f5c7e1..6c06233737937734d9d0a429ae456cdc03dcdbb6 100644 (file)
--- a/src/forms/cadtoolbarpoints.cpp
+++ b/src/forms/cadtoolbarpoints.cpp
@@ -15,51 +15,40 @@
 #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), cadToolBar(parent)
 {
-       ui.setupUi(this);
+       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(CreateToolButton(actionDrawPoint), 1, 0, 1, 1);
 }
 
 CadToolBarPoints::~CadToolBarPoints()
 {
 }
 
-void CadToolBarPoints::mousePressEvent(QMouseEvent * e)
-{
-       if (e->button() == Qt::RightButton && cadToolBar != NULL)
-       {
-               cadToolBar->back();
-               e->accept();
-       }
-}
-
-void CadToolBarPoints::contextMenuEvent(QContextMenuEvent * e)
-{
-       e->accept();
-}
-
-void CadToolBarPoints::setCadToolBar(CadToolBar * tb)
+void CadToolBarPoints::back()
 {
-       cadToolBar = tb;
-
-       if (tb != NULL)
-               actionHandler = tb->getActionHandler();
-       else
-               RS_DEBUG->print(RS_Debug::D_ERROR, "QG_CadToolBarPoints::setCadToolBar(): No valid toolbar set.");
+       cadToolBar->back();
 }
 
-void CadToolBarPoints::drawPoint()
+QToolButton * CadToolBarPoints::CreateToolButton(QAction * action)
 {
-       if (cadToolBar != NULL && actionHandler != NULL)
-               actionHandler->slotDrawPoint();
-}
+       QToolButton * button = new QToolButton(this);
+       button->setDefaultAction(action);
+       button->setIconSize(QSize(18, 18));
 
-void CadToolBarPoints::back()
-{
-       if (cadToolBar != NULL)
-               cadToolBar->back();
+       return button;
 }