Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 10, 2005, 10:39:01 AM (19 years ago)
Author:
patrick
Message:

orxonox/branches/md2_loader: merged trunk into branche using: svn merge ../trunk/ md2_loader -r 4063:HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/md2_loader/src/lib/gui/gui/gui.cc

    r4063 r4139  
    5353{
    5454  Window* orxonoxGUI = NULL;
    55 
     55  executable = NULL;
     56 
    5657  initGUI(argc, argv);
    5758
     
    9495    orxonoxGUI->fill(windowBox);
    9596  }
     97
     98
    9699  // Reading Values from File
    97100  exec->setConfDir(GUI_DEFAULT_CONF_DIR);
     
    111114  // case update //
    112115#ifdef HAVE_CURL
    113   if (static_cast<Option*>(Window::mainWindow->findWidgetByName("auto update", 0))->value == 1)
     116  if (static_cast<Option*>(Window::mainWindow->findWidgetByName(CONFIG_NAME_AUTO_UPDATE, 0))->value == 1)
    114117    {
    115118      update->checkForUpdates();
    116119    }
    117120#endif /* HAVE_CURL */
     121}
    118122
     123/**
     124   \brief starts the OrxonoxGUI
     125*/
     126void Gui::startGui(void)
     127{
    119128  mainloopGUI();
     129 
    120130#ifndef HAVE_GTK2
    121131  GuiExec::startOrxonox(NULL, exec);
     
    123133}
    124134
     135void Gui::printHelp()
     136{
     137  Window::mainWindow->walkThrough(Widget::printHelp, 1);
     138}
     139
     140/**
     141   \brief a bool that knows if orxonox should be started
     142*/
    125143bool Gui::startOrxonox = false;
    126144
Note: See TracChangeset for help on using the changeset viewer.