Changeset 4046 in orxonox.OLD for orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_gtk.h

Timestamp:

May 4, 2005, 11:50:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/guiMerge: heavy clean-up of the gui

File:

• orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_gtk.h (modified) (20 diffs)

orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -30 +30 @@
 #endif /* HAVE_GTK2 */
 
+// enumerator for different GuiOption-Types
+enum GUI_OPTION {GUI_CONTAINER = -2,
+                 GUI_BOX = -1,
+                 GUI_NOTHING = 0,
+                 GUI_BOOL = 1,
+                 GUI_INT = 2,
+                 GUI_FLOAT = 3,
+                 GUI_CHAR = 4,
+                 GUI_CHAR_ARRAY = 5};
+
 extern char* guiExecutable;
 extern char* progExecutable;
@@ -48 +58 @@
   void hide(void);
   void setSize(int width, int height);
+
   virtual void setTitle(const char* title);  //!< An abstract Function, that sets the title of Widgets.
 
@@ -65 +76 @@
 #ifdef HAVE_GTK2
   // Connection - Functions
-
   gulong connectSignal(char* event, gint(*signal)(GtkWidget*, GdkEvent*, void* ));
   gulong connectSignal(char* event, gint(*signal)(GtkWidget*, Widget* ));
@@ -72 +82 @@
   gulong connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEventKey*, void* ));
   void disconnectSignal(gulong signalID);
-
   // Signals
   static gint doNothingSignal(GtkWidget* widget, GdkEvent* event, void* nothing);
-#endif /* HAVE_GTK2 */
+#else /* HAVE_GTK2 */
+  // Connection - Functions
+  unsigned long connectSignal(char* event, int(*signal)(void*, void*, void* )){};
+  unsigned long connectSignal(char* event, int(*signal)(void*, Widget* )){};
+  unsigned long connectSignal(char* event, void* extObj, int(*signal)(void*, void*, void* )){};
+  unsigned long connectSignal(char* event, void* extObj, int(*signal)(void*, void* )){};
+  void disconnectSignal(unsigned long signalID);
+  // Signals
+  static int doNothingSignal(void* widget, void* event, void* nothing);
+#endif /* HAVE_GTK2 */
+
 
   Widget* next;                     //!< next always points to the next Widget in the list. Every Widget has a next one, or has NULL as next
 #ifdef HAVE_GTK2
   GtkWidget* widget;                //!< widget is the gtk_widget that the specific Object Contains.
-#endif /* HAVE_GTK2 */
+#else /* HAVE_GTK2 */
+  void* widget;
+#endif /* HAVE_GTK2 */
+
   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
-
-  //! defines isOption states
-  enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; 
+  
   char* title;                      //!< The name of the Widget. Some do display it, Options need it to save;
 };
@@ -95 +115 @@
   virtual ~Packer(void);
 
-  Widget* down; //!< this points to the Widget below this.
-  char* groupName; //!< For each Packer you can specify a Groupname under which the lowerWidgets will be saved.
-
-  void setGroupName(char* name);
-  char* getGroupName(void);
+  Widget* down;                      //!< this points to the Widget below this.
+  char* groupName;                   //!< For each Packer you can specify a Groupname under which the lowerWidgets will be saved.
+
+  void setGroupName(const char* name);
+  /** \returns the GroupName if existent NULL otherwise */
+  inline const char* getGroupName(void) const {return this->groupName;}
+
 
   virtual void fill(Widget* lowerWidget) = 0; //!< An abstract function, that fills Packers.
@@ -119 +141 @@
   Container(void);
   virtual ~Container(void);
-  //  void setBorderWidth(int borderwidth);
+  void setBorderWidth(int borderwidth);
   void fill(Widget* lowerWidget);
 };
@@ -136 +158 @@
   static void addWindow(Window* windowToAdd);
 
-  Window(void);
-  Window(char* windowName);
+  Window(const char* windowName = NULL);
   virtual ~Window(void);
-  void init(void);
-  
-  void setTitle(const char* title);
+  
+  virtual void setTitle(const char* title);
   void showall(void);
   void open(void);
@@ -150 +170 @@
   static gint windowOpen(GtkWidget* widget, GdkEvent* event, void* window);
   static gint windowClose(GtkWidget* widget, GdkEvent* event, void* window);
+#else /* HAVE_GTK2 */
+  int Window::windowOpen(void* widget, void* event, void* window);
+  int Window::windowClose(void* widget, void* event, void* window);
 #endif /* HAVE_GTK2 */
 };
@@ -161 +184 @@
 {
  public:
-  Frame(void);
-  Frame(char* frameName);
+  Frame(char* frameName = NULL);
   virtual ~Frame(void);
-  void init(void);
-
-  void setTitle(const char* title);
+
+  virtual void setTitle(const char* title);
 };
 
@@ -176 +197 @@
 {
  public:
-  EventBox(void);
-  EventBox(char* eventBoxName);
+  EventBox(const char* eventBoxName = NULL);
   virtual ~EventBox(void);
-  void init(void);
 };
 
