small changes to ButtonController usage

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 616d2ed3af03a2acaf4b285a714e573b99596ab0..ba4529c6dd61408ef76234b5b13095f89b962920 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -17,6 +17,8 @@
 #include "lyxfunc.h"
 #include "LyXView.h"
 
+using std::endl;
+using std::pair;
 
 LyXVC::LyXVC()
 {
@@ -33,9 +35,7 @@ LyXVC::~LyXVC()
                        fl_hide_form(browser->LaTeXLog);
                fl_free_form(browser->LaTeXLog);
        }
-       if (vcs) {
-               delete vcs;
-       }
+       delete vcs;
 }
 
 
@@ -59,9 +59,13 @@ bool LyXVC::file_found_hook(string const & fn)
 }
 
 
-bool LyXVC::file_not_found_hook(string const &)
+bool LyXVC::file_not_found_hook(string const & fn)
 {
-       // file is not under any VCS.
+       // Check if file is under RCS
+       if (!RCS::find_file(fn).empty())
+               return true;
+       if (!CVS::find_file(fn).empty())
+               return true;
        return false;
 }
 
@@ -78,14 +82,14 @@ void LyXVC::registrer()
        // so... we use RCS as default, later this should perhaps be
        // a lyxrc option.
        if (!vcs) {
-               vcs = new RCS(owner_->getFileName());
+               vcs = new RCS(owner_->fileName());
                vcs->owner(owner_);
        }
        
        // If the document is changed, we might want to save it
        if (!vcs->owner()->isLyxClean() && 
            AskQuestion(_("Changes in document:"),
-                       MakeDisplayPath(vcs->owner()->getFileName(), 50),
+                       MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
                        ->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
@@ -98,15 +102,18 @@ void LyXVC::registrer()
        }
 
        lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
-       string tmp = askForText(_("LyX VC: Initial description"),
-                                _("(no initial description)"));
-       if (tmp.empty()) {
+       pair<bool, string> tmp =
+               askForText(_("LyX VC: Initial description"),
+                          _("(no initial description)"));
+       if (!tmp.first || tmp.second.empty()) {
+               // should we insist on checking tmp.second.empty()?
                lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
-               WriteAlert(_("Info"), _("This document has NOT been registered."));
+               WriteAlert(_("Info"),
+                          _("This document has NOT been registered."));
                return;
        }
        
-       vcs->registrer(tmp);
+       vcs->registrer(tmp.second);
 }
 
 
@@ -115,7 +122,7 @@ void LyXVC::checkIn()
        // If the document is changed, we might want to save it
        if (!vcs->owner()->isLyxClean() && 
            AskQuestion(_("Changes in document:"),
-                       MakeDisplayPath(vcs->owner()->getFileName(), 50),
+                       MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
                        ->getLyXFunc()->Dispatch(LFUN_MENUWRITE);
@@ -128,11 +135,15 @@ void LyXVC::checkIn()
        }
 
        lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
-       string tmp = askForText(_("LyX VC: Log Message"));
-       if (tmp.empty()) tmp = "(no log msg)";
-
-       vcs->checkIn(tmp);
-       
+       pair<bool, string> tmp = askForText(_("LyX VC: Log Message"));
+       if (tmp.first) {
+               if (tmp.second.empty()) {
+                       tmp.second = _("(no log message)");
+               }
+               vcs->checkIn(tmp.second);
+       } else {
+               lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
+       }
 }
 
 
@@ -141,7 +152,7 @@ void LyXVC::checkOut()
        lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
        if (!vcs->owner()->isLyxClean() 
            && !AskQuestion(_("Changes in document:"),
-                          MakeDisplayPath(vcs->owner()->getFileName(), 50),
+                          MakeDisplayPath(vcs->owner()->fileName(), 50),
                           _("Ignore changes and proceed with check out?"))) {
                return;
        }
@@ -174,7 +185,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();