Added button actions so that property fields can be applied or

updated.

diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 9301ba92b9b759c9163519028e6601ac695a80cc..656fc2a2aa2c806eca4b4a56f93bce988457cddc 100644 (file)
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -11,6 +11,49 @@ SG_USING_STD(vector);
 #include <Main/fg_props.hxx>
 
 
+/**
+ * Callback to update all property values.
+ */
+static void
+update_callback (puObject * object)
+{
+    ((NewGUI *)object->getUserData())->updateProperties();
+}
+
+
+/**
+ * Callback to close the dialog.
+ */
+static void
+close_callback (puObject * object)
+{
+    ((NewGUI *)object->getUserData())->closeActiveObject();
+}
+
+
+/**
+ * Callback to apply the property value for every field.
+ */
+static void
+apply_callback (puObject * object)
+{
+    ((NewGUI *)object->getUserData())->applyProperties();
+    update_callback(object);
+}
+
+
+/**
+ * Callback to apply the property values and close the dialog.
+ */
+static void
+close_apply_callback (puObject * object)
+{
+    apply_callback(object);
+    close_callback(object);
+}
+
+
+
 NewGUI::NewGUI ()
     : _activeObject(0)
 {
@@ -53,19 +96,6 @@ NewGUI::update (double delta_time_sec)
     // NO OP
 }
 
-static void
-close_callback (puObject * object)
-{
-    ((NewGUI *)object->getUserData())->closeActiveObject();
-}
-
-void
-NewGUI::closeActiveObject ()
-{
-    delete _activeObject;
-    _activeObject = 0;
-}
-
 void
 NewGUI::display (const string &name)
 {
@@ -90,6 +120,34 @@ NewGUI::display (const string &name)
     }
 }
 
+void
+NewGUI::applyProperties ()
+{
+    for (int i = 0; i < _propertyObjects.size(); i++) {
+        puObject * object = _propertyObjects[i].object;
+        SGPropertyNode_ptr node = _propertyObjects[i].node;
+        node->setStringValue(object->getStringValue());
+    }
+}
+
+void
+NewGUI::updateProperties ()
+{
+    for (int i = 0; i < _propertyObjects.size(); i++) {
+        puObject * object = _propertyObjects[i].object;
+        SGPropertyNode_ptr node = _propertyObjects[i].node;
+        object->setValue(node->getStringValue());
+    }
+}
+
+void
+NewGUI::closeActiveObject ()
+{
+    delete _activeObject;
+    _activeObject = 0;
+    _propertyObjects.clear();
+}
+
 puObject *
 NewGUI::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
 {
@@ -129,8 +187,6 @@ NewGUI::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
         else
             b = new puButton(x, y, legend);
         setupObject(b, props);
-        b->setCallback(close_callback);
-        b->setUserData(this);
         return b;
     } else {
         return 0;
@@ -140,14 +196,34 @@ NewGUI::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
 void
 NewGUI::setupObject (puObject * object, SGPropertyNode * props)
 {
+    object->setUserData(this);
+
     if (props->hasValue("legend"))
         object->setLegend(props->getStringValue("legend"));
 
     if (props->hasValue("label"))
         object->setLabel(props->getStringValue("label"));
 
-    if (props->hasValue("default-value-prop"))
-        object->setValue(fgGetString(props->getStringValue("default-value-prop")));
+    if (props->hasValue("default-value-prop")) {
+        const char * name = props->getStringValue("default-value-prop");
+        SGPropertyNode_ptr node = fgGetNode(name, true);
+        object->setValue(node->getStringValue());
+        _propertyObjects.push_back(PropertyObject(object, node));
+    }
+
+    if (props->hasValue("action")) {
+        string action = props->getStringValue("action");
+        if (action == "update")
+            object->setCallback(update_callback);
+        else if (action == "close")
+            object->setCallback(close_callback);
+        else if (action == "apply")
+            object->setCallback(apply_callback);
+        else if (action == "close-apply")
+            object->setCallback(close_apply_callback);
+        else
+            SG_LOG(SG_GENERAL, SG_ALERT, "Unknown GUI action " + action);
+    }
 
     object->makeReturnDefault(props->getBoolValue("default"));
 }
@@ -167,4 +243,10 @@ NewGUI::setupGroup (puGroup * group, SGPropertyNode * props,
     group->close();
 }
 
+NewGUI::PropertyObject::PropertyObject (puObject * o, SGPropertyNode_ptr n)
+    : object(o),
+      node(n)
+{
+}
+
 // end of new_gui.cxx

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 3030cae7788956276494886ddf272bc69d4b6bf4..1c2f455af3ffefb530e3a622a52a51b19778b2cd 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -10,6 +10,9 @@
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/misc/props.hxx>
 
+#include <vector>
+SG_USING_STD(vector);
+
 #include <map>
 SG_USING_STD(map);
 
@@ -25,9 +28,12 @@ public:
     virtual void init ();
     virtual void update (double delta_time_sec);
 
-    virtual void closeActiveObject ();
     virtual void display (const string &name);
 
+    virtual void updateProperties ();
+    virtual void applyProperties ();
+    virtual void closeActiveObject ();
+
 private:
 
     puObject * makeObject (SGPropertyNode * props,
@@ -41,6 +47,14 @@ private:
     map<string,SGPropertyNode_ptr> _objects;
     puObject * _activeObject;
 
+    struct PropertyObject {
+        PropertyObject (puObject * object, SGPropertyNode_ptr node);
+        puObject * object;
+        SGPropertyNode_ptr node;
+    };
+
+    vector<PropertyObject> _propertyObjects;
+
 };
 
 #endif // __NEW_GUI_HXX