move some selection related stuff over to textcursor.C

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 5dff933476ccba05a8e623ef84f80be54f5ea890..3e09e77d346b5bfffffb89b72d1d2d5a636558dd 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -13,13 +13,13 @@
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "BoostFormat.h"
 
 #include <unistd.h>
 
 using std::endl;
 using std::pair;
 
+
 /* WARNING: Several of the vcs-> methods end up
  * deleting this object via BufferView::reload() !
  */
@@ -80,16 +80,10 @@ bool LyXVC::ensureClean()
                return true;
 
        string const file = MakeDisplayPath(owner_->fileName(), 30);
-#if USE_BOOST_FORMAT
-       boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
-       fmt % file;
-       string text = fmt.str();
-#else
-       string text = _("The document ");
-       text += file + _(" has unsaved changes.\n\nDo you want to save the document?");
-#endif
+       string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+               "Do you want to save the document?"), file);
        int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, _("&Save"), _("&Cancel"));
+               text, 0, 1, _("&Save"), _("&Cancel"));
 
        if (ret == 0) {
                vcs->owner()->getUser()->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
@@ -105,9 +99,9 @@ void LyXVC::registrer()
 
        // there must be a file to save
        if (!IsFileReadable(filename)) {
-               Alert::alert(_("File not saved"),
-                       _("You must save the file"),
-                       _("before it can be registered."));
+               Alert::error(_("Document not saved"),
+                       _("You must save the document "
+                         "before it can be registered."));
                return;
        }
 
@@ -145,8 +139,6 @@ void LyXVC::registrer()
        if (!tmp.first || tmp.second.empty()) {
                // should we insist on checking tmp.second.empty()?
                lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
-               Alert::alert(_("Info"),
-                          _("This document has NOT been registered."));
                return;
        }
 
@@ -195,17 +187,11 @@ void LyXVC::revert()
        lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
 
        string const file = MakeDisplayPath(owner_->fileName(), 20);
-#if USE_BOOST_FORMAT
-       boost::format fmt(_("Reverting to the stored version of the document %1$s will "
-                       "lose all current changes.\n\nDo you want to revert to the saved version?"));
-       fmt % file;
-       string text = fmt.str();
-#else
-       string text = _("Reverting to the stored version of the document ");
-       text += file + _(" will lose all current changes.\n\nDo you want to revert to the saved version?");
-#endif
+       string 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);
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
-               text, 1, _("&Revert"), _("&Cancel"));
+               text, 0, 1, _("&Revert"), _("&Cancel"));
 
        if (ret == 0)
                vcs->revert();