+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <string.h>
#include <iostream>
#include <plib/pu.h>
#include <simgear/debug/logstream.hxx>
+#include <Autopilot/auto_gui.hxx>
+#include <Input/input.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
-#include <Input/input.hxx>
-
#include "new_gui.hxx"
#include "menubar.hxx"
return true;
}
+#if 0
extern void fgAPAdjust (puObject *);
static bool
do_ap_adjust_dialog (const SGPropertyNode * arg)
fgAPAdjust(0);
return true;
}
+#endif
extern void fgLatLonFormatToggle (puObject *);
static bool
{ "old-ap-add-waypoint-dialog", do_ap_add_waypoint_dialog },
{ "old-ap-pop-waypoint-dialog", do_ap_pop_waypoint_dialog },
{ "old-ap-clear-route-dialog", do_ap_clear_route_dialog },
- { "old-ap-adjust-dialog", do_ap_adjust_dialog },
{ "old-lat-lon-format-dialog", do_lat_lon_format_dialog },
{ "old-help-dialog", do_help_dialog },
{ 0, 0 }
FGMenuBar::~FGMenuBar ()
{
- hide();
- puDeleteObject(_menuBar);
-
- int i;
-
- // Delete all the character arrays
- // we were forced to keep around for
- // plib.
- SG_LOG(SG_GENERAL, SG_INFO, "Deleting char arrays");
- for (i = 0; i < _char_arrays.size(); i++) {
- for (int j = 0; _char_arrays[i][j] != 0; j++)
- free(_char_arrays[i][j]); // added with strdup
- delete _char_arrays[i];
- }
-
- // Delete all the callback arrays
- // we were forced to keep around for
- // plib.
- SG_LOG(SG_GENERAL, SG_INFO, "Deleting callback arrays");
- for (i = 0; i < _callback_arrays.size(); i++)
- delete _callback_arrays[i];
-
- // Delete all those bindings
- SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
- map<string,vector<FGBinding *> >::iterator it;
- it = _bindings.begin();
- for (it = _bindings.begin(); it != _bindings.end(); it++) {
- SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);
- for (int i = 0; i < it->second.size(); i++)
- delete it->second[i];
- }
-
- SG_LOG(SG_GENERAL, SG_INFO, "Done.");
+ destroy_menubar();
}
void
char ** items = make_char_array(array_size);
puCallback * callbacks = make_callback_array(array_size);
- for (int i = 0, j = item_nodes.size() - 1;
+ for (unsigned int i = 0, j = item_nodes.size() - 1;
i < item_nodes.size();
i++, j--) {
vector<SGPropertyNode_ptr> binding_nodes =
item_nodes[i]->getChildren("binding");
- for (int k = 0; k < binding_nodes.size(); k++)
+ for (unsigned int k = 0; k < binding_nodes.size(); k++)
_bindings[items[j]].push_back(new FGBinding(binding_nodes[k]));
}
void
FGMenuBar::make_menubar ()
{
+ SGPropertyNode *targetpath;
+
+ targetpath = fgGetNode("/sim/menubar/default",true);
+ // fgLoadProps("gui/menubar.xml", targetpath);
+
+ /* NOTE: there is no check to see whether there's any usable data at all
+ *
+ * This would also have the advantage of being able to create some kind of
+ * 'fallback' menu - just in case that either menubar.xml is empty OR that
+ * its XML data is not valid, that way we would avoid displaying an
+ * unusable menubar without any functionality - if we decided to add another
+ * char * element to the commands structure in
+ * $FG_SRC/src/Main/fgcommands.cxx
+ * we could additionally save each function's (short) description and use
+ * this as label for the fallback PUI menubar item labels - as a workaround
+ * one might simply use the internal fgcommands and put them into the
+ * fallback menu, so that the user is at least able to re-init the menu
+ * loading - just in case there was some malformed XML in it
+ * (it happend to me ...)
+ */
+
+ make_menubar(targetpath);
+}
+
+/* WARNING: We aren't yet doing any validation of what's found - but since
+ * this isn't done with menubar.xml either, it should not really matter
+ * right now. Although one should later on consider to validate the
+ * contents, whether they are representing a 'legal' menubar structure.
+ */
+void
+FGMenuBar::make_menubar(const SGPropertyNode * props)
+{
+ // Just in case.
+ destroy_menubar();
_menuBar = new puMenuBar;
- SGPropertyNode props;
- fgLoadProps("gui/menubar.xml", &props);
- vector<SGPropertyNode_ptr> menu_nodes = props.getChildren("menu");
- for (int i = 0; i < menu_nodes.size(); i++)
+ vector<SGPropertyNode_ptr> menu_nodes = props->getChildren("menu");
+ for (unsigned int i = 0; i < menu_nodes.size(); i++)
make_menu(menu_nodes[i]);
_menuBar->close();
_menuBar->hide();
}
+void
+FGMenuBar::destroy_menubar ()
+{
+ if ( _menuBar == 0 )
+ return;
+
+ hide();
+ puDeleteObject(_menuBar);
+
+ unsigned int i;
+
+ // Delete all the character arrays
+ // we were forced to keep around for
+ // plib.
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting char arrays");
+ for (i = 0; i < _char_arrays.size(); i++) {
+ for (int j = 0; _char_arrays[i][j] != 0; j++)
+ free(_char_arrays[i][j]); // added with strdup
+ delete[] _char_arrays[i];
+ }
+
+ // Delete all the callback arrays
+ // we were forced to keep around for
+ // plib.
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting callback arrays");
+ for (i = 0; i < _callback_arrays.size(); i++)
+ delete[] _callback_arrays[i];
+
+ // Delete all those bindings
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
+ map<string,vector<FGBinding *> >::iterator it;
+ it = _bindings.begin();
+ for (it = _bindings.begin(); it != _bindings.end(); it++) {
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);
+ for ( i = 0; i < it->second.size(); i++ )
+ delete it->second[i];
+ }
+
+ SG_LOG(SG_GENERAL, SG_INFO, "Done.");
+}
+
+
char **
FGMenuBar::make_char_array (int size)
{