@@ -191 +210 @@
 {
  public:
-  Box(void);
-  Box(char boxtype);
+  Box(char boxtype = 'h');
   virtual ~Box(void);
-  void init(char boxtype);
-  
-  void fill(Widget* lowerWidget);
+  
+  virtual void fill(Widget* lowerWidget);
 };
 
@@ -206 +223 @@
 {
  protected:
-  bool saveable;  //!< Options can be Saved.
+  bool saveable;              //!< Options can be Saved.
   
  public:
   Option(void);
   virtual ~Option(void);
-  void init(void);
-
-  int value; //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume
-  char* flagName; //!< options have a flag name that will be appendet if you start the Program from the GUI.
-  char* flagNameShort; //!< like flag_name but shorter
-  int defaultValue; //!< A default value is good, for hiding a option if it is not needed.(hidden if value == default_value)
-
-  void saveability(void);
-  void saveability(bool isSaveable);
+
+  int value;                  //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume
+  char* flagName;             //!< options have a flag name that will be appendet if you start the Program from the GUI.
+  char* flagNameShort;        //!< like flag_name but shorter
+  int defaultValue;           //!< A default value is good, for hiding a option if it is not needed.(hidden if value == default_value)
+
+  char* shortDescription;      //!< A Text that describes this option in short
+  char* longDescription;      //!< A Longer Text describing this option in a full way
+
+  void saveability(bool isSaveable = true);
   virtual char* save(void);
   virtual void load(char* loadString);
 
   bool isSaveable(void);
-  void setFlagName(char* flagname, int defaultvalue);
-  void setFlagName(char* flagname, char* flagnameshort, int defaultvalue);
-  virtual void redraw(void) = 0; //!< A Option must be able to redraw itself.
+  void setFlagName(const char* flagname, int defaultvalue);
+  void setFlagName(const char* flagname, const char* flagnameshort, int defaultvalue);
+  void setDescription(const char* shortDescription, const char* longDescription = NULL);
+
+  virtual void redraw(void) = 0;       //!< A Option must be able to redraw itself.
   virtual void changeOption(void) = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.
 #ifdef HAVE_GTK2
@@ -241 +261 @@
 {
  public:
-  Button(char* buttonname);
+  Button(char* buttonName = NULL);
   virtual ~Button(void);
-  void init(void);
-
-  void setTitle(const char* title);
-  void redraw(void);
-  void changeOption(void);
+
+  virtual void setTitle(const char* title);
+  virtual void redraw(void);
+  virtual void changeOption(void);
 };
 
@@ -256 +275 @@
 {
  public:
-  CheckButton(char* buttonname);
+  CheckButton(const char* buttonName = NULL);
   virtual ~CheckButton(void);
-  void init(void);
-
-  void setTitle(const char* title);
-  bool isActive(void);           //!< a Bool value to see, if this CheckButton is active.
-  void redraw(void);
-  void changeOption(void);
+
+  bool isActive(void);
+
+  virtual void setTitle(const char* title);
+  virtual void redraw(void);
+  virtual void changeOption(void);
 };
 
@@ -276 +295 @@
   int end;                              //!< The end of the Slider-range.
  public:
-  Slider(char* slidername, int start, int end);
+  Slider(const char* slidername, int start, int end);
   virtual ~Slider(void);
-  void init(int start, int end);
 
   void setValue(int value);
-  void redraw(void);
-  void changeOption(void);
+  virtual void redraw(void);
+  virtual void changeOption(void);
 };
 
@@ -301 +319 @@
     GtkWidget* item;                    //!< One Item From a Menu.
 #endif /* HAVE_GTK2 */
+
     MenuItem* next;                     //!< Pointer to the next MenuItem.
   };
@@ -316 +335 @@
   
   void addItem(char* itemName);
-  void redraw(void);
-  void changeOption(void);
+  virtual void redraw(void);
+  virtual void changeOption(void);
 };
 
@@ -323 +342 @@
 class OptionLabel : public Option
 {
- private:
-
- public:
-  OptionLabel(char* label, char* value);
+ public:
+  OptionLabel(const char* label, const char* value);
   virtual ~OptionLabel(void);
-  void init(void);
-  
-  void setValue(char* newValue);
+  
+  void setValue(const char* newValue);
 
   virtual char* save(void);
   virtual void load(char* loadString);
 
-  void redraw(void);
-  void changeOption(void);
+  virtual void redraw(void);
+  virtual void changeOption(void);
 
   char* cValue;                          //!< The Value the Label will have. \todo make private
-
 };
 
@@ -346 +361 @@
 {
  public:
-  Label(void);
-  Label(char* text);
+  Label(const char* text = NULL);
   virtual ~Label(void);
-  void init(void);
-  
-  void setTitle(char* text);
+  
+  virtual void setTitle(const char* text);
   void ereaseText(void);
   void appendText(char* textToAppend);
   void appendInt(int intToAppend);
-  char* getText(void);
+  const char* getText(void);
 };
 
@@ -362 +375 @@
 {
  public:
-  ProgressBar(void);
-  ProgressBar(char* label);
+  ProgressBar(const char* label = NULL);
   virtual ~ProgressBar(void);
-  void init(void);
 
   void setProgress(double progress);