Changeset 1996 in orxonox.OLD for orxonox/branches/gui/guicc/orxonox_gui.cc

Timestamp:

Jun 21, 2004, 2:11:32 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: added flags-frame, and an Option to rewrite it.

File:

• orxonox/branches/gui/guicc/orxonox_gui.cc (modified) (10 diffs)

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -5 +5 @@
 #include "orxonox_gui_audio.h"
 #include "orxonox_gui_exec.h"
+#include "orxonox_gui_flags.h"
 
 
@@ -27 +28 @@
   
   Box* windowBox = new Box ('v');
-  {
-    Box* avBox = new Box ('h');
-    {
-      OrxonoxGuiVideo* video = new OrxonoxGuiVideo ();
-      avBox->fill (video->getFrame ());
-      OrxonoxGuiAudio* audio = new OrxonoxGuiAudio ();
-      avBox->fill (audio->getFrame ());
+  
+  Box* avBox = new Box ('h');
+
+  OrxonoxGuiVideo* video = new OrxonoxGuiVideo ();
+  avBox->fill (video->getFrame ());
+  OrxonoxGuiAudio* audio = new OrxonoxGuiAudio ();
+  avBox->fill (audio->getFrame ());
       
-    }
-    windowBox->fill (avBox);
+  windowBox->fill (avBox);
     
-    OrxonoxGuiExec* exec = new OrxonoxGuiExec (orxonoxGUI);
-    windowBox->fill (exec->getFrame ());
-  }
+  OrxonoxGuiExec* exec = new OrxonoxGuiExec (orxonoxGUI);
+  windowBox->fill (exec->getFrame ());
+
+  OrxonoxGuiFlags* flags = new OrxonoxGuiFlags (orxonoxGUI);
+  windowBox->fill (flags->getFrame ());
+  
   orxonoxGUI->fill (windowBox);
   orxonoxGUI->listOptions();
+  flags->setTextFromFlags (orxonoxGUI);
 
   /* TEST ENVIRONMENT
@@ -298 +302 @@
 /* OPTION */
 
-void Option::setFlagName (char *flagname)
+void Option::setFlagName (char* flagname, int defaultvalue)
+{
+  flag_name = flagname;
+  default_value = defaultvalue;
+  cout << "Set Flagname of " << option_name << " to " << flagname << endl;
+}
+
+void Option::setFlagName (char* flagname, char* flagnameshort,  int defaultvalue)
 {
   /**
@@ -304 +315 @@
    */
   flag_name = flagname;
+  flag_name_short = flagnameshort;
+  default_value = defaultvalue;
   cout << "Set Flagname of " << option_name << " to " << flagname << endl;
 }
@@ -319 +332 @@
   option_name = buttonname;
   flag_name = "";
+  flag_name_short = "";
+  default_value = 0;
   widget = gtk_button_new_with_label (buttonname);
 }
@@ -333 +348 @@
   option_name = buttonname;
   flag_name = "";
+  flag_name_short = "";
+  default_value = 0;
   widget = gtk_check_button_new_with_label (buttonname);
 
   this->connectSignal ("clicked", this->OptionChange);
 }
+
 gint CheckButton::OptionChange (GtkWidget *widget, Widget* checkbutton)
 {
@@ -352 +370 @@
    * Creates a new Slider with name slidername a beginning value of start and an end value of end.
    */
-  is_option = 1;
+  is_option = 2;
   value = 0;
   next = NULL;
   option_name = slidername;
   flag_name = "";
+  flag_name_short = "";
+  default_value = 0;
   widget = gtk_hscale_new_with_range (start, end, 5);
   value = start;
@@ -372 +392 @@
 }
 
-
 Menu::Menu (char* menuname, ...)
 {
@@ -378 +397 @@
    * Creates an Menu-Item-list out of multiple input. Consider, that the last input argument has to be "lastItem" for this to work.
    */
-  is_option = 1;
+  is_option = 2;
   value = 0;
   next = NULL;
   option_name = menuname;
   flag_name = "";
+  flag_name_short = "";
+  default_value = 0;
   char *tmp;
   va_list itemlist;
@@ -409 +430 @@
   cout << static_cast<Menu*>(menu)->option_name << " changed to : " << static_cast<Menu*>(menu)->value << endl;
 }
+
+Label:: Label ()
+{
+  is_option = 0;
+  next = NULL;
+  widget = gtk_label_new ("");
+}
+Label::~Label ()
+{}
+  
+void Label::setText (char * text)
+{
+  gtk_label_set_text (GTK_LABEL (this->widget), text);
+}
+
+char* Label::getText ()
+{
+  return ((char*)gtk_label_get_text (GTK_LABEL (this->widget)));
+}