mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 02:28:35 +00:00
Master/Child: do not clean includeonly list while editing (part of #12470)
This commit is contained in:
parent
4c8a698a28
commit
69d54ff9d8
@ -1989,16 +1989,16 @@ void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
|
||||
return;
|
||||
|
||||
string child = fromqstr(item->text(0));
|
||||
|
||||
if (child.empty())
|
||||
return;
|
||||
|
||||
if (std::find(includeonlys_.begin(),
|
||||
includeonlys_.end(), child) != includeonlys_.end())
|
||||
if (isChildIncluded(child))
|
||||
includeonlys_.remove(child);
|
||||
else
|
||||
includeonlys_.push_back(child);
|
||||
|
||||
updateIncludeonlys();
|
||||
updateIncludeonlys(false);
|
||||
change_adaptor();
|
||||
}
|
||||
|
||||
@ -3768,6 +3768,7 @@ void GuiDocument::applyView()
|
||||
|
||||
// Master/Child
|
||||
bp_.clearIncludedChildren();
|
||||
updateIncludeonlys();
|
||||
if (masterChildModule->includeonlyRB->isChecked()) {
|
||||
list<string>::const_iterator it = includeonlys_.begin();
|
||||
for (; it != includeonlys_.end() ; ++it) {
|
||||
@ -4690,7 +4691,7 @@ void GuiDocument::updateIncludeonlyDisplay()
|
||||
}
|
||||
|
||||
|
||||
void GuiDocument::updateIncludeonlys()
|
||||
void GuiDocument::updateIncludeonlys(bool const cleanup)
|
||||
{
|
||||
masterChildModule->childrenTW->clear();
|
||||
QString const no = qt_("No");
|
||||
@ -4716,7 +4717,7 @@ void GuiDocument::updateIncludeonlys()
|
||||
}
|
||||
// Both if all children are included and if none is included
|
||||
// is equal to "include all" (i.e., omit \includeonly).
|
||||
if (!has_unincluded || all_unincluded)
|
||||
if (cleanup && (!has_unincluded || all_unincluded))
|
||||
includeonlys_.clear();
|
||||
}
|
||||
|
||||
|
@ -215,7 +215,7 @@ private:
|
||||
///
|
||||
void updateIncludeonlyDisplay();
|
||||
///
|
||||
void updateIncludeonlys();
|
||||
void updateIncludeonlys(bool const cleanup = true);
|
||||
///
|
||||
void updateDefaultBiblio(std::string const & style,
|
||||
std::string const & which = std::string());
|
||||
|
Loading…
Reference in New Issue
Block a user