Changeset 1996 in orxonox.OLD for orxonox/branches

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.

Location:

orxonox/branches/gui/guicc

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• orxonox_gui.cc (modified) (10 diffs)
• orxonox_gui.h (modified) (3 diffs)
• orxonox_gui_audio.cc (modified) (1 diff)
• orxonox_gui_exec.cc (modified) (1 diff)
• orxonox_gui_video.cc (modified) (1 diff)

orxonox/branches/gui/guicc/Makefile.am

@@ -3 +3 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc 
+gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc
 #orxonox_gui_file.cc 
 

orxonox/branches/gui/guicc/Makefile.in

@@ -114 +114 @@
 
 bin_PROGRAMS = gui
-gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc 
+gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc
 subdir = guicc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -124 +124 @@
 
 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
-        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT)
+        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
+        orxonox_gui_flags.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -136 +137 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -192 +194 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
 

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)));
+}

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -15 +15 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
+#include <gtk/gtklabel.h>
 
 
@@ -101 +102 @@
   int default_value;
 
-  void setFlagName (char* flagname);
+  void setFlagName (char* flagname, int defaultvalue);
+  void setFlagName (char* flagname, char* flagnameshort, int defaultvalue);
 };
 
@@ -136 +138 @@
   static gint OptionChange (GtkWidget* widget, Widget* menu);
 };
-    
+
+class Label : public Widget
+{
+ public:
+  Label ();
+  ~Label ();
+  
+  void setText (char * text);
+  char* getText ();
+};
+
 //gint orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data);
 

orxonox/branches/gui/guicc/orxonox_gui_audio.cc

@@ -6 +6 @@
   audioBox = new Box ('v');
   
-  enableSound = new CheckButton ("Enable Sound");
-  enableSound->setFlagName ("enablesound");
+  enableSound = new CheckButton ("Disable Sound");
+  enableSound->setFlagName ("no-sound", 0);
   audioBox->fill (enableSound);
   musicVolume = new Slider ("Music Volume", 0, 100);
-  musicVolume->setFlagName ("music-volume");
+  musicVolume->setFlagName ("music-volume", "m", 80);
   audioBox->fill (musicVolume);
   effectsVolume = new Slider ("Effects Volume", 0, 100);
-  effectsVolume->setFlagName ("effects-volume");
+  effectsVolume->setFlagName ("effects-volume", "e", 80);
   audioBox->fill (effectsVolume);
 

orxonox/branches/gui/guicc/orxonox_gui_exec.cc

@@ -11 +11 @@
   execBox->fill (saveSettings);
   verboseMode = new Menu ("verbose mode", "no output", "verbose", "debug", "lastItem");
-  verboseMode->setFlagName ("verbose");
+  verboseMode->setFlagName ("verbose", "v", 0);
   execBox->fill (verboseMode);
   alwaysShow = new CheckButton ("Always Show this Menu");
-  alwaysShow->setFlagName ("verbose");
+  alwaysShow->setFlagName ("gui", "g", 0);
   execBox->fill (alwaysShow);
   quit = new Button ("Quit");

orxonox/branches/gui/guicc/orxonox_gui_video.cc

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