- Added ultra-light traffic is now a separate traffic class that can have its

[flightgear.git] / src / GUI / gui_funcs.cxx

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index d8bb9b280597d9b2becbe0f1f21ee634bcbd25c7..413c65bd5b1b6aa54d2681df85dda452c0817eab 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -60,6 +60,8 @@
 # endif
 #endif
 
+#include <sstream>
+
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -129,19 +131,45 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
 
 /* ================ General Purpose Functions ================ */
 
-// General Purpose Message Box
+// General Purpose Message Box. Makes sure no more than 5 different
+// messages are displayed at the same time, and none of them are
+// duplicates. (5 is a *lot*, but this will hardly ever be reached
+// and we don't want to miss any, either.)
 void mkDialog (const char *txt)
 {
     NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
     if (!gui)
         return;
-    SGPropertyNode_ptr dlg = gui->getDialogProperties("message");
-    if (!dlg)
+    SGPropertyNode *master = gui->getDialogProperties("message");
+    if (!master)
         return;
 
-    dlg->setStringValue("text/label", txt);
-    dlg->setStringValue("button/legend", "OK");
-    gui->showDialog("message");
+    const int maxdialogs = 5;
+    string name;
+    SGPropertyNode *msg = fgGetNode("/sim/gui/dialogs", true);
+    int i;
+    for (i = 0; i < maxdialogs; i++) {
+        std::ostringstream s;
+        s << "message-" << i;
+        name = s.str();
+
+        if (!msg->getNode(name.c_str(), false))
+            break;
+
+        if (!strcmp(txt, msg->getNode(name.c_str())->getStringValue("message"))) {
+            SG_LOG(SG_GENERAL, SG_WARN, "mkDialog(): duplicate of message " << txt);
+            return;
+        }
+    }
+    if (i == maxdialogs)
+        return;
+    msg = msg->getNode(name.c_str(), true);
+    msg->setStringValue("message", txt);
+    msg = msg->getNode("dialog", true);
+    copyProperties(master, msg);
+    msg->setStringValue("name", name.c_str());
+    gui->newDialog(msg);
+    gui->showDialog(name.c_str());
 }
 
 // Message Box to report an error.
@@ -158,9 +186,9 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
     msg += '\n';
     msg += throwable.getFormattedMessage();
     if (!throwable.getOrigin().empty()) {
-      msg += "\n (reported by ";
-      msg += throwable.getOrigin();
-      msg += ')';
+        msg += "\n (reported by ";
+        msg += throwable.getOrigin();
+        msg += ')';
     }
     SG_LOG(SG_GENERAL, SG_ALERT, msg);
     mkDialog(msg.c_str());
@@ -506,7 +534,6 @@ void fgHiResDumpWrapper ( puObject *obj ) {
 void fgDumpSnapShot () {
     bool show_pu_cursor = false;
     char *filename = new char [24];
-    string message;
     static int count = 1;
 
     static const SGPropertyNode *master_freeze
@@ -543,20 +570,13 @@ void fgDumpSnapShot () {
         fclose(fp);
     }
 
-    if ( sg_glDumpWindow( filename,
-                         fgGetInt("/sim/startup/xsize"), 
-                         fgGetInt("/sim/startup/ysize")) ) {
-       message = "Snapshot saved to \"";
-       message += filename;
-       message += "\".";
-    } else {
-        message = "Failed to save to \"";
-       message += filename;
-       message += "\".";
-    }
+    int result = sg_glDumpWindow(filename,
+                                 fgGetInt("/sim/startup/xsize"),
+                                 fgGetInt("/sim/startup/ysize"));
+    fgSetString("/sim/last-screenshot", result ? filename : "");
 
     fgSetBool("/sim/signals/screenshot", false);
-    mkDialog (message.c_str());
+    //mkDialog (message.c_str());
 
     delete [] filename;