]> git.lyx.org Git - features.git/blobdiff - src/frontends/gtk/Dialogs.C
* remove various xforms relicts, in particular:
[features.git] / src / frontends / gtk / Dialogs.C
index e1dd28e6c896b4f56517d693764bcb87ab927958..65abdfbf4df1258b3e84c9715df403bd2165a934 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * \file xforms/Dialogs.C
+// * \file gtk/Dialogs.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "Dialogs.h"
 #include "Dialog.h"
 
-#include "Tooltips.h"
-
 #include "ControlAboutlyx.h"
 #include "ControlBibtex.h"
+#include "ControlBox.h"
 #include "ControlBranch.h"
 #include "ControlChanges.h"
 #include "ControlCharacter.h"
 #include "ControlCitation.h"
 #include "ControlCommand.h"
+#include "ControlDocument.h"
 #include "ControlErrorList.h"
 #include "ControlERT.h"
 #include "ControlExternal.h"
 #include "ControlInclude.h"
 #include "ControlLog.h"
 #include "ControlMath.h"
-#include "ControlMinipage.h"
 #include "ControlNote.h"
 #include "ControlParagraph.h"
+#include "ControlPrefs.h"
+#include "ControlPrint.h"
 #include "ControlRef.h"
+#include "ControlSearch.h"
+#include "ControlSendto.h"
 #include "ControlShowFile.h"
+#include "ControlSpellchecker.h"
 #include "ControlTabular.h"
 #include "ControlTabularCreate.h"
 #include "ControlTexinfo.h"
 #include "ControlToc.h"
-#include "ControlVCLog.h"
+#include "ControlVSpace.h"
 #include "ControlWrap.h"
 
 #include "GAboutlyx.h"
 #include "GText.h"
-#include "FormBibitem.h"
-#include "FormBibtex.h"
-#include "FormBranch.h"
-#include "FormChanges.h"
-#include "FormCharacter.h"
-#include "FormCitation.h"
-#include "FormErrorList.h"
-#include "FormERT.h"
-#include "FormExternal.h"
-#include "FormFloat.h"
-#include "FormGraphics.h"
-#include "FormInclude.h"
-#include "FormLog.h"
-#include "FormMathsPanel.h"
-#include "FormMathsBitmap.h"
-#include "FormMathsDelim.h"
-#include "FormMathsMatrix.h"
-#include "FormMathsSpace.h"
-#include "FormMathsStyle.h"
-#include "FormMinipage.h"
-#include "FormNote.h"
-#include "FormParagraph.h"
-#include "FormRef.h"
-#include "FormTabular.h"
-#include "FormTexinfo.h"
-#include "FormShowFile.h"
-#include "FormTabularCreate.h"
-#include "FormToc.h"
-#include "FormUrl.h"
-#include "FormVCLog.h"
-#include "FormWrap.h"
+#include "GMathDelim.h"
+#include "GBibItem.h"
+#include "GBibtex.h"
+#include "GBox.h"
+#include "GBranch.h"
+#include "GChanges.h"
+#include "GCharacter.h"
+#include "GCitation.h"
+#include "GDocument.h"
+#include "GErrorList.h"
+#include "GERT.h"
+#include "GExternal.h"
+#include "GFloat.h"
+#include "GGraphics.h"
+#include "GInclude.h"
+#include "GLog.h"
+#include "GMathPanel.h"
+//#include "FormMathsBitmap.h"
+#include "GMathsMatrix.h"
+//#include "FormMathsSpace.h"
+//#include "FormMathsStyle.h"
+#include "GNote.h"
+#include "GParagraph.h"
+#include "GPreferences.h"
+#include "GPrint.h"
+#include "GRef.h"
+#include "GSearch.h"
+#include "GSendto.h"
+#include "GTabular.h"
+#include "GTexinfo.h"
+#include "GShowFile.h"
+#include "GSpellchecker.h"
+#include "GTableCreate.h"
+#include "GToc.h"
+#include "GUrl.h"
+#include "GVSpace.h"
+#include "GWrap.h"
 
 #ifdef HAVE_LIBAIKSAURUS
 #include "ControlThesaurus.h"
