anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify and polish

Browse Source
This commit is contained in:
Richard Kimberly Heck 2021-01-13 14:42:26 -05:00
parent d41ec3368d
commit 9504ec84c5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt/GuiView.cpp
View File

@ -2716,11 +2716,11 @@ void GuiView::newDocument(string const & filename, string templatefile,
}
void GuiView::insertLyXFile(docstring const & fname, bool ignorelang)
bool GuiView::insertLyXFile(docstring const & fname, bool ignorelang)
{
BufferView * bv = documentBufferView();
if (!bv)
return;
return false;
// FIXME UNICODE
FileName filename(to_utf8(fname));
@ -2742,7 +2742,7 @@ void GuiView::insertLyXFile(docstring const & fname, bool ignorelang)
QStringList(qt_("LyX Documents (*.lyx)")));
if (result.first == FileDialog::Later)
return;
return false;
// FIXME UNICODE
filename.set(fromqstr(result.second));
@ -2751,12 +2751,13 @@ void GuiView::insertLyXFile(docstring const & fname, bool ignorelang)
if (filename.empty()) {
// emit message signal.
message(_("Canceled."));
return;
return false;
}
}
bv->insertLyXFile(filename, ignorelang);
bv->buffer().errors("Parse");
return true;
}
@ -4158,12 +4159,11 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
case LFUN_FILE_INSERT: {
if (cmd.getArg(1) == "ignorelang")
insertLyXFile(from_utf8(cmd.getArg(0)), true);
else
insertLyXFile(cmd.argument());
dr.forceBufferUpdate();
dr.screenUpdate(Update::Force);
bool const ignore_lang = cmd.getArg(1) == "ignorelang";
if (insertLyXFile(from_utf8(cmd.getArg(0)), ignore_lang)) {
dr.forceBufferUpdate();
dr.screenUpdate(Update::Force);
}
break;
}

4
src/frontends/qt/GuiView.h
View File

@ -376,8 +376,8 @@ private:
bool lfunUiToggle(std::string const & ui_component);
///
void toggleFullScreen();
///
void insertLyXFile(docstring const & fname, bool ignorelang = false);
/// \return whether we did anything
bool insertLyXFile(docstring const & fname, bool ignorelang = false);
///
/// Open Export As ... dialog. \p iformat is the format the
/// filter is initially set to.