better selection and scrolling behaviour

[lyx.git] / src / frontends / qt2 / Alert_pimpl.C

diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C
index 657b473103ae5d63ad3c60585b10068c647855b3..553bc0b0c50c859e5a9c4fb0b1ca9881cdc1426a 100644 (file)
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt2/Alert_pimpl.C
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
@@ -26,37 +26,47 @@
 #include "Alert.h"
 #include "Alert_pimpl.h"
 
+#include "BoostFormat.h"
+
+
 using std::pair;
 using std::make_pair;
 
+
 void alert_pimpl(string const & s1, string const & s2, string const & s3)
 {
-       QMessageBox::warning(0, "LyX", (s1 + "\n" + "\n" + s2 + "\n" + s3).c_str());
+       QMessageBox::warning(0, "LyX",
+                            (s1 + '\n' + '\n' + s2 + '\n' + s3).c_str());
 }
 
 
 bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3)
 {
-       return !(QMessageBox::information(0, "LyX", (s1 + "\n" + s2 + "\n" + s3).c_str(),
+       return !(QMessageBox::information(0, "LyX", (s1 + '\n' + s2 + '\n' + s3).c_str(),
                _("&Yes"), _("&No"), 0, 1));
 }
 
 
 int askConfirmation_pimpl(string const & s1, string const & s2, string const & s3)
 {
-       return (QMessageBox::information(0, "LyX", (s1 + "\n" + s2 + "\n" + s3).c_str(),
+       return (QMessageBox::information(0, "LyX", (s1 + '\n' + s2 + '\n' + s3).c_str(),
                _("&Yes"), _("&No"), _("&Cancel"), 0, 2)) + 1;
 }
 
 
-pair<bool, string> const askForText_pimpl(string const & msg, string const & dflt)
+pair<bool, string> const
+askForText_pimpl(string const & msg, string const & dflt)
 {
-       string title = _("LyX: ");
-       title += msg;
-
+#if USE_BOOST_FORMAT
+       boost::format fmt(_("LyX: %1$s"));
+       fmt % msg;
+       string const title = fmt.str();
+#else
+       string const title = _("LyX: ") + msg;
+#endif
        QAskForTextDialog d(0, title.c_str(), true);
        // less than ideal !
-       d.askLA->setText((string("&") + msg).c_str());
+       d.askLA->setText(('&' + msg).c_str());
        d.askLE->setText(dflt.c_str());
        d.askLE->setFocus();
        int ret = d.exec();