cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 264bb6f622effaa7aea880d3de8272ba9786c6c7..8b9d7c608ea382b9969025b75b5bdbeb0cc6b9a9 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -24,6 +24,7 @@
 #include "frontends/alert.h"
 
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/lyxlib.h"
 
 
@@ -32,7 +33,6 @@ namespace lyx {
 using support::bformat;
 using support::FileName;
 using support::makeAbsPath;
-using support::makeDisplayPath;
 using support::tempName;
 
 using std::endl;
@@ -84,7 +84,7 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
 }
 
 
-void LyXVC::buffer(Buffer * buf)
+void LyXVC::setBuffer(Buffer * buf)
 {
        owner_ = buf;
 }
@@ -92,7 +92,7 @@ void LyXVC::buffer(Buffer * buf)
 
 void LyXVC::registrer()
 {
-       FileName const filename(owner_->fileName());
+       FileName const filename = owner_->fileName();
 
        // there must be a file to save
        if (!filename.isFileReadable()) {
@@ -107,66 +107,60 @@ void LyXVC::registrer()
                FileName const cvs_entries(makeAbsPath("CVS/Entries"));
 
                if (cvs_entries.isFileReadable()) {
-                       LYXERR(Debug::LYXVC)
-                               << "LyXVC: registering "
-                               << to_utf8(makeDisplayPath(filename.absFilename()))
-                               << " with CVS" << endl;
+                       LYXERR(Debug::LYXVC, "LyXVC: registering "
+                               << to_utf8(filename.displayName()) << " with CVS");
                        vcs.reset(new CVS(cvs_entries, filename));
 
                } else {
-                       LYXERR(Debug::LYXVC)
-                               << "LyXVC: registering "
-                               << to_utf8(makeDisplayPath(filename.absFilename()))
-                               << " with RCS" << endl;
+                       LYXERR(Debug::LYXVC, "LyXVC: registering "
+                               << to_utf8(filename.displayName()) << " with RCS");
                        vcs.reset(new RCS(filename));
                }
 
                vcs->owner(owner_);
        }
 
-       LYXERR(Debug::LYXVC) << "LyXVC: registrer" << endl;
-       pair<bool, docstring> tmp =
-               Alert::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;
+       LYXERR(Debug::LYXVC, "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()?
+               LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
                return;
        }
 
-       vcs->registrer(to_utf8(tmp.second));
+       vcs->registrer(to_utf8(response));
 }
 
 
 void LyXVC::checkIn()
 {
-
-       LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl;
-       pair<bool, docstring> tmp = Alert::askForText(_("LyX VC: Log Message"));
-       if (tmp.first) {
-               if (tmp.second.empty()) {
-                       tmp.second = _("(no log message)");
-               }
-               vcs->checkIn(to_utf8(tmp.second));
+       LYXERR(Debug::LYXVC, "LyXVC: checkIn");
+       docstring response;
+       bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+       if (ok) {
+               if (response.empty())
+                       response = _("(no log message)");
+               vcs->checkIn(to_utf8(response));
        } else {
-               LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
+               LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
        }
 }
 
 
 void LyXVC::checkOut()
 {
-       LYXERR(Debug::LYXVC) << "LyXVC: checkOut" << endl;
-
+       LYXERR(Debug::LYXVC, "LyXVC: checkOut");
        vcs->checkOut();
 }
 
 
 void LyXVC::revert()
 {
-       LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
+       LYXERR(Debug::LYXVC, "LyXVC: revert");
 
-       docstring const file = makeDisplayPath(owner_->fileName(), 20);
+       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);
@@ -188,11 +182,11 @@ void LyXVC::toggleReadOnly()
 {
        switch (vcs->status()) {
        case VCS::UNLOCKED:
-               LYXERR(Debug::LYXVC) << "LyXVC: toggle to locked" << endl;
+               LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
                checkOut();
                break;
        case VCS::LOCKED:
-               LYXERR(Debug::LYXVC) << "LyXVC: toggle to unlocked" << endl;
+               LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
                checkIn();
                break;
        }
@@ -201,7 +195,8 @@ void LyXVC::toggleReadOnly()
 
 bool LyXVC::inUse()
 {
-       if (vcs) return true;
+       if (vcs)
+               return true;
        return false;
 }
 
@@ -211,6 +206,7 @@ bool LyXVC::inUse()
 //     return vcs->version();
 //}
 
+
 string const LyXVC::versionString() const
 {
        return vcs->versionString();
@@ -230,11 +226,10 @@ string const LyXVC::getLogFile() const
 
        FileName const tmpf(tempName(FileName(), "lyxvclog"));
        if (tmpf.empty()) {
-               LYXERR(Debug::LYXVC) << "Could not generate logfile "
-                                    << tmpf << endl;
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return string();
        }
-       LYXERR(Debug::LYXVC) << "Generating logfile " << tmpf << endl;
+       LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
        vcs->getLog(tmpf);
        return tmpf.absFilename();
 }