Changeset 2738 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 6, 2004, 4:34:25 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: better order of key-options

File:

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

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -76 +76 @@
 {
   keyBox[key] = new Box();
+  keyLabel[key] = new Label (name);
   keyButton[key] = new Button(name);
-  keyLabel[key] = new Label ("test");
   
-  keyButton[key]->connectSignal("key_press_event", keyLabel[key], key_cb);
+  keyButton[key]->connectSignal("key_press_event", keyButton[key], key_cb);
   
+  keyBox[key]->fill(keyLabel[key]);
   keyBox[key]->fill(keyButton[key]);
-  keyBox[key]->fill(keyLabel[key]);
   return keyBox[key];
 }
@@ -127 +127 @@
 gint Player::key_cb(GtkWidget* w, GdkEventKey* event, void* widget)
 {
-  Label* label = static_cast<Label*>(widget);
+  Button* button = static_cast<Button*>(widget);
 
   switch(event->keyval) {
   case GDK_Up:
     printf("Up arrow key!\n");
-    label->setText("up");
+    button->setTitle("up");
     break;
   case GDK_Down:
     printf("Down arrow key!\n");
-    label->setText("down");
+    button->setTitle("down");
     break;
   case GDK_Left:
     printf("Left arrow key!\n");
-    label->setText("left");
+    button->setTitle("left");
     break;
   case GDK_Right:
     printf("Right arrow key!\n");
-    label->setText("right");
+    button->setTitle("right");
     break;
 
   case GDK_space:
     printf("Space Pressed.\n");
-    label->setText("space");
+    button->setTitle("space");
     break;
 
   case 65293:
     printf("Enter Pressed\n");
-    label->setText("enter");
+    button->setTitle("enter");
     break;
 
@@ -160 +160 @@
   case GDK_Shift_L:
     printf("Left Shift!\n");
-    label->setText("l_shift");
+    button->setTitle("l_shift");
     break;
   case GDK_Shift_R:
     printf("Right Shift!\n");
-    label->setText("r_shift");
+    button->setTitle("r_shift");
     break;
   case GDK_Control_L:
     printf("Left Control!\n");
-    label->setText("l_ctrl");
+    button->setTitle("l_ctrl");
     break;
   case GDK_Control_R:
     printf("Right Control!\n");
-    label->setText("r_ctrl");
+    button->setTitle("r_ctrl");
     break;
   case GDK_Alt_L:
     printf("Left Alt!\n");
-    label->setText("l_alt");
+    button->setTitle("l_alt");
     break;
   case GDK_Alt_R:
     printf("Rigth Alt!\n");
-    label->setText("r_alt");
+    button->setTitle("r_alt");
     break;
     // FXX KEYS //
   case GDK_F1:
     printf("F1!\n");
-    label->setText("f1");
+    button->setTitle("f1");
     break;
   case GDK_F2:
     printf("F2!\n");
-    label->setText("f2");
+    button->setTitle("f2");
     break;
   case GDK_F3:
     printf("F3!\n");
-    label->setText("f3");
+    button->setTitle("f3");
     break;
   case GDK_F4:
     printf("F4!\n");
-    label->setText("f4");
+    button->setTitle("f4");
     break;
   case GDK_F5:
     printf("F5!\n");
-    label->setText("f5");
+    button->setTitle("f5");
     break;
   case GDK_F6:
     printf("F6!\n");
-    label->setText("f6");
+    button->setTitle("f6");
     break;
   case GDK_F7:
     printf("F7!\n");
-    label->setText("f7");
+    button->setTitle("f7");
     break;
   case GDK_F8:
     printf("F8!\n");
-    label->setText("f8");
+    button->setTitle("f8");
     break;
   case GDK_F9:
     printf("F9\n");
-    label->setText("f9");
+    button->setTitle("f9");
     break;
   case GDK_F10:
     printf("F10!\n");
-    label->setText("f10");
+    button->setTitle("f10");
     break;
   case GDK_F11:
     printf("F11!\n");
-    label->setText("f11");
+    button->setTitle("f11");
     break;
   case GDK_F12:
     printf("F12!\n");
-    label->setText("f12");
+    button->setTitle("f12");
     break;
 
@@ -237 +237 @@
     sprintf(tmp, "%c", event->keyval);
     printf ("other key %s \n", tmp);
-    label->setText(tmp);
+    button->setTitle(tmp);
     break;
   }