Minipage is no more (long live the box inset)

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

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