namespace grfx -> lyx::graphics

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

diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h
index 0e235546a4a63feb80be761785f3ef8d2f1e1d5d..12847b2dc1a388c01f7d3a688e682657e23815be 100644 (file)
--- a/src/frontends/Alert.h
+++ b/src/frontends/Alert.h
@@ -20,26 +20,40 @@ namespace Alert {
 
 /**
  * Prompt for a question. Returns 0-2 for the chosen button.
- * Set default_button to a reasonable value. b1-b3 should have
- * accelerators marked with an '&'. title should be a short summary.
- * Strings should be gettextised. Please think about the poor user.
+ * Set default_button and cancel_button to reasonable values. b1-b3
+ * should have accelerators marked with an '&'. title should be
+ * a short summary. Strings should be gettextised.
+ * Please think about the poor user.
  *
  * Remember to use boost::format. If you make any of these buttons
  * "Yes" or "No", I will personally come around to your house and
  * slap you with fish, and not in an enjoyable way either.
  */
 int prompt(string const & title, string const & question,
-           int default_button,
+           int default_button, int cancel_button,
           string const & b1, string const & b2, string const & b3 = string());
 
-/// show an alert message
-void alert(string const & title, string const & s1 = string(),
-          string const & s2 = string());
+/**
+ * Display a warning to the user. Title should be a short (general) summary.
+ * Only use this if the user cannot perform some remedial action.
+ */
+void warning(string const & title, string const & message);
 
-/// show an alert message and strerror(errno)
-void err_alert(string const & s1, string const & s2 = string());
+/**
+ * Display a warning to the user. Title should be a short (general) summary.
+ * Only use this if the user cannot perform some remedial action.
+ */
+void error(string const & title, string const & message);
+
+/**
+ * Informational message. Use very very sparingly. That is, you must
+ * apply to me, in triplicate, under the sea, breathing in petrol
+ * and reciting the Nicene Creed, whilst running uphill and also
+ * eating.
+ */
+void information(string const & title, string const & message);
 
-/// Asks for a text
+/// Asks for a text. DO NOT USE !!
 std::pair<bool, string> const
 askForText(string const & msg,
           string const & dflt = string());