If I ever see another licence blurb again, it'll be too soon...

[lyx.git] / src / frontends / Alert.C

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 334e8d103ba84879a4de915378e71e2e0b3db763..984abfab875f14bd451d9dbc7204e8d0609895e3 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -5,7 +5,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -13,45 +13,21 @@
 #include "Alert.h"
 
 #include "debug.h"
-#include "lyxrc.h"
+#include "lyx_gui.h"
 
 #include "Alert_pimpl.h"
 
-#include <cerrno>
-
-#ifndef CXX_GLOBAL_CSTD
-using std::strerror;
-#endif
-
 using std::endl;
 using std::pair;
 using std::make_pair;
 
-
-void Alert::alert(string const & s1, string const & s2, string const & s3)
-{
-       if (!lyxrc.use_gui) {
-               lyxerr << "------------------------------" << endl
-                      << s1 << endl << s2 << endl << s3 << endl
-                      << "------------------------------" << endl;
-       } else {
-               alert_pimpl(s1, s2, s3);
-       }
-}
-
-
-void Alert::err_alert(string const & s1, string const & s2)
-{
-       alert(s1, s2, strerror(errno));
-}
-
-
 int Alert::prompt(string const & title, string const & question,
-           int default_button,
+           int default_button, int escape_button,
           string const & b1, string const & b2, string const & b3)
 {
-       if (lyxrc.use_gui)
-               return prompt_pimpl(title, question, default_button, b1, b2, b3);
+       if (lyx_gui::use_gui)
+               return prompt_pimpl(title, question,
+                       default_button, escape_button, b1, b2, b3);
 
        lyxerr << title << endl;
        lyxerr << "----------------------------------------" << endl;
@@ -66,10 +42,43 @@ int Alert::prompt(string const & title, string const & question,
 }
 
 
+void Alert::warning(string const & title, string const & message)
+{
+       if (lyx_gui::use_gui)
+               return warning_pimpl(title, message);
+
+       lyxerr << "Warning: " << title << endl;
+       lyxerr << "----------------------------------------" << endl;
+       lyxerr << message << endl;
+}
+
+
+void Alert::error(string const & title, string const & message)
+{
+       if (lyx_gui::use_gui)
+               return error_pimpl(title, message);
+
+       lyxerr << "Error: " << title << endl;
+       lyxerr << "----------------------------------------" << endl;
+       lyxerr << message << endl;
+}
+
+
+void Alert::information(string const & title, string const & message)
+{
+       if (lyx_gui::use_gui)
+               return information_pimpl(title, message);
+
+       lyxerr << title << endl;
+       lyxerr << "----------------------------------------" << endl;
+       lyxerr << message << endl;
+}
+
+
 pair<bool, string> const Alert::askForText(string const & msg,
                                           string const & dflt)
 {
-       if (!lyxrc.use_gui) {
+       if (!lyx_gui::use_gui) {
                lyxerr << "----------------------------------------" << endl
                       << msg << endl
                       << "Assuming answer is " << dflt