anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport fix for bug #7751: Sort the modules and formats by translated string.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39596 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-09-05 18:58:56 +00:00
parent d111a220e1
commit b9955190bd
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ModuleList.cpp
View File

@ -18,6 +18,7 @@
#include "support/debug.h" #include "support/debug.h"
#include "support/FileName.h" #include "support/FileName.h"
#include "support/gettext.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h" #include "support/lstrings.h"
@ -112,18 +113,19 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2)
return true; return true;
} }
// used when sorting the module list. // used when sorting the module list.
class ModuleSorter class ModuleSorter
{ {
public: public:
int operator()(LyXModule const & lm1, LyXModule const & lm2) const int operator()(LyXModule const & lm1, LyXModule const & lm2) const
{ {
return lm1.getName() < lm2.getName(); return _(lm1.getName()) < _(lm2.getName());
} }
}; };
//Much of this is borrowed from LayoutFileList::read() // Much of this is borrowed from LayoutFileList::read()
bool ModuleList::read() bool ModuleList::read()
{ {
FileName const real_file = libFileSearch("", "lyxmodules.lst"); FileName const real_file = libFileSearch("", "lyxmodules.lst");

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

@ -19,8 +19,9 @@
#include "Format.h" #include "Format.h"
#include "FuncRequest.h" #include "FuncRequest.h"
#include "support/qstring_helpers.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/gettext.h"
#include "support/qstring_helpers.h"
#include <algorithm> #include <algorithm>
@ -67,12 +68,14 @@ void GuiSendTo::changed_adaptor()
changed(); changed();
} }
namespace { namespace {
bool formatSorter(Format const * lhs, Format const * rhs) { bool formatSorter(Format const * lhs, Format const * rhs) {
return lhs->prettyname() < rhs->prettyname(); return _(lhs->prettyname()) < _(rhs->prettyname());
} }
} // end namespace } // end namespace
void GuiSendTo::updateContents() void GuiSendTo::updateContents()
{ {
all_formats_ = buffer().params().exportableFormats(false); all_formats_ = buffer().params().exportableFormats(false);

4
status.20x
View File

@ -56,6 +56,10 @@ What's new
- Adjust the cursor language after document language change had changed the - Adjust the cursor language after document language change had changed the
text language (bug 7681). text language (bug 7681).
- Correctly sort modules in Document>Settings and formats in the "Other
formats" dialog (bug 7751).
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE