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

Small fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1268 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-12-07 13:36:39 +00:00
parent 893fe4da80
commit f676dacf9c
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2000-12-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lib/ui/default.ui: put TOC at the beginning of the TOC menu.
* src/lyxfunc.C (getStatus): disable insertion of floats in a
tabular.
2000-12-06 Angus Leeming <a.leeming@ic.ac.uk> 2000-12-06 Angus Leeming <a.leeming@ic.ac.uk>
* src/frontends/xforms/FormPreferences.C (ScreenFonts::build): changed * src/frontends/xforms/FormPreferences.C (ScreenFonts::build): changed

4
lib/ui/default.ui
View File

@ -251,10 +251,10 @@ Menuset
# NAVIGATE MENU # NAVIGATE MENU
# #
Menu "navigate" Menu "navigate"
Toc
Separator
Item "Error|E" "error-next" Item "Error|E" "error-next"
Item "Note|N" "note-next" Item "Note|N" "note-next"
Separator
Toc
End End
Menu "documents" Menu "documents"

28
po/POTFILES.in
View File

@ -53,35 +53,35 @@ src/frontends/kde/refdlg.C
src/frontends/kde/tocdlg.C src/frontends/kde/tocdlg.C
src/frontends/kde/urldlg.C src/frontends/kde/urldlg.C
src/frontends/xforms/FormBase.h src/frontends/xforms/FormBase.h
src/frontends/xforms/form_citation.C
src/frontends/xforms/FormCitation.C src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_copyright.C src/frontends/xforms/form_citation.C
src/frontends/xforms/FormCopyright.C src/frontends/xforms/FormCopyright.C
src/frontends/xforms/form_document.C src/frontends/xforms/form_copyright.C
src/frontends/xforms/FormDocument.C src/frontends/xforms/FormDocument.C
src/frontends/xforms/form_error.C src/frontends/xforms/form_document.C
src/frontends/xforms/FormError.C src/frontends/xforms/FormError.C
src/frontends/xforms/form_graphics.C src/frontends/xforms/form_error.C
src/frontends/xforms/FormGraphics.C src/frontends/xforms/FormGraphics.C
src/frontends/xforms/form_index.C src/frontends/xforms/form_graphics.C
src/frontends/xforms/FormIndex.C src/frontends/xforms/FormIndex.C
src/frontends/xforms/form_index.C
src/frontends/xforms/FormInset.h src/frontends/xforms/FormInset.h
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormParagraph.C src/frontends/xforms/FormParagraph.C
src/frontends/xforms/form_preferences.C src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormPreferences.C src/frontends/xforms/FormPreferences.C
src/frontends/xforms/form_print.C src/frontends/xforms/form_preferences.C
src/frontends/xforms/FormPrint.C src/frontends/xforms/FormPrint.C
src/frontends/xforms/form_ref.C src/frontends/xforms/form_print.C
src/frontends/xforms/FormRef.C src/frontends/xforms/FormRef.C
src/frontends/xforms/form_tabular.C src/frontends/xforms/form_ref.C
src/frontends/xforms/FormTabular.C src/frontends/xforms/FormTabular.C
src/frontends/xforms/form_tabular_create.C src/frontends/xforms/form_tabular.C
src/frontends/xforms/FormTabularCreate.C src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/form_toc.C src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/FormToc.C src/frontends/xforms/FormToc.C
src/frontends/xforms/form_url.C src/frontends/xforms/form_toc.C
src/frontends/xforms/FormUrl.C src/frontends/xforms/FormUrl.C
src/frontends/xforms/form_url.C
src/frontends/xforms/input_validators.C src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/xform_helpers.C src/frontends/xforms/xform_helpers.C

11
src/lyxfunc.C
View File

@ -346,6 +346,17 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
disable = !Exporter::IsExportable(buf, "program"); disable = !Exporter::IsExportable(buf, "program");
break; break;
case LFUN_INSERTFOOTNOTE:
case LFUN_FOOTMELT:
case LFUN_MARGINMELT:
// Disable insertion of floats in a tabular.
disable = false;
if (owner->view()->theLockingInset()) {
disable = (owner->view()->theLockingInset()->LyxCode() == Inset::TABULAR_CODE) ||
owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE);
}
break;
case LFUN_LAYOUT_TABULAR: case LFUN_LAYOUT_TABULAR:
disable = true; disable = true;
if (owner->view()->theLockingInset()) { if (owner->view()->theLockingInset()) {