Changeset 3299 in orxonox.OLD for orxonox/branches/updater/src

Timestamp:

Dec 27, 2004, 2:02:11 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/updater: flags now working perfectly. not the fastest way to implement this, but still….

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui.h (modified) (1 diff)
• orxonox_gui_flags.cc (modified) (4 diffs)
• orxonox_gui_flags.h (modified) (2 diffs)
• orxonox_gui_gtk.cc (modified) (1 diff)
• orxonox_gui_gtk.h (modified) (2 diffs)
• rc (modified) (1 diff)

orxonox/branches/updater/src/gui/orxonox_gui.h

@@ -28 +28 @@
   ~OrxonoxGui ();
 
+  void copyOptionsToGameStruct();
 };
 
 
-
 #endif /* _ORXONOX_GUI_H */

orxonox/branches/updater/src/gui/orxonox_gui_flags.cc

@@ -32 +32 @@
 OrxonoxGuiFlags::OrxonoxGuiFlags (Widget* widget)
 {
-  flagText = (char*) malloc (1024);
+  this->flagsFrame = new Frame ("Orxonox-Startup-Flags:");
+  this->flagsBox = new Box ('v');
 
-  flagsFrame = new Frame ("Orxonox-Startup-Flags:");
-  flagsBox = new Box ('v');
+  this->flagsLabel = new Label ();
+  this->flagsLabel->setSize (260,60);
+  this->flagsBox->fill (flagsLabel);
+  this->shortFlags = new CheckButton ("shortFlags");
+  this->flagsBox->fill (shortFlags);
 
-  flagsLabel = new Label ();
-  flagsLabel->setSize (260,60);
-  flagsBox->fill (flagsLabel);
-  shortFlags = new CheckButton ("shortFlags");
-  flagsBox->fill (shortFlags);
-
-  flagsFrame->fill (flagsBox);
+  this->flagsFrame->fill (flagsBox);
 }
 
@@ -52 +50 @@
 Widget* OrxonoxGuiFlags::getWidget ()
 {
-  return flagsFrame;
+  return this->flagsFrame;
 }
 
@@ -61 +59 @@
 void OrxonoxGuiFlags::setTextFromFlags (Widget* widget)
 {
-  sprintf (flagText, "");
-  strcat (flagText, "orxonox");
-  FlagsText (widget);
-  flagsLabel->setTitle(flagText);
+  FlagInfo flagInfo;
+  flagInfo.shortFlags = this->shortFlags;
+  flagInfo.flagsLabel = this->flagsLabel;
+
+  this->flagsLabel->ereaseText();
+  this->flagsLabel->appendText("orxonox");
+  widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
+  //  flagsLabel->setTitle(flagText);
 }
 
@@ -71 +73 @@
     \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)
 */
-void OrxonoxGuiFlags::FlagsText(Widget* widget)
+void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)
 {
+  FlagInfo* info = (FlagInfo*)flagInfo;
   if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue && (static_cast<Option*>(widget)->flagName || static_cast<Option*>(widget)->flagNameShort ))
+    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue )
       {
-        if (shortFlags->isActive())
+        if (info->shortFlags->isActive() && static_cast<Option*>(widget)->flagNameShort)
           {
-            strcat (flagText, " -");
-            strcat (flagText, static_cast<Option*>(widget)->flagNameShort);
+            info->flagsLabel->appendText(" -");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagNameShort);
           }
-        else
+        else if (!info->shortFlags->isActive() && static_cast<Option*>(widget)->flagName)
           {
-            strcat (flagText, " --");
-            strcat (flagText, static_cast<Option*>(widget)->flagName);
+            info->flagsLabel->appendText(" --");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagName);
           }
+
         if (static_cast<Option*>(widget)->isOption == 2)
           {
-            sprintf (flagText, "%s=%i", flagText, static_cast<Option*>(widget)->value);
+            info->flagsLabel->appendText("=");
+            info->flagsLabel->appendInt(static_cast<Option*>(widget)->value);
           }
       }
-  switch (widget->isOption)
-    {
-    case -1:
-      FlagsText (static_cast<Container*>(widget)->down);
-      break;
-    case -2:
-      FlagsText (static_cast<Box*>(widget)->down);
-      break;
-    } 
-  
-  if (widget->next != NULL)
-    FlagsText (widget->next);
 }

