Changeset 2736 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 6, 2004, 3:38:51 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: nicer, modularer, better, but not finished

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_keys.cc (modified) (2 diffs)
• orxonox_gui_keys.h (modified) (1 diff)

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -62 +62 @@
   keyWindow = new Window("keys of player");
 
-  keyBox = new Box('v');
-  Keys[UP] = new Button("up");
-  Keys[DOWN] = new Button("down");
-  Keys[LEFT] = new Button("left");
-  Keys[RIGHT] = new Button("right");
-  Keys[SHOOT] = new Button("shoot");
-
-  Keys[UP]->connectSignal("key_press_event", Keys[UP], key_cb);
-  Keys[DOWN]->connectSignal("key_press_event", Keys[DOWN], key_cb);
-  Keys[LEFT]->connectSignal("key_press_event", Keys[LEFT], key_cb);
-  Keys[RIGHT]->connectSignal("key_press_event", Keys[RIGHT], key_cb);
-  Keys[SHOOT]->connectSignal("key_press_event", Keys[SHOOT], key_cb);
-
-  keyBox->fill(Keys[UP]);
-  keyBox->fill(Keys[DOWN]);
-  keyBox->fill(Keys[LEFT]);
-  keyBox->fill(Keys[RIGHT]);
-  keyBox->fill(Keys[SHOOT]);
-
-  keyWindow->fill(keyBox);
+  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;
 
+}
+
+Widget* Player::addKey (KEYS key, char* name)
+{
+  keyBox[key] = new Box();
+  keyButton[key] = new Button(name);
+  keyLabel[key] = new Label ("test");
+  
+  keyButton[key]->connectSignal("key_press_event", keyLabel[key], key_cb);
+  
+  keyBox[key]->fill(keyButton[key]);
+  keyBox[key]->fill(keyLabel[key]);
+  return keyBox[key];
 }
 
@@ -131 +131 @@
   case GDK_Up:
     printf("Up arrow key!\n");
+    static_cast<Label*>(Widget)->setText("up");
     break;
   case GDK_Down:

orxonox/trunk/gui/orxonox_gui_keys.h

@@ -24 +24 @@
 
 
-  Box* keyBox;
-  Button* Keys[10];
+  Box* keysBox;
+  
+  Box* keyBox[10];
+  Button* keyButton[10];
+  Label* keyLabel[10];
 
 
  public:
   Player(char* player);
+
+  Widget* addKey (KEYS key, char* name);
 
   Button* getOpenButton();