anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lessen indentation by returning early if there's nothing to do.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35821 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-10-25 12:14:10 +00:00
parent b942b87e7d
commit 1edd77ca30
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/Buffer.cpp
View File

@ -3605,51 +3605,53 @@ Buffer::ReadStatus Buffer::readFromVC(FileName const & fn)
Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
{
FileName const emergencyFile(fn.absFileName() + ".emergency");
if (emergencyFile.exists()
&& emergencyFile.lastModified() > fn.lastModified()) {
docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("An emergency save of the document "
"%1$s exists.\n\n"
"Recover emergency save?"), file);
if (!emergencyFile.exists()
|| emergencyFile.lastModified() <= fn.lastModified())
return ReadFileNotFound;
switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
_("&Recover"), _("&Load Original"),
_("&Cancel")))
{
case 0: {
// the file is not saved if we load the emergency file.
markDirty();
docstring str;
bool const res = readFile(emergencyFile);
docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("An emergency save of the document "
"%1$s exists.\n\n"
"Recover emergency save?"), file);
switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
_("&Recover"), _("&Load Original"),
_("&Cancel")))
{
case 0: {
// the file is not saved if we load the emergency file.
markDirty();
docstring str;
bool const res = readFile(emergencyFile);
if (res)
str = _("Document was successfully recovered.");
else
str = _("Document was NOT successfully recovered.");
str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
makeDisplayPath(emergencyFile.absFileName()));
if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
_("&Remove"), _("&Keep"))) {
emergencyFile.removeFile();
if (res)
str = _("Document was successfully recovered.");
else
str = _("Document was NOT successfully recovered.");
str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
makeDisplayPath(emergencyFile.absFileName()));
if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
_("&Remove"), _("&Keep"))) {
emergencyFile.removeFile();
if (res)
Alert::warning(_("Emergency file deleted"),
_("Do not forget to save your file now!"), true);
}
return res ? ReadSuccess : ReadEmergencyFailure;
}
case 1:
if (!Alert::prompt(_("Delete emergency file?"),
_("Remove emergency file now?"), 1, 1,
_("&Remove"), _("&Keep")))
emergencyFile.removeFile();
return ReadOriginal;
default:
return ReadCancel;
}
Alert::warning(_("Emergency file deleted"),
_("Do not forget to save your file now!"), true);
}
return res ? ReadSuccess : ReadEmergencyFailure;
}
return ReadFileNotFound;
case 1:
if (!Alert::prompt(_("Delete emergency file?"),
_("Remove emergency file now?"), 1, 1,
_("&Remove"), _("&Keep")))
emergencyFile.removeFile();
return ReadOriginal;
default:
return ReadCancel;
}
// suppress warning
return ReadCancel;
}