#include <config.h>
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
#include "Dialogs.h"
#include "Dialog.h"
#include "GMathDelim.h"
#include "FormBibitem.h"
#include "FormBibtex.h"
-#include "FormBox.h"
+#include "GBox.h"
#include "FormBranch.h"
-#include "FormChanges.h"
-#include "FormCharacter.h"
+#include "GChanges.h"
+#include "GCharacter.h"
#include "FormCitation.h"
#include "FormDocument.h"
-#include "FormErrorList.h"
-#include "FormERT.h"
+#include "GErrorList.h"
+#include "GERT.h"
#include "FormExternal.h"
-#include "FormFloat.h"
-#include "FormGraphics.h"
+#include "GFloat.h"
+#include "GGraphics.h"
#include "FormInclude.h"
-#include "FormLog.h"
+#include "GLog.h"
#include "GMathPanel.h"
#include "FormMathsBitmap.h"
-#include "FormMathsMatrix.h"
+#include "GMathsMatrix.h"
#include "FormMathsSpace.h"
#include "FormMathsStyle.h"
-#include "FormNote.h"
-#include "FormParagraph.h"
+#include "GNote.h"
+#include "GParagraph.h"
#include "FormPreamble.h"
#include "FormPreferences.h"
-#include "FormPrint.h"
+#include "GPrint.h"
#include "FormRef.h"
-#include "FormSearch.h"
-#include "FormSendto.h"
+#include "GSearch.h"
+#include "GSendto.h"
#include "FormTabular.h"
-#include "FormTexinfo.h"
-#include "FormShowFile.h"
-#include "FormSpellchecker.h"
+#include "GTexinfo.h"
+#include "GShowFile.h"
+#include "GSpellchecker.h"
#include "GTableCreate.h"
-#include "FormToc.h"
+#include "GToc.h"
#include "GUrl.h"
-#include "FormVSpace.h"
+#include "GVSpace.h"
#include "FormWrap.h"
#ifdef HAVE_LIBAIKSAURUS
using std::string;
+using namespace lyx::frontend;
namespace {
dialog->setView(new FormBibtex(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "box") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlBox(*dialog));
- dialog->setView(new FormBox(*dialog));
+ dialog->setView(new GBox(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "changes") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlChanges(*dialog));
- dialog->setView(new FormChanges(*dialog));
+ dialog->setView(new GChanges(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "character") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlCharacter(*dialog));
- dialog->setView(new FormCharacter(*dialog));
+ dialog->setView(new GCharacter(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "citation") {
dialog->setController(new ControlCitation(*dialog));
dialog->setView(new FormDocument(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "errorlist") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlErrorList(*dialog));
- dialog->setView(new FormErrorList(*dialog));
+ dialog->setView(new GErrorList(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "ert") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlERT(*dialog));
- dialog->setView(new FormERT(*dialog));
+ dialog->setView(new GERT(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "external") {
dialog->setController(new ControlExternal(*dialog));
dialog->setView(new FormExternal(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "file") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlShowFile(*dialog));
- dialog->setView(new FormShowFile(*dialog));
+ dialog->setView(new GShowFile(*dialog));
dialog->bc().bp(new OkCancelPolicy);
} else if (name == "findreplace") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlSearch(*dialog));
- dialog->setView(new FormSearch(*dialog));
+ dialog->setView(new GSearch(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "float") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlFloat(*dialog));
- dialog->setView(new FormFloat(*dialog));
+ dialog->setView(new GFloat(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "graphics") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlGraphics(*dialog));
- dialog->setView(new FormGraphics(*dialog));
+ dialog->setView(new GGraphics(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "include") {
dialog->setController(new ControlInclude(*dialog));
_("Label"), _("Label:|#L")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "log") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlLog(*dialog));
- dialog->setView(new FormLog(*dialog));
+ dialog->setView(new GLog(*dialog));
dialog->bc().bp(new OkCancelPolicy);
} else if (name == "mathpanel") {
dialog->setView(new GMathDelim(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "mathmatrix") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlMath(*dialog));
- dialog->setView(new FormMathsMatrix(*dialog));
- dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
+ dialog->setView(new GMathsMatrix(*dialog));
+ dialog->bc().bp(new OkCancelReadOnlyPolicy);
} else if (name == "mathspace") {
dialog->setController(new ControlMath(*dialog));
dialog->setView(new FormMathsSpace(*dialog));
dialog->setView(new FormMathsStyle(*dialog));
dialog->bc().bp(new IgnorantPolicy);
} else if (name == "note") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlNote(*dialog));
- dialog->setView(new FormNote(*dialog));
+ dialog->setView(new GNote(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "branch") {
dialog->setController(new ControlBranch(*dialog));
dialog->setView(new FormBranch(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "paragraph") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlParagraph(*dialog));
- dialog->setView(new FormParagraph(*dialog));
+ dialog->setView(new GParagraph(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "preamble") {
dialog->setController(new ControlPreamble(*dialog));
dialog->setView(new FormPreferences(*dialog));
dialog->bc().bp(new PreferencesPolicy);
} else if (name == "print") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlPrint(*dialog));
- dialog->setView(new FormPrint(*dialog));
- dialog->bc().bp(new OkApplyCancelPolicy);
+ dialog->setView(new GPrint(*dialog));
+ dialog->bc().bp(new OkCancelPolicy);
} else if (name == "ref") {
dialog->setController(new ControlRef(*dialog));
dialog->setView(new FormRef(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "sendto") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlSendto(*dialog));
- dialog->setView(new FormSendto(*dialog));
+ dialog->setView(new GSendto(*dialog));
dialog->bc().bp(new OkApplyCancelPolicy);
} else if (name == "spellchecker") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlSpellchecker(*dialog));
- dialog->setView(new FormSpellchecker(*dialog));
+ dialog->setView(new GSpellchecker(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "tabular") {
dialog->setController(new ControlTabular(*dialog));
dialog->setView(new GTableCreate(*dialog));
dialog->bc().bp(new IgnorantPolicy);
} else if (name == "texinfo") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlTexinfo(*dialog));
- dialog->setView(new FormTexinfo(*dialog));
+ dialog->setView(new GTexinfo(*dialog));
dialog->bc().bp(new OkCancelPolicy);
#ifdef HAVE_LIBAIKSAURUS
} else if (name == "thesaurus") {
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
#endif
} else if (name == "toc") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlToc(*dialog));
- dialog->setView(new FormToc(*dialog));
+ dialog->setView(new GToc(*dialog));
dialog->bc().bp(new OkCancelPolicy);
} else if (name == "url") {
dialog->bc().view(new GBC(dialog->bc()));
dialog->setView(new GUrl(*dialog));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "vspace") {
+ dialog->bc().view(new GBC(dialog->bc()));
dialog->setController(new ControlVSpace(*dialog));
- dialog->setView(new FormVSpace(*dialog));
+ dialog->setView(new GVSpace(*dialog));
dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
} else if (name == "wrap") {
dialog->setController(new ControlWrap(*dialog));
projects / lyx.git / blobdiff