The View->Source pane resets the format every time you click into

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index bb643dae45893201f688ddabf995cb21f1b87242..378149f6170e7af2b97629f638490e1081292819 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -710,6 +710,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
                this, SLOT(setColSep()));
+       connect(textLayoutModule->justCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
 
        textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
                textLayoutModule->lspacingLE));
@@ -768,6 +770,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(outputModule->strictCB, SIGNAL(stateChanged(int)),
                this, SLOT(change_adaptor()));
+       connect(outputModule->cssCB, SIGNAL(stateChanged(int)),
+               this, SLOT(change_adaptor()));
        connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
                this, SLOT(change_adaptor()));
 
@@ -2426,6 +2430,8 @@ void GuiDocument::applyView()
        else
                bp_.columns = 1;
 
+       bp_.justification = textLayoutModule->justCB->isChecked();
+
        if (textLayoutModule->indentRB->isChecked()) {
                // if paragraphs are separated by an indentation
                bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
@@ -2514,6 +2520,7 @@ void GuiDocument::applyView()
        bp_.useNonTeXFonts = nontexfonts;
 
        bp_.output_sync = outputModule->outputsyncCB->isChecked();
+       
        bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
 
        int mathfmt = outputModule->mathoutCB->currentIndex();
@@ -2523,6 +2530,7 @@ void GuiDocument::applyView()
                static_cast<BufferParams::MathOutput>(mathfmt);
        bp_.html_math_output = mo;
        bp_.html_be_strict = outputModule->strictCB->isChecked();
+       bp_.html_css_as_file = outputModule->cssCB->isChecked();
        bp_.html_math_img_scale = outputModule->mathimgSB->value();
 
        // fonts
@@ -2872,6 +2880,7 @@ void GuiDocument::paramsToDialog()
 
        textLayoutModule->twoColumnCB->setChecked(
                bp_.columns == 2);
+       textLayoutModule->justCB->setChecked(bp_.justification);
 
        if (!bp_.options.empty()) {
                latexModule->optionsLE->setText(
@@ -2960,6 +2969,7 @@ void GuiDocument::paramsToDialog()
        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(),
@@ -3087,6 +3097,10 @@ void GuiDocument::paramsToDialog()
        // PDF support
        PDFOptions const & pdf = bp_.pdfoptions();
        pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
+       if (bp_.documentClass().provides("hyperref"))
+               pdfSupportModule->use_hyperrefGB->setTitle(qt_("C&ustomize Hyperref Options"));
+       else
+               pdfSupportModule->use_hyperrefGB->setTitle(qt_("&Use Hyperref Support"));
        pdfSupportModule->titleLE->setText(toqstr(pdf.title));
        pdfSupportModule->authorLE->setText(toqstr(pdf.author));
        pdfSupportModule->subjectLE->setText(toqstr(pdf.subject));