Refactored CAD tool bars to use predefined actions.

[architektonas] / src / forms / cadtoolbar.cpp

diff --git a/src/forms/cadtoolbar.cpp b/src/forms/cadtoolbar.cpp
index 2ae0746f427baeae21cd65f8d2a89c400e0deeda..fd44fc798609494bc8630502cbbd34a45c5d353a 100644 (file)
--- a/src/forms/cadtoolbar.cpp
+++ b/src/forms/cadtoolbar.cpp
@@ -35,10 +35,19 @@ CadToolBar::CadToolBar(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        tbEllipses(NULL), tbArcs(NULL), tbModify(NULL), tbCircles(NULL), tbSnap(NULL),
        tbSelect(NULL), tbPolylines(NULL)
 {
-       ui.setupUi(this);
+//hmm.
+#if 1
+       resize(86, 336);
+//     QSizePolicy policy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
+//     policy.setHorizontalStretch(0);
+//     policy.setVerticalStretch(0);
+//     policy.setHeightForWidth(sizePolicy().hasHeightForWidth());
+//     setSizePolicy(policy);
+       setMinimumSize(QSize(56, 336));
+#endif
 //hm. here maybe? Yesh!
-if (parent)
-       ((QToolBar *)parent)->addWidget(this);
+       if (parent)
+               ((QToolBar *)parent)->addWidget(this);
 }
 
 CadToolBar::~CadToolBar()
@@ -97,51 +106,39 @@ void CadToolBar::createSubToolBars(QG_ActionHandler * ah)
        currentTb = tbMain;
 
        tbPoints = new CadToolBarPoints(this);
-       tbPoints->setCadToolBar(this);
        tbPoints->hide();
 
        tbLines = new CadToolBarLines(this);
-//     tbLines->setCadToolBar(this);
        tbLines->hide();
 
        tbArcs = new CadToolBarArcs(this);
-       tbArcs->setCadToolBar(this);
        tbArcs->hide();
 
        tbCircles = new CadToolBarCircles(this);
-       tbCircles->setCadToolBar(this);
        tbCircles->hide();
 
        tbEllipses = new CadToolBarEllipses(this);
-       tbEllipses->setCadToolBar(this);
        tbEllipses->hide();
 
        tbSplines = new CadToolBarSplines(this);
-       tbSplines->setCadToolBar(this);
        tbSplines->hide();
 
        tbPolylines = new CadToolBarPolylines(this);
-       tbPolylines->setCadToolBar(this);
        tbPolylines->hide();
 
        tbDim = new CadToolBarDim(this);
-       tbDim->setCadToolBar(this);
        tbDim->hide();
 
        tbInfo = new CadToolBarInfo(this);
-       tbInfo->setCadToolBar(this);
        tbInfo->hide();
 
        tbModify = new CadToolBarModify(this);
-       tbModify->setCadToolBar(this);
        tbModify->hide();
 
        tbSnap = new CadToolBarSnap(this);
-       tbSnap->setCadToolBar(this);
        tbSnap->hide();
 
        tbSelect = new CadToolBarSelect(this);
-       tbSelect->setCadToolBar(this);
        tbSelect->hide();
 }