Refactored CAD tool bars once more...

[architektonas] / src / forms / cadtoolbarmodify.cpp

diff --git a/src/forms/cadtoolbarmodify.cpp b/src/forms/cadtoolbarmodify.cpp
index 35edbce46be0601306ed5822d058069ee5a4c81a..6e79e8eb6821708d0a11a2e973a2c2465213120f 100644 (file)
--- a/src/forms/cadtoolbarmodify.cpp
+++ b/src/forms/cadtoolbarmodify.cpp
@@ -17,62 +17,42 @@
 #include "createqtactions.h"
 
 CadToolBarModify::CadToolBarModify(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(actionModifyMove), 1, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyRotate), 1, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyScale), 2, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyMirror), 2, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyMoveRotate), 3, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyRotate2), 3, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyMove), 1, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyRotate), 1, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyScale), 2, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyMirror), 2, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyMoveRotate), 3, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyRotate2), 3, 1, 1, 1);
 
-       gridLayout->addWidget(CreateToolButton(actionModifyTrim), 5, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyTrim2), 5, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyTrimAmount), 6, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyTrim), 5, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyTrim2), 5, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyTrimAmount), 6, 0, 1, 1);
 
-       gridLayout->addWidget(CreateToolButton(actionModifyBevel), 8, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyRound), 8, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyBevel), 8, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyRound), 8, 1, 1, 1);
 
-       gridLayout->addWidget(CreateToolButton(actionModifyCut), 10, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyStretch), 10, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyCut), 10, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyStretch), 10, 1, 1, 1);
 
-       gridLayout->addWidget(CreateToolButton(actionModifyEntity), 12, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyAttributes), 12, 1, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyDelete), 13, 0, 1, 1);
-       gridLayout->addWidget(CreateToolButton(actionModifyExplode), 13, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyEntity), 12, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyAttributes), 12, 1, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyDelete), 13, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyExplode), 13, 1, 1, 1);
 
-       gridLayout->addWidget(CreateToolButton(actionModifyExplodeText), 15, 0, 1, 1);
+       gridLayout->addWidget(parent->CreateToolButton(actionModifyExplodeText), 15, 0, 1, 1);
 #warning "!!! actionModifyEntityText is missing !!!"
 //EntityText
-//     gridLayout->addWidget(CreateToolButton(actionModifyEntityText), 15, 1, 1, 1);
+//     gridLayout->addWidget(parent->CreateToolButton(actionModifyEntityText), 15, 1, 1, 1);
 }
 
 CadToolBarModify::~CadToolBarModify()
 {
 }
-
-void CadToolBarModify::back()
-{
-       cadToolBar->back();
-}
-
-QToolButton * CadToolBarModify::CreateToolButton(QAction * action)
-{
-       QToolButton * button = new QToolButton(this);
-       button->setDefaultAction(action);
-       button->setIconSize(QSize(18, 18));
-
-       return button;
-}