X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbarinfo.cpp;h=e8fd7a4e67b037832d77df12481422071eaf7c56;hb=d774c2655ba2c3657a565f325411144452392277;hp=e0f4143984e12929f4585863496b0a81943f13e0;hpb=27d4a138d23453e93a833e9347444b828a971cb4;p=architektonas

diff --git a/src/forms/cadtoolbarinfo.cpp b/src/forms/cadtoolbarinfo.cpp
index e0f4143..e8fd7a4 100644
--- a/src/forms/cadtoolbarinfo.cpp
+++ b/src/forms/cadtoolbarinfo.cpp
@@ -1,5 +1,6 @@
 // cadtoolbarinfo.cpp
 //
+// Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
 // (C) 2010 Underground Software
@@ -14,75 +15,24 @@
 #include "cadtoolbarinfo.h"
 
 #include "cadtoolbar.h"
-#include "qg_actionhandler.h"
-#include "rs_debug.h"
+#include "createqtactions.h"
 
-CadToolBarInfo::CadToolBarInfo(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags), actionHandler(NULL), cadToolBar(NULL)
+CadToolBarInfo::CadToolBarInfo(CadToolBar * parent, Qt::WindowFlags flags/*= 0*/):
+	QWidget((QWidget *)parent, flags)
 {
-	ui.setupUi(this);
-}
-
-CadToolBarInfo::~CadToolBarInfo()
-{
-}
-
-void CadToolBarInfo::mousePressEvent(QMouseEvent * e)
-{
-	if (e->button() == Qt::RightButton && cadToolBar != NULL)
-	{
-		cadToolBar->back();
-		e->accept();
-	}
-}
-
-void CadToolBarInfo::contextMenuEvent(QContextMenuEvent *e) {
-	e->accept();
-}
+	QGridLayout * gridLayout = new QGridLayout(this);
+	gridLayout->setSpacing(0);
+	gridLayout->setContentsMargins(0, 0, 0, 0);
 
-void CadToolBarInfo::setCadToolBar(CadToolBar * tb)
-{
-	cadToolBar = tb;
+	gridLayout->addWidget(parent->CreateBackButton(this), 0, 0, 1, 2);
 
-	if (tb != NULL)
-		actionHandler = tb->getActionHandler();
-	else
-		RS_DEBUG->print(RS_Debug::D_ERROR,
-			"CadToolBarInfo::setCadToolBar(): No valid toolbar set.");
-}
-
-void CadToolBarInfo::infoDist()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotInfoDist();
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoDist), 1, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoDist2), 1, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoAngle), 2, 0, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoTotalLength), 2, 1, 1, 1);
+	gridLayout->addWidget(parent->CreateToolButton(actionInfoArea), 3, 0, 1, 1);
 }
 
-void CadToolBarInfo::infoDist2()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotInfoDist2();
-}
-
-void CadToolBarInfo::infoAngle()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotInfoAngle();
-}
-
-void CadToolBarInfo::infoTotalLength()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotInfoTotalLength();
-}
-
-void CadToolBarInfo::infoArea()
-{
-	if (cadToolBar != NULL && actionHandler != NULL)
-		actionHandler->slotInfoArea();
-}
-
-void CadToolBarInfo::back()
+CadToolBarInfo::~CadToolBarInfo()
 {
-	if (cadToolBar != NULL)
-		cadToolBar->back();
 }