Changeset 4046 in orxonox.OLD for orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui.cc
- Timestamp:
- May 4, 2005, 11:50:34 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui.cc
r4044 r4046 26 26 #include <unistd.h> 27 27 28 #include "orxonox_gui_gtk.h" 28 29 #include "orxonox_gui.h" 29 30 #include "orxonox_gui_video.h" … … 35 36 #include "orxonox_gui_update.h" 36 37 37 Window* orxonoxGUI = NULL; 38 OrxonoxGuiVideo* video= NULL;39 OrxonoxGuiAudio* audio = NULL;40 OrxonoxGuiExec* exec= NULL;41 OrxonoxGuiFlags* flags= NULL;42 43 44 38 // GUI-modules 39 OrxonoxGuiFlags* flags = NULL; 40 OrxonoxGuiVideo* video = NULL; 41 OrxonoxGuiAudio* audio = NULL; 42 OrxonoxGuiExec* exec = NULL; 43 OrxonoxGuiBanner* banner = NULL; 44 OrxonoxGuiKeys* keys = NULL; 45 OrxonoxGuiUpdate* update = NULL; 45 46 46 47 /* ORXONOXGUI */ … … 51 52 OrxonoxGui::OrxonoxGui(int argc, char *argv[]) 52 53 { 54 Window* orxonoxGUI = NULL; 55 53 56 initGUI(argc, argv); 54 57 55 58 orxonoxGUI = new Window( "grafical orxonox loader, "PACKAGE_VERSION); 56 57 Box* windowBox = new Box ('h'); 59 { 60 Box* windowBox = new Box ('h'); 61 { 62 banner = new OrxonoxGuiBanner(); 63 windowBox->fill (banner->getWidget()); 64 65 Box* optionBoxL = new Box('v'); 66 { 67 Box* avBox = new Box('h'); 68 69 video = new OrxonoxGuiVideo(); 70 avBox->fill(video->getWidget()); 71 audio = new OrxonoxGuiAudio(); 72 avBox->fill(audio->getWidget()); 73 74 optionBoxL->fill(avBox); 58 75 59 banner = new OrxonoxGuiBanner(); 60 windowBox->fill (banner->getWidget()); 61 62 Box* optionBoxL = new Box('v'); 63 Box* optionBoxR = new Box('v'); 64 65 Box* avBox = new Box('h'); 66 67 video = new OrxonoxGuiVideo(); 68 avBox->fill(video->getWidget()); 69 audio = new OrxonoxGuiAudio(); 70 avBox->fill(audio->getWidget()); 71 72 optionBoxL->fill(avBox); 73 74 keys = new OrxonoxGuiKeys(); 75 optionBoxL->fill(keys->getWidget()); 76 windowBox->fill(optionBoxL); 77 78 exec = new OrxonoxGuiExec(); 79 optionBoxR->fill(exec->getWidget()); 80 81 flags = new OrxonoxGuiFlags(); 82 83 optionBoxR->fill(flags->getWidget()); 84 85 update = new OrxonoxGuiUpdate(); 86 optionBoxR->fill(update->getWidget()); 87 windowBox->fill(optionBoxR); 88 89 orxonoxGUI->fill(windowBox); 90 76 keys = new OrxonoxGuiKeys(); 77 optionBoxL->fill(keys->getWidget()); 78 windowBox->fill(optionBoxL); 79 } 80 Box* optionBoxR = new Box('v'); 81 { 82 exec = new OrxonoxGuiExec(); 83 optionBoxR->fill(exec->getWidget()); 84 85 flags = new OrxonoxGuiFlags(); 86 87 optionBoxR->fill(flags->getWidget()); 88 89 update = new OrxonoxGuiUpdate(); 90 optionBoxR->fill(update->getWidget()); 91 } 92 windowBox->fill(optionBoxR); 93 } 94 orxonoxGUI->fill(windowBox); 95 } 91 96 // Reading Values from File 92 exec->setConfFile( "~/.orxonox/orxonox.conf");93 exec->readFromFile( orxonoxGUI);97 exec->setConfFile(ORXONOX_GUI_DEFAULT_CONFIG_FILE); 98 exec->readFromFile(Window::mainWindow); 94 99 // Merging changes to the Options from appended flags. 95 100 for (int optCount = 1; optCount < argc; optCount++) 96 101 orxonoxGUI->walkThrough(Widget::flagCheck, argv[optCount], 0); 97 102 98 flags->setTextFromFlags( orxonoxGUI);103 flags->setTextFromFlags(Window::mainWindow); 99 104 orxonoxGUI->showall(); 100 105 … … 103 108 // case update // 104 109 #ifdef HAVE_CURL 105 if (static_cast<Option*>( orxonoxGUI->findWidgetByName("auto update", 0))->value == 1)110 if (static_cast<Option*>(Window::mainWindow->findWidgetByName("auto update", 0))->value == 1) 106 111 { 107 112 update->checkForUpdates(); … … 110 115 111 116 // case start-with-gui. 112 if (!access(exec->getConfigFile(), F_OK) && static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0) 117 if (!access(exec->getConfigFile(), F_OK) && 118 static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0) 113 119 OrxonoxGuiExec::startOrxonox(NULL, exec); 114 120 else
Note: See TracChangeset
for help on using the changeset viewer.