Changeset 3161 in orxonox.OLD

Timestamp:

Dec 13, 2004, 2:10:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: OptionLabel now has a member cValue for saving its state beside its name

Location:

orxonox/trunk/gui

Files:

• orxonox_gui.cc (modified) (1 diff)
• orxonox_gui_exec.cc (modified) (6 diffs)
• orxonox_gui_gtk.cc (modified) (4 diffs)
• orxonox_gui_gtk.h (modified) (2 diffs)
• orxonox_gui_keys.cc (modified) (4 diffs)

orxonox/trunk/gui/orxonox_gui.cc

@@ -26 +26 @@
    curl interface to Download cool stuff
 
-   make Windows grab Focus if it is open and release it when closed (only child-windows)
    chain all the windows when starting the GUI (DANGER: performance!!)
 
-   widgets save themselve
+   widgets save themselves
    good way to step through all the Widgets
    ... many more ...
+   label -> protected : getlabel function
+
 */
 

orxonox/trunk/gui/orxonox_gui_exec.cc

@@ -128 +128 @@
                               && (static_cast<Option*>(widget)->saveable) )
                              || (widget->isOption<0
-                                 && strcmp (static_cast<Packer*>(widget)->getGroupName(), ""))))
+                                 && static_cast<Packer*>(widget)->getGroupName())))
     {
       fprintf (CONFIG_FILE, "  ", depth);
@@ -137 +137 @@
   if (widget->isOption <0)
     {
-      if (strcmp (static_cast<Packer*>(widget)->getGroupName(), ""))
+      if (static_cast<Packer*>(widget)->getGroupName())
         {
           fprintf (CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
@@ -155 +155 @@
         char Buffer[256];
         char* space2under;
-        sprintf (Buffer, "%s", static_cast<Option*>(widget)->label);
+        strcpy (Buffer, static_cast<Option*>(widget)->label);
         if (strchr (Buffer, '_'))
           cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl;
         while (space2under = strchr(Buffer, ' '))
           {
-            sprintf (space2under, "_%s", space2under+1);
+            space2under[0] = '_';
           }
-        fprintf (CONFIG_FILE, "%s = %i\n", Buffer, static_cast<Option*>(widget)->value);
+        if (widget->isOption <=3)
+          fprintf (CONFIG_FILE, "%s = %d\n", Buffer, static_cast<Option*>(widget)->value);
+        else if (widget->isOption == 5)
+          fprintf (CONFIG_FILE, "%s = %s\n", Buffer, static_cast<OptionLabel*>(widget)->cValue);
       }
 
@@ -184 +187 @@
       while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF)
         {
+          // group-search //
           if (!strncmp (Buffer, "[", 1))
             {
@@ -192 +196 @@
                 }
             }
+          // option-setting //
           if (!strcmp (Buffer, "="))
             {
@@ -248 +253 @@
   if (widget->isOption < 0)
     {
-      if (!strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
+      if (static_cast<Packer*>(widget)->getGroupName() && !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
         {
           return widget;

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -188 +188 @@
 {
   down = NULL;
-  this->setGroupName ("");
+  groupName = NULL;
 
 
@@ -201 +201 @@
 void Packer::setGroupName (char* name)
 {
-  groupName = name;
+  if (groupName)
+    delete groupName;
+  groupName = new char [strlen(name)+1];
+  strcpy(groupName, name);
 }
 
@@ -398 +401 @@
 {
   if (exec->shouldsave())
-    exec->writeToFile (orxonoxGUI);
+    exec->writeToFile (Window::mainWindow);
 
   gtk_main_quit();
@@ -902 +905 @@
 }
 
-OptionLabel::OptionLabel(char* text)
+OptionLabel::OptionLabel(char* label, char* value)
 {
   init();
-  setTitle(text);
+  setTitle(label);
+  setValue(value);
 }
 
 void OptionLabel::init(void)
 {
-  isOption = 4;
-
   static_cast<Option*>(this)->init();
+  isOption = 5;
+  cValue = NULL;
 
   widget = gtk_label_new ("");
 }
+void OptionLabel::setValue(char* newValue)
+{
+  if (cValue)
+    delete cValue;
+  cValue = new char [strlen(newValue)+1];
+  strcpy(cValue, newValue);
+  gtk_label_set_text (GTK_LABEL (widget), cValue);
+}
 
 void OptionLabel::setTitle(char* title)
 {
+  if (label)
+    delete label;
+  label = new char [strlen(title)+1];
+  strcpy(label, title);
   gtk_label_set_text (GTK_LABEL (widget), title);
 }

orxonox/trunk/gui/orxonox_gui_gtk.h

@@ -32 +32 @@
   GtkWidget* widget; //!< widget is the gtk_widget that the specific Object Contains.
   void init(void);
-  int isOption; //!< with this Paramenter one can set the option-type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option, 3:float option, 4:char option, 5: char* option
+  int isOption; //!< with this Paramenter one can set the option-type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option, 3: float option, 4:char option, 5: char* option
   /**
      \briefdefines isOption states
@@ -262 +262 @@
 {
  public:
-  OptionLabel(char* text);
-  void init(void);
-
+  OptionLabel(char* label, char* value);
+  void init(void);
+  
+  char* cValue;
+  
+  void setValue(char* newValue);
   void setTitle(char* title);
   void redraw();

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -61 +61 @@
   pKeyFrame = new Frame ("keys");
    pKeysBox = new Box('v');
+   pKeysBox->setGroupName ("player1");
     pKeysBox->fill(addKey(UP, "up"));
     pKeysBox->fill(addKey(DOWN, "down"));
@@ -73 +74 @@
     pKeyFrame->fill(pKeysBox);
    pKeyWindow->fill(pKeyFrame);
-   //  Window::addWindow(pKeyWindow);
+   Window::addWindow(pKeyWindow);
    pKeyWindow->connectSignal("destroy", pKeyWindow, Window::windowClose);
    pKeyWindow->connectSignal("delete_event", pKeyWindow, Window::windowClose);
@@ -94 +95 @@
   inputKey[key]->pKeyBox = new Box();
   inputKey[key]->pKeyButton = new Button(name);
-  inputKey[key]->pKeyOLabel = new OptionLabel (name);
+  inputKey[key]->pKeyOLabel = new OptionLabel (name, name);
   inputKey[key]->pKeyOLabel->saveable = true;
   
@@ -256 +257 @@
     }
 
-  inputkey->pKeyOLabel->setTitle (title);
+  inputkey->pKeyOLabel->setValue (title);
   inputButton->disconnectSignal(keySignal);
   inputWindow->close();