Fix line endings

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

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index fa3d69d56ba8f111eff7bd80a853de87a391b908..e37bb4cafea6912362caef05fde126ff70788e6e 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -302,7 +302,7 @@ FGMenuBar::make_menubar(SGPropertyNode * props)
         make_menu(menu_nodes[i]);
 
     _menuBar->close();
-    make_map(props);
+    make_object_map(props);
 
     if (_visible)
         _menuBar->reveal();
@@ -351,31 +351,11 @@ FGMenuBar::destroy_menubar ()
     SG_LOG(SG_GENERAL, SG_INFO, "Done.");
 }
 
-struct EnabledListener : SGPropertyChangeListener {
-    void valueChanged(SGPropertyNode* node) {
-        NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
-        if (!gui)
-            return;
-        FGMenuBar *menubar = gui->getMenuBar();
-        if (menubar)
-            menubar->enable_item(node->getParent(), node->getBoolValue());
-    }
-};
-
 void
-FGMenuBar::add_enabled_listener(SGPropertyNode * node)
+FGMenuBar::make_object_map(SGPropertyNode * node)
 {
-    if (!node->hasValue("enabled"))
-        node->setBoolValue("enabled", true);
-
-    enable_item(node, node->getBoolValue("enabled"));
-    node->getNode("enabled")->addChangeListener(new EnabledListener());
-}
-
-void
-FGMenuBar::make_map(SGPropertyNode * node)
-{
-    int menu_index = 0;
+    unsigned int menu_index = 0;
+    vector<SGPropertyNode_ptr> menus = node->getChildren("menu");
     for (puObject *obj = ((puGroup *)_menuBar)->getFirstChild();
             obj; obj = obj->getNextObject()) {
 
@@ -384,50 +364,72 @@ FGMenuBar::make_map(SGPropertyNode * node)
         if (!(obj->getType() & PUCLASS_ONESHOT))
             continue;
 
-        SGPropertyNode *menu = node->getNode("menu", menu_index, false);
-        if (!menu) {
-            SG_LOG(SG_GENERAL, SG_WARN, "<menu> without node: "
+        if (menu_index >= menus.size()) {
+            SG_LOG(SG_GENERAL, SG_WARN, "'menu' object without node: "
                     << node->getPath() << "/menu[" << menu_index << ']');
-            continue;
+            return;
         }
 
-        _entries[menu->getPath()] = obj;
+        SGPropertyNode *menu = menus.at(menu_index);
+        _objects[menu->getPath()] = obj;
         add_enabled_listener(menu);
 
-        puPopupMenu *popup = (puPopupMenu *)obj->getUserData();
+        puGroup *popup = (puGroup *)obj->getUserData();
         if (!popup)
             continue;
 
         // the entries are for some reason reversed (last first), and we
-        // don't know yet how many will be usable; so we collect first
+        // don't know yet how many there will be; so we collect first
         vector<puObject *> e;
-        for (puObject *me = ((puGroup *)popup)->getFirstChild();
-                me; me = me->getNextObject())
+        for (puObject *me = popup->getFirstChild(); me; me = me->getNextObject())
             e.push_back(me);
 
+        vector<SGPropertyNode_ptr> items = menu->getChildren("item");
         for (unsigned int i = 0; i < e.size(); i++) {
-            SGPropertyNode *item = menu->getNode("item", e.size() - i - 1, false);
-            if (!item) {
-                SG_LOG(SG_GENERAL, SG_WARN, "menu <item> without node: "
+            if (i >= items.size()) {
+                SG_LOG(SG_GENERAL, SG_WARN, "'item' object without node: "
                         << menu->getPath() << "/item[" << i << ']');
-                continue;
+                break;
             }
-            _entries[item->getPath()] = e[i];
+            SGPropertyNode *item = items.at(e.size() - i - 1);
+            _objects[item->getPath()] = e[i];
             add_enabled_listener(item);
         }
         menu_index++;
     }
 }
 
+struct EnabledListener : SGPropertyChangeListener {
+    void valueChanged(SGPropertyNode *node) {
+        NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+        if (!gui)
+            return;
+        FGMenuBar *menubar = gui->getMenuBar();
+        if (menubar)
+            menubar->enable_item(node->getParent(), node->getBoolValue());
+    }
+};
+
+void
+FGMenuBar::add_enabled_listener(SGPropertyNode * node)
+{
+    if (!node->hasValue("enabled"))
+        node->setBoolValue("enabled", true);
+
+    enable_item(node, node->getBoolValue("enabled"));
+    node->getNode("enabled")->addChangeListener(new EnabledListener());
+}
+
 bool
 FGMenuBar::enable_item(const SGPropertyNode * node, bool state)
 {
-    if (!node || _entries.find(node->getPath()) == _entries.end()) {
-        SG_LOG(SG_GENERAL, SG_WARN, "Trying to enable/disable "
-            "non-existent menu item");
+    const char *path = node->getPath();
+    if (_objects.find(path) == _objects.end()) {
+        SG_LOG(SG_GENERAL, SG_ALERT, "Trying to enable/disable "
+            "non-existent menu item for node `" << path << '\'');
         return false;
     }
-    puObject *object = _entries[node->getPath()];
+    puObject *object = _objects[path];
     if (state)
         object->activate();
     else