HTML output for InsetMathCancel.

[lyx.git] / src / frontends / qt4 / GuiDocument.cpp

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index df6c035a71f9380f440de8144c31b71a00f4c323..2a718031a0af4236273ff0778447f59fbbb53b87 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1132,6 +1132,10 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // biblio
        biblioModule = new UiWidget<Ui::BiblioUi>;
+       connect(biblioModule->citeDefaultRB, SIGNAL(toggled(bool)),
+               this, SLOT(setNumerical(bool)));
+       connect(biblioModule->citeJurabibRB, SIGNAL(toggled(bool)),
+               this, SLOT(setAuthorYear(bool)));
        connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
                biblioModule->citationStyleL, SLOT(setEnabled(bool)));
        connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
@@ -2045,6 +2049,22 @@ void GuiDocument::bibtexChanged(int n)
 }
 
 
+void GuiDocument::setAuthorYear(bool authoryear)
+{
+       if (authoryear)
+               biblioModule->citeStyleCO->setCurrentIndex(0);
+       biblioChanged();
+}
+
+
+void GuiDocument::setNumerical(bool numerical)
+{
+       if (numerical)
+               biblioModule->citeStyleCO->setCurrentIndex(1);
+       biblioChanged();
+}
+
+
 namespace {
        // FIXME unicode
        // both of these should take a vector<docstring>
@@ -2279,17 +2299,16 @@ void GuiDocument::applyView()
        // biblio
        bp_.setCiteEngine(ENGINE_BASIC);
 
-       if (biblioModule->citeNatbibRB->isChecked()) {
-               bool const use_numerical_citations =
-                       biblioModule->citeStyleCO->currentIndex();
-               if (use_numerical_citations)
-                       bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
-               else
-                       bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
-
-       } else if (biblioModule->citeJurabibRB->isChecked())
+       if (biblioModule->citeNatbibRB->isChecked())
+               bp_.setCiteEngine(ENGINE_NATBIB);
+       else if (biblioModule->citeJurabibRB->isChecked())
                bp_.setCiteEngine(ENGINE_JURABIB);
 
+       if (biblioModule->citeStyleCO->currentIndex())
+               bp_.setCiteEngineType(ENGINE_TYPE_NUMERICAL);
+       else
+               bp_.setCiteEngineType(ENGINE_TYPE_AUTHORYEAR);
+
        bp_.use_bibtopic =
                biblioModule->bibtopicCB->isChecked();
 
@@ -2692,11 +2711,10 @@ void GuiDocument::paramsToDialog()
                bp_.citeEngine() == ENGINE_BASIC);
 
        biblioModule->citeNatbibRB->setChecked(
-               bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
-               bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
+               bp_.citeEngine() == ENGINE_NATBIB);
 
        biblioModule->citeStyleCO->setCurrentIndex(
-               bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL);
+               bp_.citeEngineType() == ENGINE_TYPE_NUMERICAL);
 
        biblioModule->citeJurabibRB->setChecked(
                bp_.citeEngine() == ENGINE_JURABIB);
@@ -2969,31 +2987,13 @@ void GuiDocument::paramsToDialog()
                InsetListingsParams(bp_.listings_params).separatedParams();
        listingsModule->listingsED->setPlainText(toqstr(lstparams));
 
-       // Output
-       // update combobox with formats
-       updateDefaultFormat();
-       int index = outputModule->defaultFormatCO->findData(toqstr(
-               bp_.default_output_format));
-       // set to default if format is not found
-       if (index == -1)
-               index = 0;
-       outputModule->defaultFormatCO->setCurrentIndex(index);
+       // Fonts
        bool const os_fonts_available =
                bp_.baseClass()->outputType() == lyx::LATEX
                && LaTeXFeatures::isAvailable("fontspec");
        fontModule->osFontsCB->setEnabled(os_fonts_available);
        fontModule->osFontsCB->setChecked(
                os_fonts_available && bp_.useNonTeXFonts);
-
-       outputModule->outputsyncCB->setChecked(bp_.output_sync);
-       outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
-
-       outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
-       outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
-       outputModule->strictCB->setChecked(bp_.html_be_strict);
-       outputModule->cssCB->setChecked(bp_.html_css_as_file);
-
-       // Fonts
        updateFontsize(documentClass().opt_fontsize(),
                        bp_.fontsize);
 
@@ -3060,6 +3060,26 @@ void GuiDocument::paramsToDialog()
                fontModule->fontencLE->setText(toqstr(bp_.fontenc));
        }
 
+       // Output
+       // This must be set _after_ fonts since updateDefaultFormat()
+       // checks osFontsCB settings.
+       // update combobox with formats
+       updateDefaultFormat();
+       int index = outputModule->defaultFormatCO->findData(toqstr(
+               bp_.default_output_format));
+       // set to default if format is not found
+       if (index == -1)
+               index = 0;
+       outputModule->defaultFormatCO->setCurrentIndex(index);
+
+       outputModule->outputsyncCB->setChecked(bp_.output_sync);
+       outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
+
+       outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
+       outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
+       outputModule->strictCB->setChecked(bp_.html_be_strict);
+       outputModule->cssCB->setChecked(bp_.html_css_as_file);
+
        // paper
        bool const extern_geometry =
                documentClass().provides("geometry");