Changeset 2739 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 6, 2004, 4:51:59 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: modified savable rutine. now a widget has to be set saveable, otherwise it won't be saved

Location:

orxonox/trunk/gui

Files:

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

orxonox/trunk/gui/orxonox_gui.cc

@@ -552 +552 @@
   flag_name = "";
   flag_name_short = "";
+  saveable = false;
   default_value = 0;
 

orxonox/trunk/gui/orxonox_gui.h

@@ -188 +188 @@
   char* flag_name_short; //!< like flag_name but shorter
   int default_value; //!< A default value is good, for hiding a option if it is not needed. (hidden if value == default_value)
+  bool saveable;
 
   void setFlagName (char* flagname, int defaultvalue);

orxonox/trunk/gui/orxonox_gui_audio.cc

@@ -37 +37 @@
   enableSound = new CheckButton ("Disable Sound");
   enableSound->setFlagName ("no-sound", 0);
+  enableSound->saveable = true;
   audioBox->fill (enableSound);
   Label* musicVolumeLabel = new Label ("Music Volume");
@@ -42 +43 @@
   musicVolume = new Slider ("Music Volume", 0, 100);
   musicVolume->setFlagName ("music-volume", "m", 80);
+  musicVolume->saveable = true;
   audioBox->fill (musicVolume);
   Label* effectsVolumeLabel = new Label ("Effects Volume");
@@ -47 +49 @@
   effectsVolume = new Slider ("Effects Volume", 0, 100);
   effectsVolume->setFlagName ("effects-volume", "e", 80);
+  effectsVolume->saveable = true;
   audioBox->fill (effectsVolume);
 

orxonox/trunk/gui/orxonox_gui_exec.cc

@@ -45 +45 @@
   saveSettings = new CheckButton ("Save Settings");
   saveSettings->value = 1;
+  saveSettings->saveable = true;
   execBox->fill (saveSettings);
   verboseMode = new Menu ("verbose mode", "no output", "verbose", "debug", "lastItem");
   verboseMode->setFlagName ("verbose", "v", 0);
+  verboseMode->saveable = true;
   execBox->fill (verboseMode);
   alwaysShow = new CheckButton ("Always Show this Menu");
   alwaysShow->setFlagName ("gui", "g", 0);
+  alwaysShow->saveable = true;
   execBox->fill (alwaysShow);
   quit = new Button ("Quit");
@@ -98 +101 @@
 int OrxonoxGuiExec::shouldsave ()
 {
-  return ( static_cast<Option*>(saveSettings)->value);
+  return (static_cast<Option*>(saveSettings)->value);
 }
 
@@ -123 +126 @@
   int counter = 0;
   while (counter < depth && ((widget->is_option>0
-                              && (strcmp (static_cast<Option*>(widget)->flag_name, "")
-                                  || strcmp (static_cast<Option*>(widget)->flag_name_short, "")) )
+                              && (static_cast<Option*>(widget)->saveable) )
                              || (widget->is_option<0
                                  && strcmp (static_cast<Packer*>(widget)->getGroupName(), ""))))
@@ -148 +150 @@
   
   if (widget->is_option >= 1)
-    if  (strcmp (static_cast<Option*>(widget)->flag_name, "") || strcmp (static_cast<Option*>(widget)->flag_name_short, ""))
+    if  (static_cast<Option*>(widget)->saveable)
       {
         char Buffer[256];

orxonox/trunk/gui/orxonox_gui_video.cc

@@ -36 +36 @@
   fullscreen = new CheckButton ("Fullscreen-mode");
   fullscreen->setFlagName ("windowed", "q", 1);
+  fullscreen->saveable = true;
   videoBox->fill (fullscreen);
   wireframe = new CheckButton ("WireFrame-mode");
   wireframe->setFlagName ("wireframe", "w", 0);
+  wireframe->saveable = true;
   videoBox->fill (wireframe);