X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flineoptions.cpp;h=11ec4212c0d351b810408f9904df5489ff4d9508;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=289d85a9870c40101f0c2090edbe3c969c552b63;hpb=3f46c180da0806c9c263e6d87d0f1404632402da;p=architektonas

diff --git a/src/forms/lineoptions.cpp b/src/forms/lineoptions.cpp
index 289d85a..11ec421 100644
--- a/src/forms/lineoptions.cpp
+++ b/src/forms/lineoptions.cpp
@@ -3,7 +3,9 @@
 // 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
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,14 +16,27 @@
 
 #include "lineoptions.h"
 
-#include "rs.h"
-#include "rs_actiondrawline.h"
-#include "rs_actioninterface.h"
+#include "enums.h"
+#include "actiondrawline.h"
+#include "actioninterface.h"
+#include "debug.h"
 
 LineOptions::LineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags), action(NULL)
+	QWidget(parent, flags), action(NULL),
+	bClose(new QToolButton(this)),
+	bUndo(new QToolButton(this))
 {
-	ui.setupUi(this);
+	QHBoxLayout * layout = new QHBoxLayout(this);
+	layout->setContentsMargins(0, 0, 0, 0);
+
+	bClose->setText(tr("Close"));
+	bUndo->setText(tr("Undo"));
+
+	layout->addWidget(bClose);
+	layout->addWidget(bUndo);
+
+	connect(bClose, SIGNAL(clicked()), this, SLOT(close()));
+	connect(bUndo, SIGNAL(clicked()), this, SLOT(undo()));
 
 	// We need to add the widget (this thing) to the toolbar passed in. Otherwise,
 	// nothing will show up on the screen. :-)
@@ -33,15 +48,16 @@ LineOptions::~LineOptions()
 {
 }
 
-void LineOptions::setAction(RS_ActionInterface * a)
+//void LineOptions::setAction(ActionInterface * a)
+void LineOptions::setAction(ActionInterface * a)
 {
 	if (a != NULL && a->rtti() == RS2::ActionDrawLine)
 	{
-		action = (RS_ActionDrawLine *)a;
+		action = (ActionDrawLine *)a;
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "QG_LineOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "QG_LineOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }