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

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Kornel Benko 2013-01-05 10:10:19 +01:00
commit 40b0f3dfae
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/FuncCode.h
View File

@ -255,7 +255,7 @@ enum FuncCode
LFUN_MARGINALNOTE_INSERT, // Lgb 20000626 LFUN_MARGINALNOTE_INSERT, // Lgb 20000626
LFUN_FLOAT_INSERT, // Lgb 20000627 LFUN_FLOAT_INSERT, // Lgb 20000627
LFUN_FLOAT_WIDE_INSERT, // Lgb 20010531 LFUN_FLOAT_WIDE_INSERT, // Lgb 20010531
LFUN_CAPTION_INSERT, // Lgb 20000718; inactive as of 20060905 LFUN_CAPTION_INSERT, // Lgb 20000718
LFUN_BUFFER_SWITCH, LFUN_BUFFER_SWITCH,
// 190 // 190
LFUN_BUFFER_CHKTEX, // Asger 971030 LFUN_BUFFER_CHKTEX, // Asger 971030
@ -422,7 +422,7 @@ enum FuncCode
// 325 // 325
LFUN_INSET_BEGIN_SELECT, // JMarc, 20090316 LFUN_INSET_BEGIN_SELECT, // JMarc, 20090316
LFUN_INSET_END_SELECT, // JMarc, 20090316 LFUN_INSET_END_SELECT, // JMarc, 20090316
LFUN_INSET_SELECT_ALL, // vfr, 20090822 LFUN_INSET_SELECT_ALL, // vfr, 20090822
LFUN_BUFFER_ZOOM_IN, // vfr, 20090330 LFUN_BUFFER_ZOOM_IN, // vfr, 20090330
LFUN_BUFFER_ZOOM_OUT, // vfr, 20090330 LFUN_BUFFER_ZOOM_OUT, // vfr, 20090330
// 330 // 330

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

@ -1572,6 +1572,9 @@ void MenuDefinition::expandArguments(BufferView const * bv, bool switcharg)
if (!bv) if (!bv)
return; return;
if (!bv->cursor().inTexted())
return;
Inset const * inset = &bv->cursor().inset(); Inset const * inset = &bv->cursor().inset();
Layout::LaTeXArgMap args = bv->cursor().paragraph().layout().args(); Layout::LaTeXArgMap args = bv->cursor().paragraph().layout().args();
if (inset && args.empty()) if (inset && args.empty())

4
src/mathed/InsetMathNest.cpp
View File

@ -1441,6 +1441,10 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
flag.setEnabled(false); flag.setEnabled(false);
break; break;
case LFUN_CAPTION_INSERT:
flag.setEnabled(false);
break;
case LFUN_SPACE_INSERT: { case LFUN_SPACE_INSERT: {
docstring const & name = cmd.argument(); docstring const & name = cmd.argument();
if (name == "visible") if (name == "visible")