X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Ftextoptions.cpp;h=3275a9510f6c0333c765156cda1c9ba75bcb984a;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=055de11d6201cf0b62ad5364868691073994592d;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/textoptions.cpp b/src/forms/textoptions.cpp
index 055de11..3275a95 100644
--- a/src/forms/textoptions.cpp
+++ b/src/forms/textoptions.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,23 +16,30 @@
 
 #include "textoptions.h"
 
-#include "rs_actiondrawtext.h"
-#include "rs_actioninterface.h"
+#include "actiondrawtext.h"
+#include "actioninterface.h"
+#include "debug.h"
 
-TextOptions::TextOptions(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/)
+TextOptions::TextOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
+	QWidget(parent, flags)
 {
 	ui.setupUi(this);
+
+	// We need to add the widget (this thing) to the toolbar passed in. Otherwise,
+	// nothing will show up on the screen. :-)
+	if (parent)
+		parent->addWidget(this);
 }
 
 TextOptions::~TextOptions()
 {
 }
 
-void TextOptions::setAction(RS_ActionInterface * a, bool update)
+void TextOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionDrawText)
 	{
-		action = (RS_ActionDrawText *)a;
+		action = (ActionDrawText *)a;
 
 		QString st;
 		QString sa;
@@ -38,7 +47,7 @@ void TextOptions::setAction(RS_ActionInterface * a, bool update)
 		if (update)
 		{
 			st = action->getText();
-			sa = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+			sa = QString("%1").arg(Math::rad2deg(action->getAngle()));
 		}
 		else
 		{
@@ -51,7 +60,7 @@ void TextOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "TextOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "TextOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -65,5 +74,5 @@ void TextOptions::updateText()
 void TextOptions::updateAngle()
 {
 	if (action != NULL)
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text())));
+		action->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text())));
 }