controller-view split of FormLog and FormVCLog.

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

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index 4e218d7792b106ad5a4899f54cae3c114ad6681d..776df33c40d852b711c4a38bce145d3c2ba81f33 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -10,7 +10,6 @@
  */
 
 #include <config.h>
-#include FORMS_H_LOCATION
 
 #ifdef __GNUG__
 #pragma implementation
@@ -19,12 +18,23 @@
 #include "Dialogs.h"
 
 #include "ControlBibitem.h"
+#include "ControlBibtex.h"
 #include "ControlCitation.h"
+#include "ControlLog.h"
+#include "ControlVCLog.h"
 #include "xformsBC.h"
 
+#include "form_bibitem.h" // needed for clean destructtion of boost::scoped ptr
+#include "form_bibtex.h"
+#include "form_browser.h"
+#include "form_citation.h"
+
 #include "FormBibitem.h"
 #include "FormBibtex.h"
 #include "FormCitation.h"
+#include "FormLog.h"
+#include "FormVCLog.h"
+
 #include "FormCharacter.h"
 #include "FormCopyright.h"
 #include "FormCredits.h"
@@ -34,7 +44,7 @@
 #include "FormGraphics.h"
 #include "FormInclude.h"
 #include "FormIndex.h"
-#include "FormLog.h"
+#include "FormMathsPanel.h"
 #include "FormParagraph.h"
 #include "FormPreamble.h"
 #include "FormPreferences.h"
@@ -46,11 +56,11 @@
 #include "FormTabularCreate.h"
 #include "FormToc.h"
 #include "FormUrl.h"
-#include "FormVCLog.h"
+#include "FormMinipage.h"
 
 // Signal enabling all visible popups to be redrawn if so desired.
 // E.g., when the GUI colours have been remapped.
-Signal0<void> Dialogs::redrawGUI;
+SigC::Signal0<void> Dialogs::redrawGUI;
 
 Dialogs::Dialogs(LyXView * lv)
 {
@@ -58,8 +68,10 @@ Dialogs::Dialogs(LyXView * lv)
 
        add(new GUICitation<FormCitation, xformsBC>(*lv, *this));
        add(new GUIBibitem<FormBibitem, xformsBC>(*lv, *this));
+       add(new GUIBibtex<FormBibtex, xformsBC>(*lv, *this));
+       add(new GUILog<FormLog, xformsBC>(*lv, *this));
+       add(new GUIVCLog<FormVCLog, xformsBC>(*lv, *this));
 
-       add(new FormBibtex(lv, this));
        add(new FormCharacter(lv, this));
        add(new FormCopyright(lv, this));
        add(new FormCredits(lv, this));
@@ -69,7 +81,7 @@ Dialogs::Dialogs(LyXView * lv)
        add(new FormGraphics(lv, this));
        add(new FormInclude(lv, this));
        add(new FormIndex(lv, this));
-       add(new FormLog(lv, this));
+       add(new FormMathsPanel(lv, this));
        add(new FormParagraph(lv, this));
        add(new FormPreamble(lv, this));
        add(new FormPreferences(lv, this));
@@ -81,7 +93,7 @@ Dialogs::Dialogs(LyXView * lv)
        add(new FormTabularCreate(lv, this));
        add(new FormToc(lv, this));
        add(new FormUrl(lv, this));
-       add(new FormVCLog(lv, this));
+       add(new FormMinipage(lv, this));
        
        // reduce the number of connections needed in
        // dialogs by a simple connection here.