Changeset 4030 in orxonox.OLD

Timestamp:

May 4, 2005, 12:09:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: pixmaps now part of the Code

Location:

orxonox/trunk/src/lib/gui/gui

Files:

• logo.xpm (added)
• orxonox_gui_banner.cc (modified) (3 diffs)
• orxonox_gui_banner.h (modified) (1 diff)
• orxonox_gui_gtk.cc (modified) (1 diff)
• orxonox_gui_gtk.h (modified) (1 diff)

orxonox/trunk/src/lib/gui/gui/orxonox_gui_banner.cc

@@ -25 +25 @@
 
 #include "orxonox_gui_banner.h"
+#include "banner.xpm"
+#include "logo.xpm"
 
 /**
@@ -33 +35 @@
   // Banner Itself //
   this->bannerEventBox = new EventBox("BannerEventBox");
-  this->bannerImage = new Image("banner.xpm");
+  this->bannerImage = new Image(banner_xpm);
   this->bannerEventBox->fill(this->bannerImage);
 
@@ -47 +49 @@
   this->logoEventBox = new EventBox();
   this->logoBox = new Box('v');
-  this->logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
-  this->logoImage = new Image("banner.xpm");
-  this->logoEventBox->fill(this->logoImage);
-  
+  this->logoLabel = new Label("orxonox, version: " PACKAGE_VERSION);
   this->logoBox->fill(this->logoLabel);
-  this->logoBox->fill(this->logoEventBox);
+  this->logoImage = new Image(logo_xpm);
+  this->logoBox->fill(this->logoImage);
+
+  //! \todo add the names of all the guys working on orxonox
+  this->orxIsLabel = new Label("orxonox is:\nPatrick Boenzli - main Developer\nBenjamin Grauer - right Hand\n....");
+  this->logoBox->fill(this->orxIsLabel);
+  this->logoEventBox->fill(this->logoBox);
 #ifdef HAVE_GTK2
   this->logoEventBox->connectSignal("button_press_event", this->logoWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
-  this->logoWindow->fill(this->logoBox);
+  this->logoWindow->fill(this->logoEventBox);
   
   Window::addWindow(this->logoWindow);

orxonox/trunk/src/lib/gui/gui/orxonox_gui_banner.h

@@ -28 +28 @@
   Image* logoImage;         //!< The Orxonox-CrewLogo-Image
   Label* logoLabel;         //!< The Label for the Orxonox-CrewLogo
+  Label* orxIsLabel;        //!< Some text about us.
 
  public:

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.cc

@@ -1745 +1745 @@
 /**
    \brief Creates a new Image
-   \param imagename the location of the Image on the Hard Disc
-*/
-Image::Image(char* imagename)
-{
-  this->init();
+   \param imageName the location of the Image on the Hard Disc
+*/
+Image::Image(const char* imageName)
+{
+  this->init(imageName);
+
+#ifdef HAVE_GTK2
+  widget = gtk_image_new_from_file(imageName);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Creates a new Image
+   \param imageData data to the PixBuff
+*/
+Image::Image(char** imageData)
+{
+  this->init("pixBuffImage");
+
+#ifdef HAVE_GTK2
+  widget = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_xpm_data((const char**)imageData));
+#endif /* HAVE_GTK2 */
+}
+
+
+/**
+   \brief destructs an Image.
+*/
+Image::~Image(void)
+{
+  PRINTF(5)("deleting the Image: %s\n", this->title);
+}
+
+/** 
+    \brief Initializes a new Image
+    \param name the name to set to the Image
+*/
+void Image::init(const char* name)
+{
+  isOption = 0;
+
   if (this->title)
     delete []this->title;
-  this->title = new char[strlen(imagename)+1];
-  strcpy(this->title, imagename);
-
-#ifdef HAVE_GTK2
-  widget = gtk_image_new_from_file(imagename);
-#endif /* HAVE_GTK2 */
-}
-
-/**
-   \brief destructs an Image.
-*/
-Image::~Image(void)
-{
-  PRINTF(5)("deleting the Image: %s\n", this->title);
-}
-
-/** 
-    \brief Initializes a new Image
-*/
-void Image::init(void)
-{
-  isOption = 0;
-}
+  this->title = new char[strlen(name)+1];
+  strcpy(this->title, name);
+
+}

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -384 +384 @@
 {
  public:
-  Image(char* imgaename);
+  Image(const char* imgaeName);
+  Image(char** imageData);
   virtual ~Image(void);
-  void init(void);
+  void init(const char* name);
 };