mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Fix the outstanding part of #7764, which involves sorting the file lists
under Document>Settings>Output. It turns out that we always want this list to be sorted when we get it, so we can sort it in BufferParams rather than in three different places. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40101 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
05eff0e344
commit
256e16d0c2
@ -2038,6 +2038,13 @@ bool BufferParams::isExportable(string const & format) const
|
||||
}
|
||||
|
||||
|
||||
namespace {
|
||||
bool formatSorter(Format const * lhs, Format const * rhs) {
|
||||
return _(lhs->prettyname()) < _(rhs->prettyname());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
vector<Format const *> BufferParams::exportableFormats(bool only_viewable) const
|
||||
{
|
||||
vector<string> const backs = backends();
|
||||
@ -2054,6 +2061,7 @@ vector<Format const *> BufferParams::exportableFormats(bool only_viewable) const
|
||||
theConverters().getReachable(*it, only_viewable, false, excludes);
|
||||
result.insert(result.end(), r.begin(), r.end());
|
||||
}
|
||||
sort(result.begin(), result.end(), formatSorter);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -69,19 +69,10 @@ void GuiSendTo::changed_adaptor()
|
||||
}
|
||||
|
||||
|
||||
namespace {
|
||||
bool formatSorter(Format const * lhs, Format const * rhs) {
|
||||
return _(lhs->prettyname()) < _(rhs->prettyname());
|
||||
}
|
||||
} // end namespace
|
||||
|
||||
|
||||
void GuiSendTo::updateContents()
|
||||
{
|
||||
all_formats_ = buffer().params().exportableFormats(false);
|
||||
|
||||
sort(all_formats_.begin(), all_formats_.end(), formatSorter);
|
||||
|
||||
// Save the current selection if any
|
||||
Format const * current_format = 0;
|
||||
int const line = formatLW->currentRow();
|
||||
|
@ -723,12 +723,6 @@ bool MenuDefinition::searchMenu(FuncRequest const & func, docstring_list & names
|
||||
}
|
||||
|
||||
|
||||
bool compareFormat(Format const * p1, Format const * p2)
|
||||
{
|
||||
return *p1 < *p2;
|
||||
}
|
||||
|
||||
|
||||
QString limitStringLength(docstring const & str)
|
||||
{
|
||||
size_t const max_item_length = 45;
|
||||
@ -1023,8 +1017,6 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
|
||||
return;
|
||||
}
|
||||
|
||||
sort(formats.begin(), formats.end(), &compareFormat);
|
||||
|
||||
bool const view_update = (kind == MenuItem::ViewFormats
|
||||
|| kind == MenuItem::UpdateFormats);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user