X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=782a05f7ea16538e31f8ebd6bbc2691bb416cdbd;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=176670d4b82bb83dc0d4deefacc81e4631ccb674;hpb=1712e4f35e3e8cb132f731dca773f7767a241bf6;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 176670d4b8..782a05f7ea 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -583,12 +583,15 @@ void LocalLayout::validate() {
 		toqstr("<p style=\"color: #c00000; font-weight: bold; \">") 
 		  + invalid + toqstr("</p>");
 
-	string const layout = fromqstr(locallayoutTE->document()->toPlainText());
-	if (layout.empty())
+	string const layout = 
+		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+	if (layout.empty()) {
 		is_valid_ = true;
-	else
+		infoLB->setText("");
+	} else {
 		is_valid_ = TextClass::validate(layout);
-	infoLB->setText(is_valid_ ? vtext : ivtext);
+		infoLB->setText(is_valid_ ? vtext : ivtext);
+	}
 	validatePB->setEnabled(false);
 }
 
@@ -1070,6 +1073,8 @@ GuiDocument::GuiDocument(GuiView & lv)
 		mathsModule->esintCB, SLOT(setDisabled(bool)));
 	connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
 		mathsModule->mhchemCB, SLOT(setDisabled(bool)));
+	connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)),
+		mathsModule->mathdotsCB, SLOT(setDisabled(bool)));
 	
 	connect(mathsModule->amsCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
@@ -1085,7 +1090,9 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(mathsModule->mathdotsCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
-
+	connect(mathsModule->mathdotsautoCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	
 
 	// latex class
 	latexModule = new UiWidget<Ui::LaTeXUi>;
@@ -1239,6 +1246,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(latexModule, qt_("Document Class"));
 	docPS->addPanel(masterChildModule, qt_("Child Documents"));
 	docPS->addPanel(modulesModule, qt_("Modules"));
+	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->addPanel(fontModule, qt_("Fonts"));
 	docPS->addPanel(textLayoutModule, qt_("Text Layout"));
 	docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
@@ -1256,7 +1264,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(branchesModule, qt_("Branches"));
 	docPS->addPanel(outputModule, qt_("Output"));
 	docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
-	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
@@ -2244,11 +2251,15 @@ void GuiDocument::applyView()
 		else
 			bp_.use_mhchem = BufferParams::package_off;
 	}
-	if (mathsModule->mathdotsCB->isChecked())
-		bp_.use_mathdots = true;
-	else
-		bp_.use_mathdots = false;
-
+	if (mathsModule->mathdotsautoCB->isChecked())
+		bp_.use_mathdots = BufferParams::package_auto;
+	else {
+		if (mathsModule->mathdotsCB->isChecked())
+			bp_.use_mathdots = BufferParams::package_on;
+		else
+			bp_.use_mathdots = BufferParams::package_off;
+	}
+	
 	// Page Layout
 	if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
 		bp_.pagestyle = "default";
@@ -2659,7 +2670,10 @@ void GuiDocument::paramsToDialog()
 	mathsModule->mhchemautoCB->setChecked(
 		bp_.use_mhchem == BufferParams::package_auto);
 
-	mathsModule->mathdotsCB->setChecked(bp_.use_mathdots);
+	mathsModule->mathdotsCB->setChecked(
+		bp_.use_mathdots == BufferParams::package_on);
+	mathsModule->mathdotsautoCB->setChecked(
+		bp_.use_mathdots == BufferParams::package_auto);
 
 	switch (bp_.spacing().getSpace()) {
 		case Spacing::Other: nitem = 3; break;
@@ -2768,10 +2782,7 @@ void GuiDocument::paramsToDialog()
 	}
 
 	// Master/Child
-	std::vector<Buffer *> children;
-	if (bufferview())
-		children = buffer().getChildren(false);
-	if (children.empty()) {
+	if (!buffer().hasChildren()) {
 		masterChildModule->childrenTW->clear();
 		includeonlys_.clear();
 		docPS->showPanel(qt_("Child Documents"), false);
@@ -3034,9 +3045,9 @@ void GuiDocument::updateIncludeonlys()
 		masterChildModule->maintainAuxCB->setEnabled(true);
 	}
 	QTreeWidgetItem * item = 0;
-	std::vector<Buffer *> children = buffer().getChildren(false);
-	vector<Buffer *>::const_iterator it  = children.begin();
-	vector<Buffer *>::const_iterator end = children.end();
+	ListOfBuffers children = buffer().getChildren();
+	ListOfBuffers::const_iterator it  = children.begin();
+	ListOfBuffers::const_iterator end = children.end();
 	bool has_unincluded = false;
 	bool all_unincluded = true;
 	for (; it != end; ++it) {