Fix line endings

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

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 1f4d75a894c7abb000cb4dcf0d3651e5ad6d6c6f..fbc5e902aa80f385ce71d32edd650ddb44a0356a 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -34,137 +34,26 @@
 #  include <windows.h>
 #endif
 
-#include <simgear/misc/props.hxx>
-#include <simgear/misc/props_io.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <plib/pu.h>
 
 #include <Include/general.hxx>
+#include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
 #include "gui.h"
 #include "gui_local.hxx"
-#include "net_dlg.hxx"
 #include "preset_dlg.hxx"
-
-
-// main.cxx hack, should come from an include someplace
-extern void fgInitVisuals( void );
-extern void fgReshape( int width, int height );
-extern void fgRenderFrame( void );
-
-extern void initDialog (void);
-extern void mkDialogInit (void);
-extern void ConfirmExitDialogInit(void);
+#include "layout.hxx"
 
 
 puFont guiFnt = 0;
 fntTexFont *guiFntHandle = 0;
-#if defined(FG_OLD_MENUBAR)
-int gui_menu_on = 0;
-puMenuBar    *mainMenuBar = 0;
-//static puButton     *hideMenuButton = 0;
-
-
-struct fg_gui_t {
-       char *name;
-       char **submenu;
-       puCallback *cb;
-} *Menu;
-unsigned int Menu_size;
-
-void initMenu()
-{
-     SGPropertyNode main;
-
-     try {
-         fgLoadProps("menu.xml", &main);
-     } catch (const sg_exception &ex) {
-         SG_LOG(SG_GENERAL, SG_ALERT, "Error processing the menu file.");
-         return;
-     }
-
-     SG_LOG(SG_GENERAL, SG_INFO, "Reading menu entries.");
-
-     // Make the menu bar
-     mainMenuBar = new puMenuBar ();
-
-     SGPropertyNode *menu = main.getChild("menu");
-     SGPropertyNode *locale = globals->get_locale();
-
-     vector<SGPropertyNode_ptr>submenu = menu->getChildren("submenu");
-
-     Menu_size = 1+submenu.size();
-     Menu = (fg_gui_t *)calloc(Menu_size, sizeof(fg_gui_t));
-
-     for (unsigned int h = 0; h < submenu.size(); h++) {
-
-         vector<SGPropertyNode_ptr>option = submenu[h]->getChildren("option");
-
-         //
-         // Make sure all entries will fit into allocated memory
-         //
-         Menu[h].submenu = (char **)calloc(1+option.size(), sizeof(char *));
-         Menu[h].cb = (puCallback *)calloc(1+option.size(), sizeof(puCallback));
-
-         for (unsigned int i = 0; i < option.size(); i++) {
-
-             SGPropertyNode *name = option[i]->getNode("name");
-             SGPropertyNode *call = option[i]->getNode("call");
-             SGPropertyNode *sep = option[i]->getNode("seperator");
-
-             int pos = option.size()-i-1;
-             if (sep) {
-                Menu[h].submenu[pos] = strdup("----------");
-             } else if (call && strcmp(call->getStringValue(), "")) {
-                 string text = locale->getStringValue( name->getStringValue(),
-                                                       "strings/null" );
-                 Menu[h].submenu[pos]
-                     = strdup(text.c_str());
-             } else {
-                 Menu[h].submenu[pos] = strdup("not specified");
-             }
-
-             Menu[h].cb[pos] = NULL;
-             for (unsigned int j=0; __fg_gui_fn[j].fn; j++)
-                 if (call &&
-                     !strcmp(call->getStringValue(), __fg_gui_fn[j].name) )
-                 {
-                     Menu[h].cb[pos] = __fg_gui_fn[j].fn;
-                     break;
-                 }
-         }
-
-         SGPropertyNode *name = submenu[h]->getNode("name");
-         string text = locale->getStringValue( name->getStringValue(),
-                                               "strings/null" );
-
-         Menu[h].name = strdup(text.c_str());
-         mainMenuBar->add_submenu(Menu[h].name, Menu[h].submenu, Menu[h].cb);
-
-    }
-
-    mainMenuBar->close();
-}
-
-
-// FIXME: Has to be called from somewhere
-//        or better yet, turn the menu into a class of its own
-void destroyMenu(void) {
-    for(unsigned int i=0; i < Menu_size; i++) {
-
-        free(Menu[i].name);
-
-                                // FIXME: don't use strdup/free
-        for(unsigned int j=0; Menu[i].submenu[j] != NULL; j++)
-           free(Menu[i].submenu[j]);
-    }
-}
-#endif
-
 
 
 /* -------------------------------------------------------------------------
@@ -178,10 +67,8 @@ void guiInit()
 
     // Initialize PUI
     puInit();
-    puSetDefaultStyle         ( PUSTYLE_BEVELLED ); //PUSTYLE_DEFAULT
-    puSetDefaultColourScheme  (0.6, 0.6, 0.5, 1.0);
-
-    initDialog();
+    puSetDefaultStyle         ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT
+    puSetDefaultColourScheme  (0.8, 0.8, 0.9, 1);
 
     // Next check home directory
     SGPath fntpath;
@@ -201,6 +88,8 @@ void guiInit()
     puFont GuiFont ( guiFntHandle, 15 ) ;
     puSetDefaultFonts( GuiFont, GuiFont ) ;
     guiFnt = puGetDefaultLabelFont();
+
+    LayoutWidget::setDefaultFont(&GuiFont, 15);
   
     if (!fgHasNode("/sim/startup/mouse-pointer")) {
         // no preference specified for mouse pointer, attempt to autodetect...
@@ -229,24 +118,5 @@ void guiInit()
        initMouseQuat();
 
     // Set up our Dialog Boxes
-    ConfirmExitDialogInit();
     fgPresetInit();
-       
-#ifdef FG_NETWORK_OLK
-    NewNetIdInit();
-    NewNetFGDInit();
-#endif
-
-    mkDialogInit();
-
-#if defined(FG_OLD_MENUBAR)
-    initMenu();
-    
-    // Set up menu bar toggle
-    gui_menu_on = ~0;
-
-    if (!strcmp(fgGetString("/sim/flight-model"), "ada")) {
-        guiToggleMenu(); // Menu off by default
-    }
-#endif
 }