#pragma implementation
#endif
+#include "version.h"
#include "lyxlookup.h"
#include "kbmap.h"
#include "lyxfunc.h"
#include "insets/insettheorem.h"
#include "insets/insetcaption.h"
#include "mathed/formulamacro.h"
-#include "toolbar.h"
#include "spellchecker.h" // RVDK_PATCH_5
#include "minibuffer.h"
#include "vspace.h"
#include "layout.h"
#include "WorkArea.h"
#include "lyxfr1.h"
-#include "menus.h"
#include "bufferview_funcs.h"
#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#ifdef NEW_MENUBAR
+#include "frontends/Menubar.h"
+#else
+#include "menus.h"
+#endif
#include "FloatList.h"
using std::pair;
extern void InsertAsciiFile(BufferView *, string const &, bool);
extern void math_insert_symbol(char const *);
-extern Bool math_insert_greek(char const); // why "Bool"?
+extern bool math_insert_greek(char);
extern BufferList bufferlist;
extern LyXServer * lyxserver;
-extern short greek_kb_flag;
+extern int greek_kb_flag;
extern FD_form_toc * fd_form_toc;
extern bool selection_possible;
extern void QuitLyX();
extern void MenuFax(Buffer *);
extern void MenuExport(Buffer *, string const &);
+extern void show_symbols_form(LyXFunc *);
extern LyXAction lyxaction;
// (alkis)
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
- //owner->getMiniBuffer()->Set(CurrentState());
+ //owner->showState();
owner->view()->setState();
}
owner->view()->unlockInset(tli);
owner->view()->text->CursorRight(owner->view());
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
} else {
tli->UnlockInsetInInset(owner->view(),
tli->GetLockingInset(),true);
// no
setErrorMessage(N_("Document is read-only"));
flag |= LyXFunc::Disabled;
+ return flag;
}
} else {
// no
}
}
- if (flag & LyXFunc::Disabled)
- return flag;
-
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
static bool noLaTeX = lyxrc.latex_command == "none";
disable = noLaTeX || lyxrc.fax_command == "none";
break;
case LFUN_IMPORT:
- if (argument == "latex")
+ if (argument == "latex" || argument == "noweb")
disable = lyxrc.relyx_command == "none";
- if (argument == "linuxdoc")
+ else if (argument == "linuxdoc")
disable = lyxrc.linuxdoc_to_lyx_command == "none";
break;
case LFUN_EXPORT:
- if (argument == "dvi" || argument == "postscript")
+ if (argument == "latex")
+ disable = ! buf->isLatex();
+ else if (argument == "linuxdoc")
+ disable = ! buf->isLinuxDoc();
+ else if (argument == "docbook")
+ disable = ! buf->isDocBook();
+ else if (argument == "dvi" || argument == "postscript")
disable = noLaTeX;
- if (argument == "html")
- disable = lyxrc.html_command == "none";
- if (argument == "html-linuxdoc")
- disable = lyxrc.linuxdoc_to_html_command == "none";
- if (argument == "html-docbook")
- disable = lyxrc.docbook_to_html_command == "none";
+ else if (argument == "html")
+ disable = (! buf->isLatex()
+ || lyxrc.html_command == "none");
+ else if (argument == "html-linuxdoc")
+ disable = (! buf->isLinuxDoc()
+ || lyxrc.linuxdoc_to_html_command == "none");
+ else if (argument == "html-docbook")
+ disable = (! buf->isDocBook()
+ || lyxrc.docbook_to_html_command == "none");
+ else if (argument == "custom")
+ disable = ! buf->isLatex();
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
case LFUN_RUNCHKTEX:
disable = lyxrc.chktex_command == "none";
break;
+ case LFUN_BUILDPROG:
+ disable = (lyxrc.literate_command == "none"
+ || ! buf->isLiterate());
+#ifndef NEW_TABULAR
case LFUN_LAYOUT_TABLE:
disable = ! owner->view()->text->cursor.par()->table;
break;
+#endif
+ case LFUN_VC_REGISTER:
+ disable = buf->lyxvc.inUse();
+ break;
+ case LFUN_VC_CHECKIN:
+ disable = !buf->lyxvc.inUse() || buf->isReadonly();
+ break;
+ case LFUN_VC_CHECKOUT:
+ disable = !buf->lyxvc.inUse() || !buf->isReadonly();
+ break;
+ case LFUN_VC_REVERT:
+ case LFUN_VC_UNDO:
+ case LFUN_VC_HISTORY:
+ disable = !buf->lyxvc.inUse();
+ break;
default:
break;
}
case LFUN_BREAKLINE:
owner->view()->text->CursorRight(owner->view());
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_RIGHT:
if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
owner->view()->text->CursorRight(owner->view());
moveCursorUpdate(false);
- owner->getMiniBuffer()->
- Set(CurrentState(owner->view()));
+ owner->showState();
}
return string();
case LFUN_LEFT:
if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
owner->view()->text->CursorRight(owner->view());
moveCursorUpdate(false);
- owner->getMiniBuffer()->
- Set(CurrentState(owner->view()));
+ owner->showState();
}
return string();
case LFUN_DOWN:
owner->view()->text->CursorDown(owner->view());
moveCursorUpdate(false);
- owner->getMiniBuffer()->
- Set(CurrentState(owner->view()));
+ owner->showState();
return string();
default:
break;
Figure();
break;
- case LFUN_INSERT_GRAPHICS:
+ case LFUN_INSET_GRAPHICS:
{
Inset * new_inset = new InsetGraphics;
if (!owner->view()->insertInset(new_inset))
case LFUN_FREE:
Free(owner->view());
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_TEX:
Tex(owner->view());
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
#ifndef NEW_INSETS
case LFUN_MELT:
owner->getDialogs()->showCopyright();
break;
+ case LFUN_HELP_CREDITS:
+ owner->getDialogs()->showCredits();
+ break;
+
+ case LFUN_HELP_OPEN: {
+ string arg = argument;
+ if (arg.empty()) {
+ setErrorMessage(N_("Missing argument"));
+ break;
+ }
+ ProhibitInput(owner->view());
+ string fname = i18nLibFileSearch("doc", arg, "lyx");
+ if (fname.empty()) {
+ lyxerr << "LyX: unable to find documentation file `"
+ << arg << "'. Bad installation?" << endl;
+ AllowInput(owner->view());
+ break;
+ }
+ owner->getMiniBuffer()->Set(_("Opening help file"),
+ MakeDisplayPath(fname),"...");
+ owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
+ AllowInput(owner->view());
+ break;
+ }
+
+ case LFUN_HELP_VERSION:
+ ProhibitInput(owner->view());
+ fl_show_message((string(_("LyX Version ")) + LYX_VERSION
+ + _(" of ") + LYX_RELEASE).c_str(),
+ (_("Library directory: ")
+ + MakeDisplayPath(system_lyxdir)).c_str(),
+ (_("User directory: ")
+ + MakeDisplayPath(user_lyxdir)).c_str());
+ AllowInput(owner->view());
+ break;
+
// --- version control -------------------------------
case LFUN_VC_REGISTER:
{
// --- buffers ----------------------------------------
+ case LFUN_SWITCHBUFFER:
+ owner->view()->buffer(bufferlist.getBuffer(argument));
+ break;
+
+
case LFUN_FILE_INSERT:
{
MenuInsertLyXFile(argument);
owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->
SetLayout(owner->view(), layout.second);
- owner->getToolbar()->combox->
- select(owner->view()->
- text->cursor.par()->
- GetLayout() + 1);
+ owner->setLayout(layout.second);
owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
owner->view()->setState();
}
break;
case LFUN_DROP_LAYOUTS_CHOICE:
- owner->getToolbar()->combox->Show();
+ owner->getToolbar()->openLayoutList();
break;
case LFUN_LANGUAGE:
Lang(owner->view(), argument);
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_EMPH:
Emph(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_BOLD:
Bold(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_NOUN:
Noun(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_CODE:
Code(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_SANS:
Sans(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_ROMAN:
Roman(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_DEFAULT:
StyleReset(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_UNDERLINE:
Underline(owner->view());
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_FONT_SIZE:
FontSize(owner->view(), argument);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_FONT_STATE:
break;
case LFUN_MENU_OPEN_BY_NAME:
+#ifdef NEW_MENUBAR
+ owner->getMenubar()->openByName(argument);
+#else
owner->getMenus()->openByName(argument);
+#endif
break; // RVDK_PATCH_5
case LFUN_SPELLCHECK:
tmptext->CursorRight(owner->view(), false);
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
}
break;
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
}
break;
owner->view()->text->CursorUp(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_DOWN:
owner->view()->text->CursorDown(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_UP_PARAGRAPH:
owner->view()->text->CursorUpParagraph(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_DOWN_PARAGRAPH:
owner->view()->text->CursorDownParagraph(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_PRIOR:
owner->view()->cursorPrevious();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_NEXT:
owner->view()->cursorNext();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_HOME:
owner->view()->text->CursorHome(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_END:
owner->view()->text->CursorEnd(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_SHIFT_TAB:
owner->view()->text->CursorTab(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_WORDRIGHT:
owner->view()->text->CursorRightOneWord(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_WORDLEFT:
owner->view()->text->CursorLeftOneWord(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_BEGINNINGBUF:
owner->view()->text->CursorTop(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_ENDBUF:
owner->view()->text->CursorBottom(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
owner->view()->text->CursorRight(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_LEFTSEL:
owner->view()->text->CursorLeft(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_UPSEL:
owner->view()->text->CursorUp(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_DOWNSEL:
owner->view()->text->CursorDown(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_UP_PARAGRAPHSEL:
owner->view()->text->CursorUpParagraph(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_DOWN_PARAGRAPHSEL:
owner->view()->text->CursorDownParagraph(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_PRIORSEL:
owner->view()->cursorPrevious();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_NEXTSEL:
owner->view()->cursorNext();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_HOMESEL:
owner->view()->text->CursorHome(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_ENDSEL:
owner->view()->text->CursorEnd(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_WORDRIGHTSEL:
owner->view()->text->CursorRightOneWord(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_WORDLEFTSEL:
owner->view()->text->CursorLeftOneWord(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_BEGINNINGBUFSEL:
owner->view()->text->CursorTop(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
case LFUN_ENDBUFSEL:
owner->view()->text->CursorBottom(owner->view());
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
// --- text changing commands ------------------------
owner->view()->cut();
}
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
owner->view()->setState();
break;
owner->view()->text->DeleteWordForward(owner->view());
owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
/* -------> Delete word backward. */
owner->view()->text->DeleteWordBackward(owner->view());
owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
/* -------> Kill to end of line. */
} else {
owner->view()->cut();
}
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
owner->view()->setState();
}
break;
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
}
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
break;
}
owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
owner->view()->text->sel_cursor = cursor;
owner->view()->setState();
- owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->showState();
}
break;
case LFUN_PUSH_TOOLBAR:
{
int nth = strToInt(argument);
- if (lyxerr.debugging(Debug::TOOLBAR)) {
- lyxerr << "LFUN_PUSH_TOOLBAR: argument = `"
- << argument << "'\n"
- << "LFUN_PUSH_TOOLBAR: nth = `"
- << nth << "'" << endl;
- }
-
if (nth <= 0) {
- LyXBell();
setErrorMessage(N_("Push-toolbar needs argument > 0"));
} else {
owner->getToolbar()->push(nth);
case LFUN_ADD_TO_TOOLBAR:
{
- if (lyxerr.debugging(Debug::TOOLBAR)) {
+ if (lyxerr.debugging(Debug::GUI)) {
lyxerr << "LFUN_ADD_TO_TOOLBAR:"
"argument = `" << argument << '\'' << endl;
}
//lyxerr <<string("Argument: ") + argument);
//lyxerr <<string("Tmp : ") + tmp);
if (tmp.empty()) {
- LyXBell();
setErrorMessage(N_("Usage: toolbar-add-to <LyX command>"));
} else {
owner->getToolbar()->add(argument, false);
break;
case LFUN_MATH_MODE: // Open or create a math inset
- {
-
+ {
if (owner->view()->available())
owner->view()->open_new_inset(new InsetFormula);
setMessage(N_("Math editor mode"));
case LFUN_MATH_LIMITS:
{
setErrorMessage(N_("This is only allowed in math mode!"));
+
+ }
+ break;
+
+ case LFUN_MATH_PANEL:
+ {
+ show_symbols_form(this);
}
break;