Changeset 3152 in orxonox.OLD for orxonox/trunk/gui/orxonox_gui_keys.cc

Timestamp:

Dec 11, 2004, 5:36:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: keys in the new Style

File:

• orxonox/trunk/gui/orxonox_gui_keys.cc (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -60 +60 @@
   openButton->connectSignal("button_press_event", this, openWindowEvent);
 
-  keyWindow = new Window("keys of player");
-
-  keysBox = new Box('v');
-  keysBox->fill(addKey(UP, "up"));
-  keysBox->fill(addKey(DOWN, "down"));
-  keysBox->fill(addKey(LEFT, "left"));
-  keysBox->fill(addKey(RIGHT, "right"));
-  keysBox->fill(addKey(SHOOT, "shoot"));
-  keyWindow->fill(keysBox);
-  windowIsOpen = false;
-
+  pKeyWindow = new Window("keys of player");
+   pKeysBox = new Box('v');
+    pKeysBox->fill(addKey(UP, "up"));
+    pKeysBox->fill(addKey(DOWN, "down"));
+    pKeysBox->fill(addKey(LEFT, "left"));
+    pKeysBox->fill(addKey(RIGHT, "right"));
+    pKeysBox->fill(addKey(SHOOT, "shoot"));
+    
+    closeButton = new Button("close");
+    closeButton->connectSignal("button_press_event", this, closeWindowEvent);
+    pKeysBox->fill(closeButton);
+   pKeyWindow->fill(pKeysBox);
+   //  Window::addWindow(pKeyWindow);
 }
 
 Widget* Player::addKey (KEYS key, char* name)
 {
-  keyBox[key] = new Box();
-  keyLabel[key] = new Label (name);
-  keyButton[key] = new Button(name);
-  keyButton[key]->saveable;
+  pKeyBox[key] = new Box();
+  pKeyLabel[key] = new Label (name);
+  pKeyButton[key] = new Button(name);
+  pKeyButton[key]->saveable = true;
   
-  keyButton[key]->connectSignal("key_press_event", keyButton[key], key_cb);
+  pKeyButton[key]->connectSignal("key_press_event", pKeyButton[key], key_cb);
   
-  keyBox[key]->fill(keyLabel[key]);
-  keyBox[key]->fill(keyButton[key]);
-  return keyBox[key];
+  pKeyBox[key]->fill(pKeyLabel[key]);
+  pKeyBox[key]->fill(pKeyButton[key]);
+  return pKeyBox[key];
 }
 
@@ -96 +98 @@
 {
   cout << "setting up Key: "<< key <<endl;
-
-}
-
-/**
-   \brief function to display, hide the palyer window
-   Buggy, segmentation fault on WindowMaker
-*/
-void Player::openWindow ()
-{
-  if (!windowIsOpen)
-    keyWindow->showall();
-  else
-    keyWindow->hide();
-  windowIsOpen = !windowIsOpen;
 }
 
 gint Player::openWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
 {
-
-  static_cast<Player*>(player)->openWindow();
-}
-
+  static_cast<Player*>(player)->pKeyWindow->open();
+}
+
+gint Player::closeWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
+{
+  static_cast<Player*>(player)->pKeyWindow->close();
+}
 
 /**