anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a real Cancel button to 'Already Loaded' dialog box (part of #8787).

Browse Source 
Also correlate the other buttons more explicitly to the question asked.
This commit is contained in:
Juergen Spitzmueller 2013-11-28 17:06:49 +01:00
parent a43a3e31d1
commit afab1140e9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/buffer_funcs.cpp
View File

@ -73,13 +73,22 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
docstring const text = bformat(_(
"The document %1$s is already loaded and has unsaved changes.\n"
"Do you want to abandon your changes and reload the version on disk?"), file);
if (!Alert::prompt(_("Reload saved document?"),
text, 1, 1, _("&Reload"), _("&Keep Changes"))) {
// reload the document
if (checkBuffer->reload() != Buffer::ReadSuccess)
int res = Alert::prompt(_("Reload saved document?"),
text, 2, 2, _("Yes, &Reload"), _("No, &Keep Changes"), _("&Cancel"));
switch (res) {
case 0: {
// reload the document
if (checkBuffer->reload() != Buffer::ReadSuccess)
return 0;
return checkBuffer;
}
case 1:
// keep changes
return checkBuffer;
case 2:
// cancel
return 0;
}
return checkBuffer;
}
bool const exists = filename.exists();