orxonox/branches/updater/src/gui/orxonox_gui_flags.h

@@ -17 +17 @@
   CheckButton* shortFlags;    //!< CheckButton to change the display of short and long flags \todo show long if long not availible...
   Label* flagsLabel;          //!< The Label of the Flags
-  char* flagText;             //!< The Text of the Label. \todo Delete when Object is destroyed.
 
  public:
@@ -24 +23 @@
 
   void setTextFromFlags (Widget* widget);
-  void OrxonoxGuiFlags::FlagsText(Widget* widget);
+  static void flagsText(Widget* widget, void* flagInfo);
   
+  struct FlagInfo
+  {
+    CheckButton* shortFlags;
+    Label* flagsLabel;
+  };
   Widget* getWidget ();
 };

orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

@@ -1513 +1513 @@
 
 /**
+   \brief ereases the Text of a Label
+*/
+void Label::ereaseText(void)
+{
+  this->setTitle("");
+}
+
+/** 
+    \brief appends some Text to a Label
+    \param textToAppend The text that will be appended to this Label
+*/
+void Label::appendText(char* textToAppend)
+{
+  if (this->title)
+    {
+      char* tmpTitle = new char[strlen(this->title)+strlen(textToAppend)+1];
+      strcpy(tmpTitle, title);  
+      strcat(tmpTitle, textToAppend);
+      delete []this->title;
+      this->title = tmpTitle;
+    }
+  else
+    {
+      this->title = new char[strlen(textToAppend)];
+    }
+  
+#ifdef HAVE_GTK2
+  gtk_label_set_text (GTK_LABEL (this->widget), title);
+#endif /* HAVE_GTK2 */
+}
+
+/** 
+    \brief Appends some integer to the Label
+    \param intToAppend The Int that will be added.
+    
+    it does this by just converting the int into a char* and send it to appendText
+*/
+void Label::appendInt(int intToAppend)
+{
+  char append [20];
+  sprintf(append, "%d", intToAppend);
+  this->appendText(append);
+}
+
+
+/**
    \brief get the Text of a Label
    \return The Text the Label holds.

orxonox/branches/updater/src/gui/orxonox_gui_gtk.h

@@ -316 +316 @@
 };
 
-//! A CharLabel is a simple Label, that holds a char*, and will be updated, if changed.
+//! A OptionLabel is a simple Label, that holds a char*, and will be updated, if changed.
 class OptionLabel : public Option
 {
@@ -347 +347 @@
   
   void setTitle(char* text);
+  void ereaseText(void);
+  void appendText(char* textToAppend);
+  void appendInt(int intToAppend);
   char* getText ();
 };

orxonox/branches/updater/src/gui/rc

@@ -120 +120 @@
 # just listed in this document for the users reference.
 
-widget_class "GtkWindow" style "window"
-widget_class "GtkFrame" style "window"
-widget_class "Gtk*EventBox" style "window"
-widget_class "GtkDialog" style "window"
-widget_class "GtkFileSelection" style "window"
-widget_class "*Gtk*Scale" style "scale"
-widget_class "*GtkCheckButton*" style "toggle_button"
-widget_class "*Gtk*Menu*" style "toggle_button"
-widget_class "*GtkRadioButton*" style "toggle_button"
-widget_class "*GtkButton*" style "button"
-widget_class "*Ruler" style "ruler"
-widget_class "*GtkText" style "text"
-widget_class "*GtkLabel" style "text"
+widget_class "GtkWindow"           style "window"
+widget_class "GtkFrame"            style "window"
+widget_class "Gtk*EventBox"        style "window"
+widget_class "GtkDialog"           style "window"
+widget_class "GtkFileSelection"    style "window"
+widget_class "*Gtk*Scale"          style "scale"
+widget_class "*GtkCheckButton*"    style "toggle_button"
+widget_class "*Gtk*Menu*"          style "toggle_button"
+widget_class "*GtkRadioButton*"    style "toggle_button"
+widget_class "*GtkButton*"         style "button"
+widget_class "*Ruler"              style "ruler"
+widget_class "*GtkText"            style "text"
+widget_class "*GtkLabel"           style "text"