- Added ultra-light traffic is now a separate traffic class that can have its

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

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index bbdbda878f85260a37ba212f6d87e8a841b42ecc..b34e135e2a15720dbc6f513486e6c6f2f096ccc1 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/
@@ -39,26 +39,20 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 
-#include <Main/fg_os.hxx> // Must come *before* pu.h!
 #include <plib/pu.h>
 
 #include <Include/general.hxx>
 #include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <GUI/new_gui.hxx>
 
 #include "gui.h"
 #include "gui_local.hxx"
-#include "preset_dlg.hxx"
-
-
-extern void initDialog (void);
-extern void mkDialogInit (void);
-extern void ConfirmExitDialogInit(void);
+#include "layout.hxx"
 
 
 puFont guiFnt = 0;
-fntTexFont *guiFntHandle = 0;
 
 
 /* -------------------------------------------------------------------------
@@ -71,30 +65,18 @@ void guiInit()
     char *mesa_win_state;
 
     // Initialize PUI
+#ifndef PU_USE_NONE
     puInit();
-    puSetDefaultStyle         ( PUSTYLE_SMALL_BEVELLED ); //PUSTYLE_DEFAULT
-    puSetDefaultColourScheme  (0.8, 0.8, 0.9, 0.8);
-
-    initDialog();
-
-    // Next check home directory
-    SGPath fntpath;
-    char* envp = ::getenv( "FG_FONTS" );
-    if ( envp != NULL ) {
-        fntpath.set( envp );
-    } else {
-        fntpath.set( globals->get_fg_root() );
-       fntpath.append( "Fonts" );
-    }
+#endif
+    puSetDefaultStyle         ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT
+    puSetDefaultColourScheme  (0.8, 0.8, 0.9, 1);
 
-    // Install our fast fonts
-    SGPropertyNode *locale = globals->get_locale();
-    fntpath.append(locale->getStringValue("font", "typewriter.txf"));
-    guiFntHandle = new fntTexFont ;
-    guiFntHandle -> load ( (char *)fntpath.c_str() ) ;
-    puFont GuiFont ( guiFntHandle, 15 ) ;
-    puSetDefaultFonts( GuiFont, GuiFont ) ;
+    FGFontCache *fc = globals->get_fontcache();
+    puFont *GuiFont = fc->get(globals->get_locale()->getStringValue("font", "typewriter.txf"), 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...
@@ -121,10 +103,4 @@ void guiInit()
        
     // MOUSE_VIEW mode stuff
        initMouseQuat();
-
-    // Set up our Dialog Boxes
-    ConfirmExitDialogInit();
-    fgPresetInit();
-       
-    mkDialogInit();
 }