X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=31d3f28c0328e8b8ee3cd1a8cdab7ee64b5446df;hb=3df345c9383480f68fad51feae8b9c64425c8729;hp=0af4ce33cde93db8219615902e88df926041285c;hpb=b4f44f8c47360b82870aedfa33a970c4d6b34df1;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 0af4ce33cd..31d3f28c03 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -42,8 +42,10 @@ #include "insets/insetinclude.h" #include "insets/insetbib.h" #include "insets/insettext.h" +//#include "insets/insetnumber.h" #include "insets/insetert.h" #include "insets/insetgraphics.h" +#include "insets/insetfoot.h" #include "mathed/formulamacro.h" #include "toolbar.h" #include "spellchecker.h" // RVDK_PATCH_5 @@ -67,10 +69,14 @@ #include "layout.h" #include "WorkArea.h" #include "lyxfr1.h" +#include "menus.h" + +using std::pair; +using std::endl; extern bool cursor_follows_scrollbar; -extern void InsertAsciiFile(string const &, bool); +extern void InsertAsciiFile(BufferView *, string const &, bool); extern void math_insert_symbol(char const *); extern Bool math_insert_greek(char const); // why "Bool"? extern BufferList bufferlist; @@ -194,13 +200,17 @@ int LyXFunc::processKeyEvent(XEvent * ev) } // this function should be used always [asierra060396] - if (owner->view()->available() && - owner->view()->the_locking_inset && - keysym_return == XK_Escape) { - owner->view()->unlockInset(owner->view()->the_locking_inset); - owner->view()->text->CursorRight(); - moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState()); + UpdatableInset * tli = owner->view()->the_locking_inset; + if (owner->view()->available() && tli && (keysym_return==XK_Escape)) { + if (tli == tli->GetLockingInset()) { + owner->view()->unlockInset(tli); + owner->view()->text->CursorRight(); + moveCursorUpdate(false); + owner->getMiniBuffer()->Set(CurrentState()); + } else { + tli->UnlockInsetInInset(owner->view(), + tli->GetLockingInset()); + } return 0; } @@ -333,34 +343,40 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const // 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"; + static bool noLaTeX = lyxrc.latex_command == "none"; bool disable = false; switch (action) { case LFUN_PREVIEW: - disable = noLaTeX || lyxrc->view_dvi_command == "none"; + disable = noLaTeX || lyxrc.view_dvi_command == "none"; break; case LFUN_PREVIEWPS: - disable = noLaTeX || lyxrc->view_ps_command == "none"; + disable = noLaTeX || lyxrc.view_ps_command == "none"; break; case LFUN_RUNLATEX: case LFUN_RUNDVIPS: disable = noLaTeX; break; case LFUN_MENUPRINT: - disable = noLaTeX || lyxrc->print_command == "none"; + disable = noLaTeX || lyxrc.print_command == "none"; break; case LFUN_FAX: - disable = noLaTeX || lyxrc->fax_command == "none"; + disable = noLaTeX || lyxrc.fax_command == "none"; break; case LFUN_IMPORT: if (argument == "latex") - disable = lyxrc->relyx_command == "none"; + disable = lyxrc.relyx_command == "none"; + if (argument == "linuxdoc") + disable = lyxrc.linuxdoc_to_lyx_command == "none"; break; case LFUN_EXPORT: if (argument == "dvi" || argument == "postscript") disable = noLaTeX; if (argument == "html") - disable = lyxrc->html_command == "none"; + 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"; break; case LFUN_UNDO: disable = buf->undostack.empty(); @@ -369,10 +385,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const disable = buf->redostack.empty(); break; case LFUN_SPELLCHECK: - disable = lyxrc->isp_command == "none"; + disable = lyxrc.isp_command == "none"; break; case LFUN_RUNCHKTEX: - disable = lyxrc->chktex_command == "none"; + disable = lyxrc.chktex_command == "none"; break; case LFUN_LAYOUT_TABLE: disable = ! owner->view()->text->cursor.par->table; @@ -403,10 +419,6 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const if (font.latex() == LyXFont::ON) box = LyXFunc::ToggleOn; break; - case LFUN_RTL: - if (font.direction() == LyXFont::RTL_DIR) - box = LyXFunc::ToggleOn; - break; default: box = LyXFunc::OK; break; @@ -462,7 +474,7 @@ string LyXFunc::Dispatch(int ac, commandshortcut.clear(); - if (lyxrc->display_shortcuts && show_sc) { + if (lyxrc.display_shortcuts && show_sc) { if (action != LFUN_SELFINSERT) { // Put name of command and list of shortcuts // for it in minibuffer @@ -527,10 +539,15 @@ string LyXFunc::Dispatch(int ac, inset->GetCursorPos(slx, sly); owner->view()->unlockInset(inset); owner->view()->menuUndo(); - inset = static_cast( - owner->view()->text->cursor.par-> - GetInset(owner->view()->text-> - cursor.pos)); + if (owner->view()->text->cursor.par-> + IsInset(owner->view()->text->cursor.pos)) { + inset = static_cast( + owner->view()->text->cursor.par-> + GetInset(owner->view()->text-> + cursor.pos)); + } else { + inset = 0; + } if (inset) inset->Edit(owner->view(),slx,sly,0); return string(); @@ -555,26 +572,33 @@ string LyXFunc::Dispatch(int ac, return string(); else { setMessage(N_("Text mode")); - LyXDirection direction = owner->view()->text-> - cursor.par->getParDirection(); - if ((action == -1) || - ((action == LFUN_RIGHT) && - (direction == LYX_DIR_LEFT_TO_RIGHT))) { - owner->view()->text->CursorRight(); - moveCursorUpdate(false); - owner->getMiniBuffer()-> - Set(CurrentState()); - } - if ((action == LFUN_LEFT) && - (direction == LYX_DIR_RIGHT_TO_LEFT)) { + switch(action) { + case LFUN_UNKNOWN_ACTION: + case LFUN_BREAKPARAGRAPH: + case LFUN_BREAKLINE: owner->view()->text->CursorRight(); - moveCursorUpdate(false); - owner->getMiniBuffer()-> - Set(CurrentState()); - } - if ((action == LFUN_LEFT) || - (action == LFUN_RIGHT)) + owner->view()->setState(); + owner->getMiniBuffer()->Set(CurrentState()); + break; + case LFUN_RIGHT: + if (!owner->view()->text->cursor.par->isRightToLeftPar()) { + owner->view()->text->CursorRight(); + moveCursorUpdate(false); + owner->getMiniBuffer()-> + Set(CurrentState()); + } return string(); + case LFUN_LEFT: + if (owner->view()->text->cursor.par->isRightToLeftPar()) { + owner->view()->text->CursorRight(); + moveCursorUpdate(false); + owner->getMiniBuffer()-> + Set(CurrentState()); + } + return string(); + default: + break; + } } } } @@ -772,6 +796,8 @@ string LyXFunc::Dispatch(int ac, // noweb } else if (imtyp == "noweb") { doImportLaTeX(true); + } else if (imtyp == "linuxdoc") { + doImportLinuxDoc(); } else { setErrorMessage(string(N_("Unknown import type: ")) + imtyp); @@ -869,6 +895,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_PASTE: owner->view()->paste(); + owner->view()->setState(); break; case LFUN_PASTESELECTION: @@ -893,6 +920,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_LAYOUT_PASTE: owner->view()->pasteEnvironment(); + owner->view()->setState(); break; case LFUN_GOTOERROR: @@ -1045,7 +1073,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_FILE_INSERT_ASCII: { bool asPara = (argument == "paragraph"); - InsertAsciiFile(string(), asPara); + InsertAsciiFile(owner->view(), string(), asPara); } break; @@ -1081,7 +1109,7 @@ string LyXFunc::Dispatch(int ac, // Pretend we got the name instead. Dispatch(int(LFUN_LAYOUT), textclasslist.NameOfLayout(owner->view()-> - text->parameters-> + text->bparams-> textclass, sel).c_str()); return string(); @@ -1095,7 +1123,7 @@ string LyXFunc::Dispatch(int ac, // Derive layout number from given argument (string) // and current buffer's textclass (number). */ LyXTextClassList::ClassList::size_type tclass = - owner->view()->text->parameters->textclass; + owner->view()->text->bparams->textclass; pair layout = textclasslist.NumberOfLayout(tclass, argument); @@ -1126,6 +1154,7 @@ string LyXFunc::Dispatch(int ac, text->cursor.par-> GetLayout() + 1); owner->view()->update(1); + owner->view()->setState(); } } break; @@ -1170,9 +1199,9 @@ string LyXFunc::Dispatch(int ac, owner->getToolbar()->combox->Show(); break; - case LFUN_RTL: + case LFUN_LANGUAGE: { - RTLCB(); + LangCB(argument); owner->view()->setState(); owner->getMiniBuffer()->Set(CurrentState()); } @@ -1180,38 +1209,47 @@ string LyXFunc::Dispatch(int ac, case LFUN_EMPH: Emph(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_BOLD: Bold(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_NOUN: Noun(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_CODE: Code(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_SANS: Sans(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_ROMAN: Roman(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_DEFAULT: StyleReset(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_UNDERLINE: Underline(); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_FONT_SIZE: FontSize(argument); + owner->getMiniBuffer()->Set(CurrentState()); break; case LFUN_FONT_STATE: @@ -1294,7 +1332,7 @@ string LyXFunc::Dispatch(int ac, break; // RVDK_PATCH_5 case LFUN_SPELLCHECK: - if (lyxrc->isp_command != "none") + if (lyxrc.isp_command != "none") ShowSpellChecker(owner->view()); break; // RVDK_PATCH_5 @@ -1302,24 +1340,23 @@ string LyXFunc::Dispatch(int ac, case LFUN_RIGHT: { LyXText * tmptext = owner->view()->text; - LyXDirection direction = - tmptext->cursor.par->getParDirection(); + bool is_rtl = tmptext->cursor.par->isRightToLeftPar(); if(!tmptext->mark_set) owner->view()->beforeChange(); owner->view()->update(-2); - if (direction == LYX_DIR_RIGHT_TO_LEFT) + if (is_rtl) tmptext->CursorLeft(); if (tmptext->cursor.pos < tmptext->cursor.par->Last() && tmptext->cursor.par->GetChar(tmptext->cursor.pos) == LyXParagraph::META_INSET && tmptext->cursor.par->GetInset(tmptext->cursor.pos) - && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable() == 2){ + && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE){ Inset * tmpinset = tmptext->cursor.par->GetInset(tmptext->cursor.pos); setMessage(tmpinset->EditMessage()); tmpinset->Edit(owner->view(), 0, 0, 0); break; } - if (direction == LYX_DIR_LEFT_TO_RIGHT) + if (!is_rtl) tmptext->CursorRight(); owner->view()->text->FinishUndo(); moveCursorUpdate(false); @@ -1332,16 +1369,16 @@ string LyXFunc::Dispatch(int ac, // This is soooo ugly. Isn`t it possible to make // it simpler? (Lgb) LyXText * txt = owner->view()->text; - LyXDirection direction = txt->cursor.par->getParDirection(); + bool is_rtl = txt->cursor.par->isRightToLeftPar(); if(!txt->mark_set) owner->view()->beforeChange(); owner->view()->update(-2); - if (direction == LYX_DIR_LEFT_TO_RIGHT) + if (!is_rtl) txt->CursorLeft(); if (txt->cursor.pos < txt->cursor.par->Last() && txt->cursor.par->GetChar(txt->cursor.pos) == LyXParagraph::META_INSET && txt->cursor.par->GetInset(txt->cursor.pos) - && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == 2) { + && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE) { Inset * tmpinset = txt->cursor.par->GetInset(txt->cursor.pos); setMessage(tmpinset->EditMessage()); tmpinset->Edit(owner->view(), @@ -1351,7 +1388,7 @@ string LyXFunc::Dispatch(int ac, 0, 0); break; } - if (direction == LYX_DIR_RIGHT_TO_LEFT) + if (is_rtl) txt->CursorRight(); owner->view()->text->FinishUndo(); @@ -1453,11 +1490,10 @@ string LyXFunc::Dispatch(int ac, if(!owner->view()->text->mark_set) owner->view()->beforeChange(); owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorRightOneWord(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorLeftOneWord(); + else + owner->view()->text->CursorRightOneWord(); owner->view()->text->FinishUndo(); moveCursorUpdate(false); owner->getMiniBuffer()->Set(CurrentState()); @@ -1467,11 +1503,10 @@ string LyXFunc::Dispatch(int ac, if(!owner->view()->text->mark_set) owner->view()->beforeChange(); owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorLeftOneWord(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorRightOneWord(); + else + owner->view()->text->CursorLeftOneWord(); owner->view()->text->FinishUndo(); moveCursorUpdate(false); owner->getMiniBuffer()->Set(CurrentState()); @@ -1501,11 +1536,10 @@ string LyXFunc::Dispatch(int ac, /* cursor selection ---------------------------- */ case LFUN_RIGHTSEL: owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorRight(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorLeft(); + else + owner->view()->text->CursorRight(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); owner->getMiniBuffer()->Set(CurrentState()); @@ -1513,11 +1547,10 @@ string LyXFunc::Dispatch(int ac, case LFUN_LEFTSEL: owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorLeft(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorRight(); + else + owner->view()->text->CursorLeft(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); owner->getMiniBuffer()->Set(CurrentState()); @@ -1589,11 +1622,10 @@ string LyXFunc::Dispatch(int ac, case LFUN_WORDRIGHTSEL: owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorRightOneWord(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorLeftOneWord(); + else + owner->view()->text->CursorRightOneWord(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); owner->getMiniBuffer()->Set(CurrentState()); @@ -1601,11 +1633,10 @@ string LyXFunc::Dispatch(int ac, case LFUN_WORDLEFTSEL: owner->view()->update(-2); - if (owner->view()->text->cursor.par->getParDirection() - == LYX_DIR_LEFT_TO_RIGHT) - owner->view()->text->CursorLeftOneWord(); - else + if (owner->view()->text->cursor.par->isRightToLeftPar()) owner->view()->text->CursorRightOneWord(); + else + owner->view()->text->CursorLeftOneWord(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); owner->getMiniBuffer()->Set(CurrentState()); @@ -1642,7 +1673,19 @@ string LyXFunc::Dispatch(int ac, case LFUN_PROTECTEDSPACE: #if 1 - owner->view()->protectedBlank(); + { + LyXLayout const & style = + textclasslist.Style(owner->view()->buffer()->params.textclass, + owner->view()->text->cursor.par->GetLayout()); + + if (style.free_spacing) { + owner->view()->text->InsertChar(' '); + owner->view()->update(-1); + } else { + owner->view()->protectedBlank(); + } + moveCursorUpdate(false); + } #else owner->view()->beforeChange(); owner->view()->text-> @@ -1923,6 +1966,15 @@ string LyXFunc::Dispatch(int ac, new_inset->Edit(owner->view(), 0, 0, 0); } break; +#if 0 + case LFUN_INSET_NUMBER: + { + InsetNumber * new_inset = new InsetNumber(owner->buffer()); + owner->view()->insertInset(new_inset); + new_inset->Edit(owner->view(), 0, 0, 0); + } + break; +#endif case LFUN_INSET_ERT: { InsetERT * new_inset = new InsetERT(owner->buffer()); @@ -1930,6 +1982,13 @@ string LyXFunc::Dispatch(int ac, new_inset->Edit(owner->view(), 0, 0, 0); } break; + case LFUN_INSET_FOOTNOTE: + { + InsetFoot * new_inset = new InsetFoot(owner->buffer()); + owner->view()->insertInset(new_inset); + new_inset->Edit(owner->view(), 0, 0, 0); + } + break; // --- lyxserver commands ---------------------------- @@ -1938,8 +1997,11 @@ string LyXFunc::Dispatch(int ac, LyXParagraph::size_type pos = owner->view()->text->cursor.pos; if(pos < owner->view()->text->cursor.par->size()) - dispatch_buffer = owner->view()->text-> - cursor.par->text[pos]; + //dispatch_buffer = owner->view()->text-> + // cursor.par->text[pos]; + dispatch_buffer = + owner->view()->text-> + cursor.par->GetChar(pos); else dispatch_buffer = "EOF"; } @@ -2460,7 +2522,7 @@ string LyXFunc::Dispatch(int ac, if (!argument.empty()) arg = argument; else if (arg.empty()) - arg = lyxrc->date_insert_format; + arg = lyxrc.date_insert_format; datetmp_len = (int) strftime(datetmp, 32, arg.c_str(), now_tm); for (int i = 0; i < datetmp_len; i++) { owner->view()->text->InsertChar(datetmp[i]); @@ -2475,7 +2537,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_SAVEPREFERENCES: { Path p(user_lyxdir); - lyxrc->write("preferences"); + lyxrc.write("preferences"); } break; @@ -2501,7 +2563,7 @@ string LyXFunc::Dispatch(int ac, * "auto_region_delete", which defaults to * true (on). */ - if ( lyxrc->auto_region_delete ) { + if ( lyxrc.auto_region_delete ) { if (owner->view()->text->selection){ owner->view()->text->CutSelection(false); owner->view()->update(-1); @@ -2509,6 +2571,21 @@ string LyXFunc::Dispatch(int ac, } owner->view()->beforeChange(); + +#if 0 + if (isdigit(argument[0]) && + (lyxrc.number_inset == "true" || + (lyxrc.number_inset == "rtl" && + owner->view()->text->real_current_font.isVisibleRightToLeft() + ))) { + UpdatableInset * tmpinset = new InsetNumber(owner->buffer()); + owner->view()->open_new_inset(tmpinset); + tmpinset->LocalDispatch(owner->view(), action, + argument); + return string(); + } +#endif + for (string::size_type i = 0; i < argument.length(); ++i) { if (greek_kb_flag) { @@ -2569,7 +2646,7 @@ void LyXFunc::setupLocalKeymap() void LyXFunc::MenuNew(bool fromTemplate) { - string fname, initpath = lyxrc->document_path; + string fname, initpath = lyxrc.document_path; LyXFileDlg fileDlg; if (owner->view()->available()) { @@ -2580,8 +2657,8 @@ void LyXFunc::MenuNew(bool fromTemplate) } ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); - fileDlg.SetButton(1, _("Templates"), lyxrc->template_path); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); + fileDlg.SetButton(1, _("Templates"), lyxrc.template_path); fname = fileDlg.Select(_("Enter Filename for new document"), initpath, "*.lyx", _("newfile")); AllowInput(); @@ -2644,7 +2721,7 @@ void LyXFunc::MenuNew(bool fromTemplate) if (fromTemplate) { ProhibitInput(); fname = fileDlg.Select(_("Choose template"), - lyxrc->template_path, + lyxrc.template_path, "*.lyx"); templname = fname; AllowInput(); @@ -2658,7 +2735,7 @@ void LyXFunc::MenuNew(bool fromTemplate) void LyXFunc::MenuOpen() { - string initpath = lyxrc->document_path; + string initpath = lyxrc.document_path; LyXFileDlg fileDlg; if (owner->view()->available()) { @@ -2670,7 +2747,7 @@ void LyXFunc::MenuOpen() // launches dialog ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); fileDlg.SetButton(1, _("Examples"), AddPath(system_lyxdir, "examples")); string filename = fileDlg.Select(_("Select Document to Open"), @@ -2707,7 +2784,7 @@ void LyXFunc::MenuOpen() void LyXFunc::doImportASCII(bool linorpar) { - string initpath = lyxrc->document_path; + string initpath = lyxrc.document_path; LyXFileDlg fileDlg; if (owner->view()->available()) { @@ -2719,7 +2796,7 @@ void LyXFunc::doImportASCII(bool linorpar) // launches dialog ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); fileDlg.SetButton(1, _("Examples"), AddPath(system_lyxdir, "examples")); string filename = fileDlg.Select(_("Select ASCII file to Import"), @@ -2771,7 +2848,7 @@ void LyXFunc::doImportASCII(bool linorpar) owner->getMiniBuffer()->Set(_("Importing ASCII file"), MakeDisplayPath(filename), "..."); // Insert ASCII file - InsertAsciiFile(filename, linorpar); + InsertAsciiFile(owner->view(), filename, linorpar); owner->getMiniBuffer()->Set(_("ASCII file "), MakeDisplayPath(filename), _("imported.")); @@ -2780,7 +2857,7 @@ void LyXFunc::doImportASCII(bool linorpar) void LyXFunc::doImportLaTeX(bool isnoweb) { - string initpath = lyxrc->document_path; + string initpath = lyxrc.document_path; LyXFileDlg fileDlg; if (owner->view()->available()) { @@ -2792,7 +2869,7 @@ void LyXFunc::doImportLaTeX(bool isnoweb) // launches dialog ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); fileDlg.SetButton(1, _("Examples"), AddPath(system_lyxdir, "examples")); string filename; @@ -2875,13 +2952,102 @@ void LyXFunc::doImportLaTeX(bool isnoweb) } +void LyXFunc::doImportLinuxDoc() +{ + string initpath = lyxrc.document_path; + LyXFileDlg fileDlg; + + if (owner->view()->available()) { + string trypath = owner->buffer()->filepath; + // If directory is writeable, use this as default. + if (IsDirWriteable(trypath) == 1) + initpath = trypath; + } + + // launches dialog + ProhibitInput(); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); + fileDlg.SetButton(1, _("Examples"), + AddPath(system_lyxdir, "examples")); + + string filename = fileDlg.Select(_("Select LinuxDoc file to Import"), + initpath, "*.sgml"); + + AllowInput(); + + // check selected filename + if (filename.empty()) { + owner->getMiniBuffer()->Set(_("Canceled.")); + return; + } + + // get absolute path of file + filename = MakeAbsPath(filename); + + // Check if the document already is open + string LyXfilename = ChangeExtension(filename, ".lyx", false); + if (bufferlist.exists(LyXfilename)){ + switch(AskConfirmation(_("Document is already open:"), + MakeDisplayPath(LyXfilename, 50), + _("Do you want to close that document now?\n" + "('No' will just switch to the open version)"))) + { + case 1: // Yes: close the document + if (!bufferlist.close(bufferlist.getBuffer(LyXfilename))) + // If close is canceled, we cancel here too. + return; + break; + case 2: // No: switch to the open document + owner->view()->buffer( + bufferlist.getBuffer(LyXfilename)); + return; + case 3: // Cancel: Do nothing + owner->getMiniBuffer()->Set(_("Canceled.")); + return; + } + } + + // Check if a LyX document by the same root exists in filesystem + FileInfo f(LyXfilename, true); + if (f.exist() && !AskQuestion(_("A document by the name"), + MakeDisplayPath(LyXfilename), + _("already exists. Overwrite?"))) { + owner->getMiniBuffer()->Set(_("Canceled.")); + return; + } + + // loads document + owner->getMiniBuffer()->Set(_("Importing LinuxDoc file"), + MakeDisplayPath(filename), "..."); + + // run sgml2lyx + string tmp = lyxrc.linuxdoc_to_lyx_command + filename; + Systemcalls one; + Buffer * buf = 0; + + int result = one.startscript(Systemcalls::System, tmp); + if (result == 0) { + string filename = ChangeExtension(filename, ".lyx", false); + // File was generated without problems. Load it. + buf = bufferlist.loadLyXFile(filename); + owner->view()->buffer(buf); + owner->getMiniBuffer()->Set(_("LinuxDoc file "), + MakeDisplayPath(filename), + _("imported.")); + } else { + owner->getMiniBuffer()->Set(_("Could not import LinuxDoc file"), + MakeDisplayPath(filename)); + } +} + + void LyXFunc::MenuInsertLyXFile(string const & filen) { string filename = filen; if (filename.empty()) { // Launch a file browser - string initpath = lyxrc->document_path; + string initpath = lyxrc.document_path; LyXFileDlg fileDlg; if (owner->view()->available()) { @@ -2893,7 +3059,7 @@ void LyXFunc::MenuInsertLyXFile(string const & filen) // launches dialog ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); fileDlg.SetButton(1, _("Examples"), AddPath(system_lyxdir, "examples")); filename = fileDlg.Select(_("Select Document to Insert"),