If we are in a closeEvent, we don't want to close all buffers, because these may...

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 8c068a371ccbf9b94f9632300b8036c7fa9dda4c..6b3acb422c7569593475a86a00f07a62a09cf558 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -58,6 +58,7 @@
 #include "frontends/alert.h"
 
 #include <QAbstractItemModel>
+#include <QHeaderView>
 #include <QColor>
 #include <QColorDialog>
 #include <QCloseEvent>
@@ -191,11 +192,11 @@ public:
                //   2. Description (lexicographic)
                LayoutFile const & tc1 = LayoutFileList::get()[lhs];
                LayoutFile const & tc2 = LayoutFileList::get()[rhs];
-               int const rel = compare_no_case(
+               int const order = compare_no_case(
                        translateIfPossible(from_utf8(tc1.description())),
                        translateIfPossible(from_utf8(tc2.description())));
                return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
-                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && rel < 0);
+                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0);
        }
 };
 
@@ -206,7 +207,7 @@ namespace {
 
 vector<string> getRequiredList(string const & modName) 
 {
-       LyXModule const * const mod = moduleList[modName];
+       LyXModule const * const mod = theModuleList[modName];
        if (!mod)
                return vector<string>(); //empty such thing
        return mod->getRequiredModules();
@@ -215,7 +216,7 @@ vector<string> getRequiredList(string const & modName)
 
 vector<string> getExcludedList(string const & modName)
 {
-       LyXModule const * const mod = moduleList[modName];
+       LyXModule const * const mod = theModuleList[modName];
        if (!mod)
                return vector<string>(); //empty such thing
        return mod->getExcludedModules();
@@ -224,7 +225,7 @@ vector<string> getExcludedList(string const & modName)
 
 docstring getModuleDescription(string const & modName)
 {
-       LyXModule const * const mod = moduleList[modName];
+       LyXModule const * const mod = theModuleList[modName];
        if (!mod)
                return _("Module not found!");
        // FIXME Unicode
@@ -234,7 +235,7 @@ docstring getModuleDescription(string const & modName)
 
 vector<string> getPackageList(string const & modName)
 {
-       LyXModule const * const mod = moduleList[modName];
+       LyXModule const * const mod = theModuleList[modName];
        if (!mod)
                return vector<string>(); //empty such thing
        return mod->getPackageList();
@@ -243,7 +244,7 @@ vector<string> getPackageList(string const & modName)
 
 bool isModuleAvailable(string const & modName)
 {
-       LyXModule * mod = moduleList[modName];
+       LyXModule const * const mod = theModuleList[modName];
        if (!mod)
                return false;
        return mod->isAvailable();
@@ -264,7 +265,7 @@ class ModuleSelectionManager : public GuiSelectionManager
 public:
        ///
        ModuleSelectionManager(
-               QListView * availableLV, 
+               QTreeView * availableLV,
                QListView * selectedLV,
                QPushButton * addPB, 
                QPushButton * delPB, 
@@ -590,21 +591,12 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
                this, SLOT(setColSep()));
-       connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
-               this, SLOT(change_adaptor()));
-       connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
-               this, SLOT(change_adaptor()));
-       connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
-               this, SLOT(setListingsMessage()));
-       connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
-               this, SLOT(setListingsMessage()));
-       textLayoutModule->listingsTB->setPlainText(
-               qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
+
        textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
                textLayoutModule->lspacingLE));
        textLayoutModule->indentLE->setValidator(unsignedLengthValidator(
                textLayoutModule->indentLE));
-       textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
+       textLayoutModule->skipLE->setValidator(unsignedGlueLengthValidator(
                textLayoutModule->skipLE));
 
        textLayoutModule->indentCO->addItem(qt_("Default"));
@@ -612,7 +604,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        textLayoutModule->skipCO->addItem(qt_("SmallSkip"));
        textLayoutModule->skipCO->addItem(qt_("MedSkip"));
        textLayoutModule->skipCO->addItem(qt_("BigSkip"));
-       textLayoutModule->skipCO->addItem(qt_("Length"));
+       textLayoutModule->skipCO->addItem(qt_("Custom"));
        textLayoutModule->lspacingCO->insertItem(
                Spacing::Single, qt_("Single"));
        textLayoutModule->lspacingCO->insertItem(
@@ -941,6 +933,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(latexModule->childDocPB, SIGNAL(clicked()),
                this, SLOT(browseMaster()));
+       connect(latexModule->suppressDateCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
 
        // postscript drivers
        for (int n = 0; tex_graphics[n][0]; ++n) {
@@ -983,7 +977,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // Modules
        modulesModule = new UiWidget<Ui::ModulesUi>;
-
+       modulesModule->availableLV->header()->setVisible(false);
        selectionManager =
                new ModuleSelectionManager(modulesModule->availableLV,
                        modulesModule->selectedLV,
@@ -1041,6 +1035,19 @@ GuiDocument::GuiDocument(GuiView & lv)
        connect(floatModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
+       // listings
+       listingsModule = new UiWidget<Ui::ListingsSettingsUi>;
+       connect(listingsModule->listingsED, SIGNAL(textChanged()),
+               this, SLOT(change_adaptor()));
+       connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+               this, SLOT(change_adaptor()));
+       connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+               this, SLOT(setListingsMessage()));
+       connect(listingsModule->listingsED, SIGNAL(textChanged()),
+               this, SLOT(setListingsMessage()));
+       listingsModule->listingsTB->setPlainText(
+               qt_("Input listings parameters below. Enter ? for a list of parameters."));
+
        docPS->addPanel(latexModule, qt_("Document Class"));
        docPS->addPanel(modulesModule, qt_("Modules"));
        docPS->addPanel(fontModule, qt_("Fonts"));
@@ -1054,6 +1061,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
        docPS->addPanel(mathsModule, qt_("Math Options"));
        docPS->addPanel(floatModule, qt_("Float Placement"));
+       docPS->addPanel(listingsModule, qt_("Listings"));
        docPS->addPanel(bulletsModule, qt_("Bullets"));
        docPS->addPanel(branchesModule, qt_("Branches"));
        docPS->addPanel(outputModule, qt_("Output"));
@@ -1098,10 +1106,10 @@ QString GuiDocument::validateListingsParameters()
        static string param_cache;
        static QString msg_cache;
        
-       if (textLayoutModule->bypassCB->isChecked())
+       if (listingsModule->bypassCB->isChecked())
                return QString();
 
-       string params = fromqstr(textLayoutModule->listingsED->toPlainText());
+       string params = fromqstr(listingsModule->listingsED->toPlainText());
        if (params != param_cache) {
                param_cache = params;
                msg_cache = toqstr(InsetListingsParams(params).validate());
@@ -1119,13 +1127,13 @@ void GuiDocument::setListingsMessage()
                        return;
                isOK = true;
                // listingsTB->setTextColor("black");
-               textLayoutModule->listingsTB->setPlainText(
-                       qt_("Input listings parameters on the right. "
+               listingsModule->listingsTB->setPlainText(
+                       qt_("Input listings parameters below. "
                 "Enter ? for a list of parameters."));
        } else {
                isOK = false;
                // listingsTB->setTextColor("red");
-               textLayoutModule->listingsTB->setPlainText(msg);
+               listingsModule->listingsTB->setPlainText(msg);
        }
 }
 
@@ -1599,7 +1607,7 @@ namespace {
                vector<string>::const_iterator it  = idList.begin();
                vector<string>::const_iterator end = idList.end();
                for (; it != end; ++it) {
-                       LyXModule const * const mod = moduleList[*it];
+                       LyXModule const * const mod = theModuleList[*it];
                        if (!mod)
                                retval.push_back(*it + " (Unavailable)");
                        else
@@ -1656,8 +1664,11 @@ void GuiDocument::updateModuleInfo()
        
        //Module description
        bool const focus_on_selected = selectionManager->selectedFocused();
-       QListView const * const lv = 
-                       focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV;
+       QAbstractItemView * lv;
+       if (focus_on_selected)
+               lv = modulesModule->selectedLV;
+       else
+               lv= modulesModule->availableLV;
        if (lv->selectionModel()->selectedIndexes().isEmpty()) {
                modulesModule->infoML->document()->clear();
                return;
@@ -1772,6 +1783,9 @@ void GuiDocument::applyView()
        // preamble
        preambleModule->apply(bp_);
 
+       // date
+       bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+
        // biblio
        bp_.setCiteEngine(ENGINE_BASIC);
 
@@ -1883,6 +1897,7 @@ void GuiDocument::applyView()
        // Modules
        modulesToParams(bp_);
 
+       // Math
        if (mathsModule->amsautoCB->isChecked()) {
                bp_.use_amsmath = BufferParams::package_auto;
        } else {
@@ -1901,6 +1916,7 @@ void GuiDocument::applyView()
                        bp_.use_esint = BufferParams::package_off;
        }
 
+       // Page Layout
        if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
                bp_.pagestyle = "default";
        else {
@@ -1910,6 +1926,7 @@ void GuiDocument::applyView()
                                bp_.pagestyle = pagestyles[i].first;
        }
 
+       // Text Layout
        switch (textLayoutModule->lspacingCO->currentIndex()) {
        case 0:
                bp_.spacing().set(Spacing::Single);
@@ -1931,10 +1948,6 @@ void GuiDocument::applyView()
        else
                bp_.columns = 1;
 
-       // text should have passed validation
-       bp_.listings_params =
-               InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
-
        if (textLayoutModule->indentRB->isChecked()) {
                // if paragraphs are separated by an indentation
                bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
@@ -1996,8 +2009,14 @@ void GuiDocument::applyView()
        else
                bp_.master = string();
 
+       // Float Placement
        bp_.float_placement = floatModule->get();
 
+       // Listings
+       // text should have passed validation
+       bp_.listings_params =
+               InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
+
        // output
        bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
                outputModule->defaultFormatCO->currentIndex()).toString());
@@ -2138,6 +2157,9 @@ void GuiDocument::paramsToDialog()
        // preamble
        preambleModule->update(bp_, id());
 
+       // date
+       latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+
        // biblio
        biblioModule->citeDefaultRB->setChecked(
                bp_.citeEngine() == ENGINE_BASIC);
@@ -2273,9 +2295,7 @@ void GuiDocument::paramsToDialog()
                textLayoutModule->indentRB->setChecked(true);
                string indentation = bp_.getIndentation().asLyXCommand();
                int indent = 0;
-               if (indentation == "default")
-                       indent = 0;
-               else {
+               if (indentation != "default") {
                        lengthToWidgets(textLayoutModule->indentLE,
                        textLayoutModule->indentLengthCO,
                        indentation, defaultUnit);
@@ -2316,11 +2336,6 @@ void GuiDocument::paramsToDialog()
        textLayoutModule->twoColumnCB->setChecked(
                bp_.columns == 2);
 
-       // break listings_params to multiple lines
-       string lstparams =
-               InsetListingsParams(bp_.listings_params).separatedParams();
-       textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
-
        if (!bp_.options.empty()) {
                latexModule->optionsLE->setText(
                        toqstr(bp_.options));
@@ -2361,8 +2376,15 @@ void GuiDocument::paramsToDialog()
                latexModule->childDocGB->setChecked(false);
        }
 
+       // Float Settings
        floatModule->set(bp_.float_placement);
 
+       // ListingsSettings
+       // break listings_params to multiple lines
+       string lstparams =
+               InsetListingsParams(bp_.listings_params).separatedParams();
+       listingsModule->listingsED->setPlainText(toqstr(lstparams));
+
        // Output
        // update combobox with formats
        updateDefaultFormat();
@@ -2676,7 +2698,7 @@ list<GuiDocument::modInfoStruct> const
        for (; it != end; ++it) {
                modInfoStruct m;
                m.id = *it;
-               LyXModule * mod = moduleList[*it];
+               LyXModule const * const mod = theModuleList[*it];
                if (mod)
                        // FIXME Unicode
                        m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
@@ -2868,8 +2890,8 @@ bool GuiDocument::providesScale(string const & font) const
 void GuiDocument::loadModuleInfo()
 {
        moduleNames_.clear();
-       LyXModuleList::const_iterator it  = moduleList.begin();
-       LyXModuleList::const_iterator end = moduleList.end();
+       LyXModuleList::const_iterator it  = theModuleList.begin();
+       LyXModuleList::const_iterator end = theModuleList.end();
        for (; it != end; ++it) {
                modInfoStruct m;
                m.id = it->getID();