Small fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1268 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index f70af7eb1b18705c4145210c0035e43be0896039..2241fe98c62caf914de742226456334224f27c80 100644 (file)
--- 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 2705d496b56625d101ace63e2d5c209b682a6495..a157d36f0501f16fb8eb49c7838e84ed394efc9f 100644 (file)
--- 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 6bbe76c9238b543b588a1d074c3a5eb31ac3312f..59c622c5603bf49229119b68e9af317e5922d8d6 100644 (file)
--- 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 c73dd858e26058f8c2721273c0005b4406ff4989..242c756850c9da2d917b4c53fa1b3c6b23d19fcf 100644 (file)
--- 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()) {