insetquote fix; getStatus tweaks

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 0a5c1e6173d3b24ca69418f18c39567bf75ba1d4..40dcf2547d6164aa2f95435f6f3e881dfb9d2ae6 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -6,34 +6,30 @@
 
 #include <unistd.h>
 
-#include FORMS_H_LOCATION
 #include "lyxvc.h"
 #include "vc-backend.h"
 #include "debug.h"
 #include "lyx_gui_misc.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "gettext.h"
 #include "support/filetools.h"
-#include "lyxfunc.h"
+#include "support/lyxlib.h"
 #include "LyXView.h"
+#include "lyxfunc.h"
 
 using std::endl;
+using std::pair;
 
 LyXVC::LyXVC()
 {
        vcs = 0;
-       browser = 0;
        owner_ = 0;
 }
 
 
 LyXVC::~LyXVC()
 {
-       if (browser) {
-               if (browser->LaTeXLog->visible)
-                       fl_hide_form(browser->LaTeXLog);
-               fl_free_form(browser->LaTeXLog);
-       }
        delete vcs;
 }
 
@@ -91,7 +87,7 @@ void LyXVC::registrer()
                        MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
-                       ->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
+                       ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
        }
 
        // Maybe the save fails, or we answered "no". In both cases,
@@ -124,7 +120,7 @@ void LyXVC::checkIn()
                        MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
-                       ->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
+                       ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
        }
 
        // Maybe the save fails, or we answered "no". In both cases,
@@ -184,7 +180,7 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
-       switch (vcs->stat()) {
+       switch (vcs->status()) {
        case VCS::UNLOCKED:
                lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
                checkOut();
@@ -216,83 +212,13 @@ string const & LyXVC::locker() const
 }
 
 
-// This is a hack anyway so I'll put it here in the mean time.
-void LyXVC::logClose(FL_OBJECT * obj, long)
-{
-       LyXVC * This = static_cast<LyXVC*>(obj->form->u_vdata);
-       fl_hide_form(This->browser->LaTeXLog);
-}
-
-
-// and, hack over hack, here is a C wrapper :)
-extern "C" void C_LyXVC_logClose(FL_OBJECT * ob, long data)
+const string LyXVC::getLogFile() const
 {
-       LyXVC::logClose(ob, data);
-}
-
+       if (!vcs)
+               return string();
 
-void LyXVC::logUpdate(FL_OBJECT * obj, long)
-{
-       LyXVC * This = static_cast<LyXVC*>(obj->form->u_vdata);
-       This->showLog();
-}
-
-extern "C" void C_LyXVC_logUpdate(FL_OBJECT *ob, long data)
-{
-       LyXVC::logUpdate(ob, data);
-}
-
-
-void LyXVC::viewLog(string const & fil)
-{
-       static int ow = -1, oh;
-
-       if (!browser) {
-               FL_OBJECT * obj;
-               browser = (FD_LaTeXLog *) fl_calloc(1, sizeof(*browser));
-               
-               browser->LaTeXLog = fl_bgn_form(FL_NO_BOX, 470, 380);
-               browser->LaTeXLog->u_vdata = this;
-               obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 380, "");
-               browser->browser_latexlog = fl_add_browser(FL_NORMAL_BROWSER,
-                                                          10, 10,
-                                                          450, 320, "");
-               obj = fl_add_button(FL_RETURN_BUTTON, 270, 340, 90, 30,
-                                   _("Close"));
-               fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-               fl_set_object_callback(obj, C_LyXVC_logClose, 0);
-               obj = fl_add_button(FL_NORMAL_BUTTON, 370, 340, 90, 30,
-                                   idex(_("Update|#Uu")));
-               fl_set_button_shortcut(obj, scex(_("Update|#Uu")), 1);
-               fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-               fl_set_object_callback(obj, C_LyXVC_logUpdate, 0);
-               fl_end_form();
-               fl_set_form_atclose(browser->LaTeXLog, CancelCloseBoxCB, 0);
-       }
-
-       if (!fl_load_browser(browser->browser_latexlog, fil.c_str()))
-               fl_add_browser_line(browser->browser_latexlog,
-                                   _("No VC History!"));
-       
-       if (browser->LaTeXLog->visible) {
-               fl_raise_form(browser->LaTeXLog);
-       } else {
-               fl_show_form(browser->LaTeXLog,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
-                            _("VC History"));
-               if (ow < 0) {
-                       ow = browser->LaTeXLog->w;
-                       oh = browser->LaTeXLog->h;
-               }
-               fl_set_form_minsize(browser->LaTeXLog, ow, oh);
-       }
-}
-
-
-void LyXVC::showLog()
-{
-       string tmpf = tmpnam(0);
+       string tmpf = lyx::tempName(string(), "lyxvclog");
+       lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
        vcs->getLog(tmpf);
-       viewLog(tmpf);
-       unlink(tmpf.c_str());
+       return tmpf;
 }