Refactored CAD tool bars once more...

[architektonas] / src / forms / cadtoolbarpolylines.cpp

diff --git a/src/forms/cadtoolbarpolylines.cpp b/src/forms/cadtoolbarpolylines.cpp
index 6ff2ea185172f9baea9784d6b084f227e60eb945..1ea4636af9d207ab828854d428a3f3ab97bd66bf 100644 (file)
--- a/src/forms/cadtoolbarpolylines.cpp
+++ b/src/forms/cadtoolbarpolylines.cpp
@@ -18,43 +18,23 @@
 #include "createqtactions.h"
 
 CadToolBarPolylines::CadToolBarPolylines(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(actionDrawPolyline), 1, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionPolylineAdd), 1, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionDrawPolyline), 1, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionPolylineAdd), 1, 1, 1, 1);
 #warning "!!! Missing actionPolylineAppend !!!"
-//     gridLayout->addWidget(CreateToolButton(actionPolylineAppend), 2, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionPolylineDel), 2, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionPolylineDelBetween), 3, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionPolylineTrim), 3, 1, 1, 1);
+//     gridLayout->addWidget(parent->CreateToolButton(actionPolylineAppend), 2, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionPolylineDel), 2, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionPolylineDelBetween), 3, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionPolylineTrim), 3, 1, 1, 1);
 }
 
 CadToolBarPolylines::~CadToolBarPolylines()
 {
 }
-
-void CadToolBarPolylines::back()
-{
-       cadToolBar->back();
-}
-
-QToolButton * CadToolBarPolylines::CreateToolButton(QAction * action)
-{
-       QToolButton * button = new QToolButton(this);
-       button->setDefaultAction(action);
-       button->setIconSize(QSize(18, 18));
-
-       return button;
-}