X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbar.cpp;h=8a09e77e6909c713db2ff0a25402287ea3e9c92e;hb=c5e595b3156fdf5f93ab6a1032dcc77e859ac6fa;hp=fd44fc798609494bc8630502cbbd34a45c5d353a;hpb=f7188d32d0beaef31fc3475be05daea2f018ebec;p=architektonas

diff --git a/src/forms/cadtoolbar.cpp b/src/forms/cadtoolbar.cpp
index fd44fc7..8a09e77 100644
--- a/src/forms/cadtoolbar.cpp
+++ b/src/forms/cadtoolbar.cpp
@@ -102,43 +102,32 @@ void CadToolBar::createSubToolBars(QG_ActionHandler * ah)
 {
 	actionHandler = ah;
 	tbMain = new CadToolBarMain(this);
-	tbMain->setCadToolBar(this);
 	currentTb = tbMain;
 
 	tbPoints = new CadToolBarPoints(this);
-	tbPoints->hide();
-
 	tbLines = new CadToolBarLines(this);
-	tbLines->hide();
-
 	tbArcs = new CadToolBarArcs(this);
-	tbArcs->hide();
-
 	tbCircles = new CadToolBarCircles(this);
-	tbCircles->hide();
-
 	tbEllipses = new CadToolBarEllipses(this);
-	tbEllipses->hide();
-
 	tbSplines = new CadToolBarSplines(this);
-	tbSplines->hide();
-
 	tbPolylines = new CadToolBarPolylines(this);
-	tbPolylines->hide();
-
 	tbDim = new CadToolBarDim(this);
-	tbDim->hide();
-
 	tbInfo = new CadToolBarInfo(this);
-	tbInfo->hide();
-
 	tbModify = new CadToolBarModify(this);
-	tbModify->hide();
-
 	tbSnap = new CadToolBarSnap(this);
-	tbSnap->hide();
-
 	tbSelect = new CadToolBarSelect(this);
+
+	tbPoints->hide();
+	tbLines->hide();
+	tbArcs->hide();
+	tbCircles->hide();
+	tbEllipses->hide();
+	tbSplines->hide();
+	tbPolylines->hide();
+	tbDim->hide();
+	tbInfo->hide();
+	tbModify->hide();
+	tbSnap->hide();
 	tbSelect->hide();
 }
 
@@ -234,9 +223,7 @@ void CadToolBar::showToolBarSplines()
 
 void CadToolBar::showToolBarPolylines()
 {
-//#ifdef RS_PROF
 	showToolBar(RS2::ToolBarPolylines);
-//#endif
 }
 
 void CadToolBar::showToolBarCircles()
@@ -275,3 +262,24 @@ void CadToolBar::showToolBarSelect(RS_ActionInterface * selectAction, int nextAc
 	tbSelect->setSelectAction(selectAction);
 	showToolBar(RS2::ToolBarSelect);
 }
+
+QToolButton * CadToolBar::CreateBackButton(QWidget * widget)
+{
+	QAction * actionBack = new QAction(QIcon(":/res/qg_back"), tr("Back"), widget);
+	QToolButton * button = new QToolButton(widget);
+	button->setDefaultAction(actionBack);
+	QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+	button->setSizePolicy(policy);
+	connect(button, SIGNAL(triggered(QAction *)), this, SLOT(back()));
+
+	return button;
+}
+
+QToolButton * CadToolBar::CreateToolButton(QAction * action)
+{
+	QToolButton * button = new QToolButton();
+	button->setDefaultAction(action);
+	button->setIconSize(QSize(18, 18));
+
+	return button;
+}