#include <fstream>
#include <algorithm>
+#include <utility>
#include <iostream>
#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 "bufferlist.h"
-#include "filedlg.h"
#include "lyx_gui_misc.h"
-#include "LyXView.h"
-#include "lastfiles.h"
+#include "lyx_main.h"
+#include "bufferlist.h"
#include "bufferview_funcs.h"
+#include "lastfiles.h"
+#include "LyXView.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "frontends/FileDialog.h"
+#include "insets/insetlabel.h"
#include "support/FileInfo.h"
-#include "support/syscall.h"
#include "support/filetools.h"
#include "support/path.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
+#include "support/syscall.h"
+#include "gettext.h"
+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::vector;
-using std::sort;
-using std::equal;
+using std::make_pair;
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 --------------------
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 (lyxrc.use_gui) {
+ string const str = msg1 + ' ' + msg2 + ' ' + msg3;
+ buf->getUser()->owner()->message(str);
+ } else
lyxerr << msg1 << msg2 << msg3 << endl;
}
//
// 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 MenuWriteAs(bv, buffer);
+ return WriteAs(bv, buffer);
}
return false;
- } else {
+ } else
lastfiles->newFile(buffer->fileName());
- }
return true;
}
+
// should be moved to BufferView.C
// Half of this func should be in LyXView, the rest in BufferView.
-bool MenuWriteAs(BufferView * bv, Buffer * buffer)
+bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
{
- // Why do we require BufferView::text to be able to write a
- // document? I see no point in that. (Lgb)
- //if (!bv->text) return;
-
string fname = buffer->fileName();
string oldname = fname;
- LyXFileDlg fileDlg;
- ProhibitInput(bv);
- fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
- fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
+ if (filename.empty()) {
- if (!IsLyXFilename(fname))
- fname += ".lyx";
+ FileDialog fileDlg(bv->owner(),
+ _("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)));
- fname = fileDlg.Select(_("Enter Filename to Save Document as"),
- OnlyPath(fname),
- "*.lyx",
- OnlyFilename(fname));
+ if (!IsLyXFilename(fname))
+ fname += ".lyx";
- AllowInput(bv);
+ FileDialog::Result result =
+ fileDlg.Select(OnlyPath(fname),
+ _("*.lyx|LyX Documents (*.lyx)"),
+ OnlyFilename(fname));
- if (fname.empty())
- return false;
+ if (result.first == FileDialog::Later)
+ return false;
- // Make sure the absolute filename ends with appropriate suffix
- string s = MakeAbsPath(fname);
- if (!IsLyXFilename(s))
- s += ".lyx";
+ fname = result.second;
+
+ if (fname.empty())
+ return false;
+
+ // Make sure the absolute filename ends with appropriate suffix
+ fname = MakeAbsPath(fname);
+ if (!IsLyXFilename(fname))
+ fname += ".lyx";
+ } else
+ fname = filename;
// Same name as we have already?
- if (!buffer->isUnnamed() && s == oldname) {
+ if (!buffer->isUnnamed() && fname == oldname) {
if (!AskQuestion(_("Same name as document already has:"),
- MakeDisplayPath(s, 50),
+ 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(s)) {
+ else if (!buffer->isUnnamed() && bufferlist.exists(fname)) {
if (AskQuestion(_("Another document with same name open!"),
- MakeDisplayPath(s, 50),
+ MakeDisplayPath(fname, 50),
_("Replace with current document?")))
{
- bufferlist.close(bufferlist.getBuffer(s));
+ bufferlist.close(bufferlist.getBuffer(fname));
// Ok, change the name of the buffer, but don't save!
- buffer->setFileName(s);
+ buffer->setFileName(fname);
buffer->markDirty();
ShowMessage(buffer, _("Document renamed to '"),
- MakeDisplayPath(s), _("', but not saved..."));
- }
+ MakeDisplayPath(fname), _("', but not saved..."));
+ }
return false;
} // Check whether the file exists
else {
- FileInfo const myfile(s);
+ FileInfo const myfile(fname);
if (myfile.isOK() && !AskQuestion(_("Document already exists:"),
- MakeDisplayPath(s, 50),
+ MakeDisplayPath(fname, 50),
_("Replace file?")))
return false;
}
// Ok, change the name of the buffer
- buffer->setFileName(s);
+ buffer->setFileName(fname);
buffer->markDirty();
bool unnamed = buffer->isUnnamed();
buffer->setUnnamed(false);
- // And save
- // Small bug: If the save fails, we have irreversible changed the name
- // of the document.
- // Hope this is fixed this way! (Jug)
+
if (!MenuWrite(bv, buffer)) {
buffer->setFileName(oldname);
buffer->setUnnamed(unnamed);
return;
}
- bv->owner()->getMiniBuffer()->Set(_("Autosaving current document..."));
+ bv->owner()->message(_("Autosaving current document..."));
// create autosave filename
string fname = OnlyPath(bv->buffer()->fileName());
// 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...
void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
{
string fname = f;
- LyXFileDlg fileDlg;
-
- if (!bv->available()) return;
+
+ if (!bv->available())
+ return;
if (fname.empty()) {
- ProhibitInput(bv);
- fname = fileDlg.Select(_("File to Insert"),
- bv->owner()->buffer()->filepath,
- "*");
- AllowInput(bv);
- if (fname.empty()) return;
+ FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+ (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
+
+ FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filepath);
+
+ if (result.first == FileDialog::Later)
+ return;
+
+ fname = result.second;
+
+ if (fname.empty())
+ return;
}
FileInfo fi(fname);
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());
- if (layout->latextype == LATEX_PARAGRAPH && par->previous) {
-#ifndef NEW_INSETS
- LyXParagraph * par2 = par->previous->FirstPhysicalPar();
-#else
- LyXParagraph * par2 = par->previous;
-#endif
+ if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
+ LyXParagraph * par2 = par->previous();
LyXLayout const * layout2 =
&textclasslist.Style(bv->buffer()->params.textclass,
par2->GetLayout());
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)
}
-// This is _only_ used in Toolbar_pimpl.C, move it there and get rid of
-// current_view. (Lgb)
-void LayoutsCB(int sel, void *, Combox *)
-{
- string const tmp = tostr(sel);
- current_view->owner()->getLyXFunc()->Dispatch(LFUN_LAYOUTNO,
- tmp);
-}
-
-
void MenuLayoutSave(BufferView * bv)
{
if (!bv->available())
}
-void Figure()
-{
- 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"));
- }
-}
-
-
-/* callbacks for form form_figure */
-extern "C"
-void FigureApplyCB(FL_OBJECT *, long)
-{
- if (!current_view->available())
- return;
-
- 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);
-
- if (current_view->text->cursor.par()->Last()) {
- current_view->text->CursorLeft(current_view);
-
- current_view->text->BreakParagraph(current_view);
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-
- // 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);
- }
-#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);
-}
-
-
// This function runs "configure" and then rereads lyx.defaults to
// 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,
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"),
projects / lyx.git / blobdiff