X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=534d64e73741eb2413992bc5d8acbe4505d406c6;hb=45bd81a203238ef43a026463d6dcf0fd020beedb;hp=fe755a51e18be6f40a21ee0202c654cc327f834f;hpb=da7c04db11dd482f7b126e576fbc9a319d941aad;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index fe755a51e1..534d64e737 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -12,8 +12,9 @@ #include "Lsstream.h" -#include -#include +#include +#include + #include #include @@ -25,6 +26,7 @@ #endif #include "support/lyxalgo.h" +#include "support/LAssert.h" #include "version.h" #include "kbmap.h" #include "lyxfunc.h" @@ -53,14 +55,15 @@ #include "insets/insetmarginal.h" #include "insets/insetminipage.h" #include "insets/insetfloat.h" +#if 0 #include "insets/insetlist.h" -#include "insets/insettabular.h" #include "insets/insettheorem.h" +#endif +#include "insets/insettabular.h" #include "insets/insetcaption.h" #include "mathed/formulamacro.h" #include "mathed/math_cursor.h" #include "mathed/math_inset.h" -#include "spellchecker.h" #include "minibuffer.h" #include "vspace.h" #include "LyXView.h" @@ -90,6 +93,9 @@ #include "FontLoader.h" #include "TextCache.h" #include "lyxfind.h" +#include "undo_funcs.h" +#include "ParagraphParameters.h" +#include "figureForm.h" using std::pair; using std::make_pair; @@ -344,7 +350,7 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) bool tmp_sc = show_sc; show_sc = false; - Dispatch(action, argument); + dispatch(action, argument); show_sc = tmp_sc; //return 0; @@ -428,15 +434,6 @@ func_status::value_type LyXFunc::getStatus(int ac, disable = !Exporter::IsExportable(buf, "program"); break; - case LFUN_INSERTFOOTNOTE: - // 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()) { @@ -490,10 +487,21 @@ func_status::value_type LyXFunc::getStatus(int ac, case LFUN_BOOKMARK_GOTO: disable = !owner->view()-> isSavedPosition(strToUnsignedInt(argument)); + break; + + + case LFUN_INSET_TOGGLE: + disable = (TEXT(false)->getInset() == 0); + break; + case LFUN_MATH_VALIGN: { - Inset * tli = owner->view()->theLockingInset(); - if (tli && (tli->lyxCode() == Inset::MATH_CODE - || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + // I think this test can be simplified (Andre') + // mathcursor is != 0 iff we are in math mode + //Inset * tli = owner->view()->theLockingInset(); + //if (tli && (tli->lyxCode() == Inset::MATH_CODE + // || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + // + if (mathcursor) { char align = mathcursor->valign(); if (align == '\0') { disable = true; @@ -516,9 +524,10 @@ func_status::value_type LyXFunc::getStatus(int ac, break; } case LFUN_MATH_HALIGN: { - Inset * tli = owner->view()->theLockingInset(); - if (tli && (tli->lyxCode() == Inset::MATH_CODE - || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + //Inset * tli = owner->view()->theLockingInset(); + //if (tli && (tli->lyxCode() == Inset::MATH_CODE + // || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + if (mathcursor) { char align = mathcursor->halign(); if (align == '\0') { disable = true; @@ -543,7 +552,7 @@ func_status::value_type LyXFunc::getStatus(int ac, case LFUN_MATH_MUTATE: { Inset * tli = owner->view()->theLockingInset(); if (tli && (tli->lyxCode() == Inset::MATH_CODE)) { - MathInsetTypes type = mathcursor->par()->GetType(); + MathInsetTypes type = mathcursor->formula()->getType(); func_status::value_type box = func_status::ToggleOff; if (argument == "inline") { if (type == LM_OT_SIMPLE) @@ -566,46 +575,170 @@ func_status::value_type LyXFunc::getStatus(int ac, disable = true; break; } + + // we just need to be in math mode to enable that + case LFUN_MATH_SIZE: + case LFUN_MATH_SPACE: + case LFUN_MATH_LIMITS: + case LFUN_MATH_NONUMBER: + case LFUN_MATH_NUMBER: + disable = !mathcursor; + break; + + // we need to be math mode and a math array for that + // Hack: halign produces non-zero result iff we are in a math array + case LFUN_MATH_ROW_INSERT: + case LFUN_MATH_ROW_DELETE: + case LFUN_MATH_COLUMN_INSERT: + case LFUN_MATH_COLUMN_DELETE: + disable = !mathcursor || !mathcursor->halign(); + break; + default: break; - } - if (disable) - flag |= func_status::Disabled; - - if (buf) { - func_status::value_type box = func_status::ToggleOff; - LyXFont const & font = - TEXT(false)->real_current_font; - switch (action) { - case LFUN_EMPH: - if (font.emph() == LyXFont::ON) - box = func_status::ToggleOn; - break; - case LFUN_NOUN: - if (font.noun() == LyXFont::ON) - box = func_status::ToggleOn; - break; - case LFUN_BOLD: - if (font.series() == LyXFont::BOLD_SERIES) - box = func_status::ToggleOn; - break; -#ifndef NO_LATEX - case LFUN_TEX: - if (font.latex() == LyXFont::ON) - box = func_status::ToggleOn; - break; + } + + // the functions which insert insets + Inset::Code code = Inset::NO_CODE; + switch (action) { + case LFUN_INSET_TEXT: + code = Inset::TEXT_CODE; + break; + case LFUN_INSET_ERT: + code = Inset::ERT_CODE; + break; + case LFUN_FIGURE: + case LFUN_INSET_GRAPHICS: + code = Inset::GRAPHICS_CODE; + break; + case LFUN_INSET_FOOTNOTE: + code = Inset::FOOT_CODE; + break; + case LFUN_DIALOG_TABULAR_INSERT: + case LFUN_INSET_TABULAR: + code = Inset::TABULAR_CODE; + break; + case LFUN_INSET_EXTERNAL: + code = Inset::EXTERNAL_CODE; + break; + case LFUN_INSET_MARGINAL: + code = Inset::MARGIN_CODE; + break; + case LFUN_INSET_MINIPAGE: + code = Inset::MINIPAGE_CODE; + break; + case LFUN_INSET_FLOAT: + case LFUN_INSET_WIDE_FLOAT: + code = Inset::FLOAT_CODE; + break; + case LFUN_FLOAT_LIST: + code = Inset::FLOAT_LIST_CODE; + break; +#if 0 + case LFUN_INSET_LIST: + code = Inset::LIST_CODE; + break; + case LFUN_INSET_THEOREM: + code = Inset::THEOREM_CODE; + break; #endif - case LFUN_READ_ONLY_TOGGLE: - if (buf->isReadonly()) - box = func_status::ToggleOn; - break; - default: - box = func_status::OK; - break; - } - flag |= box; + case LFUN_INSET_CAPTION: + code = Inset::CAPTION_CODE; + break; + case LFUN_INSERT_NOTE: + code = Inset::IGNORE_CODE; + break; + case LFUN_INSERT_LABEL: + code = Inset::LABEL_CODE; + break; + case LFUN_REF_INSERT: + code = Inset::REF_CODE; + break; + case LFUN_CITATION_CREATE: + case LFUN_CITATION_INSERT: + code = Inset::CITE_CODE; + break; + case LFUN_INSERT_BIBTEX: + code = Inset::BIBTEX_CODE; + break; + case LFUN_INDEX_INSERT: + case LFUN_INDEX_INSERT_LAST: + case LFUN_INDEX_CREATE: + code = Inset::INDEX_CODE; + break; + case LFUN_INDEX_PRINT: + code = Inset::INDEX_PRINT_CODE; + break; + case LFUN_CHILD_INSERT: + code = Inset::INCLUDE_CODE; + break; + case LFUN_TOC_INSERT: + code = Inset::TOC_CODE; + break; + case LFUN_PARENTINSERT: + code = Inset::PARENT_CODE; + break; + case LFUN_HTMLURL: + case LFUN_URL: + case LFUN_INSERT_URL: + code = Inset::URL_CODE; + break; + case LFUN_QUOTE: + // always allow this, since we will inset a raw quote + // if an inset is not allowed. + break; + case LFUN_HYPHENATION: + case LFUN_LIGATURE_BREAK: + case LFUN_HFILL: + case LFUN_MENU_SEPARATOR: + case LFUN_LDOTS: + case LFUN_END_OF_SENTENCE: + case LFUN_PROTECTEDSPACE: + code = Inset::SPECIALCHAR_CODE; + break; + default: + break; + } + if (code != Inset::NO_CODE + && owner->view()->theLockingInset() + && !owner->view()->theLockingInset()->insetAllowed(code)) { + disable = true; } + if (disable) + flag |= func_status::Disabled; + + // the font related functions (and a few others) + func_status::value_type box = func_status::ToggleOff; + LyXFont const & font = + TEXT(false)->real_current_font; + switch (action) { + case LFUN_EMPH: + if (font.emph() == LyXFont::ON) + box = func_status::ToggleOn; + break; + case LFUN_NOUN: + if (font.noun() == LyXFont::ON) + box = func_status::ToggleOn; + break; + case LFUN_BOLD: + if (font.series() == LyXFont::BOLD_SERIES) + box = func_status::ToggleOn; + break; + case LFUN_READ_ONLY_TOGGLE: + if (buf->isReadonly()) + box = func_status::ToggleOn; + break; + case LFUN_APPENDIX: + if (TEXT(false)->cursor.par()->params().startOfAppendix()) + box = func_status::ToggleOn; + break; + default: + box = func_status::OK; + break; + } + flag |= box; + return flag; } @@ -614,23 +747,23 @@ func_status::value_type LyXFunc::getStatus(int ac, void LyXFunc::miniDispatch(string const & s) { if (!s.empty()) { - Dispatch(s); + dispatch(s); } } -string const LyXFunc::Dispatch(string const & s) +string const LyXFunc::dispatch(string const & s) { // Split command string into command and argument string cmd; string line = frontStrip(s); string const arg = strip(frontStrip(split(line, cmd, ' '))); - return Dispatch(lyxaction.LookupFunc(cmd), arg); + return dispatch(lyxaction.LookupFunc(cmd), arg); } -string const LyXFunc::Dispatch(int ac, +string const LyXFunc::dispatch(int ac, string const & do_not_use_this_arg) { lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac @@ -669,9 +802,13 @@ string const LyXFunc::Dispatch(int ac, owner->view()->hideCursor(); // We cannot use this function here - if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) + if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) { + lyxerr << "LyXFunc::Dispatch: " + << lyxaction.getActionName(ac) + << " [" << ac << "] is disabled at this location" + << endl; goto exit_with_message; - + } if (owner->view()->available() && owner->view()->theLockingInset()) { UpdatableInset::RESULT result; @@ -682,14 +819,21 @@ string const LyXFunc::Dispatch(int ac, argument = keyseq.getiso(); } // Undo/Redo is a bit tricky for insets. - if (action == LFUN_UNDO) { + if (action == LFUN_UNDO) { +#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED int slx; int sly; UpdatableInset * inset = - owner->view()->theLockingInset(); + owner->view()->theLockingInset()->getLockingInset(); + int inset_id = inset->id(); inset->getCursorPos(owner->view(), slx, sly); owner->view()->unlockInset(inset); +#else + owner->view()->unlockInset(owner->view()->theLockingInset()); +#endif owner->view()->menuUndo(); +#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED +#if 0 if (TEXT()->cursor.par()-> isInset(TEXT()->cursor.pos())) { inset = static_cast( @@ -699,8 +843,12 @@ string const LyXFunc::Dispatch(int ac, } else { inset = 0; } +#else + inset = static_cast(owner->view()->buffer()->getInsetFromID(inset_id)); +#endif if (inset) inset->edit(owner->view(),slx,sly,0); +#endif return string(); } else if (action == LFUN_REDO) { int slx; @@ -718,12 +866,40 @@ string const LyXFunc::Dispatch(int ac, inset->edit(owner->view(),slx,sly,0); return string(); } else if (((result=owner->view()->theLockingInset()-> - localDispatch(owner->view(), action, - argument)) == - UpdatableInset::DISPATCHED) || - (result == UpdatableInset::DISPATCHED_NOUPDATE)) + localDispatch(owner->view(), action, argument)) == + UpdatableInset::DISPATCHED) || + (result == UpdatableInset::DISPATCHED_NOUPDATE)) + return string(); + else if (result == UpdatableInset::FINISHED) { + if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_RIGHT) { + if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_UP) { + if (TEXT()->cursor.row()->previous()) { + TEXT()->cursorUp(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_DOWN) { + if (TEXT()->cursor.row()->next()) + TEXT()->cursorDown(owner->view()); + else + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); return string(); - else { + } else { //setMessage(N_("Text mode")); switch (action) { case LFUN_UNKNOWN_ACTION: @@ -802,34 +978,11 @@ string const LyXFunc::Dispatch(int ac, } else { searched_string = last_search; } - - if (!searched_string.empty() && - ((action == LFUN_WORDFINDBACKWARD) ? - SearchBackward(owner->view(), searched_string) : - SearchForward(owner->view(), searched_string))) { - - // ??? What is that ??? - owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR); - - // ??? Needed ??? - // clear the selection (if there is any) - owner->view()->toggleSelection(); - TEXT()->clearSelection(owner->view()); - - // Move cursor so that successive C-s 's will not stand in place. - if (action == LFUN_WORDFINDFORWARD ) - TEXT()->cursorRightOneWord(owner->view()); - TEXT()->finishUndo(); - moveCursorUpdate(true, false); - - // ??? Needed ??? - // set the new selection - // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected); - owner->view()->toggleSelection(false); + bool fw = (action == LFUN_WORDFINDBACKWARD); + if (!searched_string.empty()) { + LyXFind(owner->view(), searched_string, fw); } - - // REMOVED : if (owner->view()->getWorkArea()->focus) - owner->view()->showCursor(); +// owner->view()->showCursor(); } break; @@ -862,7 +1015,7 @@ string const LyXFunc::Dispatch(int ac, meta_fake_bit = 0; if (owner->view()->available()) // cancel any selection - Dispatch(LFUN_MARK_OFF); + dispatch(LFUN_MARK_OFF); setMessage(N_("Cancel")); break; @@ -890,15 +1043,15 @@ string const LyXFunc::Dispatch(int ac, // --- Menus ----------------------------------------------- case LFUN_MENUNEW: - MenuNew(false); + menuNew(false); break; case LFUN_MENUNEWTMPLT: - MenuNew(true); + menuNew(true); break; case LFUN_CLOSEBUFFER: - CloseBuffer(); + closeBuffer(); break; case LFUN_MENUWRITE: @@ -1007,7 +1160,7 @@ string const LyXFunc::Dispatch(int ac, case LFUN_REMOVEERRORS: if (owner->view()->removeAutoInsets()) { owner->view()->redraw(); - owner->view()->fitCursor(TEXT()); + owner->view()->fitCursor(); } break; @@ -1027,14 +1180,6 @@ string const LyXFunc::Dispatch(int ac, owner->getDialogs()->setUserFreeFont(); break; -#ifndef NO_LATEX - case LFUN_TEX: - Tex(owner->view()); - owner->view()->setState(); - owner->showState(); - break; -#endif - case LFUN_RECONFIGURE: Reconfigure(owner->view()); break; @@ -1055,13 +1200,13 @@ string const LyXFunc::Dispatch(int ac, #warning Find another implementation here (or another lyxfunc)! #endif #endif - case LFUN_HELP_COPYRIGHT: - owner->getDialogs()->showCopyright(); + case LFUN_HELP_ABOUTLYX: + owner->getDialogs()->showAboutlyx(); break; + case LFUN_HELP_COPYRIGHT: case LFUN_HELP_CREDITS: - owner->getDialogs()->showCredits(); - break; + case LFUN_HELP_OPEN: { @@ -1070,37 +1215,24 @@ string const LyXFunc::Dispatch(int ac, setErrorMessage(N_("Missing argument")); break; } - ProhibitInput(owner->view()); + owner->prohibitInput(); string const fname = i18nLibFileSearch("doc", arg, "lyx"); if (fname.empty()) { lyxerr << "LyX: unable to find documentation file `" << arg << "'. Bad installation?" << endl; - AllowInput(owner->view()); + owner->allowInput(); break; } ostringstream str; str << _("Opening help file") << ' ' << MakeDisplayPath(fname) << "..."; owner->message(str.str().c_str()); - owner->view()->buffer(bufferlist.loadLyXFile(fname,false)); - AllowInput(owner->view()); + owner->view()->buffer(bufferlist.loadLyXFile(fname, false)); + owner->allowInput(); break; } - case LFUN_HELP_VERSION: { - ProhibitInput(owner->view()); - string msg(_("LyX Version ")); - msg += LYX_VERSION; - msg += " of "; - msg += LYX_RELEASE; - fl_show_message(msg.c_str(), - (_("Library directory: ") - + MakeDisplayPath(system_lyxdir)).c_str(), - (_("User directory: ") - + MakeDisplayPath(user_lyxdir)).c_str()); - AllowInput(owner->view()); - break; - } + case LFUN_HELP_VERSION: // --- version control ------------------------------- case LFUN_VC_REGISTER: @@ -1160,7 +1292,7 @@ string const LyXFunc::Dispatch(int ac, break; case LFUN_FILE_OPEN: - Open(argument); + open(argument); break; case LFUN_LATEX_LOG: @@ -1180,7 +1312,7 @@ string const LyXFunc::Dispatch(int ac, --sel; // sel 1..., but layout 0... // Pretend we got the name instead. - Dispatch(int(LFUN_LAYOUT), + dispatch(int(LFUN_LAYOUT), textclasslist.NameOfLayout(owner->view() ->buffer()->params.textclass, sel)); @@ -1232,8 +1364,8 @@ string const LyXFunc::Dispatch(int ac, case LFUN_SPELLCHECK: if (lyxrc.isp_command != "none") - ShowSpellChecker(owner->view()); - break; // RVDK_PATCH_5 + owner->getDialogs()->showSpellchecker(); + break; // --- lyxserver commands ---------------------------- @@ -1256,16 +1388,10 @@ string const LyXFunc::Dispatch(int ac, case LFUN_GOTOFILEROW: { -#if 0 - char file_name[100]; - int row; - ::sscanf(argument.c_str(), " %s %d", file_name, &row); -#else string file_name; int row; istringstream istr(argument.c_str()); istr >> file_name >> row; -#endif // Must replace extension of the file to be .lyx and get full path string const s(ChangeExtension(file_name, ".lyx")); @@ -1290,15 +1416,18 @@ string const LyXFunc::Dispatch(int ac, int id; istr >> id; - Paragraph * par = TEXT()->getParFromID(id); + Paragraph * par = owner->buffer()->getParFromID(id); if (par == 0) { lyxerr[Debug::INFO] << "No matching paragraph found! [" << id << "]" << std::endl; break; + } else { + lyxerr << "Paragraph " << par->id() + << " found." << endl; } // Set the cursor - TEXT()->setCursor(owner->view(), par, 0); + owner->view()->text->setCursor(owner->view(), par, 0); owner->view()->setState(); owner->showState(); @@ -1348,30 +1477,6 @@ string const LyXFunc::Dispatch(int ac, // --- insert characters ---------------------------------------- // --- Mathed stuff. If we are here, there is no locked inset yet. - - // Greek mode - case LFUN_GREEK: - { - if (!greek_kb_flag) { - greek_kb_flag = 1; - setMessage(N_("Math greek mode on")); - } else - greek_kb_flag = 0; - } - break; - - // Greek keyboard - case LFUN_GREEK_TOGGLE: - { - greek_kb_flag = greek_kb_flag ? 0 : 2; - if (greek_kb_flag) { - setMessage(N_("Math greek keyboard on")); - } else { - setMessage(N_("Math greek keyboard off")); - } - } - break; - case LFUN_MATH_EXTERN: case LFUN_MATH_NUMBER: case LFUN_MATH_NONUMBER: @@ -1400,7 +1505,7 @@ string const LyXFunc::Dispatch(int ac, } else { p.setContents( argument ); } - Dispatch(LFUN_CITATION_INSERT, p.getAsString()); + dispatch(LFUN_CITATION_INSERT, p.getAsString()); } else owner->getDialogs()->createCitation( p.getAsString() ); } @@ -1447,7 +1552,7 @@ string const LyXFunc::Dispatch(int ac, while (argument.find(';') != string::npos) { string first; argument = split(argument, first, ';'); - Dispatch(first); + dispatch(first); } } break; @@ -1519,7 +1624,8 @@ string const LyXFunc::Dispatch(int ac, // Then if it was none of the above if (!owner->view()->Dispatch(action, argument)) lyxerr << "A truly unknown func [" - << action << "]!" << endl; + << lyxaction.getActionName(action) << "]!" + << endl; break; } // end of switch @@ -1596,14 +1702,14 @@ void LyXFunc::setupLocalKeymap() } -void LyXFunc::MenuNew(bool fromTemplate) +void LyXFunc::menuNew(bool fromTemplate) { string initpath = lyxrc.document_path; if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } @@ -1722,14 +1828,14 @@ void LyXFunc::MenuNew(bool fromTemplate) } -void LyXFunc::Open(string const & fname) +void LyXFunc::open(string const & fname) { string initpath = lyxrc.document_path; if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } @@ -1762,8 +1868,14 @@ void LyXFunc::Open(string const & fname) // get absolute path of file and add ".lyx" to the filename if // necessary - filename = FileSearch(string(), filename, "lyx"); + string const fullpath = FileSearch(string(), filename, "lyx"); + if (fullpath.empty()) { + WriteAlert(_("Error"), _("Could not find file"), filename); + return; + } + filename = fullpath; + // loads document string const disp_fn(MakeDisplayPath(filename)); @@ -1800,11 +1912,11 @@ void LyXFunc::doImport(string const & argument) if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } - string const text = _("Select ") + formats.PrettyName(format) + string const text = _("Select ") + formats.prettyName(format) + _(" file to import"); FileDialog fileDlg(owner, text, @@ -1814,9 +1926,9 @@ void LyXFunc::doImport(string const & argument) make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples")))); - string const extension = "*." + formats.Extension(format) - + "| " + formats.PrettyName(format) - + " (*." + formats.Extension(format) + ")"; + string const extension = "*." + formats.extension(format) + + "| " + formats.prettyName(format) + + " (*." + formats.extension(format) + ")"; FileDialog::Result result = fileDlg.Select(initpath, extension); @@ -1883,7 +1995,7 @@ void LyXFunc::reloadBuffer() } -void LyXFunc::CloseBuffer() +void LyXFunc::closeBuffer() { if (bufferlist.close(owner->buffer()) && !quitting) { if (bufferlist.empty()) {