ng back unconverted dialogs

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3168 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index a423678676e49d93df7623b72dac061d1a6e6e63..a605a0d13f232f6e59ca519069419ebd315d3356 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-08  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Makefile.am:
+       * Dialogs.C: bring back unconverted dialogs
+ 
 2001-12-05  John Levon  <moz@compsoc.man.ac.uk>
 
        * QParagraph.C:

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 78b10a82989f923674025fbb1bb7971ae25b98df..ebd0e97b8563aa85c13146099dedbf76066f44f5 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -89,12 +89,29 @@
 #include "controllers/ControlUrl.h"
 #include "controllers/ControlVCLog.h"
 #if 0
-#include "controllers/ControlCitation.h"
-#include "controllers/ControlFloat.h"
-#include "controllers/ControlRef.h"
 #include "controllers/ControlToc.h"
 #endif
 
+// xforms stuff
+#include "controllers/ControlERT.h"
+#include "controllers/ControlFloat.h"
+#include "controllers/ControlShowFile.h"
+#include "controllers/ControlToc.h"
+#include "xforms/FormBrowser.h"
+#include "xforms/form_browser.h"
+#include "xforms/FormDocument.h"
+#include "xforms/FormERT.h"
+#include "xforms/form_ert.h"
+#include "xforms/FormFloat.h"
+#include "xforms/form_float.h"
+#include "xforms/FormMathsPanel.h"
+#include "xforms/FormParagraph.h"
+#include "xforms/FormPreferences.h"
+#include "xforms/FormShowFile.h"
+#include "xforms/FormTabular.h"
+#include "xforms/FormToc.h"
+#include "xforms/form_toc.h"
+ 
 #include "GUI.h"
 
 // this makes no real sense for Qt2
@@ -127,6 +144,19 @@ Dialogs::Dialogs(LyXView * lv)
        add(new GUIUrl<QURL, Qt2BC>(*lv, *this));
        add(new GUIVCLog<QVCLog, Qt2BC>(*lv, *this));
 
+       // dialogs not yet converted
+       add(new GUIERT<FormERT, xformsBC>(*lv, *this));
+       add(new GUIFloat<FormFloat, xformsBC>(*lv, *this));
+       add(new GUIShowFile<FormShowFile, xformsBC>(*lv, *this));
+       add(new GUIToc<FormToc, xformsBC>(*lv, *this));
+
+       // dialogs not yet MVCd
+       add(new FormDocument(lv, this));
+       add(new FormMathsPanel(lv, this));
+       add(new FormParagraph(lv, this));
+       add(new FormPreferences(lv, this));
+       add(new FormTabular(lv, this));
+ 
        // reduce the number of connections needed in
        // dialogs by a simple connection here.
        hideAll.connect(hideBufferDependent.slot());

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index b76265a16a78494063269cae670acd847581bbf0..bd9e6b385cb1bc0d824c68204691825451360477 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -23,38 +23,42 @@ libqt2_la_LIBADD = \
        ../xforms/Alert_pimpl.lo \
        ../xforms/Color.lo \
        ../xforms/DropDown.lo \
+       ../xforms/FormBase.lo \
        ../xforms/FormBaseDeprecated.lo \
        ../xforms/FormBrowser.lo \
-       ../xforms/FormDocument.lo \
-       ../xforms/FormIndex.lo \
-       ../xforms/FormInset.lo \
+       ../xforms/FormERT.lo \
+       ../xforms/FormFloat.lo \
+       ../xforms/FormMathsBitmap.lo \
+       ../xforms/FormMathsDeco.lo \
+       ../xforms/FormMathsDelim.lo \
+       ../xforms/FormMathsMatrix.lo \
+       ../xforms/FormMathsPanel.lo \
+       ../xforms/FormMathsSpace.lo \
+       ../xforms/FormParagraph.lo \
        ../xforms/FormPreferences.lo \
-       ../xforms/FormRef.lo \
+       ../xforms/FormShowFile.lo \
        ../xforms/FormTabular.lo \
+       ../xforms/FormDocument.lo \
+       ../xforms/FormInset.lo \
        ../xforms/FormToc.lo \
-       ../xforms/FormUrl.lo \
        ../xforms/MathsSymbols.lo \
        ../xforms/Menubar_pimpl.lo \
        ../xforms/RadioButtonGroup.lo \
        ../xforms/Toolbar_pimpl.lo \
        ../xforms/bmtable.lo \
-       ../xforms/form_bibitem.lo \
-       ../xforms/form_bibtex.lo \
        ../xforms/form_browser.lo \
        ../xforms/form_document.lo \
-       ../xforms/form_error.lo \
-       ../xforms/form_external.lo \
-       ../xforms/form_index.lo \
-       ../xforms/form_graphics.lo \
-       ../xforms/form_include.lo \
-       ../xforms/form_index.lo \
-       ../xforms/form_minipage.lo \
-       ../xforms/form_preamble.lo \
+       ../xforms/form_ert.lo \
+       ../xforms/form_float.lo \
        ../xforms/form_preferences.lo \
-       ../xforms/form_ref.lo \
        ../xforms/form_tabular.lo \
        ../xforms/form_toc.lo \
-       ../xforms/form_url.lo \
+       ../xforms/form_maths_deco.lo \
+       ../xforms/form_maths_delim.lo \
+       ../xforms/form_maths_matrix.lo \
+       ../xforms/form_maths_panel.lo \
+       ../xforms/form_maths_space.lo \
+       ../xforms/form_paragraph.lo \
        ../xforms/input_validators.lo \
        ../xforms/xformsBC.lo \
        ../xforms/xforms_helpers.lo \