Changeset 3153 in orxonox.OLD

Timestamp:

Dec 11, 2004, 6:09:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: more modular.

Location:

orxonox/trunk/gui

Files:

• 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_gui_keys.cc (modified) (3 diffs)
• orxonox_gui_keys.h (modified) (1 diff)

orxonox/trunk/gui/orxonox_gui_banner.cc

@@ -35 +35 @@
   bannerImage = new Image ("banner.xpm");
   bannerEventBox->fill(bannerImage);
-  bannerEventBox->connectSignal ("button_press_event", this, LogoWindowOpen);
 
   // Banner Window //
   logoWindow = new Window("Logo");
-  logoWindow->connectSignal("destroy", this, LogoWindowClose);
-  logoWindow->connectSignal("delete_event", this, LogoWindowClose);
+    bannerEventBox->connectSignal ("button_press_event", logoWindow, Window::windowOpen);
+
+
+  logoWindow->connectSignal("destroy", logoWindow, Window::windowClose);
+  logoWindow->connectSignal("delete_event", logoWindow, Window::windowClose);
   logoEventBox = new EventBox();
   logoBox = new Box('v');
@@ -49 +51 @@
   logoBox->fill(logoLabel);
   logoBox->fill(logoEventBox);
-  logoEventBox->connectSignal("button_press_event",this,LogoWindowClose);
+  logoEventBox->connectSignal("button_press_event",logoWindow, Window::windowClose);
   
   logoWindow->fill (logoBox);
@@ -72 +74 @@
 }
 
-/**
-   \brief opens up the banner-window.\n
-   this is the Signal that does it. !!SIGNALS ARE STATIC!!
-   \param widget the widget that did it!
-   \param event the event that did it!
-   \param banner the Object that holds the banner-logo-window
-*/
-gint OrxonoxGuiBanner::LogoWindowOpen (GtkWidget* widget, GdkEvent* event, void* banner)
-{
-  static_cast<OrxonoxGuiBanner*>(banner)->logoWindow->open();
-}
 
-/**
-   \brief closes the banner-window.\n
-   this is the Signal that does it. !!SIGNALS ARE STATIC!!
-   \param widget the widget that did it!
-   \param event the event that did it!
-   \param banner the Object that holds the banner-logo-window
-*/
-gint OrxonoxGuiBanner::LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner)
-{
-  static_cast<OrxonoxGuiBanner*>(banner)->logoWindow->close();
-  
-}

orxonox/trunk/gui/orxonox_gui_banner.h

@@ -34 +34 @@
   Widget* getWidget ();
 
-  static gint LogoWindowOpen (GtkWidget *widget, GdkEvent* event, void* banner);
-  static gint LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner);
 };
 

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -352 +352 @@
 }
 
+/**
+   \brief opens up a window (not topmost Window).
+   this is the Signal that does it. !!SIGNALS ARE STATIC!!
+   \param widget the widget that did it!
+   \param event the event that did it!
+   \param window the Window that should be opened
+*/
+gint Window::windowOpen (GtkWidget *widget, GdkEvent* event, void* window)
+{
+  static_cast<Window*>(window)->open();
+}
+
+/**
+   \brief closes a window (not topmost Window).
+   this is the Signal that does it. !!SIGNALS ARE STATIC!!
+   \param widget the widget that did it!
+   \param event the event that did it!
+   \param window the Window that should be closed
+*/
+gint Window::windowClose (GtkWidget *widget, GdkEvent* event, void* window)
+{
+  static_cast<Window*>(window)->close();
+  
+}
 /**
  * Quits the orxonox_GUI.

orxonox/trunk/gui/orxonox_gui_gtk.h

@@ -97 +97 @@
   
   void setTitle (char* title);
-  void showall (); 
+  void showall ();
   void open();
   void close();
+
+  static gint windowOpen (GtkWidget *widget, GdkEvent* event, void* window);
+  static gint windowClose (GtkWidget *widget, GdkEvent* event, void* window);
   static gint orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data);
 };

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -57 +57 @@
 Player::Player(char* player)
 {
-  openButton = new Button (player);
-  openButton->connectSignal("button_press_event", this, openWindowEvent);
 
   pKeyWindow = new Window("keys of player");
@@ -69 +67 @@
     
     closeButton = new Button("close");
-    closeButton->connectSignal("button_press_event", this, closeWindowEvent);
+    closeButton->connectSignal("button_press_event", pKeyWindow, Window::windowClose);
     pKeysBox->fill(closeButton);
    pKeyWindow->fill(pKeysBox);
    //  Window::addWindow(pKeyWindow);
+
+  openButton = new Button (player);
+  openButton->connectSignal("button_press_event", pKeyWindow, Window::windowOpen);
+
 }
 
@@ -100 +102 @@
 }
 
-gint Player::openWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
-{
-  static_cast<Player*>(player)->pKeyWindow->open();
-}
-
-gint Player::closeWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
-{
-  static_cast<Player*>(player)->pKeyWindow->close();
-}
-
 /**
    \brief Function which gets keystrokes

orxonox/trunk/gui/orxonox_gui_keys.h

@@ -54 +54 @@
   Button* getOpenButton();
 
-  static gint openWindowEvent(GtkWidget* widget, GdkEvent* event, void* player);
-  static gint closeWindowEvent(GtkWidget* widget, GdkEvent* event, void* player);
   static gint key_cb(GtkWidget* w, GdkEventKey* event, void* widget);
   void setkey(KEYS key);