X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiERT.cpp;h=65a6095cee2a7ddb979fdc91ed0ca8b2769d69b6;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=66f1fa6ebead0083fbb6c07625819e9dd49c5e65;hpb=a1cec91afaca91968b46e695533c10ad2a3f73d3;p=lyx.git

diff --git a/src/frontends/qt4/GuiERT.cpp b/src/frontends/qt4/GuiERT.cpp
index 66f1fa6ebe..65a6095cee 100644
--- a/src/frontends/qt4/GuiERT.cpp
+++ b/src/frontends/qt4/GuiERT.cpp
@@ -3,6 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Jürgen Vigna
+ * \author Angus Leeming
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -11,95 +13,81 @@
 #include <config.h>
 
 #include "GuiERT.h"
-#include "Qt2BC.h"
+#include "FuncRequest.h"
 
-#include "controllers/ControlERT.h"
+#include "support/gettext.h"
 
 #include <QRadioButton>
 #include <QPushButton>
-#include <QCloseEvent>
 
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiERTDialog
-//
-/////////////////////////////////////////////////////////////////////
-
-
-GuiERTDialog::GuiERTDialog(GuiERT * form)
-	: form_(form)
+GuiERT::GuiERT(GuiView & lv)
+	: GuiDialog(lv, "ert", qt_("TeX Code Settings")), status_(InsetCollapsable::Collapsed)
 {
 	setupUi(this);
-	connect(okPB, SIGNAL(clicked()), form, SLOT(slotOK()));
-	connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose()));
+
+	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
 	connect(collapsedRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(openRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+
+	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
+	bc().setOK(okPB);
+	bc().setCancel(closePB);
 }
 
 
-void GuiERTDialog::closeEvent(QCloseEvent * e)
+void GuiERT::change_adaptor()
 {
-	form_->slotWMHide();
-	e->accept();
+	changed();
 }
 
 
-void GuiERTDialog::change_adaptor()
+void GuiERT::applyView()
 {
-	form_->changed();
+	if (openRB->isChecked())
+		status_ = InsetCollapsable::Open;
+	else
+		status_ = InsetCollapsable::Collapsed;
 }
 
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiERT
-//
-/////////////////////////////////////////////////////////////////////
-
-typedef QController<ControlERT, GuiView<GuiERTDialog> > ERTBase;
-
-
-GuiERT::GuiERT(Dialog & parent)
-	: ERTBase(parent, _("TeX Code Settings"))
+void GuiERT::updateContents()
 {
+	switch (status_) {
+		case InsetCollapsable::Open: openRB->setChecked(true); break;
+		case InsetCollapsable::Collapsed: collapsedRB->setChecked(true); break;
+	}
 }
 
 
-void GuiERT::build_dialog()
+bool GuiERT::initialiseParams(string const & data)
 {
-	dialog_.reset(new GuiERTDialog(this));
-
-	bcview().setOK(dialog_->okPB);
-	bcview().setCancel(dialog_->closePB);
+	status_ = InsetERT::string2params(data);
+	return true;
 }
 
 
-void GuiERT::apply()
+void GuiERT::clearParams()
 {
-	if (dialog_->openRB->isChecked())
-		controller().setStatus(Inset::Open);
-	else
-		controller().setStatus(Inset::Collapsed);
+	status_ = InsetCollapsable::Collapsed;
 }
 
 
-void GuiERT::update_contents()
+void GuiERT::dispatchParams()
 {
-	QRadioButton * rb = 0;
+	dispatch(FuncRequest(getLfun(), InsetERT::params2string(status_)));
+}
 
-	switch (controller().status()) {
-		case InsetERT::Open: rb = dialog_->openRB; break;
-		case InsetERT::Collapsed: rb = dialog_->collapsedRB; break;
-	}
 
-	rb->setChecked(true);
-}
+Dialog * createGuiERT(GuiView & lv) { return new GuiERT(lv); }
+
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiERT_moc.cpp"
+#include "moc_GuiERT.cpp"