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

Fix problem with edit button.

Browse Source 
The previous implementation relied upon the cursor being immediately
in front of the inset. A bad idea.
This commit is contained in:
Richard Kimberly Heck 2020-08-22 15:21:53 -04:00
parent a385b7dc2b
commit cf7e32ee8f
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/frontends/qt/GuiInclude.cpp
View File

@ -15,12 +15,12 @@
#include "GuiInclude.h"
#include "Buffer.h"
#include "BufferList.h"
#include "BufferParams.h"
#include "FuncRequest.h"
#include "LyXRC.h"
#include "qt_helpers.h"
#include "LyXRC.h"
#include "support/gettext.h"
#include "support/lstrings.h"
@ -28,6 +28,8 @@
#include "support/FileName.h"
#include "support/filetools.h"
#include "frontends/alert.h"
#include "insets/InsetListingsParams.h"
#include "insets/InsetInclude.h"
@ -291,7 +293,28 @@ void GuiInclude::edit()
applyView();
} else
hideView();
dispatch(FuncRequest(LFUN_INSET_EDIT));
QString const fname = filenameED->text();
string const bpath = buffer().filePath();
string const absfname = support::makeAbsPath(fromqstr(fname), bpath).absFileName();
FileName const absFileName(absfname);
Buffer const * buffer = theBufferList().getBuffer(absFileName);
if (!buffer) {
// The Buffer is not already open, so try to open it.
if (!absFileName.exists()) {
Alert::warning(_("File does not exist"),
bformat(_("The requested file\n\t%1$s\ndoes not exist."),
from_utf8(absfname)));
return;
}
dispatch(FuncRequest(LFUN_BUFFER_NEW, absfname));
// Did we succeed?
if (!theBufferList().getBuffer(absFileName)) {
// We should already have had an error message.
return;
}
}
// Switch to the requested Buffer
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, absfname));
}