anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add a 'cancel' button to the two alert dialogs triggered in File->Open

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8534 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Alfredo Braunstein 2004-03-26 17:49:08 +00:00
parent 500fa5f591
commit 9590084489
2 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-26 Alfredo Braunstein <abraunst@lyx.org>
* buffer_funcs.C (readFile): add cancel button to two prompt dialogs
2004-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* kbsequence.C (print): adjust

89
src/buffer_funcs.C
View File

@ -49,13 +49,9 @@ namespace {
bool readFile(Buffer * b, string const & s)
{
string ts(s);
string e = OnlyPath(s);
string a = e;
// File information about normal file
FileInfo fileInfo(s);
if (!fileInfo.exist()) {
FileInfo fileN(s);
if (!fileN.exist()) {
string const file = MakeDisplayPath(s, 50);
string text = bformat(_("The specified document\n%1$s"
"\ncould not be read."), file);
@ -64,58 +60,59 @@ bool readFile(Buffer * b, string const & s)
}
// Check if emergency save file exists and is newer.
e += OnlyFilename(s) + ".emergency";
FileInfo fileInfoE(e);
string const e = OnlyPath(s) + OnlyFilename(s) + ".emergency";
FileInfo fileE(e);
bool use_emergency = false;
if (fileInfoE.exist() && fileInfo.exist()) {
if (fileInfoE.getModificationTime()
> fileInfo.getModificationTime()) {
if (fileE.exist() && fileN.exist()
&& fileE.getModificationTime() > fileN.getModificationTime())
{
string const file = MakeDisplayPath(s, 20);
string text = bformat(_("An emergency save of the document %1$s exists.\n"
"\nRecover emergency save?"), file);
int const ret = Alert::prompt(_("Load emergency save?"),
text, 0, 1, _("&Recover"), _("&Load Original"));
if (ret == 0) {
ts = e;
// the file is not saved if we load the
// emergency file.
string 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.
b->markDirty();
use_emergency = true;
}
return b->readFile(e);
case 1:
break;
default:
return false;
}
}
if (!use_emergency) {
// Now check if autosave file is newer.
a += '#';
a += OnlyFilename(s);
a += '#';
FileInfo fileInfoA(a);
if (fileInfoA.exist() && fileInfo.exist()) {
if (fileInfoA.getModificationTime()
> fileInfo.getModificationTime()) {
string const file = MakeDisplayPath(s, 20);
string text = bformat(_("The backup of the document %1$s is newer.\n\n"
"Load the backup instead?"), file);
int const ret = Alert::prompt(_("Load backup?"),
text, 0, 1, _("&Load backup"), _("Load &original"));
string const a = OnlyPath(s) + '#' + OnlyFilename(s) + '#';
FileInfo fileA(a);
if (ret == 0) {
ts = a;
// the file is not saved if we load the
// autosave file.
if (fileA.exist() && fileN.exist()
&& fileA.getModificationTime() > fileN.getModificationTime())
{
string const file = MakeDisplayPath(s, 20);
string text = bformat(_("The backup of the document "
"%1$s is newer.\n\nLoad the "
"backup instead?"), file);
switch (Alert::prompt(_("Load backup?"), text, 0, 2,
_("&Load backup"), _("Load &original"),
_("&Cancel") ))
{
case 0:
// the file is not saved if we load the autosave file.
b->markDirty();
} else {
// Here, we should delete the autosave
return b->readFile(a);
case 1:
// Here we delete the autosave
unlink(a);
break;
default:
return false;
}
}
}
}
return b->readFile(ts);
return b->readFile(s);
}