Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / Dialogs.C

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index 83058457acd4653b1f000709b548a4b98b949882..ffc926049ffc6fea2b76ebedd0439d23526b57e8 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -10,6 +10,11 @@
 
 #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"
 
@@ -54,40 +59,40 @@
 #include "GMathDelim.h"
 #include "FormBibitem.h"
 #include "FormBibtex.h"
-#include "FormBox.h"
+#include "GBox.h"
 #include "FormBranch.h"
-#include "FormChanges.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 "GMathsMatrix.h"
 #include "FormMathsSpace.h"
 #include "FormMathsStyle.h"
-#include "FormNote.h"
+#include "GNote.h"
 #include "GParagraph.h"
 #include "FormPreamble.h"
 #include "FormPreferences.h"
 #include "GPrint.h"
 #include "FormRef.h"
 #include "GSearch.h"
-#include "FormSendto.h"
+#include "GSendto.h"
 #include "FormTabular.h"
-#include "FormTexinfo.h"
-#include "FormShowFile.h"
+#include "GTexinfo.h"
+#include "GShowFile.h"
 #include "GSpellchecker.h"
 #include "GTableCreate.h"
 #include "GToc.h"
 #include "GUrl.h"
-#include "FormVSpace.h"
+#include "GVSpace.h"
 #include "FormWrap.h"
 
 #ifdef HAVE_LIBAIKSAURUS
@@ -190,12 +195,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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()));
@@ -211,20 +218,23 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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()));
@@ -232,12 +242,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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));
@@ -256,8 +268,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                                          _("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") {
@@ -445,8 +458,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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));
@@ -475,8 +489,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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()));
@@ -493,8 +508,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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") {
@@ -513,8 +529,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                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));