commit 9504ec84c501625126c9ba25172c70377ba4aac9
Author: Richard Kimberly Heck <[email protected]>
Date: Wed Jan 13 14:42:26 2021 -0500
Simplify and polish
---
src/frontends/qt/GuiView.cpp | 20 ++++++++++----------
src/frontends/qt/GuiView.h | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 07e08e0..bdd7f1d 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -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;
}
diff --git a/src/frontends/qt/GuiView.h b/src/frontends/qt/GuiView.h
index 9c24811..4c610e0 100644
--- a/src/frontends/qt/GuiView.h
+++ b/src/frontends/qt/GuiView.h
@@ -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.
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
