Changeset 2024 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 23, 2004, 1:37:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: added a cool picture to the side of the Gui, and included Image into the framework

Location:

orxonox/trunk/gui

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• banner.xpm (added)
• orxonox_gui.cc (modified) (3 diffs)
• orxonox_gui.h (modified) (2 diffs)

orxonox/trunk/gui/Makefile.am

@@ -18 +18 @@
 #  following and add `chk' to the EXTRA_DIST list
 #TESTS=chk
-EXTRA_DIST = rc
+EXTRA_DIST = rc banner.xpm
 
 #  build and install the .info pages

orxonox/trunk/gui/Makefile.in

@@ -131 +131 @@
 #  following and add `chk' to the EXTRA_DIST list
 #TESTS=chk
-EXTRA_DIST = rc
+EXTRA_DIST = rc banner.xpm
 subdir = gui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

orxonox/trunk/gui/orxonox_gui.cc

@@ -33 +33 @@
   orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
   
-  Box* windowBox = new Box ('v');
+  Box* windowBox = new Box ('h');
+
+  Image* banner = new Image ("banner.xpm");
+  windowBox->fill (banner);
+  Box* optionBox = new Box ('v');
   
   Box* avBox = new Box ('h');
@@ -42 +46 @@
   avBox->fill (audio->getFrame ());
       
-  windowBox->fill (avBox);
+  optionBox->fill (avBox);
     
   exec = new OrxonoxGuiExec (orxonoxGUI);
-  windowBox->fill (exec->getFrame ());
+  optionBox->fill (exec->getFrame ());
 
   flags = new OrxonoxGuiFlags (orxonoxGUI);
-  windowBox->fill (flags->getFrame ());
+
+
+  optionBox->fill (flags->getFrame ());
+  windowBox->fill (optionBox);
   
   orxonoxGUI->fill (windowBox);
@@ -314 +321 @@
       tmp->next = lowerWidget;
     }
+}
+
+/* IMAGE */
+
+Image::Image (char* imagename)
+{
+  is_option = 0;
+  next = NULL;
+  widget = gtk_image_new_from_file (imagename);
 }
 

orxonox/trunk/gui/orxonox_gui.h

@@ -16 +16 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtklabel.h>
+#include <gtk/gtkimage.h>
 
 class OrxonoxGui
@@ -92 +93 @@
 };
 
+class Image : public Widget
+{
+ public:
+  Image (char* imgaename);
+  ~Image ();
+};
+
 class Option : public Widget
 {