#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/path.h"
-#include "support/syscall.h"
+#include "support/systemcall.h"
#include "support/lstrings.h"
#include <fstream>
bool quitting; // flag, that we are quitting the program
extern bool finished; // all cleanup done just let it run through now.
-/*
- 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,
// 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;
-
+
+ string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph);
+ if (tmpstr.empty())
+ return;
+
+ // insert the string
+ bv->hideCursor();
+
+ // clear the selection
+ bool flag = (bv->text == bv->getLyXText());
+ if (flag)
+ bv->beforeChange(bv->text);
+ if (!asParagraph)
+ bv->getLyXText()->insertStringAsLines(bv, tmpstr);
+ else
+ bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr);
+ if (flag)
+ bv->update(bv->text,
+ BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+}
+
+
+// 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"),
(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;
+ return string();
fname = result.second;
if (fname.empty())
- return;
+ return string();
}
FileInfo fi(fname);
if (!fi.readable()) {
Alert::err_alert(_("Error! Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifstream ifs(fname.c_str());
if (!ifs) {
Alert::err_alert(_("Error! Cannot open specified file: "),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifs.unsetf(ios::skipws);
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->insertStringAsLines(bv, tmpstr);
- else
- bv->text->insertStringAsParagraphs(bv, tmpstr);
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ return tmpstr;
}
bv->owner()->prohibitInput();
if (label.empty()) {
Paragraph * par = bv->getLyXText()->cursor.par();
- LyXLayout const * layout =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par->getLayout());
+ LyXTextClass const & tclass =
+ textclasslist[bv->buffer()->params.textclass];
+ LyXLayout const * layout = &tclass[par->layout()];
if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
Paragraph * par2 = par->previous();
- LyXLayout const * layout2 =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par2->getLayout());
+ LyXLayout const * layout2 = &tclass[par2->layout()];
if (layout2->latextype != LATEX_PARAGRAPH) {
par = par2;
layout = layout2;
}
}
if (!label.empty()) {
- InsetCommandParams p( "label", label );
- InsetLabel * inset = new InsetLabel( p );
- bv->insertInset( inset );
+ InsetCommandParams p("label", label);
+ InsetLabel * inset = new InsetLabel(p);
+ bv->insertInset(inset);
}
bv->owner()->allowInput();
}
// 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()->message(_("Reloading configuration..."));
projects / lyx.git / blobdiff