anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport fix for #7764: Sort the file lists under

Browse Source 
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/branches/BRANCH_2_0_X@40102 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-10-30 20:07:46 +00:00
parent 8416cc3307
commit 61e539a488
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BufferParams.cpp
View File

@ -2078,6 +2078,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();
@ -2094,6 +2101,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;
}

9
src/frontends/qt4/GuiSendto.cpp
View File

@ -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();

7
src/frontends/qt4/Menus.cpp
View File

@ -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;
@ -1018,7 +1012,6 @@ void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf)
formats = buf->params().exportableFormats(false);
action = LFUN_BUFFER_EXPORT;
}
sort(formats.begin(), formats.end(), &compareFormat);
bool const view_update = (kind == MenuItem::ViewFormats
|| kind == MenuItem::UpdateFormats);

2
status.20x
View File

@ -231,6 +231,8 @@ What's new
- Fix change of language of selected text with context menu (bug 7778).
- Sort formats under Document>Settings>Output (bug 7758).
* ADVANCED FIND AND REPLACE