Changeset 1997 in orxonox.OLD for orxonox/branches

Timestamp:

Jun 21, 2004, 2:42:52 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: flags now have the ability to update. (Main-Variables maid global to orxonox_gui)

Location:

orxonox/branches/gui/guicc

Files:

• orxonox_gui.cc (modified) (7 diffs)
• orxonox_gui.h (modified) (2 diffs)
• orxonox_gui_video.cc (modified) (1 diff)

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -7 +7 @@
 #include "orxonox_gui_flags.h"
 
+  Window* orxonoxGUI;
+  OrxonoxGuiVideo* video;
+  OrxonoxGuiAudio* audio;
+  OrxonoxGuiExec* exec;
+  OrxonoxGuiFlags* flags;  
 
 int main( int argc, char *argv[] )
@@ -23 +28 @@
   gtk_init (&argc, &argv);
 
-  Window* orxonoxGUI = new Window("Graphical Orxonox Launcher");
+
+  orxonoxGUI = new Window("Graphical Orxonox Launcher");
   orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
   orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
@@ -31 +37 @@
   Box* avBox = new Box ('h');
 
-  OrxonoxGuiVideo* video = new OrxonoxGuiVideo ();
+  video = new OrxonoxGuiVideo ();
   avBox->fill (video->getFrame ());
-  OrxonoxGuiAudio* audio = new OrxonoxGuiAudio ();
+  audio = new OrxonoxGuiAudio ();
   avBox->fill (audio->getFrame ());
       
   windowBox->fill (avBox);
     
-  OrxonoxGuiExec* exec = new OrxonoxGuiExec (orxonoxGUI);
+  exec = new OrxonoxGuiExec (orxonoxGUI);
   windowBox->fill (exec->getFrame ());
 
-  OrxonoxGuiFlags* flags = new OrxonoxGuiFlags (orxonoxGUI);
+  flags = new OrxonoxGuiFlags (orxonoxGUI);
   windowBox->fill (flags->getFrame ());
   
@@ -361 +367 @@
    */
   static_cast<CheckButton*>(checkbutton)->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((CheckButton*)checkbutton->widget));
+  flags->setTextFromFlags(orxonoxGUI);
   cout << static_cast<CheckButton*>(checkbutton)->option_name << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;
 }
@@ -389 +396 @@
    */
   static_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE ((Slider*)slider->widget));
+  flags->setTextFromFlags(orxonoxGUI);
   cout << static_cast<Slider*>(slider)->option_name << " set to: "<< static_cast<Slider*>(slider)->value << endl;
 }
@@ -428 +436 @@
    */
   static_cast<Menu*>(menu)->value = (int)gtk_option_menu_get_history (GTK_OPTION_MENU (menu->widget));
+  flags->setTextFromFlags(orxonoxGUI);
   cout << static_cast<Menu*>(menu)->option_name << " changed to : " << static_cast<Menu*>(menu)->value << endl;
 }
@@ -436 +445 @@
   next = NULL;
   widget = gtk_label_new ("");
+  gtk_widget_set_usize (widget, 260, 60);
+  gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE);
 }
 Label::~Label ()

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -17 +17 @@
 #include <gtk/gtklabel.h>
 
-
 class OrxonoxGui
 {
@@ -23 +22 @@
   OrxonoxGui (int argc, char *argv[]);
   ~OrxonoxGui ();
+
 };
 

orxonox/branches/gui/guicc/orxonox_gui_video.cc

@@ -9 +9 @@
   
   fullscreen = new CheckButton ("Fullscreen-mode");
-  fullscreen->setFlagName ("fullscreen", "f", 1);
+  fullscreen->setFlagName ("windowed", "q", 1);
   videoBox->fill (fullscreen);
   wireframe = new CheckButton ("WireFrame-mode");