X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiFloat.cpp;h=773a7f0ba88dacb917789f8c568614f59adf8b4d;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=f0e3d51c2c1d3f1102d6e41cc1a9f1fa229e38f0;hpb=94e61a3bc9c136554afd8f23fd4d49c2f4e394ba;p=lyx.git

diff --git a/src/frontends/qt4/GuiFloat.cpp b/src/frontends/qt4/GuiFloat.cpp
index f0e3d51c2c..773a7f0ba8 100644
--- a/src/frontends/qt4/GuiFloat.cpp
+++ b/src/frontends/qt4/GuiFloat.cpp
@@ -12,25 +12,23 @@
 
 #include "GuiFloat.h"
 
-#include "ControlFloat.h"
 #include "FloatPlacement.h"
+#include "FuncRequest.h"
 
 #include "insets/InsetFloat.h"
 
-#include <QCloseEvent>
 #include <QPushButton>
 
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiFloatDialog::GuiFloatDialog(LyXView & lv)
-	: GuiDialog(lv, "float")
+GuiFloat::GuiFloat(GuiView & lv)
+	: GuiDialog(lv, "float", qt_("Float Settings"))
 {
-	setController(new ControlFloat(*this));
-	setViewTitle(_("Float Settings"));
-
 	setupUi(this);
+	
 	connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
 	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
 	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
@@ -54,38 +52,47 @@ GuiFloatDialog::GuiFloatDialog(LyXView & lv)
 }
 
 
-ControlFloat & GuiFloatDialog::controller() const
+void GuiFloat::change_adaptor()
 {
-	return static_cast<ControlFloat &>(GuiDialog::controller());
+	changed();
 }
 
 
-void GuiFloatDialog::change_adaptor()
+void GuiFloat::updateContents()
 {
-	changed();
+	floatFP->set(params_);
+}
+
+
+void GuiFloat::applyView()
+{
+	params_.placement = floatFP->get(params_.wide, params_.sideways);
 }
 
 
-void GuiFloatDialog::closeEvent(QCloseEvent * e)
+bool GuiFloat::initialiseParams(string const & data)
 {
-	slotWMHide();
-	e->accept();
+	InsetFloat::string2params(data, params_);
+	return true;
 }
 
 
-void GuiFloatDialog::update_contents()
+void GuiFloat::clearParams()
 {
-	floatFP->set(controller().params());
+	params_ = InsetFloatParams();
 }
 
 
-void GuiFloatDialog::applyView()
+void GuiFloat::dispatchParams()
 {
-	InsetFloatParams & params = controller().params();
-	params.placement = floatFP->get(params.wide, params.sideways);
+	dispatch(FuncRequest(getLfun(), InsetFloat::params2string(params_)));
 }
 
+
+Dialog * createGuiFloat(GuiView & lv) { return new GuiFloat(lv); }
+
+
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiFloat_moc.cpp"
+#include "moc_GuiFloat.cpp"