#include <plib/pu.h>
#include <plib/ul.h>
+#include <simgear/compiler.h>
#include <simgear/misc/exception.hxx>
#include <Main/fg_props.hxx>
#include "menubar.hxx"
#include "dialog.hxx"
+SG_USING_STD(map);
\f
////////////////////////////////////////////////////////////////////////
NewGUI::~NewGUI ()
{
- delete _menubar;
+ clear();
}
void
ulMakePath(path1, globals->get_fg_root().c_str(), "gui");
ulMakePath(path2, path1, "dialogs");
readDir(path2);
-#if !defined(FG_OLD_MENUBAR)
_menubar->init();
-#endif
+}
+
+void
+NewGUI::reinit ()
+{
+ unbind();
+ clear();
+ _menubar = new FGMenuBar;
+ init();
+ bind();
}
void
_menubar->hide();
}
+void
+NewGUI::clear ()
+{
+ delete _menubar;
+ _menubar = 0;
+
+ map<string,SGPropertyNode *>::iterator it;
+ for (it = _dialog_props.begin(); it != _dialog_props.end(); it++)
+ delete it->second;
+ _dialog_props.clear();
+}
+
+static bool
+test_extension (const char * path, const char * ext)
+{
+ int pathlen = strlen(path);
+ int extlen = strlen(ext);
+
+ for (int i = 1; i <= pathlen && i <= extlen; i++) {
+ if (path[pathlen-i] != ext[extlen-i])
+ return false;
+ }
+ return true;
+}
+
void
NewGUI::readDir (const char * path)
{
return;
}
- ulDirEnt * dirEnt = ulReadDir(dir);
- while (dirEnt != 0) {
+ for (ulDirEnt * dirEnt = ulReadDir(dir);
+ dirEnt != 0;
+ dirEnt = ulReadDir(dir)) {
+
char subpath[1024];
ulMakePath(subpath, path, dirEnt->d_name);
- if (dirEnt->d_isdir && dirEnt->d_name[0] != '.') {
- readDir(subpath);
- } else {
- SGPropertyNode_ptr props = new SGPropertyNode;
+ if (!dirEnt->d_isdir && test_extension(subpath, ".xml")) {
+ SGPropertyNode * props = new SGPropertyNode;
try {
readProperties(subpath, props);
} catch (const sg_exception &ex) {
- SG_LOG(SG_INPUT, SG_ALERT, "Error parsing GUI file "
+ SG_LOG(SG_INPUT, SG_ALERT, "Error parsing dialog "
<< subpath);
+ delete props;
+ continue;
}
if (!props->hasValue("name")) {
- SG_LOG(SG_INPUT, SG_WARN, "GUI file " << subpath
+ SG_LOG(SG_INPUT, SG_WARN, "dialog " << subpath
<< " has no name; skipping.");
- } else {
- string name = props->getStringValue("name");
- SG_LOG(SG_INPUT, SG_BULK, "Saving GUI node " << name);
- _dialog_props[name] = props;
+ delete props;
+ continue;
}
+ string name = props->getStringValue("name");
+ SG_LOG(SG_INPUT, SG_BULK, "Saving dialog " << name);
+ if (_dialog_props[name] != 0)
+ delete _dialog_props[name];
+ _dialog_props[name] = props;
}
- dirEnt = ulReadDir(dir);
}
ulCloseDir(dir);
}