Changeset 4056 in orxonox.OLD
- Timestamp:
- May 5, 2005, 1:43:20 AM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/gui/gui/gui.cc
r4054 r4056 37 37 38 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;39 GuiFlags* flags = NULL; 40 GuiVideo* video = NULL; 41 GuiAudio* audio = NULL; 42 GuiExec* exec = NULL; 43 GuiBanner* banner = NULL; 44 GuiKeys* keys = NULL; 45 GuiUpdate* update = NULL; 46 46 47 47 /* ORXONOXGUI */ … … 50 50 \brief Initializes the Gui 51 51 */ 52 OrxonoxGui::OrxonoxGui(int argc, char *argv[])52 Gui::Gui(int argc, char *argv[]) 53 53 { 54 54 Window* orxonoxGUI = NULL; … … 60 60 Box* windowBox = new Box ('h'); 61 61 { 62 banner = new OrxonoxGuiBanner();62 banner = new GuiBanner(); 63 63 windowBox->fill (banner->getWidget()); 64 64 … … 67 67 Box* avBox = new Box('h'); 68 68 69 video = new OrxonoxGuiVideo();69 video = new GuiVideo(); 70 70 avBox->fill(video->getWidget()); 71 audio = new OrxonoxGuiAudio();71 audio = new GuiAudio(); 72 72 avBox->fill(audio->getWidget()); 73 73 74 74 optionBoxL->fill(avBox); 75 75 76 keys = new OrxonoxGuiKeys();76 keys = new GuiKeys(); 77 77 optionBoxL->fill(keys->getWidget()); 78 78 windowBox->fill(optionBoxL); … … 80 80 Box* optionBoxR = new Box('v'); 81 81 { 82 exec = new OrxonoxGuiExec();82 exec = new GuiExec(); 83 83 optionBoxR->fill(exec->getWidget()); 84 84 85 flags = new OrxonoxGuiFlags();85 flags = new GuiFlags(); 86 86 87 87 optionBoxR->fill(flags->getWidget()); 88 88 89 update = new OrxonoxGuiUpdate();89 update = new GuiUpdate(); 90 90 optionBoxR->fill(update->getWidget()); 91 91 } … … 118 118 if (!access(exec->getConfigFile(), F_OK) && 119 119 static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0) 120 OrxonoxGuiExec::startOrxonox(NULL, exec);120 GuiExec::startOrxonox(NULL, exec); 121 121 else 122 122 { … … 126 126 } 127 127 128 bool OrxonoxGui::startOrxonox = false;128 bool Gui::startOrxonox = false; 129 129 130 130 /** 131 131 \brief Destructor. 132 132 */ 133 OrxonoxGui::~OrxonoxGui(void)133 Gui::~Gui(void) 134 134 { 135 135 delete video; -
orxonox/trunk/src/lib/gui/gui/gui.h
r4054 r4056 19 19 #define GUI_DEFAULT_CONF_FILE "orxonox.conf" 20 20 21 class OrxonoxGuiElement; 22 23 //! Class that creates the OrxonoxGui 24 class OrxonoxGui 21 //! Class that creates the Gui 22 class Gui 25 23 { 26 24 public: 27 OrxonoxGui(int argc, char *argv[]);28 ~ OrxonoxGui(void);25 Gui(int argc, char *argv[]); 26 ~Gui(void); 29 27 30 28 static bool startOrxonox; -
orxonox/trunk/src/lib/gui/gui/gui_audio.cc
r4054 r4056 31 31 \brief Creates an Audio-Frame 32 32 */ 33 OrxonoxGuiAudio::OrxonoxGuiAudio(void)33 GuiAudio::GuiAudio(void) 34 34 { 35 35 Frame* audioFrame; //!< The Frame that holds the audio Options. … … 70 70 \brief Destructs the Audio-Stuff 71 71 */ 72 OrxonoxGuiAudio::~OrxonoxGuiAudio(void)72 GuiAudio::~GuiAudio(void) 73 73 { 74 74 // nothing to do here. -
orxonox/trunk/src/lib/gui/gui/gui_audio.h
r4054 r4056 10 10 11 11 //! Class that creates the Audio-Options. 12 class OrxonoxGuiAudio : public OrxonoxGuiElement12 class GuiAudio : public GuiElement 13 13 { 14 14 public: 15 OrxonoxGuiAudio(void);16 ~ OrxonoxGuiAudio(void);15 GuiAudio(void); 16 ~GuiAudio(void); 17 17 }; 18 18 #endif /* _GUI_AUDIO_H */ -
orxonox/trunk/src/lib/gui/gui/gui_banner.cc
r4054 r4056 34 34 \brief Creates a new BannerEventBox and its content. 35 35 */ 36 OrxonoxGuiBanner::OrxonoxGuiBanner(void)36 GuiBanner::GuiBanner(void) 37 37 { 38 38 // the banner Frame … … 92 92 \brief Destructs it. 93 93 */ 94 OrxonoxGuiBanner::~OrxonoxGuiBanner(void)94 GuiBanner::~GuiBanner(void) 95 95 { 96 96 // nothing to do here -
orxonox/trunk/src/lib/gui/gui/gui_banner.h
r4054 r4056 12 12 13 13 //! Class that creates the Banner-Image 14 class OrxonoxGuiBanner : public OrxonoxGuiElement14 class GuiBanner : public GuiElement 15 15 { 16 16 public: 17 OrxonoxGuiBanner(void);18 ~ OrxonoxGuiBanner(void);17 GuiBanner(void); 18 ~GuiBanner(void); 19 19 }; 20 20 -
orxonox/trunk/src/lib/gui/gui/gui_element.cc
r4054 r4056 27 27 \todo this constructor is not jet implemented - do it 28 28 */ 29 OrxonoxGuiElement::OrxonoxGuiElement ()29 GuiElement::GuiElement () 30 30 { 31 31 this->mainWidget = NULL; … … 37 37 38 38 */ 39 OrxonoxGuiElement::~OrxonoxGuiElement ()39 GuiElement::~GuiElement () 40 40 { 41 41 // delete what has to be deleted here … … 45 45 \brief Every GuiElement should set this, or it could result in a SegFault. 46 46 */ 47 void OrxonoxGuiElement::setMainWidget(Widget* widget)47 void GuiElement::setMainWidget(Widget* widget) 48 48 { 49 49 this->mainWidget = widget; -
orxonox/trunk/src/lib/gui/gui/gui_element.h
r4054 r4056 11 11 12 12 //! A SuperClass for all the Different GuiElements 13 class OrxonoxGuiElement {13 class GuiElement { 14 14 15 15 public: 16 OrxonoxGuiElement();17 virtual ~ OrxonoxGuiElement();16 GuiElement(); 17 virtual ~GuiElement(); 18 18 19 19 /** \returns the main Widget of this GuiElement. */ -
orxonox/trunk/src/lib/gui/gui/gui_exec.cc
r4054 r4056 38 38 \brief Creates the Exec-Frame 39 39 */ 40 OrxonoxGuiExec::OrxonoxGuiExec(void)40 GuiExec::GuiExec(void) 41 41 { 42 42 Frame* execFrame; //!< The Frame that holds the ExecutionOptions. … … 76 76 quit = new Button("Quit"); 77 77 #ifdef HAVE_GTK2 78 quit->connectSignal("clicked", this, OrxonoxGuiExec::quitGui);79 // Window::mainWindow->connectSignal("remove", this, OrxonoxGuiExec::quitGui);80 Window::mainWindow->connectSignal("destroy", this, OrxonoxGuiExec::quitGui);78 quit->connectSignal("clicked", this, GuiExec::quitGui); 79 // Window::mainWindow->connectSignal("remove", this, GuiExec::quitGui); 80 Window::mainWindow->connectSignal("destroy", this, GuiExec::quitGui); 81 81 #endif /* HAVE_GTK2 */ 82 82 execBox->fill(quit); … … 90 90 \brief Destructs the Execution-stuff 91 91 */ 92 OrxonoxGuiExec::~OrxonoxGuiExec(void)92 GuiExec::~GuiExec(void) 93 93 { 94 94 if(this->confFile) … … 104 104 \param confDir the Directory for the configuration files 105 105 */ 106 void OrxonoxGuiExec::setConfDir(const char* confDir)106 void GuiExec::setConfDir(const char* confDir) 107 107 { 108 108 this->confDir = ResourceManager::homeDirCheck(confDir); … … 123 123 The name will be parsed from ~/ to /home/[username] on unix and c:/Documents and Settings/username/Settings/ on Windows 124 124 */ 125 void OrxonoxGuiExec::setConfFile(const char* fileName)125 void GuiExec::setConfFile(const char* fileName) 126 126 { 127 127 if (!this->confDir) … … 135 135 \returns The name of the Configuration-File 136 136 */ 137 const char* OrxonoxGuiExec::getConfigFile(void) const137 const char* GuiExec::getConfigFile(void) const 138 138 { 139 139 return this->confFile; … … 144 144 \return 1 if it should 0 if not/ 145 145 */ 146 int OrxonoxGuiExec::shouldsave()146 int GuiExec::shouldsave() 147 147 { 148 148 return(static_cast<Option*>(this->saveSettings)->value); … … 153 153 \param widget from which Widget on should be saved. 154 154 155 this Function only opens and closes the file, in between OrxonoxGuiExec::writeFileText(Widget* widget) will execute the real writing process.156 */ 157 void OrxonoxGuiExec::writeToFile(Widget* widget)155 this Function only opens and closes the file, in between GuiExec::writeFileText(Widget* widget) will execute the real writing process. 156 */ 157 void GuiExec::writeToFile(Widget* widget) 158 158 { 159 159 this->CONFIG_FILE = fopen(this->confFile, "w"); … … 168 168 \param depth initially "0", and grows higher, while new Groups are bundeled. 169 169 */ 170 void OrxonoxGuiExec::writeFileText(Widget* widget, int depth)170 void GuiExec::writeFileText(Widget* widget, int depth) 171 171 { 172 172 int counter = 0; … … 219 219 \param widget from which Widget on should be saved. 220 220 */ 221 void OrxonoxGuiExec::readFromFile(Widget* widget)221 void GuiExec::readFromFile(Widget* widget) 222 222 { 223 223 this->CONFIG_FILE = fopen(this->confFile, "r"); … … 268 268 \param varInfo Information about the Variable to read 269 269 */ 270 void OrxonoxGuiExec::readFileText(Widget* widget, void* varInfo)270 void GuiExec::readFileText(Widget* widget, void* varInfo) 271 271 { 272 272 VarInfo* info =(VarInfo*)varInfo; … … 288 288 \todo do this in gui-gtk. 289 289 */ 290 Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth)290 Widget* GuiExec::locateGroup(Widget* widget, char* groupName, int depth) 291 291 { 292 292 Widget* tmp; … … 329 329 */ 330 330 #ifdef HAVE_GTK2 331 int OrxonoxGuiExec::startOrxonox(GtkWidget* widget, void* data)331 int GuiExec::startOrxonox(GtkWidget* widget, void* data) 332 332 #else /* HAVE_GTK2 */ 333 int OrxonoxGuiExec::startOrxonox(void* widget, void* data)333 int GuiExec::startOrxonox(void* widget, void* data) 334 334 #endif /* HAVE_GTK2 */ 335 335 { … … 343 343 344 344 PRINT(3)("Starting Orxonox\n"); 345 OrxonoxGui::startOrxonox = true;345 Gui::startOrxonox = true; 346 346 } 347 347 … … 354 354 */ 355 355 #ifdef HAVE_GTK2 356 int OrxonoxGuiExec::quitGui(GtkWidget* widget, void* data)356 int GuiExec::quitGui(GtkWidget* widget, void* data) 357 357 #else /* HAVE_GTK2 */ 358 int OrxonoxGuiExec::quitGui(void* widget, void* data)359 #endif /* HAVE_GTK2 */ 360 { 361 OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;358 int GuiExec::quitGui(void* widget, void* data) 359 #endif /* HAVE_GTK2 */ 360 { 361 GuiExec* exec =(GuiExec*)data; 362 362 if(exec->shouldsave()) 363 363 exec->writeToFile(Window::mainWindow); -
orxonox/trunk/src/lib/gui/gui/gui_exec.h
r4054 r4056 16 16 17 17 //! Class that creates the execute-Options. 18 class OrxonoxGuiExec : public OrxonoxGuiElement18 class GuiExec : public GuiElement 19 19 { 20 20 private: … … 33 33 34 34 public: 35 OrxonoxGuiExec(void);36 ~ OrxonoxGuiExec(void);35 GuiExec(void); 36 ~GuiExec(void); 37 37 38 38 void setConfDir(const char* confDir); -
orxonox/trunk/src/lib/gui/gui/gui_flags.cc
r4054 r4056 29 29 \brief Creates the Flags-Frame 30 30 */ 31 OrxonoxGuiFlags::OrxonoxGuiFlags(void)31 GuiFlags::GuiFlags(void) 32 32 { 33 33 this->flagsFrame = new Frame("Orxonox-Startup-Flags:"); … … 47 47 \brief Destructs the Flags-stuff 48 48 */ 49 OrxonoxGuiFlags::~OrxonoxGuiFlags(void)49 GuiFlags::~GuiFlags(void) 50 50 { 51 51 // nothing to do here … … 56 56 \param widget the Widget from which on to scan for deeper Options and their settings. 57 57 */ 58 void OrxonoxGuiFlags::setTextFromFlags(Widget* widget)58 void GuiFlags::setTextFromFlags(Widget* widget) 59 59 { 60 60 FlagInfo flagInfo; … … 64 64 this->flagsLabel->ereaseText(); 65 65 this->flagsLabel->appendText(executable); 66 widget->walkThrough( OrxonoxGuiFlags::flagsText, &flagInfo, 0);66 widget->walkThrough(GuiFlags::flagsText, &flagInfo, 0); 67 67 // flagsLabel->setTitle(flagText); 68 68 } … … 70 70 /** 71 71 \brief this actually sets the flagtext, and appends it to flagText 72 \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)72 \param widget like GuiFlags::setTextFromFlags(widget) 73 73 \param flagInfo Information aboout the Flag that should be updated. 74 74 */ 75 void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)75 void GuiFlags::flagsText(Widget* widget, void* flagInfo) 76 76 { 77 77 FlagInfo* info =(FlagInfo*)flagInfo; -
orxonox/trunk/src/lib/gui/gui/gui_flags.h
r4054 r4056 12 12 13 13 //! Class that creates the flags-Text. 14 class OrxonoxGuiFlags : public OrxonoxGuiElement14 class GuiFlags : public GuiElement 15 15 { 16 16 private: … … 21 21 22 22 public: 23 OrxonoxGuiFlags(void);24 ~ OrxonoxGuiFlags(void);23 GuiFlags(void); 24 ~GuiFlags(void); 25 25 26 26 void setTextFromFlags(Widget* widget); -
orxonox/trunk/src/lib/gui/gui/gui_gtk.cc
r4054 r4056 34 34 35 35 #include "gui_flags.h" 36 extern OrxonoxGuiFlags* flags;36 extern GuiFlags* flags; 37 37 38 38 char* executable; -
orxonox/trunk/src/lib/gui/gui/gui_keys.cc
r4054 r4056 31 31 \brief Creates an Keyboard-Frame 32 32 */ 33 OrxonoxGuiKeys::OrxonoxGuiKeys(void)33 GuiKeys::GuiKeys(void) 34 34 { 35 35 this->keysFrame = new Frame("Keyboard-Options:"); … … 49 49 \brief Destructs the Keys-stuff 50 50 */ 51 OrxonoxGuiKeys::~OrxonoxGuiKeys(void)51 GuiKeys::~GuiKeys(void) 52 52 { 53 53 // nothing to do here. -
orxonox/trunk/src/lib/gui/gui/gui_keys.h
r4054 r4056 22 22 class Player; 23 23 //! Class that creates the Keys-Options. 24 class OrxonoxGuiKeys : public OrxonoxGuiElement24 class GuiKeys : public GuiElement 25 25 { 26 26 private: … … 32 32 33 33 public: 34 OrxonoxGuiKeys(void);35 ~ OrxonoxGuiKeys(void);34 GuiKeys(void); 35 ~GuiKeys(void); 36 36 }; 37 37 -
orxonox/trunk/src/lib/gui/gui/gui_main.cc
r4054 r4056 30 30 int main(int argc, char *argv[]) 31 31 { 32 OrxonoxGui* orxonoxgui = new OrxonoxGui(argc, argv);32 Gui* orxonoxgui = new Gui(argc, argv); 33 33 return 0; 34 34 } -
orxonox/trunk/src/lib/gui/gui/gui_update.cc
r4054 r4056 35 35 \brief Creates an Update-Frame 36 36 */ 37 OrxonoxGuiUpdate::OrxonoxGuiUpdate(void)37 GuiUpdate::GuiUpdate(void) 38 38 { 39 39 this->tmpDir = NULL; … … 73 73 \brief Destructs the Update-stuff 74 74 */ 75 OrxonoxGuiUpdate::~OrxonoxGuiUpdate(void)75 GuiUpdate::~GuiUpdate(void) 76 76 { 77 77 … … 81 81 \brief Look what info we can get from this system 82 82 */ 83 bool OrxonoxGuiUpdate::getSystemInfo(void)83 bool GuiUpdate::getSystemInfo(void) 84 84 { 85 85 PRINTF(3)("Grabbing system information\n"); … … 107 107 108 108 #ifdef HAVE_CURL 109 bool* OrxonoxGuiUpdate::checkForUpdates(void)109 bool* GuiUpdate::checkForUpdates(void) 110 110 { 111 111 PRINTF(3)("checking for new version of orxonox\n"); … … 122 122 \brief Creates a window, and all it contains for the Data-update. 123 123 */ 124 void OrxonoxGuiUpdate::updateDataWindowCreate(void)124 void GuiUpdate::updateDataWindowCreate(void) 125 125 { 126 126 this->updateDataWindow = new Window("update orxonox::Data"); … … 161 161 \returns A Pointer to the Button of the UpdaterDataWindow 162 162 */ 163 Button* OrxonoxGuiUpdate::updateDataWindowGetButton(void)163 Button* GuiUpdate::updateDataWindowGetButton(void) 164 164 { 165 165 return this->updateDataWindowButton; … … 169 169 \brief Creates a window, and all it contains for the Source-update. 170 170 */ 171 void OrxonoxGuiUpdate::updateSourceWindowCreate(void)171 void GuiUpdate::updateSourceWindowCreate(void) 172 172 { 173 173 // the button, that opens this Window. … … 200 200 \returns A Pointer to the Button of the UpdaterSourceWindow 201 201 */ 202 Button* OrxonoxGuiUpdate::updateSourceWindowGetButton(void)202 Button* GuiUpdate::updateSourceWindowGetButton(void) 203 203 { 204 204 return this->updateSourceWindowButton; … … 213 213 \param button The Button, that triggered this event. 214 214 */ 215 gint OrxonoxGuiUpdate::updateDataFunc(GtkWidget* w, GdkEventKey* event, void* info)215 gint GuiUpdate::updateDataFunc(GtkWidget* w, GdkEventKey* event, void* info) 216 216 { 217 217 FileInfo* dataInfo =(FileInfo*)info; … … 230 230 \param button The Button, that triggered this event. 231 231 */ 232 gint OrxonoxGuiUpdate::updateSourceFunc(GtkWidget* w, GdkEventKey* event, void* bar)232 gint GuiUpdate::updateSourceFunc(GtkWidget* w, GdkEventKey* event, void* bar) 233 233 { 234 234 ProgressBar* tmpBar = static_cast<ProgressBar*>(bar); … … 245 245 \param stream Filehandler to write to. 246 246 */ 247 size_t OrxonoxGuiUpdate::curlWriteFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)247 size_t GuiUpdate::curlWriteFunc(void* ptr, size_t size, size_t nmemb, FILE* stream) 248 248 { 249 249 return fwrite(ptr, size, nmemb, stream); … … 257 257 \param stream Filehandler to get data from. 258 258 */ 259 size_t OrxonoxGuiUpdate::curlReadFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)259 size_t GuiUpdate::curlReadFunc(void* ptr, size_t size, size_t nmemb, FILE* stream) 260 260 { 261 261 return fread(ptr, size, nmemb, stream); … … 271 271 \param upProgress not needed 272 272 */ 273 int OrxonoxGuiUpdate::curlProgressFunc(ProgressBar* bar, double totalSize, double progress, double upTotal, double upProgress)273 int GuiUpdate::curlProgressFunc(ProgressBar* bar, double totalSize, double progress, double upTotal, double upProgress) 274 274 { 275 275 bar->setProgress(progress); … … 286 286 \brief The Curl handle for only one CURL(static). 287 287 */ 288 CURL* OrxonoxGuiUpdate::curlHandle = NULL;288 CURL* GuiUpdate::curlHandle = NULL; 289 289 290 290 #ifdef HAVE_PTHREAD_H 291 291 /** \brief The download Thread ID */ 292 pthread_t* OrxonoxGuiUpdate::downloadThreadID = new pthread_t;292 pthread_t* GuiUpdate::downloadThreadID = new pthread_t; 293 293 /** \brief The download Thread ID*/ 294 pthread_t* OrxonoxGuiUpdate::downloadThreadFinishID = new pthread_t;294 pthread_t* GuiUpdate::downloadThreadFinishID = new pthread_t; 295 295 #endif /* HAVE_PTHREAD_H */ 296 296 /** 297 297 \brief A bool parameter that shows if we are downloading. 298 298 */ 299 bool OrxonoxGuiUpdate::isDownloading = false;299 bool GuiUpdate::isDownloading = false; 300 300 301 301 … … 306 306 !! BE AWARE THIS WILL NOT BE THREADED. !! 307 307 */ 308 bool OrxonoxGuiUpdate::download(void* fileInfo)308 bool GuiUpdate::download(void* fileInfo) 309 309 { 310 310 if(isDownloading) … … 354 354 Downloading with a Button that gets a different Name while downloading, and a Bar, that gets to be updated. More to be followed 355 355 */ 356 bool OrxonoxGuiUpdate::downloadWithStyle(void* fileInfo)356 bool GuiUpdate::downloadWithStyle(void* fileInfo) 357 357 { 358 358 if(isDownloading) … … 426 426 \todo Threads get locked, if the cancel button is pressed in to small intervals. 427 427 */ 428 void* OrxonoxGuiUpdate::downloadThread(void* fileInfo)428 void* GuiUpdate::downloadThread(void* fileInfo) 429 429 { 430 430 isDownloading = true; … … 436 436 \param fileInfo the FileInfo. 437 437 */ 438 void* OrxonoxGuiUpdate::downloadThreadFinished(void* fileInfo)438 void* GuiUpdate::downloadThreadFinished(void* fileInfo) 439 439 { 440 440 FileInfo* info =(FileInfo*)fileInfo; … … 477 477 \todo canceling a session in non-threaded mode. 478 478 */ 479 gint OrxonoxGuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar)479 gint GuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar) 480 480 { 481 481 #ifdef HAVE_PTHREAD_H -
orxonox/trunk/src/lib/gui/gui/gui_update.h
r4054 r4056 24 24 25 25 //! Class that creates the execute-Options. 26 class OrxonoxGuiUpdate : public OrxonoxGuiElement26 class GuiUpdate : public GuiElement 27 27 { 28 28 private: … … 97 97 98 98 public: 99 OrxonoxGuiUpdate(void);100 ~ OrxonoxGuiUpdate(void);99 GuiUpdate(void); 100 ~GuiUpdate(void); 101 101 102 102 #ifdef HAVE_CURL -
orxonox/trunk/src/lib/gui/gui/gui_video.cc
r4054 r4056 33 33 \brief Creates the Video-Option-Frame 34 34 */ 35 OrxonoxGuiVideo::OrxonoxGuiVideo(void)35 GuiVideo::GuiVideo(void) 36 36 { 37 37 this->videoFrame = new Frame("Video-Options:"); … … 62 62 \brief Destructs the Video-stuff 63 63 */ 64 OrxonoxGuiVideo::~OrxonoxGuiVideo(void)64 GuiVideo::~GuiVideo(void) 65 65 { 66 66 // nothing to do here. … … 70 70 \brief Creates a window, and all it contains for the Source-update. 71 71 */ 72 void OrxonoxGuiVideo::advancedWindowCreate(void)72 void GuiVideo::advancedWindowCreate(void) 73 73 { 74 74 // the button, that opens this Window. … … 137 137 \returns A Pointer to the Button of the UpdaterSourceWindow 138 138 */ 139 Button* OrxonoxGuiVideo::advancedWindowGetButton(void)139 Button* GuiVideo::advancedWindowGetButton(void) 140 140 { 141 141 return this->advancedButton; 142 142 } 143 143 144 void OrxonoxGuiVideo::getResolutions(Menu* menu)144 void GuiVideo::getResolutions(Menu* menu) 145 145 { 146 146 SDL_Init(SDL_INIT_VIDEO); -
orxonox/trunk/src/lib/gui/gui/gui_video.h
r4054 r4056 11 11 12 12 //! Class that creates the Video-Options. 13 class OrxonoxGuiVideo : public OrxonoxGuiElement13 class GuiVideo : public GuiElement 14 14 { 15 15 private: … … 45 45 46 46 public: 47 OrxonoxGuiVideo(void);48 ~ OrxonoxGuiVideo(void);47 GuiVideo(void); 48 ~GuiVideo(void); 49 49 50 50 void getResolutions(Menu* menu); -
orxonox/trunk/src/orxonox.cc
r4054 r4056 345 345 // char* guiExec = new char[strlen(argv[0])+20]; 346 346 // sprintf(guiExec,"%sGui --gui", argv[0]); 347 OrxonoxGui* gui = new OrxonoxGui(argc, argv);347 Gui* gui = new Gui(argc, argv); 348 348 if (! gui->startOrxonox) 349 349 return 0;
Note: See TracChangeset
for help on using the changeset viewer.