sa...@lyx.org wrote:
> Author: sanda
> Date: Tue Nov 24 23:17:55 2009
> New Revision: 32180
> URL: http://www.lyx.org/trac/changeset/32180
>
> Log:
> VCS: allow displaying diff log
>
> Modified:
> lyx-devel/trunk/src/VCBackend.cpp
1.6.6?
>
> Modified: lyx-devel/trunk/src/VCBackend.cpp
> ==============================================================================
> --- lyx-devel/trunk/src/VCBackend.cpp Tue Nov 24 19:47:43 2009 (r32179)
> +++ lyx-devel/trunk/src/VCBackend.cpp Tue Nov 24 23:17:55 2009 (r32180)
> @@ -12,8 +12,11 @@
>
> #include "VCBackend.h"
> #include "Buffer.h"
> +#include "LyXFunc.h"
> +#include "FuncRequest.h"
>
> #include "frontends/alert.h"
> +#include "frontends/Application.h"
>
> #include "support/debug.h"
> #include "support/filetools.h"
> @@ -725,9 +728,15 @@
> "In case of file conflict version of the local
> directory files "
> "will be preferred."
> "\n\nContinue?"), file);
> - int const ret = frontend::Alert::prompt(_("Changes detected"),
> + int ret = frontend::Alert::prompt(_("Changes detected"),
> + text, 0, 1, _("&Yes"), _("&No"), _("See &Log"));
> + if (ret == 2 ) {
> + dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " +
> tmpf.absFilename()));
> + ret = frontend::Alert::prompt(_("Changes detected"),
> text, 0, 1, _("&Yes"), _("&No"));
> - if (ret) {
> + hideDialogs("file", 0);
> + }
> + if (ret == 1 ) {
> tmpf.erase();
> return string();
> }
