extern void MenuLayoutSave();
extern void ShowCredits();
-extern void show_symbols_form(LyXFunc *);
// A bunch of wrappers
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;
// Table submenu
int SubEditTable = fl_newpup(FL_ObjWin(ob));
+#ifndef NEW_TABULAR
if (men->currentView()->available() &&
men->currentView()->text->cursor.par()->table &&
!tmpbuffer->isReadonly()){
// 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()) {
case 19: tmpfunc->Dispatch(LFUN_PASTESELECTION, "line"); break;
case 20: tmpfunc->Dispatch(LFUN_PASTESELECTION, "paragraph"); break;
- // floats & insets sub-menu
+#ifndef NEW_INSETS
+ // floats & insets sub-menu
case 21: men->currentView()->toggleFloat(); break;
case 22: tmpfunc->Dispatch(LFUN_MELT); break;
case 23: men->currentView()->allFloats(1, 0); break;
case 25: men->currentView()->allFloats(1, 1); break;
case 26: men->currentView()->allFloats(0, 1); break;
case 27: tmpfunc->Dispatch(LFUN_REMOVEERRORS); break;
-
+#endif
case 31: tmpfunc->Dispatch(LFUN_TABLE); break;
// this is really temporary. We need new function in keybind.C
// These should set the minibuffer, too.
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
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));
}
}
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);
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;
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;
}
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);