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

At least basic capability for VC comparison.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33533 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-02-22 02:01:04 +00:00
parent 5cb1a6a08d
commit 21379cbef9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontends/qt4/GuiView.cpp
View File

@ -39,6 +39,7 @@
#include "BufferList.h" #include "BufferList.h"
#include "BufferParams.h" #include "BufferParams.h"
#include "BufferView.h" #include "BufferView.h"
#include "Compare.h"
#include "Converter.h" #include "Converter.h"
#include "Cursor.h" #include "Cursor.h"
#include "CutAndPaste.h" #include "CutAndPaste.h"
@ -2597,9 +2598,16 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
if (!buffer->lyxvc().prepareFileRevision(rev2, f2)) if (!buffer->lyxvc().prepareFileRevision(rev2, f2))
break; break;
} }
// FIXME We need to call comparison feature here // FIXME We need to call comparison feature here.
// I'm not sure whether with or without dialog. // This is quick and dirty code for testing VC.
// (Gui)Compare::compare(f1, f2); // We need that comparison feature has some LFUN_COMPARE <FLAG> file1 file1
FileName initpath(lyxrc.document_path);
Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences")));
CompareOptions options;
Compare * compare = new Compare(loadIfNeeded(FileName(f1)), loadIfNeeded(FileName(f2)), dest, options);
compare->start(QThread::LowPriority);
sleep(2);
lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName()));
break; break;
} }