Changeset 2580 in orxonox.OLD for orxonox/trunk/gui

Timestamp:

Oct 15, 2004, 10:41:25 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: Image now Pressable; added Class EventBox to but the Image inside

Location:

orxonox/trunk/gui

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• orxonox_gui.cc (modified) (4 diffs)
• orxonox_gui.h (modified) (2 diffs)
• orxonox_gui_banner.cc (added)
• orxonox_gui_banner.h (added)

orxonox/trunk/gui/Makefile.am

@@ -7 +7 @@
         orxonox_gui_audio.cc orxonox_gui_audio.h \
         orxonox_gui_exec.cc orxonox_gui_exec.h \
-        orxonox_gui_flags.cc orxonox_gui_flags.h
+        orxonox_gui_flags.cc orxonox_gui_flags.h \
+        orxonox_gui_banner.cc orxonox_gui_banner.h
 #orxonox_gui_file.cc 
 

orxonox/trunk/gui/Makefile.in

@@ -119 +119 @@
         orxonox_gui_audio.cc orxonox_gui_audio.h \
         orxonox_gui_exec.cc orxonox_gui_exec.h \
-        orxonox_gui_flags.cc orxonox_gui_flags.h
+        orxonox_gui_flags.cc orxonox_gui_flags.h \
+        orxonox_gui_banner.cc orxonox_gui_banner.h
 
 #orxonox_gui_file.cc 
@@ -142 +143 @@
 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
         orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
-        orxonox_gui_flags.$(OBJEXT)
+        orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -153 +154 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
@@ -214 +216 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_banner.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@

orxonox/trunk/gui/orxonox_gui.cc

@@ -6 +6 @@
 #include "orxonox_gui_exec.h"
 #include "orxonox_gui_flags.h"
+#include "orxonox_gui_banner.h"
 
   Window* orxonoxGUI;
@@ -11 +12 @@
   OrxonoxGuiAudio* audio;
   OrxonoxGuiExec* exec;
-  OrxonoxGuiFlags* flags;  
+  OrxonoxGuiFlags* flags;
+  OrxonoxGuiBanner* banner;
 
 int main( int argc, char *argv[] )
@@ -35 +37 @@
   Box* windowBox = new Box ('h');
 
-  Image* banner = new Image ("banner.xpm");
-  windowBox->fill (banner);
+  banner = new OrxonoxGuiBanner();
+  windowBox->fill (banner->getEventBox());
+  
   Box* optionBox = new Box ('v');
   
@@ -264 +267 @@
 }
 
+// EVENTBOX //
+EventBox::EventBox ()
+{
+  is_option = -1;
+  next = NULL;
+  down = NULL;
+  widget = gtk_event_box_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
+}
+
+EventBox::EventBox (char* title)
+{
+  /**
+   * Creates a new EventBox with name title
+   */
+  is_option = -1;
+  next = NULL;
+  down = NULL;
+  widget = gtk_event_box_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
+
+}
+void EventBox::setTitle (char* title)
+{
+  /**
+   * Sets the EventBoxes name to title
+   */
+  //  gtk_frame_set_label (GTK_FRAME (widget), title);
+}
+EventBox::~EventBox ()
+{
+}
 
 

orxonox/trunk/gui/orxonox_gui.h

@@ -17 +17 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkimage.h>
+#include <gtk/gtkeventbox.h>
 
 class OrxonoxGui
@@ -78 +79 @@
   ~Frame ();
   
+  void setTitle (char* title);
+};
+
+class EventBox : public Container
+{
+ public:
+  EventBox (char* eventBoxName);
+  EventBox (void);
+  ~EventBox ();
+
   void setTitle (char* title);
 };