From f676dacf9c69d8c906653f54d00342c01de6facf Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 7 Dec 2000 13:36:39 +0000
Subject: [PATCH] Small fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1268 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog         |  7 +++++++
 lib/ui/default.ui |  4 ++--
 po/POTFILES.in    | 28 ++++++++++++++--------------
 src/lyxfunc.C     | 11 +++++++++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f70af7eb1b..2241fe98c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* src/frontends/xforms/FormPreferences.C (ScreenFonts::build): changed
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 2705d496b5..a157d36f05 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -251,10 +251,10 @@ Menuset
 # NAVIGATE MENU
 #
     Menu "navigate"
+	Toc
+	Separator
 	Item "Error|E" "error-next"
 	Item "Note|N" "note-next"
-	Separator
-	Toc
     End
 
     Menu "documents"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6bbe76c923..59c622c560 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,35 +53,35 @@ src/frontends/kde/refdlg.C
 src/frontends/kde/tocdlg.C
 src/frontends/kde/urldlg.C
 src/frontends/xforms/FormBase.h
-src/frontends/xforms/form_citation.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/form_document.C
+src/frontends/xforms/form_copyright.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/form_graphics.C
+src/frontends/xforms/form_error.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/form_index.C
 src/frontends/xforms/FormInset.h
-src/frontends/xforms/form_paragraph.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/form_print.C
+src/frontends/xforms/form_preferences.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/form_tabular.C
+src/frontends/xforms/form_ref.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/form_toc.C
+src/frontends/xforms/form_tabular_create.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/form_url.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C
 src/frontends/xforms/xform_helpers.C
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index c73dd858e2..242c756850 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -346,6 +346,17 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 		disable = !Exporter::IsExportable(buf, "program");
 		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:
 		disable = true;
 		if (owner->view()->theLockingInset()) {