X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Ftextoptions.cpp;h=789eaf0ba40fb1a9eecdd56fa0b86e65ade41a03;hb=d774c2655ba2c3657a565f325411144452392277;hp=055de11d6201cf0b62ad5364868691073994592d;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas diff --git a/src/forms/textoptions.cpp b/src/forms/textoptions.cpp index 055de11..789eaf0 100644 --- a/src/forms/textoptions.cpp +++ b/src/forms/textoptions.cpp @@ -14,23 +14,29 @@ #include "textoptions.h" -#include "rs_actiondrawtext.h" -#include "rs_actioninterface.h" +#include "actiondrawtext.h" +#include "actioninterface.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;