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

Allow to hide formats from menus

Browse Source 
Fixes: #11657
This commit is contained in:
Juergen Spitzmueller 2019-09-11 10:29:50 +02:00
parent 9a0c52ed7e
commit d76cef70a0
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -676,7 +676,7 @@ def checkFormatEntries(dtl_tools):
\Format luatex tex "LaTeX (LuaTeX)" "" "" "%%" "document,menu=export" "" \Format luatex tex "LaTeX (LuaTeX)" "" "" "%%" "document,menu=export" ""
\Format pdflatex tex "LaTeX (pdflatex)" "" "" "%%" "document,menu=export" "" \Format pdflatex tex "LaTeX (pdflatex)" "" "" "%%" "document,menu=export" ""
\Format xetex tex "LaTeX (XeTeX)" "" "" "%%" "document,menu=export" "" \Format xetex tex "LaTeX (XeTeX)" "" "" "%%" "document,menu=export" ""
\Format latexclipboard tex "LaTeX (clipboard)" "" "" "%%" "" "" \Format latexclipboard tex "LaTeX (clipboard)" "" "" "%%" "menu=none" ""
\Format text txt "Plain text" a "" "%%" "document,menu=export" "text/plain" \Format text txt "Plain text" a "" "%%" "document,menu=export" "text/plain"
\Format text2 txt "Plain text (pstotext)" "" "" "%%" "document" "" \Format text2 txt "Plain text (pstotext)" "" "" "%%" "document" ""
\Format text3 txt "Plain text (ps2ascii)" "" "" "%%" "document" "" \Format text3 txt "Plain text (ps2ascii)" "" "" "%%" "document" ""

6
src/Format.h
View File

@ -39,7 +39,9 @@ public:
/// This format should appear in the File > Export menu /// This format should appear in the File > Export menu
export_menu = 4, export_menu = 4,
/// This may be a compressed file but doesn't need decompression /// This may be a compressed file but doesn't need decompression
zipped_native = 8 zipped_native = 8,
/// This format should not appear in a menu at all
no_menu = 16
}; };
/// ///
Format(std::string const & n, std::string const & e, docstring const & p, Format(std::string const & n, std::string const & e, docstring const & p,
@ -96,6 +98,8 @@ public:
/// ///
bool inExportMenu() const { return flags_ & export_menu; } bool inExportMenu() const { return flags_ & export_menu; }
/// ///
bool noMenu() const { return flags_ & no_menu; }
///
bool zippedNative() const { return flags_ & zipped_native; } bool zippedNative() const { return flags_ & zipped_native; }
/// ///
static bool formatSorter(Format const * lhs, Format const * rhs); static bool formatSorter(Format const * lhs, Format const * rhs);

3
src/LyXRC.cpp
View File

@ -884,6 +884,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
flgs |= Format::zipped_native; flgs |= Format::zipped_native;
else if (flag == "menu=export") else if (flag == "menu=export")
flgs |= Format::export_menu; flgs |= Format::export_menu;
else if (flag == "menu=none")
flgs |= Format::no_menu;
else else
LYXERR0("Ignoring unknown flag `" LYXERR0("Ignoring unknown flag `"
<< flag << "' for format `" << flag << "' for format `"
@ -2521,6 +2523,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
format->documentFormat() != cit->documentFormat() || format->documentFormat() != cit->documentFormat() ||
format->vectorFormat() != cit->vectorFormat() || format->vectorFormat() != cit->vectorFormat() ||
format->inExportMenu() != cit->inExportMenu() || format->inExportMenu() != cit->inExportMenu() ||
format->noMenu() != cit->noMenu() ||
format->mime() != cit->mime()) { format->mime() != cit->mime()) {
os << "\\format \"" << cit->name() << "\" \"" os << "\\format \"" << cit->name() << "\" \""
<< cit->extensions() << "\" \"" << cit->extensions() << "\" \""

2
src/frontends/qt/Menus.cpp
View File

@ -1126,6 +1126,8 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
switch (kind) { switch (kind) {
case MenuItem::ImportFormats: case MenuItem::ImportFormats:
if (f->noMenu())
continue;
label += from_ascii("..."); label += from_ascii("...");
break; break;
case MenuItem::ViewFormats: case MenuItem::ViewFormats: