anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* disable some invalid insets in description items (covers bug 5937).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29586 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-05-09 16:56:58 +00:00
parent 0221a7c390
commit a7c3fa14fd
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Text3.cpp
View File

@ -1946,8 +1946,11 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_DIALOG_SHOW_NEW_INSET: case LFUN_DIALOG_SHOW_NEW_INSET:
if (cmd.argument() == "bibitem") if (cmd.argument() == "bibitem")
code = BIBITEM_CODE; code = BIBITEM_CODE;
else if (cmd.argument() == "bibtex") else if (cmd.argument() == "bibtex") {
code = BIBTEX_CODE; code = BIBTEX_CODE;
// not allowed in description items
enable = !inDescriptionItem(cur);
}
else if (cmd.argument() == "box") else if (cmd.argument() == "box")
code = BOX_CODE; code = BOX_CODE;
else if (cmd.argument() == "branch") else if (cmd.argument() == "branch")
@ -2018,6 +2021,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
break; break;
case LFUN_FLOAT_LIST_INSERT: case LFUN_FLOAT_LIST_INSERT:
code = FLOAT_LIST_CODE; code = FLOAT_LIST_CODE;
// not allowed in description items
enable = !inDescriptionItem(cur);
break; break;
case LFUN_CAPTION_INSERT: case LFUN_CAPTION_INSERT:
code = CAPTION_CODE; code = CAPTION_CODE;
@ -2069,6 +2074,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
break; break;
case LFUN_INDEX_PRINT: case LFUN_INDEX_PRINT:
code = INDEX_PRINT_CODE; code = INDEX_PRINT_CODE;
// not allowed in description items
enable = !inDescriptionItem(cur);
break; break;
case LFUN_NOMENCL_INSERT: case LFUN_NOMENCL_INSERT:
if (cur.selIsMultiCell() || cur.selIsMultiLine()) { if (cur.selIsMultiCell() || cur.selIsMultiLine()) {
@ -2079,9 +2086,13 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
break; break;
case LFUN_NOMENCL_PRINT: case LFUN_NOMENCL_PRINT:
code = NOMENCL_PRINT_CODE; code = NOMENCL_PRINT_CODE;
// not allowed in description items
enable = !inDescriptionItem(cur);
break; break;
case LFUN_TOC_INSERT: case LFUN_TOC_INSERT:
code = TOC_CODE; code = TOC_CODE;
// not allowed in description items
enable = !inDescriptionItem(cur);
break; break;
case LFUN_HYPERLINK_INSERT: case LFUN_HYPERLINK_INSERT:
if (cur.selIsMultiCell() || cur.selIsMultiLine()) { if (cur.selIsMultiCell() || cur.selIsMultiLine()) {

8
status.16x
View File

@ -187,7 +187,10 @@ What's new
- Fix crash when passing a nonexisting file to the lyx function - Fix crash when passing a nonexisting file to the lyx function
server-goto-file-row. server-goto-file-row.
- Fix crash when creating new file - Qt 4.5 issue (bug 5887). - Fix crash when creating new file -- Qt 4.5 issue (bug 5887).
- Improve responsiveness, especially on slow or networked drives, when
editing a master with child documents (bug 5705).
- After reloading a child document, correctly re-assign the master - After reloading a child document, correctly re-assign the master
(bug 5873). (bug 5873).
@ -303,8 +306,7 @@ What's new
- Fix bug causing reverse DVI search to fail when the temporary directory - Fix bug causing reverse DVI search to fail when the temporary directory
is a symbolic link. is a symbolic link.
- Improve responsiveness, especially on slow or networked drives, when - Disable some invalid insets inside description items (bug 5937).
editing a master with child documents (bug 5705).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION