fix a couple warnings after the number localization patch

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 1ed30fe66376da1d2348ef1916c9154b41817f0a..a8455546642642b632bd8bc0a1319f1837e08fbc 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -3,11 +3,11 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Allan Rae
  *
  * Full author contact details are available in file CREDITS.
@@ -91,7 +91,7 @@ void LyXVC::setBuffer(Buffer * buf)
 }
 
 
-void LyXVC::registrer()
+bool LyXVC::registrer()
 {
        FileName const filename = owner_->fileName();
 
@@ -100,7 +100,7 @@ void LyXVC::registrer()
                Alert::error(_("Document not saved"),
                             _("You must save the document "
                                            "before it can be registered."));
-               return;
+               return false;
        }
 
        // it is very likely here that the vcs is not created yet...
@@ -122,7 +122,7 @@ void LyXVC::registrer()
                } else {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with RCS");
-                       vcs.reset(new RCS(filename));
+                       vcs.reset(new RCS(FileName()));
                }
 
                vcs->owner(owner_);
@@ -132,35 +132,48 @@ void LyXVC::registrer()
        docstring response;
        bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
                        _("(no initial description)"));
-       if (!ok || response.empty()) {
-               // should we insist on checking response.empty()?
+       if (!ok) {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
-               return;
+               return false;
        }
-
+       if (response.empty())
+               response = _("(no initial description)");
        vcs->registrer(to_utf8(response));
+       return true;
 }
 
 
-void LyXVC::checkIn()
+string LyXVC::checkIn()
 {
        LYXERR(Debug::LYXVC, "LyXVC: checkIn");
        docstring response;
+       string log;
        bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
        if (ok) {
                if (response.empty())
                        response = _("(no log message)");
-               vcs->checkIn(to_utf8(response));
+               log = vcs->checkIn(to_utf8(response));
        } else {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
        }
+       return log;
 }
 
 
-void LyXVC::checkOut()
+string LyXVC::checkOut()
 {
+       //RCS allows checkOut only in ReadOnly mode
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-       vcs->checkOut();
+       return vcs->checkOut();
+}
+
+
+string LyXVC::lockingToggle()
+{
+       LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
+       return vcs->lockingToggle();
 }
 
 
@@ -170,8 +183,8 @@ void LyXVC::revert()
 
        docstring const file = owner_->fileName().displayName(20);
        docstring text = bformat(_("Reverting to the stored version of the "
-               "document %1$s will lose all current changes.\n\n"
-                                            "Do you want to revert to the saved version?"), file);
+                               "document %1$s will lose all current changes.\n\n"
+                               "Do you want to revert to the older version?"), file);
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
                text, 0, 1, _("&Revert"), _("&Cancel"));
 
@@ -188,6 +201,9 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
+       if (!vcs->toggleReadOnlyEnabled())
+               return;
+
        switch (vcs->status()) {
        case VCS::UNLOCKED:
                LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
@@ -197,6 +213,8 @@ void LyXVC::toggleReadOnly()
                LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
                checkIn();
                break;
+       case VCS::NOLOCKING:
+               break;
        }
 }
 
@@ -255,6 +273,12 @@ bool LyXVC::checkInEnabled()
 }
 
 
+bool LyXVC::lockingToggleEnabled()
+{
+       return vcs && vcs->lockingToggleEnabled();
+}
+
+
 bool LyXVC::undoLastEnabled()
 {
        return vcs && vcs->undoLastEnabled();