Tiny clean-ups.

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

diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C
index 816c55df29bac08c669b4e4a27cdde3d11f82d1b..02c62f84ecc43dd00d6343a20a3cacc9d681d6c8 100644 (file)
--- a/src/frontends/xforms/Alert_pimpl.C
+++ b/src/frontends/xforms/Alert_pimpl.C
@@ -5,44 +5,67 @@
  *
  * \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 "Alert_pimpl.h"
+
 #include "forms_gettext.h"
+#include "xforms_helpers.h"
+
+#include "debug.h"
 #include "gettext.h"
 
-#include <algorithm>
-#include FORMS_H_LOCATION
+#include <boost/tuple/tuple.hpp>
+
+#include "lyx_forms.h"
+
 
-using std::pair;
 using std::make_pair;
+using std::pair;
+using std::string;
+
 
-void alert_pimpl(string const & s1, string const & s2, string const & s3)
+void warning_pimpl(string const &, string const & message)
 {
-       fl_set_resource("flAlert.dismiss.label", _("Dismiss"));
-       fl_show_alert(s1.c_str(), s2.c_str(), s3.c_str(), 0);
+       fl_show_messages(formatted(message, 300).c_str());
 }
 
 
-#warning error needs fixing up
-#warning a "&Save" -> "Save|#S" is whats needed
-#warning and a format maybe, and fixup default_button ?
+void error_pimpl(string const &, string const & message)
+{
+       fl_show_messages(formatted(message, 300).c_str());
+}
+
+
+void information_pimpl(string const &, string const & message)
+{
+       fl_show_messages(formatted(message, 300).c_str());
+}
 
-int prompt_pimpl(string const & title, string const & question,
-           int default_button,
-          string const & b1, string const & b2, string const & b3);
+
+int prompt_pimpl(string const &, string const & question,
+           int default_button, int /*escape_button*/,
+          string const & b1, string const & b2, string const & b3)
 {
+       string b1label, b1sc;
+       string b2label, b2sc;
+       string b3label, b3sc;
+       boost::tie(b1label, b1sc) = parse_shortcut(b1);
+       boost::tie(b2label, b2sc) = parse_shortcut(b2);
+       boost::tie(b3label, b3sc) = parse_shortcut(b3);
+
        if (b3.empty()) {
-               return fl_show_choice(title.c_str(), question.c_str(), "",
-                       2, b1.c_str(), b2.c_str(), 2);
+               fl_set_choices_shortcut(b1sc.c_str(), b2sc.c_str(), "");
+               return fl_show_choices(formatted(question, 300).c_str(),
+                       2, b1label.c_str(), b2label.c_str(), "", default_button + 1) - 1;
        } else {
-               return fl_show_choice(title.c_str(), question.c_str(), "",
-                       3, b1.c_str(), b2.c_str(), b3.c_str(), 3);
+               fl_set_choices_shortcut(b1sc.c_str(), b2sc.c_str(), b3sc.c_str());
+               return fl_show_choices(formatted(question, 300).c_str(),
+                       3, b1label.c_str(), b2label.c_str(), b3label.c_str(),
+                       default_button + 1) - 1;
        }
 }