-#include "FormThesaurus.h"
+#include "GThesaurus.h"
 #endif
 
-#include "xformsBC.h"
 #include "ButtonController.h"
 
 #include "arrows.xbm"
 #include "ams_nrel.xbm"
 #include "ams_ops.xbm"
 
+#include <boost/assert.hpp>
 #include <vector>
 
 using std::string;
 
+using namespace lyx::frontend;
 
 namespace {
 
-FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
-                                  char const * const * data, int size)
-{
-       char const * const * const end = data + size;
-       return new FormMathsBitmap(parent, title, std::vector<string>(data, end));
-}
-
-
-char const * const dialognames[] = { "aboutlyx", "bibitem", "bibtex", "branch", "changes",
-"character", "citation", "error", "errorlist" , "ert", "external", "file",
-"float", "graphics", "include", "index", "label", "latexlog", "mathpanel",
-"mathaccents", "matharrows", "mathoperators", "mathrelations", "mathgreek",
-"mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
-"mathamsarrows", "mathamsrelations", "mathamsnegatedrelations", "mathamsoperators",
-"mathdelimiter", "mathmatrix", "mathspace", "mathstyle",
-"minipage", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo",
+//FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
+//                                char const * const * data, int size)
+//{
+//     char const * const * const end = data + size;
+//     return new FormMathsBitmap(parent, title, std::vector<string>(data, end));
+//}
+
+
+char const * const dialognames[] = {
+"aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
+"citation", "document", "errorlist" , "ert", "external", "file",
+"findreplace", "float", "graphics", "include", "index", "label", "log",
+"mathpanel", "mathaccents", "matharrows", "mathoperators", "mathrelations",
+"mathgreek", "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
+"mathamsarrows", "mathamsrelations", "mathamsnegatedrelations",
+"mathamsoperators", "mathdelimiter", "mathmatrix", "mathspace", "mathstyle",
+"note", "paragraph", "prefs", "print", "ref", "sendto",
+"spellchecker", "tabular", "tabularcreate", "texinfo",
 
 #ifdef HAVE_LIBAIKSAURUS
 "thesaurus",
 #endif
 
-"toc", "url", "vclog", "wrap" };
+"toc", "url", "vspace", "wrap" };
 
 char const * const * const end_dialognames =
        dialognames + (sizeof(dialognames) / sizeof(char *));
@@ -151,13 +172,11 @@ bool Dialogs::isValidName(string const & name) const
 }
 
 
-Dialog * Dialogs::build(string const & name)
+Dialogs::DialogPtr Dialogs::build(string const & name)
 {
-       if (!isValidName(name))
-               return 0;
+       BOOST_ASSERT(isValidName(name));
 
-       Dialog * dialog = new Dialog(lyxview_, name);
-       dialog->bc().view(new xformsBC(dialog->bc()));
+       DialogPtr dialog(new Dialog(lyxview_, name));
 
        if (name == "aboutlyx") {
                dialog->bc().view(new GBC(dialog->bc()));
@@ -165,58 +184,85 @@ Dialog * Dialogs::build(string const & name)
                dialog->setView(new GAboutlyx(*dialog));
                dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "bibitem") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlCommand(*dialog, name));
-               dialog->setView(new FormBibitem(*dialog));
+               dialog->setView(new GBibItem(*dialog));
                dialog->bc().bp(new OkCancelReadOnlyPolicy);
        } else if (name == "bibtex") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlBibtex(*dialog));
