X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=5ca26ab25748ad788cd2e22aa87d8b57d28eb4ae;hb=358c483572b2d9fe3ba4ab511fd89af94ad27ce5;hp=8253912947af2f37060692733803c597a3da0b41;hpb=7fdf62dd8ed3771d17253822fc1722144ab8b4e5;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 8253912947..5ca26ab257 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -158,9 +158,6 @@ MiniBufferController mb_ctrl; /* === globals =========================================================== */ -// Initialization of static member var -bool LyXFunc::show_sc = true; - LyXFunc::LyXFunc(LyXView * o) : owner(o), @@ -325,49 +322,40 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) if (action == LFUN_SELFINSERT) { // This is very X dependent. unsigned int c = keysym; + string argument; c = kb_keymap::getiso(c); if (c > 0) argument = static_cast(c); + + dispatch(LFUN_SELFINSERT, argument); lyxerr[Debug::KEY] << "SelfInsert arg[`" << argument << "']" << endl; } - - bool tmp_sc = show_sc; - show_sc = false; - dispatch(action, argument); - show_sc = tmp_sc; - - //return 0; + else + verboseDispatch(action, false); } -func_status::value_type LyXFunc::getStatus(int ac) const +FuncStatus LyXFunc::getStatus(int ac) const { - return getStatus(ac, string()); + kb_action action; + string argument; + action = lyxaction.retrieveActionArg(ac, argument); + return getStatus(action, argument); } -func_status::value_type LyXFunc::getStatus(int ac, - string const & not_to_use_arg) const +FuncStatus LyXFunc::getStatus(kb_action action, + string const & argument) const { - kb_action action; - func_status::value_type flag = func_status::OK; - string argument; + FuncStatus flag; Buffer * buf = owner->buffer(); - if (lyxaction.isPseudoAction(ac)) - action = lyxaction.retrieveActionArg(ac, argument); - else { - action = static_cast(ac); - if (!not_to_use_arg.empty()) - argument = not_to_use_arg; // exept here - } - if (action == LFUN_UNKNOWN_ACTION) { - setErrorMessage(N_("Unknown action")); - return func_status::Unknown; + setStatusMessage(N_("Unknown action")); + return flag.unknown(true); } // Check whether we need a buffer @@ -380,18 +368,19 @@ func_status::value_type LyXFunc::getStatus(int ac, !lyxaction.funcHasFlag(action, LyXAction::ReadOnly)) { // no - setErrorMessage(N_("Document is read-only")); - flag |= func_status::Disabled; + setStatusMessage(N_("Document is read-only")); + flag.disabled(true); } } else { // no - setErrorMessage(N_("Command not allowed with" + setStatusMessage(N_("Command not allowed with" "out any document open")); - flag |= func_status::Disabled; - return flag; + return flag.disabled(true); } } + UpdatableInset * tli = owner->view()->theLockingInset(); + // I would really like to avoid having this switch and rather try to // encode this in the function itself. bool disable = false; @@ -426,38 +415,41 @@ func_status::value_type LyXFunc::getStatus(int ac, break; case LFUN_LAYOUT_TABULAR: - disable = true; - if (owner->view()->theLockingInset()) { - disable = (owner->view()->theLockingInset()->lyxCode() != Inset::TABULAR_CODE) && - !owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE); - } + disable = !tli + || (tli->lyxCode() != Inset::TABULAR_CODE + && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)); + break; + + case LFUN_LAYOUT: + case LFUN_LAYOUT_PARAGRAPH: { + Inset * inset = TEXT(false)->cursor.par()->inInset(); + disable = inset && inset->forceDefaultParagraphs(inset); break; + } case LFUN_TABULAR_FEATURE: disable = true; - if (owner->view()->theLockingInset()) { - func_status::value_type ret = func_status::Disabled; - if (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) { - ret = static_cast - (owner->view()->theLockingInset())-> - getStatus(argument); - } else if (owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) { + if (tli) { + FuncStatus ret; + //ret.disabled(true); + if (tli->lyxCode() == Inset::TABULAR_CODE) { + ret = static_cast(tli) + ->getStatus(argument); + } else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) { ret = static_cast - (owner->view()->theLockingInset()-> - getFirstLockingInsetOfType(Inset::TABULAR_CODE))-> - getStatus(argument); + (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) + ->getStatus(argument); } flag |= ret; disable = false; } else { static InsetTabular inset(*owner->buffer(), 1, 1); - func_status::value_type ret; + FuncStatus ret; disable = true; ret = inset.getStatus(argument); - if ((ret & func_status::ToggleOn) || - (ret & func_status::ToggleOff)) - flag |= func_status::ToggleOff; + if (ret.onoff(true) || ret.onoff(false)) + flag.setOnOff(false); } break; @@ -485,13 +477,7 @@ func_status::value_type LyXFunc::getStatus(int ac, disable = (TEXT(false)->getInset() == 0); break; - case LFUN_MATH_VALIGN: { - // 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)) { - // + case LFUN_MATH_VALIGN: if (mathcursor) { char align = mathcursor->valign(); if (align == '\0') { @@ -499,25 +485,19 @@ func_status::value_type LyXFunc::getStatus(int ac, break; } if (argument.empty()) { - flag = func_status::OK; + flag.clear(); break; } if (!contains("tcb", argument[0])) { disable = true; break; } - if (argument[0] == align) - flag |= func_status::ToggleOn; - else - flag |= func_status::ToggleOff; + flag.setOnOff(argument[0] == align); } else disable = true; break; - } - case LFUN_MATH_HALIGN: { - //Inset * tli = owner->view()->theLockingInset(); - //if (tli && (tli->lyxCode() == Inset::MATH_CODE - // || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + + case LFUN_MATH_HALIGN: if (mathcursor) { char align = mathcursor->halign(); if (align == '\0') { @@ -525,47 +505,35 @@ func_status::value_type LyXFunc::getStatus(int ac, break; } if (argument.empty()) { - flag = func_status::OK; + flag.clear(); break; } if (!contains("lcr", argument[0])) { disable = true; break; } - if (argument[0] == align) - flag |= func_status::ToggleOn; - else - flag |= func_status::ToggleOff; + flag.setOnOff(argument[0] == align); } else disable = true; break; - } - case LFUN_MATH_MUTATE: { - Inset * tli = owner->view()->theLockingInset(); + + case LFUN_MATH_MUTATE: if (tli && (tli->lyxCode() == Inset::MATH_CODE)) { MathInsetTypes type = mathcursor->formula()->getType(); - func_status::value_type box = func_status::ToggleOff; if (argument == "inline") { - if (type == LM_OT_SIMPLE) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_SIMPLE); } else if (argument == "display") { - if (type == LM_OT_EQUATION) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_EQUATION); } else if (argument == "eqnarray") { - if (type == LM_OT_EQNARRAY) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_EQNARRAY); } else if (argument == "align") { - if (type == LM_OT_ALIGN) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_ALIGN); } else { - box = func_status::OK; disable = true; } - flag |= box; } else disable = true; break; - } // we just need to be in math mode to enable that case LFUN_MATH_SIZE: @@ -573,8 +541,6 @@ func_status::value_type LyXFunc::getStatus(int ac, case LFUN_MATH_LIMITS: case LFUN_MATH_NONUMBER: case LFUN_MATH_NUMBER: - case LFUN_SUBSCRIPT: - case LFUN_SUPERSCRIPT: disable = !mathcursor; break; @@ -692,46 +658,80 @@ func_status::value_type LyXFunc::getStatus(int ac, default: break; } - if (code != Inset::NO_CODE - && owner->view()->theLockingInset() - && !owner->view()->theLockingInset()->insetAllowed(code)) { + if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code)) { disable = true; } if (disable) - flag |= func_status::Disabled; + flag.disabled(true); - // the font related functions (and a few others) - func_status::value_type box = func_status::ToggleOff; - LyXFont const & font = - TEXT(false)->real_current_font; + // A few general toggles 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; + flag.setOnOff(buf->isReadonly()); break; case LFUN_APPENDIX: - if (TEXT(false)->cursor.par()->params().startOfAppendix()) - box = func_status::ToggleOn; + flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix()); break; default: - box = func_status::OK; break; } - flag |= box; + // the font related toggles + if (!mathcursor) { + LyXFont const & font = TEXT(false)->real_current_font; + switch (action) { + case LFUN_EMPH: + flag.setOnOff(font.emph() == LyXFont::ON); + break; + case LFUN_NOUN: + flag.setOnOff(font.noun() == LyXFont::ON); + break; + case LFUN_BOLD: + flag.setOnOff(font.series() == LyXFont::BOLD_SERIES); + break; + case LFUN_SANS: + flag.setOnOff(font.family() == LyXFont::SANS_FAMILY); + break; + case LFUN_ROMAN: + flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY); + break; + case LFUN_CODE: + flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY); + break; + default: + break; + } + } + else { + MathTextCodes tc = mathcursor->getLastCode(); + switch (action) { + case LFUN_BOLD: + flag.setOnOff(tc == LM_TC_BF); + break; + case LFUN_SANS: + flag.setOnOff(tc == LM_TC_SF); + break; + case LFUN_EMPH: + flag.setOnOff(tc == LM_TC_CAL); + break; + case LFUN_ROMAN: + flag.setOnOff(tc == LM_TC_RM); + break; + case LFUN_CODE: + flag.setOnOff(tc == LM_TC_TT); + break; + case LFUN_NOUN: + flag.setOnOff(tc == LM_TC_BB); + break; + case LFUN_DEFAULT: + flag.setOnOff(tc == LM_TC_VAR); + break; + default: + break; + } + } + return flag; } @@ -739,48 +739,105 @@ func_status::value_type LyXFunc::getStatus(int ac, // temporary dispatch method void LyXFunc::miniDispatch(string const & s) { - if (!s.empty()) { - dispatch(s); + string s2(frontStrip(strip(s))); + + if (!s2.empty()) { + verboseDispatch(s2, true); } } -string const LyXFunc::dispatch(string const & s) +void LyXFunc::verboseDispatch(string const & s, bool show_sc) { - // 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); + int action = lyxaction.LookupFunc(frontStrip(s)); + + if (action == LFUN_UNKNOWN_ACTION) { + string const msg = string(_("Unknown function (")) + + s + ")"; + owner->message(msg); + } else { + verboseDispatch(action, show_sc); + } } -string const LyXFunc::dispatch(int ac, - string const & do_not_use_this_arg) +void LyXFunc::verboseDispatch(int ac, bool show_sc) { - lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac - <<"] arg[" << do_not_use_this_arg << "]" << endl; - string argument; kb_action action; - // we have not done anything wrong yet. - errorstat = false; - dispatch_buffer.erase(); + // get the real action and argument + action = lyxaction.retrieveActionArg(ac, argument); + + verboseDispatch(action, argument, show_sc); +} + + + +void LyXFunc::verboseDispatch(kb_action action, + string const & argument, bool show_sc) +{ + string res = dispatch(action, argument); + + commandshortcut.erase(); - // if action is a pseudo-action, we need the real action - if (lyxaction.isPseudoAction(ac)) { - string tmparg; - action = static_cast - (lyxaction.retrieveActionArg(ac, tmparg)); - if (!tmparg.empty()) - argument = tmparg; + if (lyxrc.display_shortcuts && show_sc) { + if (action != LFUN_SELFINSERT) { + // Put name of command and list of shortcuts + // for it in minibuffer + string comname = lyxaction.getActionName(action); + + int pseudoaction = action; + bool argsadded = false; + + if (!argument.empty()) { + // the pseudoaction is useful for the bindings + pseudoaction = + lyxaction.searchActionArg(action, + argument); + + if (pseudoaction == LFUN_UNKNOWN_ACTION) { + pseudoaction = action; + } else { + comname += " " + argument; + argsadded = true; + } + } + + string const shortcuts = + toplevel_keymap->findbinding(pseudoaction); + + if (!shortcuts.empty()) { + comname += ": " + shortcuts; + } else if (!argsadded && !argument.empty()) { + comname += " " + argument; + } + + if (!comname.empty()) { + comname = strip(comname); + commandshortcut = "(" + comname + ')'; + } + } + } + + if (res.empty()) { + if (!commandshortcut.empty()) { + owner->getMiniBuffer()->addSet(commandshortcut); + } } else { - action = static_cast(ac); - if (!do_not_use_this_arg.empty()) - argument = do_not_use_this_arg; // except here + owner->getMiniBuffer()->addSet(' ' + commandshortcut); } +} + + +string const LyXFunc::dispatch(kb_action action, string argument) +{ + lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << action + <<"] arg[" << argument << "]" << endl; + + // we have not done anything wrong yet. + errorstat = false; + dispatch_buffer.erase(); #ifdef NEW_DISPATCHER // We try do call the most specific dispatcher first: @@ -788,18 +845,19 @@ string const LyXFunc::dispatch(int ac, // 2. the bufferview's dispatch // 3. the lyxview's dispatch #endif - + selection_possible = false; - + if (owner->view()->available()) owner->view()->hideCursor(); // We cannot use this function here - if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) { + if (getStatus(action, argument).disabled()) { lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: " - << lyxaction.getActionName(ac) - << " [" << ac << "] is disabled at this location" + << lyxaction.getActionName(action) + << " [" << action << "] is disabled at this location" << endl; + setErrorMessage(getStatusMessage()); goto exit_with_message; } @@ -808,42 +866,43 @@ string const LyXFunc::dispatch(int ac, if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) && (!keyseq.deleted()))) { - if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){ + if ((action == LFUN_UNKNOWN_ACTION) + && argument.empty()){ argument = keyseq.getiso(); } // Undo/Redo is a bit tricky for insets. if (action == LFUN_UNDO) { owner->view()->menuUndo(); - return string(); + goto exit_with_message; } else if (action == LFUN_REDO) { owner->view()->menuRedo(); - return string(); + goto exit_with_message; } else if (((result=owner->view()->theLockingInset()-> localDispatch(owner->view(), action, argument)) == UpdatableInset::DISPATCHED) || (result == UpdatableInset::DISPATCHED_NOUPDATE)) - return string(); + goto exit_with_message; else if (result == UpdatableInset::FINISHED) { if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); } - return string(); + goto exit_with_message; } 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(); + goto exit_with_message; } else if (result == UpdatableInset::FINISHED_UP) { if (TEXT()->cursor.row()->previous()) { TEXT()->cursorUp(owner->view()); moveCursorUpdate(true, false); owner->showState(); } - return string(); + goto exit_with_message; } else if (result == UpdatableInset::FINISHED_DOWN) { if (TEXT()->cursor.row()->next()) TEXT()->cursorDown(owner->view()); @@ -851,7 +910,7 @@ string const LyXFunc::dispatch(int ac, TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); - return string(); + goto exit_with_message; } else { //setMessage(N_("Text mode")); switch (action) { @@ -868,14 +927,14 @@ string const LyXFunc::dispatch(int ac, moveCursorUpdate(true, false); owner->showState(); } - return string(); + goto exit_with_message; case LFUN_LEFT: if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); } - return string(); + goto exit_with_message; case LFUN_DOWN: if (TEXT()->cursor.row()->next()) TEXT()->cursorDown(owner->view()); @@ -883,7 +942,7 @@ string const LyXFunc::dispatch(int ac, TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); - return string(); + goto exit_with_message; default: break; } @@ -896,7 +955,6 @@ string const LyXFunc::dispatch(int ac, case LFUN_ESCAPE: { if (!owner->view()->available()) break; - // this function should be used always [asierra060396] UpdatableInset * tli = owner->view()->theLockingInset(); @@ -913,6 +971,7 @@ string const LyXFunc::dispatch(int ac, lock, true); } + finishUndo(); } } break; @@ -1331,7 +1390,7 @@ string const LyXFunc::dispatch(int ac, case LFUN_GOTO_PARAGRAPH: { - istringstream istr(argument.c_str()); + istringstream istr(argument.c_str()); int id; istr >> id; @@ -1345,8 +1404,13 @@ string const LyXFunc::dispatch(int ac, << " found." << endl; } + if (owner->view()->theLockingInset()) + owner->view()->unlockInset(owner->view()->theLockingInset()); + if (par->inInset()) { + par->inInset()->edit(owner->view()); + } // Set the cursor - owner->view()->text->setCursor(owner->view(), par, 0); + owner->view()->getLyXText()->setCursor(owner->view(), par, 0); owner->view()->setState(); owner->showState(); @@ -1400,13 +1464,19 @@ string const LyXFunc::dispatch(int ac, case LFUN_MATH_NUMBER: case LFUN_MATH_NONUMBER: case LFUN_MATH_LIMITS: - case LFUN_SUBSCRIPT: - case LFUN_SUPERSCRIPT: { setErrorMessage(N_("This is only allowed in math mode!")); } break; + // passthrough hat and underscore outside mathed: + case LFUN_SUBSCRIPT: + dispatch(LFUN_SELFINSERT, "_"); + break; + case LFUN_SUPERSCRIPT: + dispatch(LFUN_SELFINSERT, "^"); + break; + case LFUN_MATH_PANEL: owner->getDialogs()->showMathPanel(); break; @@ -1436,7 +1506,7 @@ string const LyXFunc::dispatch(int ac, { string const filename = MakeAbsPath(argument, - OnlyPath(owner->buffer()->fileName())); + owner->buffer()->filePath()); setMessage(N_("Opening child document ") + MakeDisplayPath(filename) + "..."); owner->view()->savePosition(0); @@ -1473,7 +1543,7 @@ string const LyXFunc::dispatch(int ac, while (argument.find(';') != string::npos) { string first; argument = split(argument, first, ';'); - dispatch(first); + verboseDispatch(first, false); } } break; @@ -1552,66 +1622,13 @@ string const LyXFunc::dispatch(int ac, exit_with_message: - commandshortcut.erase(); - - if (lyxrc.display_shortcuts && show_sc) { - if (action != LFUN_SELFINSERT) { - // Put name of command and list of shortcuts - // for it in minibuffer - string comname = lyxaction.getActionName(action); - - kb_action pseudoaction = action; - bool argsadded = false; - - if (!argument.empty()) { - // If we have the command with argument, - // this is better - pseudoaction = - lyxaction.searchActionArg(action, - argument); - - if (pseudoaction == -1) { - pseudoaction = action; - } else { - comname += " " + argument; - argsadded = true; - } - } - - string const shortcuts = - toplevel_keymap->findbinding(pseudoaction); - - if (!shortcuts.empty()) { - comname += ": " + shortcuts; - } else if (!argsadded) { - comname += " " + argument; - } - - if (!comname.empty()) { - comname = strip(comname); - commandshortcut = "(" + comname + ')'; - - // Here we could even add a small pause, - // to annoy the user and make him learn - // the shortcuts. - // No! That will just annoy, not teach - // anything. The user will read the messages - // if they are interested. (Asger) - } - } - } - string const res = getMessage(); - if (res.empty()) { - if (!commandshortcut.empty()) { - owner->getMiniBuffer()->addSet(commandshortcut); - } - } else { - string const msg(_(res) + ' ' + commandshortcut); - owner->message(msg); - } - + if (!res.empty()) + owner->message(_(res)); + owner->updateMenubar(); + owner->updateToolbar(); + return res; } @@ -1628,7 +1645,7 @@ void LyXFunc::menuNew(bool fromTemplate) string initpath = lyxrc.document_path; if (owner->view()->available()) { - string const trypath = owner->buffer()->filepath; + string const trypath = owner->buffer()->filePath(); // If directory is writeable, use this as default. if (IsDirWriteable(trypath)) initpath = trypath; @@ -1640,9 +1657,9 @@ void LyXFunc::menuNew(bool fromTemplate) if (lyxrc.new_ask_filename) { FileDialog fileDlg(owner, _("Enter filename for new document"), LFUN_SELECT_FILE_SYNC, - make_pair(string(_("Documents")), + make_pair(string(_("Documents|#o#O")), string(lyxrc.document_path)), - make_pair(string(_("Templates")), + make_pair(string(_("Templates|#T#t")), string(lyxrc.template_path))); FileDialog::Result result = @@ -1724,9 +1741,9 @@ void LyXFunc::menuNew(bool fromTemplate) if (fromTemplate) { FileDialog fileDlg(owner, _("Select template file"), LFUN_SELECT_FILE_SYNC, - make_pair(string(_("Documents")), + make_pair(string(_("Documents|#o#O")), string(lyxrc.document_path)), - make_pair(string(_("Templates")), + make_pair(string(_("Templates|#T#t")), string(lyxrc.template_path))); FileDialog::Result result = @@ -1754,7 +1771,7 @@ void LyXFunc::open(string const & fname) string initpath = lyxrc.document_path; if (owner->view()->available()) { - string const trypath = owner->buffer()->filepath; + string const trypath = owner->buffer()->filePath(); // If directory is writeable, use this as default. if (IsDirWriteable(trypath)) initpath = trypath; @@ -1765,9 +1782,9 @@ void LyXFunc::open(string const & fname) if (fname.empty()) { FileDialog fileDlg(owner, _("Select document to open"), LFUN_FILE_OPEN, - make_pair(string(_("Documents")), + make_pair(string(_("Documents|#o#O")), string(lyxrc.document_path)), - make_pair(string(_("Examples")), + make_pair(string(_("Examples|#E#e")), string(AddPath(system_lyxdir, "examples")))); FileDialog::Result result = @@ -1831,7 +1848,7 @@ void LyXFunc::doImport(string const & argument) string initpath = lyxrc.document_path; if (owner->view()->available()) { - string const trypath = owner->buffer()->filepath; + string const trypath = owner->buffer()->filePath(); // If directory is writeable, use this as default. if (IsDirWriteable(trypath)) initpath = trypath; @@ -1842,9 +1859,9 @@ void LyXFunc::doImport(string const & argument) FileDialog fileDlg(owner, text, LFUN_IMPORT, - make_pair(string(_("Documents")), + make_pair(string(_("Documents|#o#O")), string(lyxrc.document_path)), - make_pair(string(_("Examples")), + make_pair(string(_("Examples|#E#e")), string(AddPath(system_lyxdir, "examples")))); string const extension = "*." + formats.extension(format) @@ -1944,12 +1961,18 @@ void LyXFunc::setErrorMessage(string const & m) const } -void LyXFunc::setMessage(string const & m) +void LyXFunc::setMessage(string const & m) const { dispatch_buffer = m; } +void LyXFunc::setStatusMessage(string const & m) const +{ + status_buffer = m; +} + + void LyXFunc::initMiniBuffer() { string text = _("Welcome to LyX!");