Changeset 3148 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

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

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_banner.cc (modified) (5 diffs)
• orxonox_gui_banner.h (modified) (2 diffs)
• orxonox_gui_gtk.cc (modified) (4 diffs)
• orxonox_gui_gtk.h (modified) (1 diff)

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();

orxonox/trunk/gui/orxonox_gui_banner.h

@@ -23 +23 @@
   // the logo Window
   Window* logoWindow;
-  int logoWindowIsOpen;
   EventBox* logoEventBox;
   Box* logoBox;
@@ -33 +32 @@
   ~OrxonoxGuiBanner ();
 
-  void logoWindowNew();
+  void logoWindowOpen();
   void logoWindowClose();
   Widget* getWidget ();
+
+  static gint LogoWindowOpen (GtkWidget *widget, GdkEvent* event, void* banner);
+  static gint LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner);
 };
 
-gint LogoWindowOpen (GtkWidget *widget, GdkEvent* event, void* banner);
-gint LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner);
 
 #endif /* _ORXONOX_GUI_BANNER_H */

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -239 +239 @@
 /* WINDOW */
 
+Window* Window::mainWindow = NULL;
+
+void Window::addWindow(Window* windowToAdd)
+{
+  if (!mainWindow)
+    {
+      mainWindow = windowToAdd;
+      return;
+    }
+
+  Widget* tmpWindow = mainWindow;
+  while (tmpWindow->next)
+    tmpWindow = tmpWindow->next;
+  tmpWindow->next = windowToAdd;
+  
+  return;
+}
+      
+
+
 /**
    \brief Creating a new Window without a Name
@@ -264 +284 @@
 void Window::init()
 {
+  if (!mainWindow)
+    mainWindow = this;
+
   isOpen = false;
 
@@ -318 +341 @@
 void Window::open()
 {
-  isOpen = true;
-  gtk_grab_add(widget);
+  if (this != mainWindow)
+    {
+      isOpen = true;
+      gtk_widget_show_all(widget);
+      gtk_grab_add(widget);
+    }
 }
 
@@ -327 +354 @@
 void Window::close()
 {
-  isOpen = false;
-  gtk_grab_remove(widget);
+  if (this != mainWindow)
+    {
+      isOpen = false;
+      gtk_grab_remove(widget);
+      gtk_widget_hide (widget);
+    }
 }
 

orxonox/trunk/gui/orxonox_gui_gtk.h

@@ -89 +89 @@
   bool isOpen;
  public:
+  static Window* mainWindow;
+  static void addWindow(Window* windowToAdd);
+
   static Window* lastWindow;
   Window (void);