Baruch's graphic-inset patch.

[lyx.git] / src / menus.C

diff --git a/src/menus.C b/src/menus.C
index 81d4362aefc2211d2fcd661e64d981adec456daf..2816cd216a4b78d323092b96c58e36e5be399fc6 100644 (file)
--- a/src/menus.C
+++ b/src/menus.C
@@ -68,7 +68,6 @@ extern BufferList bufferlist;
 
 extern void MenuLayoutSave();
 extern void ShowCredits();
-extern void show_symbols_form(LyXFunc *);
 
 // A bunch of wrappers
 
@@ -726,13 +725,7 @@ void Menus::ShowFileMenu(FL_OBJECT * ob, long)
                break;
        case 43: tmpfunc->Dispatch(LFUN_EXPORT, "ascii");
                break;
-       case 44:
-               if (!LinuxDoc && !DocBook)
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html");
-               else if(LinuxDoc)
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html-linuxdoc");
-               else
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html-docbook");
+       case 44: tmpfunc->Dispatch(LFUN_EXPORT, "html");
                break;
        case 45: tmpfunc->Dispatch(LFUN_EXPORT, "custom"); 
                break;
@@ -909,6 +902,7 @@ void Menus::ShowEditMenu(FL_OBJECT * ob, long)
 
        // Table submenu
        int SubEditTable = fl_newpup(FL_ObjWin(ob));
+#ifndef NEW_TABULAR
        if (men->currentView()->available() && 
            men->currentView()->text->cursor.par()->table &&
            !tmpbuffer->isReadonly()){
@@ -1005,7 +999,9 @@ void Menus::ShowEditMenu(FL_OBJECT * ob, long)
                // xgettext:no-c-format
                fl_addtopup(SubEditTable, _("|Delete Table%x43"));
                fl_setpup_shortcut(SubEditTable, 43, scex(_("EMT|Dd#d#D")));
-       } else if (men->currentView()->the_locking_inset &&
+       } else
+#endif
+               if (men->currentView()->the_locking_inset &&
                   (men->currentView()->the_locking_inset->LyxCode() ==
                    Inset::TABULAR_CODE) &&
                   !tmpbuffer->isReadonly()) {
@@ -1250,11 +1246,14 @@ void Menus::ShowEditMenu(FL_OBJECT * ob, long)
                                    static_cast<InsetTabular *>
                                       (men->currentView()->the_locking_inset);
                                inset->TabularFeatures(men->currentView(), choice - 32);
-                       } else {
+                       }
+#ifndef NEW_TABULAR
+                       else {
                                men->currentView()->text->
                                        TableFeatures(men->currentView(), choice - 32);
                                men->currentView()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        }
+#endif
                }
                break;
                // version control sub-menu
@@ -1564,11 +1563,11 @@ void Menus::ShowRefsMenu(FL_OBJECT * ob, long)
                        men->_view->getLyXFunc()->Dispatch(LFUN_REFGOTO,
                                                           label_list[num].c_str());
                else {
-                       static string const commands[5]
-                               = { "\\ref", "\\pageref", "\\vref", "\\vpageref",
-                                   "\\prettyref"};
-                       string t = commands[type] + "{" + label_list[num] + "}";
-                       men->currentView()->insertInset(new InsetRef(t, buffer));
+                       static string const cmdname[5]
+                               = { "ref", "pageref", "vref", "vpageref", "prettyref"};
+                       InsetCommandParams p( cmdname[type] );
+                       p.setContents( label_list[num] );
+                       men->currentView()->insertInset(new InsetRef(p, buffer));
                }
        }
 
@@ -1632,11 +1631,12 @@ void Menus::ShowLayoutMenu(FL_OBJECT * ob, long)
                fl_setpup_mode(LayoutMenu, 9, FL_PUP_CHECK);
        if (font.latex() == LyXFont::ON)
                fl_setpup_mode(LayoutMenu, 10, FL_PUP_CHECK);
-          
+
        // Grey out unavailable entries