-               dialog->setView(new FormBibtex(*dialog));
+               dialog->setView(new GBibtex(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-       } else if (name == "character") {
-               dialog->setController(new ControlCharacter(*dialog));
-               dialog->setView(new FormCharacter(*dialog));
+       } else if (name == "box") {
+               dialog->bc().view(new GBC(dialog->bc()));
+               dialog->setController(new ControlBox(*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 GCharacter(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "citation") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlCitation(*dialog));
-               dialog->setView(new FormCitation(*dialog));
+               dialog->setView(new GCitation(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
+       } else if (name == "document") {
+               dialog->bc().view(new GBC(dialog->bc()));
+               dialog->setController(new ControlDocument(*dialog));
+               dialog->setView(new GDocument(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } 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->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlExternal(*dialog));
-               dialog->setView(new FormExternal(*dialog));
+               dialog->setView(new GExternal(*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 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->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlInclude(*dialog));
-               dialog->setView(new FormInclude(*dialog));
+               dialog->setView(new GInclude(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "index") {
                dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlCommand(*dialog, name));
                dialog->setView(new GText(*dialog,
-                                         _("Index"), _("Keyword:|#K")));
+                                         _("Index Entry"), _("Keyword:|#K")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->bc().view(new GBC(dialog->bc()));
@@ -224,245 +270,292 @@ Dialog * Dialogs::build(string const & name)
                dialog->setView(new GText(*dialog,
                                          _("Label"), _("Label:|#L")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-       } else if (name == "latexlog") {
+       } 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->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(new FormMathsPanel(*dialog));
+               dialog->setView(new GMathPanel(*dialog));
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathaccents") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Maths Decorations & Accents"),
-                                        latex_deco, nr_latex_deco);
-               bitmap->addBitmap(
-                       BitmapStore(12, 3, 4, deco1_width, deco1_height, deco1_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(10, 4, 3, deco2_width, deco2_height, deco2_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Maths Decorations & Accents"),
+//                                      latex_deco, nr_latex_deco);
+//             bitmap->addBitmap(
+//                     BitmapStore(12, 3, 4, deco1_width, deco1_height, deco1_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(10, 4, 3, deco2_width, deco2_height, deco2_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "matharrows") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Arrows"), latex_arrow, nr_latex_arrow);
-               bitmap->addBitmap(
-                       BitmapStore(20, 5, 4, arrow_width,  arrow_height,  arrow_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(7,  2, 4, larrow_width, larrow_height, larrow_bits, false));
-               bitmap->addBitmap(
-                       BitmapStore(4,  2, 2, darrow_width,  darrow_height, darrow_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Arrows"), latex_arrow, nr_latex_arrow);
+//             bitmap->addBitmap(
+//                     BitmapStore(20, 5, 4, arrow_width,  arrow_height,  arrow_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(7,  2, 4, larrow_width, larrow_height, larrow_bits, false));
+//             bitmap->addBitmap(
+//                     BitmapStore(4,  2, 2, darrow_width,  darrow_height, darrow_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathoperators") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Binary Ops"),
-                                        latex_bop, nr_latex_bop);
-               bitmap->addBitmap(
-                       BitmapStore(31, 4, 8, bop_width, bop_height, bop_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Binary Ops"),
+//                                      latex_bop, nr_latex_bop);
+//             bitmap->addBitmap(
+//                     BitmapStore(31, 4, 8, bop_width, bop_height, bop_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathrelations") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Binary Relations"),
-                                        latex_brel, nr_latex_brel);
-               bitmap->addBitmap(
-                       BitmapStore(35, 4, 9, brel_width, brel_height, brel_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Binary Relations"),
+//                                      latex_brel, nr_latex_brel);
+//             bitmap->addBitmap(
+//                     BitmapStore(35, 4, 9, brel_width, brel_height, brel_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathgreek") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Greek"),
-                                        latex_greek, nr_latex_greek);
-               bitmap->addBitmap(
-                       BitmapStore(11, 6, 2, Greek_width, Greek_height, Greek_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(28, 7, 4, greek_width, greek_height, greek_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Greek"),
+//                                      latex_greek, nr_latex_greek);
+//             bitmap->addBitmap(
+//                     BitmapStore(11, 6, 2, Greek_width, Greek_height, Greek_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(28, 7, 4, greek_width, greek_height, greek_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathmisc") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Misc"),
-                                        latex_misc, nr_latex_misc);
-               bitmap->addBitmap(
-                       BitmapStore(29, 5, 6, misc_width, misc_height, misc_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(5, 5, 1, misc4_width, misc4_height, misc4_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(6, 3, 2, misc2_width, misc2_height, misc2_bits, false));
-               bitmap->addBitmap(
-                       BitmapStore(4, 2, 2, misc3_width, misc3_height, misc3_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Misc"),
+//                                      latex_misc, nr_latex_misc);
+//             bitmap->addBitmap(
+//                     BitmapStore(29, 5, 6, misc_width, misc_height, misc_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(5, 5, 1, misc4_width, misc4_height, misc4_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(6, 3, 2, misc2_width, misc2_height, misc2_bits, false));
+//             bitmap->addBitmap(
+//                     BitmapStore(4, 2, 2, misc3_width, misc3_height, misc3_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathdots") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Dots"),
-                                        latex_dots, nr_latex_dots);
-               bitmap->addBitmap(
-                       BitmapStore(4, 4, 1, dots_width, dots_height, dots_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Dots"),
+//                                      latex_dots, nr_latex_dots);
+//             bitmap->addBitmap(
+//                     BitmapStore(4, 4, 1, dots_width, dots_height, dots_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathbigoperators") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("Big Operators"),
-                                        latex_varsz, nr_latex_varsz);
-               bitmap->addBitmap(
-                       BitmapStore(14, 3, 5, varsz_width, varsz_height, varsz_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("Big Operators"),
+//                                      latex_varsz, nr_latex_varsz);
+//             bitmap->addBitmap(
+//                     BitmapStore(14, 3, 5, varsz_width, varsz_height, varsz_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathamsmisc") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("AMS Misc"),
-                                        latex_ams_misc, nr_latex_ams_misc);
-               bitmap->addBitmap(
-                       BitmapStore(9, 5, 2, ams1_width, ams1_height, ams1_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(26, 3, 9, ams7_width, ams7_height, ams7_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("AMS Misc"),
+//                                      latex_ams_misc, nr_latex_ams_misc);
+//             bitmap->addBitmap(
+//                     BitmapStore(9, 5, 2, ams1_width, ams1_height, ams1_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(26, 3, 9, ams7_width, ams7_height, ams7_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathamsarrows") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("AMS Arrows"),
-                                        latex_ams_arrows, nr_latex_ams_arrows);
-               bitmap->addBitmap(
-                       BitmapStore(32, 3, 11, ams2_width, ams2_height, ams2_bits, true));
-               bitmap->addBitmap(
-                       BitmapStore(6, 3, 2, ams3_width, ams3_height, ams3_bits, true));
-
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("AMS Arrows"),
+//                                      latex_ams_arrows, nr_latex_ams_arrows);
+//             bitmap->addBitmap(
+//                     BitmapStore(32, 3, 11, ams2_width, ams2_height, ams2_bits, true));
+//             bitmap->addBitmap(
+//                     BitmapStore(6, 3, 2, ams3_width, ams3_height, ams3_bits, true));
+
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathamsrelations") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("AMS Relations"),
-                                        latex_ams_rel, nr_latex_ams_rel);
-               bitmap->addBitmap(
-                       BitmapStore(66, 6, 11, ams_rel_width, ams_rel_height, ams_rel_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("AMS Relations"),
+//                                      latex_ams_rel, nr_latex_ams_rel);
+//             bitmap->addBitmap(
+//                     BitmapStore(66, 6, 11, ams_rel_width, ams_rel_height, ams_rel_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathamsnegatedrelations") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("AMS Negated Rel"),
-                                        latex_ams_nrel, nr_latex_ams_nrel);
-               bitmap->addBitmap(
-                       BitmapStore(51, 6, 9, ams_nrel_width, ams_nrel_height, ams_nrel_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("AMS Negated Rel"),
+//                                      latex_ams_nrel, nr_latex_ams_nrel);
+//             bitmap->addBitmap(
+//                     BitmapStore(51, 6, 9, ams_nrel_width, ams_nrel_height, ams_nrel_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathamsoperators") {
-               FormMathsBitmap * bitmap =
-                       createFormBitmap(*dialog, _("AMS Operators"),
-                                        latex_ams_ops, nr_latex_ams_ops);
-               bitmap->addBitmap(
-                       BitmapStore(23, 3, 8, ams_ops_width, ams_ops_height, ams_ops_bits, true));
+//             FormMathsBitmap * bitmap =
+//                     createFormBitmap(*dialog, _("AMS Operators"),
+//                                      latex_ams_ops, nr_latex_ams_ops);
+//             bitmap->addBitmap(
+//                     BitmapStore(23, 3, 8, ams_ops_width, ams_ops_height, ams_ops_bits, true));
 
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(bitmap);
+//             dialog->setView(bitmap);
                dialog->bc().bp(new IgnorantPolicy);
 
        } else if (name == "mathdelimiter") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(new FormMathsDelim(*dialog));
+               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->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(new FormMathsSpace(*dialog));
+//             dialog->setView(new FormMathsSpace(*dialog));
                dialog->bc().bp(new IgnorantPolicy);
        } else if (name == "mathstyle") {
+//             dialog->bc().view(new xformsBC(dialog->bc()));
                dialog->setController(new ControlMath(*dialog));
-               dialog->setView(new FormMathsStyle(*dialog));
+//             dialog->setView(new FormMathsStyle(*dialog));
                dialog->bc().bp(new IgnorantPolicy);
-       } else if (name == "minipage") {
-               dialog->setController(new ControlMinipage(*dialog));
-               dialog->setView(new FormMinipage(*dialog));
-               dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } 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->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlBranch(*dialog));
-               dialog->setView(new FormBranch(*dialog));
+               dialog->setView(new GBranch(*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 == "prefs") {
+               dialog->bc().view(new GBC(dialog->bc()));
+               dialog->setController(new ControlPrefs(*dialog));
+               dialog->setView(new GPreferences(*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 GPrint(*dialog));
+               dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "ref") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlRef(*dialog));
-               dialog->setView(new FormRef(*dialog));
+               dialog->setView(new GRef(*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 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 GSpellchecker(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "tabular") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlTabular(*dialog));
-               dialog->setView(new FormTabular(*dialog));
+               dialog->setView(new GTabular(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "tabularcreate") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlTabularCreate(*dialog));
-               dialog->setView(new FormTabularCreate(*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().view(new GBC(dialog->bc()));
                dialog->setController(new ControlThesaurus(*dialog));
-               dialog->setView(new FormThesaurus(*dialog));
+               dialog->setView(new GThesaurus(*dialog));
                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->setController(new ControlCommand(*dialog, name));
-               dialog->setView(new FormUrl(*dialog));
+               dialog->setView(new GUrl(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-       } else if (name == "vclog") {
-               dialog->setController(new ControlVCLog(*dialog));
-               dialog->setView(new FormVCLog(*dialog));
-               dialog->bc().bp(new OkCancelPolicy);
+       } else if (name == "vspace") {
+               dialog->bc().view(new GBC(dialog->bc()));
+               dialog->setController(new ControlVSpace(*dialog));
+               dialog->setView(new GVSpace(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "wrap") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlWrap(*dialog));
-               dialog->setView(new FormWrap(*dialog));
+               dialog->setView(new GWrap(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        }
 
@@ -472,12 +565,15 @@ Dialog * Dialogs::build(string const & name)
 
 void Dialogs::toggleTooltips()
 {
-       Tooltips::toggleEnabled();
+       // Turning off tooltips is not necessary and will
+       // not be implemented by me - jcs
+       //Tooltips::toggleEnabled();
 }
 
 
 /// Are the tooltips on or off?
 bool Dialogs::tooltipsEnabled()
 {
-       return Tooltips::enabled();
+       //return Tooltips::enabled();
+       return true;
 }