#include "support/FileInfo.h"
#include "lyxscreen.h"
#include "support/filetools.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
#include "LaTeX.h"
#include "BufferView_pimpl.h"
#include "insets/insetcommand.h" //ChangeRefs
#include "gettext.h"
#include "undo_funcs.h"
#include "debug.h"
+#include "iterators.h"
extern BufferList bufferlist;
FileInfo const fi(fname);
if (!fi.readable()) {
- WriteAlert(_("Error!"),
+ Alert::alert(_("Error!"),
_("Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
return false;
ifstream ifs(fname.c_str());
if (!ifs) {
- WriteAlert(_("Error!"),
+ Alert::alert(_("Error!"),
_("Cannot open specified file: "),
MakeDisplayPath(fname, 50));
return false;
}
- char const c = ifs.peek();
+ int const c = ifs.peek();
LyXLex lex(0, 0);
lex.setStream(ifs);
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
if (!textUndo(this))
- owner()->message(_("No forther undo information"));
+ owner()->message(_("No further undo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
setState();
{
if (available()) {
text->copyEnvironmentType();
- // clear the selection, even if mark_set
- toggleSelection();
- text->clearSelection();
- update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Paragraph environment type copied"));
}
}
{
if (available()) {
text->copySelection(this);
- // clear the selection, even if mark_set
- toggleSelection();
- text->clearSelection();
- update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Copy"));
}
}
return string();
}
- return text->selectNextWord(this, value);
+ return text->selectNextWordToSpellcheck(this, value);
}
bool BufferView::lockInset(UpdatableInset * inset)
{
+ // don't relock if we're already locked
+ if (theLockingInset() == inset)
+ return true;
if (!theLockingInset() && inset) {
theLockingInset(inset);
return true;
Inset * locking_inset = theLockingInset()->getLockingInset();
if ((cursor.pos() - 1 >= 0) &&
- (cursor.par()->getChar(cursor.pos() - 1) ==
- Paragraph::META_INSET) &&
+ cursor.par()->isInset(cursor.pos() - 1) &&
(cursor.par()->getInset(cursor.pos() - 1) ==
locking_inset))
text->setCursor(this, cursor,
string const & from, string const & to)
{
bool flag = false;
- Paragraph * par = buffer()->paragraph;
LyXCursor cursor = text->cursor;
LyXCursor tmpcursor = cursor;
cursor.par(tmpcursor.par());
cursor.pos(tmpcursor.pos());
- while (par) {
+ ParIterator end = buffer()->par_iterator_end();
+ for (ParIterator it = buffer()->par_iterator_begin();
+ it != end; ++it) {
+ Paragraph * par = *it;
bool flag2 = false;
- for (Paragraph::inset_iterator it = par->inset_iterator_begin();
- it != par->inset_iterator_end(); ++it) {
- if ((*it)->lyxCode() == code) {
- InsetCommand * inset = static_cast<InsetCommand *>(*it);
+ for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+ it2 != par->inset_iterator_end(); ++it2) {
+ if ((*it2)->lyxCode() == code) {
+ InsetCommand * inset = static_cast<InsetCommand *>(*it2);
if (inset->getContents() == from) {
inset->setContents(to);
flag2 = true;
}
if (flag2) {
flag = true;
- // this is possible now, since SetCursor takes
- // care about footnotes
- text->setCursorIntern(this, par, 0);
- text->redoParagraphs(this, text->cursor,
- text->cursor.par()->next());
- text->fullRebreak(this);
+#warning Fix me
+ // The test it.size()==1 was needed to prevent crashes.
+ // How to set the cursor corretly when it.size()>1 ??
+ if (it.size() == 1) {
+ text->setCursorIntern(this, par, 0);
+ text->redoParagraphs(this, text->cursor,
+ text->cursor.par()->next());
+ text->fullRebreak(this);
+ }
}
- par = par->next();
}
text->setCursorIntern(this, cursor.par(), cursor.pos());
return flag;