X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=0b944b6d01e9ddd0f23664abf2d5ef46339aba04;hb=c7b495326ef46ac677b34741ece4d620c6bab78f;hp=48eeb992926cddeabebc11ad45a06585e67ed460;hpb=8cb2e519b3975cc643f2c93706137cf2e6a4f4d8;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 48eeb99292..0b944b6d01 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -1,142 +1,73 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich, - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include -#include -#include -#include - -#include FORMS_H_LOCATION -#include "lyx.h" -#include "lyx_main.h" #include "lyx_cb.h" -#include "insets/insetlabel.h" -#include "insets/figinset.h" -#include "lyxfunc.h" -#include "minibuffer.h" -#include "combox.h" +#include "lyx_main.h" +#include "buffer.h" #include "bufferlist.h" -#include "frontends/FileDialog.h" -#include "lyx_gui_misc.h" -#include "LyXView.h" -#include "lastfiles.h" #include "bufferview_funcs.h" +#include "debug.h" +#include "lastfiles.h" +#include "lyxrc.h" +#include "lyxtext.h" +#include "gettext.h" +#include "BufferView.h" + +#include "insets/insetlabel.h" + +#include "frontends/lyx_gui.h" +#include "frontends/LyXView.h" +#include "frontends/Alert.h" +#include "frontends/FileDialog.h" + #include "support/FileInfo.h" -#include "support/syscall.h" #include "support/filetools.h" +#include "support/forkedcall.h" #include "support/path.h" -#include "lyxrc.h" -#include "lyxtext.h" +#include "support/systemcall.h" +#include "support/lstrings.h" + +#include "support/BoostFormat.h" + +#include +#include +#include +#include +using std::vector; using std::ifstream; using std::copy; -using std::back_inserter; using std::endl; -using std::cout; using std::ios; +using std::back_inserter; using std::istream_iterator; using std::pair; using std::make_pair; -using std::vector; -using std::sort; -using std::equal; extern BufferList bufferlist; -extern void show_symbols_form(); -extern FD_form_figure * fd_form_figure; - -extern BufferView * current_view; // called too many times in this file... - -extern void DeleteSimpleCutBuffer(); /* for the cleanup when exiting */ - -extern void MenuSendto(); - // this should be static, but I need it in buffer.C bool quitting; // flag, that we are quitting the program -extern bool finished; // all cleanup done just let it run through now. - -char ascii_type; /* for selection notify callbacks */ - -bool scrolling = false; - -/* - This is the inset locking stuff needed for mathed -------------------- - - an inset can simple call LockInset in it's edit call and *ONLY* in it's - edit call. - Inset::Edit() can only be called by the main lyx module. - - Then the inset may modify the menu's and/or iconbars. - - Unlocking is either done by LyX or the inset itself with a UnlockInset-call - - During the lock, all button and keyboard events will be modified - and send to the inset through the following inset-features. Note that - Inset::InsetUnlock will be called from inside UnlockInset. It is meant - to contain the code for restoring the menus and things like this. - - - virtual void InsetButtonPress(int x, int y, int button); - virtual void InsetButtonRelease(int x, int y, int button); - virtual void InsetKeyPress(XKeyEvent *ev); - virtual void InsetMotionNotify(int x, int y, int state); - virtual void InsetUnlock(); - - If a inset wishes any redraw and/or update it just has to call - UpdateInset(this). - It's is completly irrelevant, where the inset is. UpdateInset will - find it in any paragraph in any buffer. - Of course the_locking_inset and the insets in the current paragraph/buffer - are checked first, so no performance problem should occur. - - Hope that's ok for the beginning, Alejandro, - sorry that I needed so much time, - - Matthias - */ - -//void UpdateInset(BufferView * bv, Inset * inset, bool mark_dirty = true); - -/* these functions return 1 if an error occured, - otherwise 0 */ -// Now they work only for updatable insets. [Alejandro 080596] -//int LockInset(UpdatableInset * inset); -void ToggleLockedInsetCursor(int x, int y, int asc, int desc); -//void FitLockedInsetCursor(long x, long y, int asc, int desc); -//int UnlockInset(UpdatableInset * inset); -//void LockedInsetStoreUndo(Undo::undo_kind kind); - -/* this is for asyncron updating. UpdateInsetUpdateList will be called - automatically from LyX. Just insert the Inset into the Updatelist */ -//void UpdateInsetUpdateList(); -//void PutInsetIntoInsetUpdateList(Inset * inset); - -//InsetUpdateStruct * InsetUpdateList = 0; - - -/* - ----------------------------------------------------------------------- - */ void ShowMessage(Buffer const * buf, string const & msg1, string const & msg2, - string const & msg3, int delay) + string const & msg3) { - if (lyxrc.use_gui) - buf->getUser()->owner()->getMiniBuffer()->Set(msg1, msg2, - msg3, delay); - else + if (lyx_gui::use_gui + && buf && buf->getUser() && buf->getUser()->owner()) { + string const str = msg1 + ' ' + msg2 + ' ' + msg3; + buf->getUser()->owner()->message(str); + } else lyxerr << msg1 << msg2 << msg3 << endl; } @@ -145,49 +76,56 @@ void ShowMessage(Buffer const * buf, // Menu callbacks // -// -// File menu -// -// should be moved to lyxfunc.C bool MenuWrite(BufferView * bv, Buffer * buffer) { - // FIXME: needed ? - XFlush(fl_get_display()); - - if (!buffer->save()) { - string const fname = buffer->fileName(); - string const s = MakeAbsPath(fname); - if (AskQuestion(_("Save failed. Rename and try again?"), - MakeDisplayPath(s, 50), - _("(If not, document is not saved.)"))) { - return WriteAs(bv, buffer); - } - return false; - } else + if (buffer->save()) { lastfiles->newFile(buffer->fileName()); - return true; + return true; + } + + // FIXME: we don't tell the user *WHY* the save failed !! + + string const file = MakeDisplayPath(buffer->fileName(), 30); + +#if USE_BOOST_FORMAT + boost::format fmt(_("The document %1$s could not be saved.\n\nDo you want to rename the document and try again?")); + fmt % file; + string text = fmt.str(); +#else + string text = _("The document "); + text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?"); +#endif + int const ret = Alert::prompt(_("Rename and save?"), + text, 0, 1, _("&Rename"), _("&Cancel")); + + if (ret == 0) + return WriteAs(bv, buffer); + return false; } -// should be moved to BufferView.C -// Half of this func should be in LyXView, the rest in BufferView. bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) { string fname = buffer->fileName(); - string oldname = fname; + string const oldname = fname; if (filename.empty()) { - FileDialog fileDlg(bv->owner(), _("Choose a filename to save document as"), + FileDialog fileDlg(_("Choose a filename to save document as"), LFUN_WRITEAS, - make_pair(string(_("Documents")), string(lyxrc.document_path)), - make_pair(string(_("Templates")), string(lyxrc.template_path))); + make_pair(string(_("Documents|#o#O")), + string(lyxrc.document_path)), + make_pair(string(_("Templates|#T#t")), + string(lyxrc.template_path))); if (!IsLyXFilename(fname)) fname += ".lyx"; - FileDialog::Result result = fileDlg.Select(OnlyPath(fname), _("*.lyx|LyX Documents (*.lyx)"), OnlyFilename(fname)); + FileDialog::Result result = + fileDlg.save(OnlyPath(fname), + _("*.lyx| LyX Documents (*.lyx)"), + OnlyFilename(fname)); if (result.first == FileDialog::Later) return false; @@ -204,37 +142,22 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) } else fname = filename; + FileInfo const myfile(fname); + if (myfile.isOK()) { + string const file = MakeDisplayPath(fname, 30); - // Same name as we have already? - if (!buffer->isUnnamed() && fname == oldname) { - if (!AskQuestion(_("Same name as document already has:"), - MakeDisplayPath(fname, 50), - _("Save anyway?"))) - return false; - // Falls through to name change and save - } - // No, but do we have another file with this name open? - else if (!buffer->isUnnamed() && bufferlist.exists(fname)) { - if (AskQuestion(_("Another document with same name open!"), - MakeDisplayPath(fname, 50), - _("Replace with current document?"))) - { - bufferlist.close(bufferlist.getBuffer(fname)); - - // Ok, change the name of the buffer, but don't save! - buffer->setFileName(fname); - buffer->markDirty(); - - ShowMessage(buffer, _("Document renamed to '"), - MakeDisplayPath(fname), _("', but not saved...")); - } - return false; - } // Check whether the file exists - else { - FileInfo const myfile(fname); - if (myfile.isOK() && !AskQuestion(_("Document already exists:"), - MakeDisplayPath(fname, 50), - _("Replace file?"))) +#if USE_BOOST_FORMAT + boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?")); + fmt % file; + string text = fmt.str(); +#else + string text = _("The document "); + text += file + _(" already exists.\n\nDo you want to over-write that document?"); +#endif + int const ret = Alert::prompt(_("Over-write document?"), + text, 0, 1, _("&Over-write"), _("&Cancel")); + + if (ret == 1) return false; } @@ -245,55 +168,22 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) buffer->setUnnamed(false); if (!MenuWrite(bv, buffer)) { - buffer->setFileName(oldname); - buffer->setUnnamed(unnamed); - ShowMessage(buffer, _("Document could not be saved!"), - _("Holding the old name."), MakeDisplayPath(oldname)); - return false; + buffer->setFileName(oldname); + buffer->setUnnamed(unnamed); + return false; } - // now remove the oldname autosave file if existant! + removeAutosaveFile(oldname); return true; } -int MenuRunChktex(Buffer * buffer) -{ - int ret; - - if (buffer->isSGML()) { - WriteAlert(_("Chktex does not work with SGML derived documents.")); - return 0; - } else - ret = buffer->runChktex(); - - if (ret >= 0) { - string s; - string t; - if (ret == 0) { - s = _("No warnings found."); - } else if (ret == 1) { - s = _("One warning found."); - t = _("Use 'Edit->Go to Error' to find it."); - } else { - s += tostr(ret); - s += _(" warnings found."); - t = _("Use 'Edit->Go to Error' to find them."); - } - WriteAlert(_("Chktex run successfully"), s, t); - } else { - WriteAlert(_("Error!"), _("It seems chktex does not work.")); - } - return ret; -} - - void QuitLyX() { - lyxerr.debug() << "Running QuitLyX." << endl; + lyxerr[Debug::INFO] << "Running QuitLyX." << endl; - if (lyxrc.use_gui) { - if (!bufferlist.QwriteAll()) + if (lyx_gui::use_gui) { + if (!bufferlist.quitWriteAll()) return; lastfiles->writeFile(lyxrc.lastfiles); @@ -307,36 +197,58 @@ void QuitLyX() bufferlist.closeAll(); // do any other cleanup procedures now - lyxerr.debug() << "Deleting tmp dir " << system_tempdir << endl; + lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl; - DestroyLyXTmpDir(system_tempdir); + if (destroyDir(system_tempdir) != 0) { +#if USE_BOOST_FORMAT + boost::format fmt = _("Could not remove the temporary directory %1$s"); + fmt % system_tempdir; + string msg = fmt.str(); +#else + string msg = _("Could not remove the temporary directory ") + system_tempdir; +#endif + Alert::warning(_("Could not remove temporary directory"), msg); + } - finished = true; + lyx_gui::exit(); } +namespace { -void AutoSave(BufferView * bv) - // should probably be moved into BufferList (Lgb) - // Perfect target for a thread... +class AutoSaveBuffer : public ForkedProcess { +public: + /// + AutoSaveBuffer(BufferView & bv, string const & fname) + : bv_(bv), fname_(fname) {} + /// + virtual ForkedProcess * clone() const { + return new AutoSaveBuffer(*this); + } + /// + int start(); +private: + /// + virtual int generateChild(); + /// + BufferView & bv_; + string fname_; +}; + + +int AutoSaveBuffer::start() { - if (!bv->available()) - return; +#if USE_BOOST_FORMAT + command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_); +#else + command_ = _("Auto-saving ") + fname_; +#endif + return runNonBlocking(); +} - if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) { - // We don't save now, but we'll try again later - bv->owner()->resetAutosaveTimer(); - return; - } - bv->owner()->getMiniBuffer()->Set(_("Autosaving current document...")); - - // create autosave filename - string fname = OnlyPath(bv->buffer()->fileName()); - fname += "#"; - fname += OnlyFilename(bv->buffer()->fileName()); - fname += "#"; - +int AutoSaveBuffer::generateChild() +{ // tmp_ret will be located (usually) in /tmp // will that be a problem? pid_t const pid = fork(); // If you want to debug the autosave @@ -347,12 +259,12 @@ void AutoSave(BufferView * bv) // to fork. But we will do the save // anyway. bool failed = false; - + string const tmp_ret = lyx::tempName(string(), "lyxauto"); if (!tmp_ret.empty()) { - bv->buffer()->writeFile(tmp_ret, 1); + bv_.buffer()->writeFile(tmp_ret); // assume successful write of tmp_ret - if (!lyx::rename(tmp_ret, fname)) { + if (!lyx::rename(tmp_ret, fname_)) { failed = true; // most likely couldn't move between filesystems // unless write of tmp_ret failed @@ -362,21 +274,50 @@ void AutoSave(BufferView * bv) } else { failed = true; } - + if (failed) { // failed to write/rename tmp_ret so try writing direct - if (!bv->buffer()->writeFile(fname, 1)) { + if (!bv_.buffer()->writeFile(fname_)) { // It is dangerous to do this in the child, // but safe in the parent, so... if (pid == -1) - bv->owner()->getMiniBuffer()->Set(_("Autosave Failed!")); + bv_.owner()->message(_("Autosave failed!")); } } if (pid == 0) { // we are the child so... _exit(0); } } - + return pid; +} + +} // namespace anon + + +void AutoSave(BufferView * bv) + // should probably be moved into BufferList (Lgb) + // Perfect target for a thread... +{ + if (!bv->available()) + return; + + if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) { + // We don't save now, but we'll try again later + bv->owner()->resetAutosaveTimer(); + return; + } + + bv->owner()->message(_("Autosaving current document...")); + + // create autosave filename + string fname = bv->buffer()->filePath(); + fname += '#'; + fname += OnlyFilename(bv->buffer()->fileName()); + fname += '#'; + + AutoSaveBuffer autosave(*bv, fname); + autosave.start(); + bv->buffer()->markBakClean(); bv->owner()->resetAutosaveTimer(); } @@ -389,7 +330,7 @@ void AutoSave(BufferView * bv) // create new file with template // SERVERCMD ! // -Buffer * NewLyxFile(string const & filename) +Buffer * NewFile(string const & filename) { // Split argument by : string name; @@ -403,11 +344,11 @@ Buffer * NewLyxFile(string const & filename) tmpname = split(tmpname, ':'); } #endif - lyxerr.debug() << "Arg is " << filename - << "\nName is " << name - << "\nTemplate is " << tmpname << endl; + lyxerr[Debug::INFO] << "Arg is " << filename + << "\nName is " << name + << "\nTemplate is " << tmpname << endl; - // find a free buffer + // find a free buffer Buffer * tmpbuf = bufferlist.newFile(name, tmpname); if (tmpbuf) lastfiles->newFile(tmpbuf->fileName()); @@ -418,39 +359,81 @@ Buffer * NewLyxFile(string const & filename) // Insert ascii file (if filename is empty, prompt for one) void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) { - string fname = f; + if (!bv->available()) + return; - if (!bv->available()) + string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph); + if (tmpstr.empty()) return; - + + // clear the selection + bool flag = (bv->text == bv->getLyXText()); + if (flag) + bv->beforeChange(bv->text); + if (!asParagraph) + bv->getLyXText()->insertStringAsLines(tmpstr); + else + bv->getLyXText()->insertStringAsParagraphs(tmpstr); + if (flag) + bv->update(BufferView::SELECT); +} + + +// Insert ascii file (if filename is empty, prompt for one) +string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph) +{ + string fname = f; + if (fname.empty()) { - FileDialog fileDlg(bv->owner(), _("Select file to insert"), + FileDialog fileDlg(_("Select file to insert"), (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII); - - FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filepath); + + FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath()); if (result.first == FileDialog::Later) - return; + return string(); fname = result.second; - if (fname.empty()) - return; + if (fname.empty()) + return string(); } FileInfo fi(fname); if (!fi.readable()) { - WriteFSAlert(_("Error! Specified file is unreadable: "), - MakeDisplayPath(fname, 50)); - return; + string const error = strerror(errno); + string const file = MakeDisplayPath(fname, 50); +#if USE_BOOST_FORMAT + boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s")); + fmt % file; + fmt % error; + string text = fmt.str(); +#else + string text = _("Could not read the specified document\n"); + text += file + _(" due to the error: "); + text += error; +#endif + Alert::error(_("Could not read file"), text); + return string(); } ifstream ifs(fname.c_str()); if (!ifs) { - WriteFSAlert(_("Error! Cannot open specified file: "), - MakeDisplayPath(fname, 50)); - return; + string const error = strerror(errno); + string const file = MakeDisplayPath(fname, 50); +#if USE_BOOST_FORMAT + boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s")); + fmt % file; + fmt % error; + string text = fmt.str(); +#else + string text = _("Could not open the specified document\n"); + text += file + _(" due to the error: "); + text += error; +#endif + Alert::error(_("Could not open file"), text); + return string(); } ifs.unsetf(ios::skipws); @@ -463,223 +446,54 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) string const tmpstr(tmp.begin(), tmp.end()); #else // This is what we want to use and what we will use once the - // compilers get good enough. + // compilers get good enough. //string tmpstr(ii, end); // yet a reason for using std::string // alternate approach to get the file into a string: string tmpstr; copy(ii, end, back_inserter(tmpstr)); #endif - // insert the string - bv->hideCursor(); - - // clear the selection - bv->beforeChange(bv->text); - if (!asParagraph) - bv->text->InsertStringA(bv, tmpstr); - else - bv->text->InsertStringB(bv, tmpstr); - bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); -} - - -void MenuInsertLabel(BufferView * bv, string const & arg) -{ - string label(arg); - ProhibitInput(bv); - if (label.empty()) { -#ifndef NEW_INSETS - LyXParagraph * par = - bv->text->cursor.par()->FirstPhysicalPar(); -#else - LyXParagraph * par = bv->text->cursor.par(); -#endif - LyXLayout const * layout = - &textclasslist.Style(bv->buffer()->params.textclass, - par->GetLayout()); - -#ifndef NEW_INSETS - if (layout->latextype == LATEX_PARAGRAPH && par->previous_) { - LyXParagraph * par2 = par->previous_->FirstPhysicalPar(); -#else - if (layout->latextype == LATEX_PARAGRAPH && par->previous()) { - LyXParagraph * par2 = par->previous(); -#endif - LyXLayout const * layout2 = - &textclasslist.Style(bv->buffer()->params.textclass, - par2->GetLayout()); - if (layout2->latextype != LATEX_PARAGRAPH) { - par = par2; - layout = layout2; - } - } - string text = layout->latexname().substr(0, 3); - if (layout->latexname() == "theorem") - text = "thm"; // Create a correct prefix for prettyref -#ifndef NEW_INSETS - if (par->footnoteflag==LyXParagraph::OPEN_FOOTNOTE) - switch (par->footnotekind) { - case LyXParagraph::FIG: - case LyXParagraph::WIDE_FIG: - text = "fig"; - break; - case LyXParagraph::TAB: - case LyXParagraph::WIDE_TAB: - text = "tab"; - break; - case LyXParagraph::ALGORITHM: - text = "alg"; - break; - case LyXParagraph::FOOTNOTE: - case LyXParagraph::MARGIN: - break; - } -#endif - text += ":"; - if (layout->latextype == LATEX_PARAGRAPH || - lyxrc.label_init_length < 0) - text.erase(); - string par_text = par->String(bv->buffer(), false); - for (int i = 0; i < lyxrc.label_init_length; ++i) { - if (par_text.empty()) - break; - string head; - par_text = split(par_text, head, ' '); - if (i > 0) - text += '-'; // Is it legal to use spaces in - // labels ? - text += head; - } - - pair result = - askForText(_("Enter new label to insert:"), text); - if (result.first) { - label = frontStrip(strip(result.second)); - } - } - if (!label.empty()) { - InsetCommandParams p( "label", label ); - InsetLabel * inset = new InsetLabel( p ); - bv->insertInset( inset ); - } - AllowInput(bv); -} - - -void MenuLayoutSave(BufferView * bv) -{ - if (!bv->available()) - return; - if (AskQuestion(_("Do you want to save the current settings"), - _("for Character, Document, Paper and Quotes"), - _("as default for new documents?"))) - bv->buffer()->saveParamsAsDefaults(); + return tmpstr; } -void Figure() +string const getPossibleLabel(BufferView const & bv) { - if (fd_form_figure->form_figure->visible) { - fl_raise_form(fd_form_figure->form_figure); - } else { - fl_show_form(fd_form_figure->form_figure, - FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT, - _("Insert Figure")); - } -} - + Paragraph * par = &*bv.getLyXText()->cursor.par(); + LyXLayout_ptr layout = par->layout(); + if (layout->latextype == LATEX_PARAGRAPH && par->previous()) { + Paragraph * par2 = par->previous(); -/* callbacks for form form_figure */ -extern "C" -void FigureApplyCB(FL_OBJECT *, long) -{ - if (!current_view->available()) - return; + LyXLayout_ptr const & layout2 = par2->layout(); - Buffer * buffer = current_view->buffer(); - if (buffer->isReadonly()) // paranoia - return; - - current_view->owner()->getMiniBuffer()->Set(_("Inserting figure...")); - if (fl_get_button(fd_form_figure->radio_inline)) { - InsetFig * new_inset = new InsetFig(100, 20, *buffer); - current_view->insertInset(new_inset); - current_view->owner()->getMiniBuffer()->Set(_("Figure inserted")); - new_inset->Edit(current_view, 0, 0, 0); - return; - } - - current_view->hideCursor(); - current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR); - current_view->beforeChange(current_view->text); - - current_view->text->SetCursorParUndo(current_view->buffer()); - current_view->text->FreezeUndo(); - - current_view->text->BreakParagraph(current_view); - current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - -#ifndef NEW_INSETS - if (current_view->text->cursor.par()->Last()) { -#else - if (current_view->text->cursor.par()->size()) { -#endif - current_view->text->CursorLeft(current_view); - - current_view->text->BreakParagraph(current_view); - current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + if (layout2->latextype != LATEX_PARAGRAPH) { + par = par2; + layout = layout2; + } } - // The standard layout should always be numer 0; - current_view->text->SetLayout(current_view, 0); - -#ifndef NEW_INSETS - if (current_view->text->cursor.par()->footnoteflag == - LyXParagraph::NO_FOOTNOTE) { -#endif - current_view->text-> - SetParagraph(current_view, 0, 0, - 0, 0, - VSpace (0.3 * buffer->params.spacing.getValue(), - LyXLength::CM), - VSpace (0.3 * - buffer->params.spacing.getValue(), - LyXLength::CM), - LYX_ALIGN_CENTER, string(), 0); -#ifndef NEW_INSETS - } else { - current_view->text->SetParagraph(current_view, 0, 0, - 0, 0, - VSpace(VSpace::NONE), - VSpace(VSpace::NONE), - LYX_ALIGN_CENTER, - string(), - 0); + string text = layout->latexname().substr(0, 3); + if (layout->latexname() == "theorem") + text = "thm"; // Create a correct prefix for prettyref + + text += ':'; + if (layout->latextype == LATEX_PARAGRAPH || + lyxrc.label_init_length < 0) + text.erase(); + + string par_text = par->asString(bv.buffer(), false); + for (int i = 0; i < lyxrc.label_init_length; ++i) { + if (par_text.empty()) + break; + string head; + par_text = split(par_text, head, ' '); + if (i > 0) + text += '-'; // Is it legal to use spaces in + // labels ? + text += head; } -#endif - - current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - - Inset * new_inset = new InsetFig(100, 100, *buffer); - current_view->insertInset(new_inset); - new_inset->Edit(current_view, 0, 0, 0); - current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR); - current_view->owner()->getMiniBuffer()->Set(_("Figure inserted")); - current_view->text->UnFreezeUndo(); - current_view->setState(); -} - -extern "C" void FigureCancelCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_figure->form_figure); -} - - -extern "C" void FigureOKCB(FL_OBJECT * ob, long data) -{ - FigureApplyCB(ob, data); - FigureCancelCB(ob, data); + return text; } @@ -687,16 +501,19 @@ extern "C" void FigureOKCB(FL_OBJECT * ob, long data) // reconfigure the automatic settings. void Reconfigure(BufferView * bv) { - bv->owner()->getMiniBuffer()->Set(_("Running configure...")); + bv->owner()->message(_("Running configure...")); // Run configure in user lyx directory Path p(user_lyxdir); - Systemcalls one(Systemcalls::System, + Systemcall one; + one.startscript(Systemcall::Wait, AddName(system_lyxdir, "configure")); p.pop(); - bv->owner()->getMiniBuffer()->Set(_("Reloading configuration...")); + bv->owner()->message(_("Reloading configuration...")); lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); - WriteAlert(_("The system has been reconfigured."), - _("You need to restart LyX to make use of any"), - _("updated document class specifications.")); + + Alert::information(_("System reconfigured"), + _("The system has been reconfigured.\n" + "You need to restart LyX to make use of any \n" + "updated document class specifications.")); }