anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-enable input of non-LyX files (e.g., tex, pgf) (#12056)

Browse Source 
This amends [a385b7dc2b58/lyxgit]

(cherry picked from commit 2af8e661a3)
(cherry picked from commit 17e4f325f3)
This commit is contained in:
Juergen Spitzmueller 2020-12-28 09:58:30 +01:00 committed by Richard Kimberly Heck
parent 6226a040d4
commit 5b69d658bb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontends/qt4/GuiInclude.cpp
View File

@ -317,14 +317,17 @@ bool GuiInclude::isValid()
okPB->setText(qt_("&OK")); okPB->setText(qt_("&OK"));
return true; return true;
} }
// Do we have a LyX filename?
if (!isLyXFileName(fromqstr(fname))) {
okPB->setText(qt_("&OK"));
return false;
}
string const bpath = buffer().filePath(); string const bpath = buffer().filePath();
// Path might be relative to current Buffer, so make absolute // Path might be relative to current Buffer, so make absolute
FileName const absfname = support::makeAbsPath(fromqstr(fname), bpath); FileName const absfname = support::makeAbsPath(fromqstr(fname), bpath);
// Do we have a LyX filename?
if (!isLyXFileName(fromqstr(fname))) {
okPB->setText(qt_("&OK"));
return absfname.exists();
}
// Set OK button text according to whether file already exists // Set OK button text according to whether file already exists
okPB->setText(absfname.exists() ? qt_("&OK") : qt_("&Create")); okPB->setText(absfname.exists() ? qt_("&OK") : qt_("&Create"));
// enable edit button iff file is open in some Buffer // enable edit button iff file is open in some Buffer

6
status.23x
View File

@ -76,11 +76,13 @@ What's new
* USER INTERFACE * USER INTERFACE
- Fix crash when pasting math grid with more rows in source than target - Re-enable input of non-LyX files (e.g., tex, pgf) (bug 12056).
(bug 11897).
- Fix problem with display of menus on Gnome Wayland (bug 11746). - Fix problem with display of menus on Gnome Wayland (bug 11746).
- Fix crash when pasting math grid with more rows in source than target
(bug 11897).
- Fix problem with drawing of auto-opened insets (bug 11870). - Fix problem with drawing of auto-opened insets (bug 11870).
- Fix crash when rejecting changes and the cursor is in an inset that will be - Fix crash when rejecting changes and the cursor is in an inset that will be