+#ifndef NEW_TABULAR
        if (!men->currentView()->text->cursor.par()->table)
                fl_setpup_mode(LayoutMenu, 5, FL_PUP_GREY);
-
+#endif
        if (tmpbuffer->isReadonly()) {
                fl_setpup_mode(LayoutMenu, 1, FL_PUP_GREY);
                fl_setpup_mode(LayoutMenu, 6, FL_PUP_GREY);
@@ -1820,27 +1820,62 @@ void Menus::ShowInsertMenu(FL_OBJECT * ob, long)
 
                case 6: tmpfunc->Dispatch(LFUN_INSET_EXTERNAL); break;
 
-               case 7: tmpfunc->Dispatch(LFUN_FOOTMELT); break
-                                                                 ;
-               case 8: tmpfunc->Dispatch(LFUN_MARGINMELT); break;
+               case 7:
+#ifndef NEW_INSETS
+                       tmpfunc->Dispatch(LFUN_FOOTMELT); break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FOOTNOTE);
+                       break;
+#endif
+               case 8:
+#ifndef NEW_INSETS
+                       tmpfunc->Dispatch(LFUN_MARGINMELT); break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_MARGINAL);
+                       break;
+#endif
   
                case 9: // Float sub-menu
                 case 71:
+#ifndef NEW_INSETS
                        tmpfunc->Dispatch(LFUN_INSERTFOOTNOTE, "figure");
                        break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FLOAT, "figure");
+                       break;
+#endif
                case 72:
+#ifndef NEW_INSETS
                        tmpfunc->Dispatch(LFUN_INSERTFOOTNOTE, "table");
                        break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FLOAT, "table");
+                       break;
+#endif
                case 73:
+#ifndef NEW_INSETS
                        tmpfunc->Dispatch(LFUN_INSERTFOOTNOTE, "wide-fig");
                        break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FLOAT, "figure");
+                       break;
+#endif
                case 74:
+#ifndef NEW_INSETS
                        tmpfunc->Dispatch(LFUN_INSERTFOOTNOTE, "wide-tab");
                        break;
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FLOAT, "table");
+                       break;
+#endif
                case 75:
+#ifndef NEW_INSETS
                        tmpfunc->Dispatch(LFUN_INSERTFOOTNOTE, "algorithm");
                        break;
-
+#else
+                       tmpfunc->Dispatch(LFUN_INSET_FLOAT, "algorithm");
+                       break;
+#endif
                case 10: // Table/List submenu
                        break;
                case 21: tmpfunc->Dispatch(LFUN_TOC_INSERT); break;
@@ -1864,8 +1899,8 @@ void Menus::ShowInsertMenu(FL_OBJECT * ob, long)
                case 12: tmpfunc->Dispatch(LFUN_INSERT_NOTE); break;
                case 13: tmpfunc->Dispatch(LFUN_INSERT_LABEL); break;
                case 14: tmpfunc->Dispatch(LFUN_INSERT_REF); break;
-               case 15: tmpfunc->Dispatch(LFUN_CREATE_CITATION); break;
-               case 16: tmpfunc->Dispatch(LFUN_INDEX_INSERT); break;
+               case 15: tmpfunc->Dispatch(LFUN_CITATION_CREATE); break;
+               case 16: tmpfunc->Dispatch(LFUN_INDEX_CREATE); break;
                case 17: tmpfunc->Dispatch(LFUN_INDEX_INSERT_LAST); break;
                case 18: tmpfunc->Dispatch(LFUN_URL); break;
                }
@@ -1955,7 +1990,7 @@ void Menus::ShowMathMenu(FL_OBJECT * ob, long)
                        tmpfunc->Dispatch(LFUN_MATH_DISPLAY);
                        break;
                case 9: /* Panel */
-                       show_symbols_form(tmpfunc);
+                       tmpfunc->Dispatch(LFUN_MATH_PANEL);
                        break;
                }
                men->currentView()->update(BufferView::SELECT|BufferView::FITCUR);