Changeset 3148 in orxonox.OLD for orxonox/trunk/gui/orxonox_gui_banner.cc

Timestamp:

Dec 11, 2004, 3:33:05 PM (21 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: banner Window is as it should be

File:

• orxonox/trunk/gui/orxonox_gui_banner.cc (modified) (5 diffs)

orxonox/trunk/gui/orxonox_gui_banner.cc

@@ -31 +31 @@
 OrxonoxGuiBanner::OrxonoxGuiBanner ()
 {
+  // Banner Itself //
   bannerEventBox = new EventBox ("BannerEventBox");
   bannerImage = new Image ("banner.xpm");
   bannerEventBox->fill(bannerImage);
   bannerEventBox->connectSignal ("button_press_event", this, LogoWindowOpen);
-  logoWindowIsOpen = -1;
+
+  // Banner Window //
+  logoWindow = new Window("Logo");
+  logoWindow->connectSignal("destroy", this, LogoWindowClose);
+  logoWindow->connectSignal("delete_event", this, LogoWindowClose);
+  logoEventBox = new EventBox();
+  logoBox = new Box('v');
+  logoLabel = new Label("OrxOnoX, " PACKAGE_VERSION);
+  logoImage = new Image("banner.xpm");
+  logoEventBox->fill(logoImage);
+  
+  logoBox->fill(logoLabel);
+  logoBox->fill(logoEventBox);
+  logoEventBox->connectSignal("button_press_event",this,LogoWindowClose);
+  
+  logoWindow->fill (logoBox);
+  
+  Window::addWindow (logoWindow);
 }
 
@@ -50 +68 @@
     it shows it if it has been created
 */
-void OrxonoxGuiBanner::logoWindowNew()
+void OrxonoxGuiBanner::logoWindowOpen()
 {
-  if (logoWindowIsOpen <= 0)
-    {
-      if (logoWindowIsOpen < 0)
-        {
-          // creating new Logo Window //
-          logoWindow = new Window("Logo");
-          logoWindow->connectSignal("destroy", this, LogoWindowClose);
-          logoWindow->connectSignal("delete_event", this, LogoWindowClose);
-          logoEventBox = new EventBox();
-          logoBox = new Box('v');
-          logoLabel = new Label("OrxOnoX, " PACKAGE_VERSION);
-          logoImage = new Image("banner.xpm");
-          logoEventBox->fill(logoImage);
-
-          logoBox->fill(logoLabel);
-          logoBox->fill(logoEventBox);
-          logoEventBox->connectSignal("button_press_event",this,LogoWindowClose);
-
-          logoWindow->fill (logoBox);
-          
-        }
-      //  showing Window //
-      logoWindowIsOpen = 1;
-     
-      
-      logoWindow->showall();
-    }
+  logoWindow->open();
 }
 
@@ -86 +78 @@
 void OrxonoxGuiBanner::logoWindowClose()
 {
-  logoWindowIsOpen = 0;
-  logoWindow->hide();
+  logoWindow->close();
 }
 
@@ -106 +97 @@
    \param banner the Object that holds the banner-logo-window
 */
-gint LogoWindowOpen (GtkWidget* widget, GdkEvent* event, void* banner)
+gint OrxonoxGuiBanner::LogoWindowOpen (GtkWidget* widget, GdkEvent* event, void* banner)
 {
-  static_cast<OrxonoxGuiBanner*>(banner)->logoWindowNew();
+  static_cast<OrxonoxGuiBanner*>(banner)->logoWindowOpen();
 }
 
@@ -118 +109 @@
    \param banner the Object that holds the banner-logo-window
 */
-gint LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner)
+gint OrxonoxGuiBanner::LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner)
 {
   static_cast<OrxonoxGuiBanner*>(banner)->logoWindowClose();